zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-26 18:00:38 +00:00
Code Activity

fix(parser): report unclosed multiline comments (#924)

Browse Source 
* fix(parser): report unclosed multiline comments

* chore: make multi line comment variable names clearer

---------

Co-authored-by: Jan Laupetin <[email protected]>
This commit is contained in:
mo
2026-07-23 18:57:28 +02:00
committed by GitHub
co-authored by Jan Laupetin
parent 04b6b5b4bf
commit 52f557a9bb
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.cpp
+19 -7
View File
@@ -1,9 +1,12 @@
#include "CommentRemovingStreamProxy.h"
#include "Parsing/ParsingException.h"
CommentRemovingStreamProxy::CommentRemovingStreamProxy(IParserLineStream* stream)
: m_stream(stream),
m_inside_multi_line_comment(false),
m_next_line_is_comment(false)
m_next_line_is_comment(false),
m_multi_line_comment_pos_in_start_line(0u)
{
}
@@ -11,13 +14,20 @@ ParserLine CommentRemovingStreamProxy::NextLine()
{
auto line = m_stream->NextLine();
if (line.IsEof() && m_inside_multi_line_comment)
{
throw ParsingException(
TokenPos(*m_multi_line_comment_start_line.m_filename, m_multi_line_comment_start_line.m_line_number, m_multi_line_comment_pos_in_start_line + 1u),
"Unclosed multi-line comment");
}
if (m_next_line_is_comment)
{
m_next_line_is_comment = !line.m_line.empty() && line.m_line[line.m_line.size() - 1] == '\\';
return ParserLine(line.m_filename, line.m_line_number, std::string());
}
auto multiLineCommentStart = 0u;
auto multiLineCommentStartInCurrentLine = 0u;
auto inString = false;
auto isEscaped = false;
for (auto i = 0u; i < line.m_line.size(); i++)
@@ -28,9 +38,9 @@ ParserLine CommentRemovingStreamProxy::NextLine()
{
if (c == '*' && i + 1 < line.m_line.size() && line.m_line[i + 1] == '/')
{
line.m_line.erase(multiLineCommentStart, i + 2 - multiLineCommentStart);
i = multiLineCommentStart - 1;
multiLineCommentStart = 0;
line.m_line.erase(multiLineCommentStartInCurrentLine, i + 2 - multiLineCommentStartInCurrentLine);
i = multiLineCommentStartInCurrentLine - 1;
multiLineCommentStartInCurrentLine = 0;
m_inside_multi_line_comment = false;
}
}
@@ -55,8 +65,10 @@ ParserLine CommentRemovingStreamProxy::NextLine()
if (c1 == '*')
{
multiLineCommentStart = i;
multiLineCommentStartInCurrentLine = i;
m_inside_multi_line_comment = true;
m_multi_line_comment_start_line = line;
m_multi_line_comment_pos_in_start_line = i;
}
else if (c1 == '/')
{
@@ -69,7 +81,7 @@ ParserLine CommentRemovingStreamProxy::NextLine()
}
if (m_inside_multi_line_comment)
line.m_line.erase(multiLineCommentStart);
line.m_line.erase(multiLineCommentStartInCurrentLine);
return line;
}
src/Parser/Parsing/Impl/CommentRemovingStreamProxy.h
+2
View File
@@ -7,6 +7,8 @@ class CommentRemovingStreamProxy final : public IParserLineStream
IParserLineStream* const m_stream;
bool m_inside_multi_line_comment;
bool m_next_line_is_comment;
ParserLine m_multi_line_comment_start_line;
size_t m_multi_line_comment_pos_in_start_line;
public:
explicit CommentRemovingStreamProxy(IParserLineStream* stream);