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

Moved recursive formula visitor to separate header file.

Browse Source
This commit is contained in:
Patrick Lühne 2017-03-23 13:28:09 +01:00
parent 7bb78656f4
commit ddbd4061e4
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 117 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
include/anthem/ASTVisitors.h Normal file
View File

@ -0,0 +1,113 @@
#ifndef __ANTHEM__AST_VISITORS_H
#define __ANTHEM__AST_VISITORS_H
#include <anthem/AST.h>
namespace anthem
{
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// AST Visitors
//
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace ast
{
////////////////////////////////////////////////////////////////////////////////////////////////////
template<class T>
struct RecursiveFormulaVisitor
{
template <class... Arguments>
void visit(ast::And &and_, ast::Formula &formula, Arguments &&... arguments)
{
for (auto &argument : and_.arguments)
argument.accept(*this, argument, std::forward<Arguments>(arguments)...);
return T::accept(and_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Biconditional &biconditional, ast::Formula &formula, Arguments &&... arguments)
{
biconditional.left.accept(*this, biconditional.left, std::forward<Arguments>(arguments)...);
biconditional.right.accept(*this, biconditional.right, std::forward<Arguments>(arguments)...);
return T::accept(biconditional, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Boolean &boolean, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(boolean, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Comparison &comparison, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(comparison, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Exists &exists, ast::Formula &formula, Arguments &&... arguments)
{
exists.argument.accept(*this, exists.argument, std::forward<Arguments>(arguments)...);
return T::accept(exists, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::ForAll &forAll, ast::Formula &formula, Arguments &&... arguments)
{
forAll.argument.accept(*this, forAll.argument, std::forward<Arguments>(arguments)...);
return T::accept(forAll, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Implies &implies, ast::Formula &formula, Arguments &&... arguments)
{
implies.antecedent.accept(*this, implies.antecedent, std::forward<Arguments>(arguments)...);
implies.consequent.accept(*this, implies.consequent, std::forward<Arguments>(arguments)...);
return T::accept(implies, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::In &in, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(in, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Not &not_, ast::Formula &formula, Arguments &&... arguments)
{
not_.argument.accept(*this, not_.argument, std::forward<Arguments>(arguments)...);
return T::accept(not_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Or &or_, ast::Formula &formula, Arguments &&... arguments)
{
for (auto &argument : or_.arguments)
argument.accept(*this, argument, std::forward<Arguments>(arguments)...);
return T::accept(or_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Predicate &predicate, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(predicate, formula, std::forward<Arguments>(arguments)...);
}
};
////////////////////////////////////////////////////////////////////////////////////////////////////
}
}
#endif

96
src/anthem/Simplification.cpp
View File

@ -1,5 +1,7 @@
#include <anthem/Simplification.h> #include <anthem/Simplification.h>
#include <anthem/ASTVisitors.h>
namespace anthem namespace anthem
{ {
@ -16,96 +18,6 @@ bool isPrimitiveTerm(const ast::Term &term)
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
template<class T>
struct RecursiveFormulaVisitor
{
template <class... Arguments>
void visit(ast::And &and_, ast::Formula &formula, Arguments &&... arguments)
{
for (auto &argument : and_.arguments)
argument.accept(*this, argument, std::forward<Arguments>(arguments)...);
return T::accept(and_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Biconditional &biconditional, ast::Formula &formula, Arguments &&... arguments)
{
biconditional.left.accept(*this, biconditional.left, std::forward<Arguments>(arguments)...);
biconditional.right.accept(*this, biconditional.right, std::forward<Arguments>(arguments)...);
return T::accept(biconditional, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Boolean &boolean, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(boolean, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Comparison &comparison, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(comparison, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Exists &exists, ast::Formula &formula, Arguments &&... arguments)
{
exists.argument.accept(*this, exists.argument, std::forward<Arguments>(arguments)...);
return T::accept(exists, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::ForAll &forAll, ast::Formula &formula, Arguments &&... arguments)
{
forAll.argument.accept(*this, forAll.argument, std::forward<Arguments>(arguments)...);
return T::accept(forAll, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Implies &implies, ast::Formula &formula, Arguments &&... arguments)
{
implies.antecedent.accept(*this, implies.antecedent, std::forward<Arguments>(arguments)...);
implies.consequent.accept(*this, implies.consequent, std::forward<Arguments>(arguments)...);
return T::accept(implies, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::In &in, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(in, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Not &not_, ast::Formula &formula, Arguments &&... arguments)
{
not_.argument.accept(*this, not_.argument, std::forward<Arguments>(arguments)...);
return T::accept(not_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Or &or_, ast::Formula &formula, Arguments &&... arguments)
{
for (auto &argument : or_.arguments)
argument.accept(*this, argument, std::forward<Arguments>(arguments)...);
return T::accept(or_, formula, std::forward<Arguments>(arguments)...);
}
template <class... Arguments>
void visit(ast::Predicate &predicate, ast::Formula &formula, Arguments &&... arguments)
{
return T::accept(predicate, formula, std::forward<Arguments>(arguments)...);
}
};
////////////////////////////////////////////////////////////////////////////////////////////////////
bool matchesVariable(const ast::Term &term, const ast::Variable &variable) bool matchesVariable(const ast::Term &term, const ast::Variable &variable)
{ {
if (!term.is<ast::Variable>()) if (!term.is<ast::Variable>())
@ -139,7 +51,7 @@ std::experimental::optional<ast::Term> extractAssignedTerm(ast::Formula &formula
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
struct ReplaceVariableWithTermVisitor : public RecursiveFormulaVisitor<ReplaceVariableWithTermVisitor> struct ReplaceVariableWithTermVisitor : public ast::RecursiveFormulaVisitor<ReplaceVariableWithTermVisitor>
{ {
static void accept(ast::Predicate &predicate, ast::Formula &, const ast::Variable &variable, ast::Term &&term) static void accept(ast::Predicate &predicate, ast::Formula &, const ast::Variable &variable, ast::Term &&term)
{ {
@ -226,7 +138,7 @@ void simplify(ast::Exists &exists, ast::Formula &formula)
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
struct SimplifyFormulaVisitor : public RecursiveFormulaVisitor<SimplifyFormulaVisitor> struct SimplifyFormulaVisitor : public ast::RecursiveFormulaVisitor<SimplifyFormulaVisitor>
{ {
static void accept(ast::Exists &exists, ast::Formula &formula) static void accept(ast::Exists &exists, ast::Formula &formula)
{ {