patrick/anthem
1
0
Fork 0
Code Issues 15 Releases 21 Activity

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

Browse Source
This commit is contained in:
Patrick Lühne
2017-05-30 16:39:44 +02:00
parent f78c0e4da5
commit 2964dd1309
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/anthem/ASTUtils.h
View File

@@ -26,7 +26,7 @@ class VariableStack
void push(Layer layer);
void pop();
std::experimental::optional<ast::VariableDeclaration *> findVariableDeclaration(const char *variableName) const;
std::experimental::optional<ast::VariableDeclaration *> findUserVariableDeclaration(const char *variableName) const;
bool contains(const ast::VariableDeclaration &variableDeclaration) const;
private:

2
include/anthem/Term.h
View File

@@ -85,7 +85,7 @@ struct TermTranslateVisitor
std::experimental::optional<ast::Term> visit(const Clingo::AST::Variable &variable, const Clingo::AST::Term &, Context &, RuleContext &ruleContext, const ast::VariableStack &variableStack)
{
const auto matchingVariableDeclaration = variableStack.findVariableDeclaration(variable.name);
const auto matchingVariableDeclaration = variableStack.findUserVariableDeclaration(variable.name);
const auto isAnonymousVariable = (strcmp(variable.name, "_") == 0);
const auto isUndeclaredUserVariable = !matchingVariableDeclaration;
const auto isUndeclared = isAnonymousVariable || isUndeclaredUserVariable;