INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 23:38:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use SimpleExpressionInterpreter in DefinesStreamProxy and expand defines and defined expressions before parsing

Browse Source
This commit is contained in:
Jan
2022-09-06 20:52:52 +02:00
parent 7cce0e387e
commit a36d1c430a
13 changed files with 77 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/RawTemplater/Templating/TemplatingStreamProxy.cpp
View File

@ -91,10 +91,8 @@ bool TemplatingStreamProxy::MatchOptionsDirective(const ParserLine& line, const
const auto optionStartPosition = currentPosition;
if (!ExtractIdentifier(line, currentPosition))
throw ParsingException(CreatePos(line, currentPosition), "Invalid options directive.");
std::ostringstream optionValueBuilder;
optionValueBuilder << '"' << line.m_line.substr(optionStartPosition, currentPosition - optionStartPosition) << '"';
options.emplace_back(optionValueBuilder.str());
options.emplace_back(line.m_line.substr(optionStartPosition, currentPosition - optionStartPosition));
firstArg = false;
}
@ -126,10 +124,7 @@ bool TemplatingStreamProxy::MatchFilenameDirective(const ParserLine& line, const
if (expressionString.empty())
throw ParsingException(CreatePos(line, currentPosition), "Cannot pragma filename without an expression.");
ParserLine expressionStringAsLine(line.m_filename, line.m_line_number, expressionString);
m_defines_proxy->ExpandDefines(expressionStringAsLine);
const auto expression = m_defines_proxy->ParseExpression(expressionStringAsLine.m_line);
const auto expression = m_defines_proxy->ParseExpression(expressionString);
if (!expression)
throw ParsingException(CreatePos(line, currentPosition), "Failed to parse pragma filename expression");