Restricting variable stack look-up to user-defined variables.

This commit is contained in:
2017-05-30 16:39:44 +02:00
parent f78c0e4da5
commit 2964dd1309
3 changed files with 5 additions and 4 deletions

View File

@@ -27,12 +27,13 @@ void VariableStack::pop()
////////////////////////////////////////////////////////////////////////////////////////////////////
std::experimental::optional<ast::VariableDeclaration *> VariableStack::findVariableDeclaration(const char *variableName) const
std::experimental::optional<ast::VariableDeclaration *> VariableStack::findUserVariableDeclaration(const char *variableName) const
{
const auto variableNameMatches =
[&variableName](const auto &variableDeclaration)
{
return variableDeclaration->name == variableName;
return variableDeclaration->type == VariableDeclaration::Type::UserDefined
&& variableDeclaration->name == variableName;
};
for (auto i = m_layers.rbegin(); i != m_layers.rend(); i++)