diff options
Diffstat (limited to 'src/core/expression')
77 files changed, 124 insertions, 124 deletions
diff --git a/src/core/expression/RBAActiveContents.cpp b/src/core/expression/RBAActiveContents.cpp index b5d88a7..818f11d 100644 --- a/src/core/expression/RBAActiveContents.cpp +++ b/src/core/expression/RBAActiveContents.cpp @@ -21,7 +21,7 @@ #include <memory> #include "RBAActiveContents.hpp" #include "RBAConstraintInfo.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAAllocatable.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" @@ -49,7 +49,7 @@ RBAActiveContents::getModelElementType() const } const RBARuleObject* -RBAActiveContents::getReferenceObjectCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAActiveContents::getReferenceObjectCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAActiveContents.hpp b/src/core/expression/RBAActiveContents.hpp index 3ee9f7d..7f3af0a 100644 --- a/src/core/expression/RBAActiveContents.hpp +++ b/src/core/expression/RBAActiveContents.hpp @@ -40,7 +40,7 @@ class RBAActiveContents : public RBAAllocatableOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAActiveState.cpp b/src/core/expression/RBAActiveState.cpp index 1e0f6b3..920f6d2 100644 --- a/src/core/expression/RBAActiveState.cpp +++ b/src/core/expression/RBAActiveState.cpp @@ -23,7 +23,7 @@ #include "RBAContent.hpp" #include "RBAContentState.hpp" #include "RBAConstraintInfo.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" namespace rba @@ -38,7 +38,7 @@ RBAModelElementType RBAActiveState::getModelElementType() const return RBAModelElementType::ActiveState; } const RBARuleObject* RBAActiveState::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAActiveState.hpp b/src/core/expression/RBAActiveState.hpp index 3876c78..5d96bab 100644 --- a/src/core/expression/RBAActiveState.hpp +++ b/src/core/expression/RBAActiveState.hpp @@ -39,7 +39,7 @@ class RBAActiveState : public RBAContentOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; #endif diff --git a/src/core/expression/RBAAllocatedContent.cpp b/src/core/expression/RBAAllocatedContent.cpp index 923717d..8342827 100644 --- a/src/core/expression/RBAAllocatedContent.cpp +++ b/src/core/expression/RBAAllocatedContent.cpp @@ -20,7 +20,7 @@ #include "RBAAllocatedContent.hpp" #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAContentState.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" @@ -47,7 +47,7 @@ RBAAllocatedContent::getModelElementType() const const RBARuleObject* RBAAllocatedContent::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* object {nullptr}; // return value const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAAllocatedContent.hpp b/src/core/expression/RBAAllocatedContent.hpp index 6fb44e2..f40c8a8 100644 --- a/src/core/expression/RBAAllocatedContent.hpp +++ b/src/core/expression/RBAAllocatedContent.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAAllocatedContent : public RBAAllocatableOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAAndOperator.cpp b/src/core/expression/RBAAndOperator.cpp index 0f3a30d..08ff794 100644 --- a/src/core/expression/RBAAndOperator.cpp +++ b/src/core/expression/RBAAndOperator.cpp @@ -42,7 +42,7 @@ RBAAndOperator::getModelElementType() const bool RBAAndOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAAndOperator.hpp b/src/core/expression/RBAAndOperator.hpp index 229c69f..a5ff778 100644 --- a/src/core/expression/RBAAndOperator.hpp +++ b/src/core/expression/RBAAndOperator.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAAndOperator : public RBALogicalOperator public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAContentValue.cpp b/src/core/expression/RBAContentValue.cpp index 23b1b20..a1c6f2e 100644 --- a/src/core/expression/RBAContentValue.cpp +++ b/src/core/expression/RBAContentValue.cpp @@ -22,7 +22,7 @@ #include "RBAContentValue.hpp" #include "RBAAllocatable.hpp" #include "RBAContentState.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -48,7 +48,7 @@ RBAContentValue::getModelElementType() const } std::int32_t -RBAContentValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAContentValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { std::int32_t result { -99 }; const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAContentValue.hpp b/src/core/expression/RBAContentValue.hpp index 52bd841..4b31513 100644 --- a/src/core/expression/RBAContentValue.hpp +++ b/src/core/expression/RBAContentValue.hpp @@ -41,7 +41,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAExistsOperator.cpp b/src/core/expression/RBAExistsOperator.cpp index 8bb8f05..48d1e4c 100644 --- a/src/core/expression/RBAExistsOperator.cpp +++ b/src/core/expression/RBAExistsOperator.cpp @@ -47,7 +47,7 @@ RBAExistsOperator::getModelElementType() const bool RBAExistsOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAExistsOperator.hpp b/src/core/expression/RBAExistsOperator.hpp index e75af32..86dce64 100644 --- a/src/core/expression/RBAExistsOperator.hpp +++ b/src/core/expression/RBAExistsOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAExpression.cpp b/src/core/expression/RBAExpression.cpp index 2b9b6fc..2ec0e39 100644 --- a/src/core/expression/RBAExpression.cpp +++ b/src/core/expression/RBAExpression.cpp @@ -41,7 +41,7 @@ RBAExpression::accept(RBAExpressionVisitor& visitor) } bool -RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitrator * const arb) const +RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitratorImpl * const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -57,7 +57,7 @@ RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitrator * const arb) } bool -RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { // This function is called when an Expression that does not define // getReferenceObject() in evaluate() is specified. @@ -67,7 +67,7 @@ RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const const RBARuleObject* RBAExpression::getReferenceObject(RBAConstraintInfo* const info, - RBAArbitrator* const arb) const + RBAArbitratorImpl* const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -78,7 +78,7 @@ RBAExpression::getReferenceObject(RBAConstraintInfo* const info, const RBARuleObject* RBAExpression::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // This function is called when an Expression that does not define // getReferenceObject() in evaluateObject() is specified. @@ -86,7 +86,7 @@ RBAExpression::getReferenceObjectCore(RBAConstraintInfo* info, } std::int32_t -RBAExpression::getValue(RBAConstraintInfo* const info, RBAArbitrator * const arb) const +RBAExpression::getValue(RBAConstraintInfo* const info, RBAArbitratorImpl * const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -101,7 +101,7 @@ RBAExpression::getLetStatements() const return letStatements_; } std::int32_t -RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { // This function is called when an Expression that does not define // getValue() in evaluateValue() is specified. @@ -109,7 +109,7 @@ RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const } void -RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb) +RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) { info->setExpression(this); doActionCore(info, arb); @@ -117,7 +117,7 @@ RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb) } void -RBAExpression::doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) +RBAExpression::doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) { // This function is called when an Expression that does not define // doAction() in evaluateDoAction() is specified. diff --git a/src/core/expression/RBAExpression.hpp b/src/core/expression/RBAExpression.hpp index 9cd14e5..de2a674 100644 --- a/src/core/expression/RBAExpression.hpp +++ b/src/core/expression/RBAExpression.hpp @@ -31,7 +31,7 @@ namespace rba class RBAExpressionVisitor; class RBALetStatement; -class RBAArbitrator; +class RBAArbitratorImpl; class RBARuleObject; class RBAConstraintInfo; #ifdef RBA_USE_LOG @@ -51,11 +51,11 @@ public: virtual ~RBAExpression()=default; void addLetStatement(RBALetStatement* const letStatement); virtual void accept(RBAExpressionVisitor& visitor); - bool execute(RBAConstraintInfo* const info, RBAArbitrator* const arb) const; + bool execute(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) const; const RBARuleObject* getReferenceObject(RBAConstraintInfo* const info, - RBAArbitrator* const arb) const; - std::int32_t getValue(RBAConstraintInfo* const info, RBAArbitrator* const arb) const; - void doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb); + RBAArbitratorImpl* const arb) const; + std::int32_t getValue(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) const; + void doAction(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb); const std::vector<RBALetStatement*>& getLetStatements() const; // Log @@ -67,12 +67,12 @@ public: #endif protected: - virtual bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const; + virtual bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const; virtual const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const; + RBAArbitratorImpl* arb) const; virtual std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const; - virtual void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb); + RBAArbitratorImpl* arb) const; + virtual void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb); private: #ifdef _MSC_VER diff --git a/src/core/expression/RBAForAllOperator.cpp b/src/core/expression/RBAForAllOperator.cpp index 93a2894..eca8cca 100644 --- a/src/core/expression/RBAForAllOperator.cpp +++ b/src/core/expression/RBAForAllOperator.cpp @@ -48,7 +48,7 @@ RBAForAllOperator::getModelElementType() const bool RBAForAllOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { const RBAExpression* const setObj {getLhsOperand()}; RBALambdaExpression* const lambda {getLambda()}; diff --git a/src/core/expression/RBAForAllOperator.hpp b/src/core/expression/RBAForAllOperator.hpp index 7c0c7cc..7442ab1 100644 --- a/src/core/expression/RBAForAllOperator.hpp +++ b/src/core/expression/RBAForAllOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetAllocatables.cpp b/src/core/expression/RBAGetAllocatables.cpp index 18d4cf4..912a26d 100644 --- a/src/core/expression/RBAGetAllocatables.cpp +++ b/src/core/expression/RBAGetAllocatables.cpp @@ -46,7 +46,7 @@ RBAGetAllocatables::getModelElementType() const const RBARuleObject* RBAGetAllocatables::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAGetAllocatables.hpp b/src/core/expression/RBAGetAllocatables.hpp index d1c7167..982ef07 100644 --- a/src/core/expression/RBAGetAllocatables.hpp +++ b/src/core/expression/RBAGetAllocatables.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetContentsList.cpp b/src/core/expression/RBAGetContentsList.cpp index c106d5f..ac929af 100644 --- a/src/core/expression/RBAGetContentsList.cpp +++ b/src/core/expression/RBAGetContentsList.cpp @@ -45,7 +45,7 @@ RBAGetContentsList::getModelElementType() const const RBARuleObject* RBAGetContentsList::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAGetContentsList.hpp b/src/core/expression/RBAGetContentsList.hpp index 240a50c..6f89177 100644 --- a/src/core/expression/RBAGetContentsList.hpp +++ b/src/core/expression/RBAGetContentsList.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetProperty.cpp b/src/core/expression/RBAGetProperty.cpp index 3a774d8..cee2236 100644 --- a/src/core/expression/RBAGetProperty.cpp +++ b/src/core/expression/RBAGetProperty.cpp @@ -21,7 +21,7 @@ #include "RBAGetProperty.hpp" #include "RBAExpressionVisitor.hpp" #include "RBASceneImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" #include "RBAExpressionType.hpp" #include "RBAModelElementType.hpp" @@ -47,7 +47,7 @@ RBAGetProperty::getModelElementType() const std::int32_t RBAGetProperty::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { std::int32_t value{0}; const RBAAbstractProperty* prop{nullptr}; diff --git a/src/core/expression/RBAGetProperty.hpp b/src/core/expression/RBAGetProperty.hpp index eff3852..299dd4d 100644 --- a/src/core/expression/RBAGetProperty.hpp +++ b/src/core/expression/RBAGetProperty.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const override; + RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasBeenDisplayed.cpp b/src/core/expression/RBAHasBeenDisplayed.cpp index 72c1d40..f9a603f 100644 --- a/src/core/expression/RBAHasBeenDisplayed.cpp +++ b/src/core/expression/RBAHasBeenDisplayed.cpp @@ -21,7 +21,7 @@ #include "RBAHasBeenDisplayed.hpp" #include "RBAModelElementType.hpp" #include "RBAExpressionType.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAExpressionVisitor.hpp" @@ -41,7 +41,7 @@ RBAModelElementType RBAHasBeenDisplayed::getModelElementType() const } bool RBAHasBeenDisplayed::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasBeenDisplayed.hpp b/src/core/expression/RBAHasBeenDisplayed.hpp index 3e3ebde..5d5a1c3 100644 --- a/src/core/expression/RBAHasBeenDisplayed.hpp +++ b/src/core/expression/RBAHasBeenDisplayed.hpp @@ -38,7 +38,7 @@ class DLL_EXPORT RBAHasBeenDisplayed : public RBAContentOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasComeEarlierThan.cpp b/src/core/expression/RBAHasComeEarlierThan.cpp index ae15a2c..5e20ab4 100644 --- a/src/core/expression/RBAHasComeEarlierThan.cpp +++ b/src/core/expression/RBAHasComeEarlierThan.cpp @@ -20,7 +20,7 @@ #include "RBAHasComeEarlierThan.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -43,7 +43,7 @@ void RBAHasComeEarlierThan::accept(RBAExpressionVisitor& visitor) bool RBAHasComeEarlierThan::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasComeEarlierThan.hpp b/src/core/expression/RBAHasComeEarlierThan.hpp index fd39782..b9c0bef 100644 --- a/src/core/expression/RBAHasComeEarlierThan.hpp +++ b/src/core/expression/RBAHasComeEarlierThan.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasComeLaterThan.cpp b/src/core/expression/RBAHasComeLaterThan.cpp index 341d164..cddc067 100644 --- a/src/core/expression/RBAHasComeLaterThan.cpp +++ b/src/core/expression/RBAHasComeLaterThan.cpp @@ -21,7 +21,7 @@ #include "RBAHasComeLaterThan.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -44,7 +44,7 @@ RBAHasComeLaterThan::getModelElementType() const bool RBAHasComeLaterThan::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasComeLaterThan.hpp b/src/core/expression/RBAHasComeLaterThan.hpp index 659068f..9a9cc2e 100644 --- a/src/core/expression/RBAHasComeLaterThan.hpp +++ b/src/core/expression/RBAHasComeLaterThan.hpp @@ -38,7 +38,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIfStatement.cpp b/src/core/expression/RBAIfStatement.cpp index d776bf7..3f0666d 100644 --- a/src/core/expression/RBAIfStatement.cpp +++ b/src/core/expression/RBAIfStatement.cpp @@ -78,7 +78,7 @@ RBAIfStatement::getModelElementType() const bool RBAIfStatement::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); bool isPassed; @@ -116,7 +116,7 @@ RBAIfStatement::executeCore(RBAConstraintInfo* info, const RBARuleObject* RBAIfStatement::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); const RBARuleObject* object {nullptr}; @@ -144,7 +144,7 @@ RBAIfStatement::getReferenceObjectCore(RBAConstraintInfo* info, std::int32_t RBAIfStatement::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); std::int32_t value; @@ -172,7 +172,7 @@ RBAIfStatement::getValueCore(RBAConstraintInfo* info, void RBAIfStatement::doActionCore(RBAConstraintInfo* info, - RBAArbitrator* arb) + RBAArbitratorImpl* arb) { LOG_addHierarchy("IF"); RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAIfStatement.hpp b/src/core/expression/RBAIfStatement.hpp index 7059583..90659fe 100644 --- a/src/core/expression/RBAIfStatement.hpp +++ b/src/core/expression/RBAIfStatement.hpp @@ -46,12 +46,12 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; - void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) override; + RBAArbitratorImpl* arb) const override; + void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAImpliesOperator.cpp b/src/core/expression/RBAImpliesOperator.cpp index ab95dc7..1dd6170 100644 --- a/src/core/expression/RBAImpliesOperator.cpp +++ b/src/core/expression/RBAImpliesOperator.cpp @@ -41,7 +41,7 @@ RBAImpliesOperator::getModelElementType() const bool RBAImpliesOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/core/expression/RBAImpliesOperator.hpp b/src/core/expression/RBAImpliesOperator.hpp index cc1cb33..9d9bbee 100644 --- a/src/core/expression/RBAImpliesOperator.hpp +++ b/src/core/expression/RBAImpliesOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIntegerValue.cpp b/src/core/expression/RBAIntegerValue.cpp index aadffb0..c88bfc1 100644 --- a/src/core/expression/RBAIntegerValue.cpp +++ b/src/core/expression/RBAIntegerValue.cpp @@ -44,7 +44,7 @@ RBAIntegerValue::getModelElementType() const } std::int32_t -RBAIntegerValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAIntegerValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { return getValue(); } diff --git a/src/core/expression/RBAIntegerValue.hpp b/src/core/expression/RBAIntegerValue.hpp index 44cf8cb..236c97d 100644 --- a/src/core/expression/RBAIntegerValue.hpp +++ b/src/core/expression/RBAIntegerValue.hpp @@ -42,7 +42,7 @@ public: std::int32_t getValue() const; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const override; + RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsActive.cpp b/src/core/expression/RBAIsActive.cpp index a89745f..2c9d846 100644 --- a/src/core/expression/RBAIsActive.cpp +++ b/src/core/expression/RBAIsActive.cpp @@ -20,7 +20,7 @@ #include "RBAIsActive.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -43,7 +43,7 @@ RBAIsActive::getModelElementType() const bool RBAIsActive::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsActive.hpp b/src/core/expression/RBAIsActive.hpp index 73ab055..fa1394d 100644 --- a/src/core/expression/RBAIsActive.hpp +++ b/src/core/expression/RBAIsActive.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsEqualToOperator.cpp b/src/core/expression/RBAIsEqualToOperator.cpp index 5dfa929..a38eb23 100644 --- a/src/core/expression/RBAIsEqualToOperator.cpp +++ b/src/core/expression/RBAIsEqualToOperator.cpp @@ -17,7 +17,7 @@ /// IsEqualToOperator class definitino file #include "RBAIsEqualToOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsEqualToOperator::getModelElementType() const bool RBAIsEqualToOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsEqualToOperator.hpp b/src/core/expression/RBAIsEqualToOperator.hpp index d66efed..0c9e9fb 100644 --- a/src/core/expression/RBAIsEqualToOperator.hpp +++ b/src/core/expression/RBAIsEqualToOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsGreaterThanEqualOperator.cpp b/src/core/expression/RBAIsGreaterThanEqualOperator.cpp index 368bb3b..633c61e 100644 --- a/src/core/expression/RBAIsGreaterThanEqualOperator.cpp +++ b/src/core/expression/RBAIsGreaterThanEqualOperator.cpp @@ -17,7 +17,7 @@ /// IsGreaterThanEqualOperator class definition file #include "RBAIsGreaterThanEqualOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsGreaterThanEqualOperator::getModelElementType() const bool RBAIsGreaterThanEqualOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsGreaterThanEqualOperator.hpp b/src/core/expression/RBAIsGreaterThanEqualOperator.hpp index 0d5db61..5181c9f 100644 --- a/src/core/expression/RBAIsGreaterThanEqualOperator.hpp +++ b/src/core/expression/RBAIsGreaterThanEqualOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsGreaterThanOperator.cpp b/src/core/expression/RBAIsGreaterThanOperator.cpp index d9153f1..323ac36 100644 --- a/src/core/expression/RBAIsGreaterThanOperator.cpp +++ b/src/core/expression/RBAIsGreaterThanOperator.cpp @@ -17,7 +17,7 @@ /// IsGreaterThanOperator class definition file #include "RBAIsGreaterThanOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsGreaterThanOperator::accept(RBAExpressionVisitor& visitor) bool RBAIsGreaterThanOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsGreaterThanOperator.hpp b/src/core/expression/RBAIsGreaterThanOperator.hpp index 9e0938b..327152b 100644 --- a/src/core/expression/RBAIsGreaterThanOperator.hpp +++ b/src/core/expression/RBAIsGreaterThanOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsLowerThanEqualOperator.cpp b/src/core/expression/RBAIsLowerThanEqualOperator.cpp index 811b34d..cdebf8f 100644 --- a/src/core/expression/RBAIsLowerThanEqualOperator.cpp +++ b/src/core/expression/RBAIsLowerThanEqualOperator.cpp @@ -17,7 +17,7 @@ /// IsLowerThanEqualOperator class definition file #include "RBAIsLowerThanEqualOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAConstraintInfo.hpp" @@ -41,7 +41,7 @@ RBAIsLowerThanEqualOperator::getModelElementType() const bool RBAIsLowerThanEqualOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsLowerThanEqualOperator.hpp b/src/core/expression/RBAIsLowerThanEqualOperator.hpp index 3459110..3830b00 100644 --- a/src/core/expression/RBAIsLowerThanEqualOperator.hpp +++ b/src/core/expression/RBAIsLowerThanEqualOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsLowerThanOperator.cpp b/src/core/expression/RBAIsLowerThanOperator.cpp index 99a7860..6b79b3c 100644 --- a/src/core/expression/RBAIsLowerThanOperator.cpp +++ b/src/core/expression/RBAIsLowerThanOperator.cpp @@ -17,7 +17,7 @@ /// IsLowerThanOperator class definition file #include "RBAIsLowerThanOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsLowerThanOperator::getModelElementType() const bool RBAIsLowerThanOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsLowerThanOperator.hpp b/src/core/expression/RBAIsLowerThanOperator.hpp index 3a23e45..eb1d30c 100644 --- a/src/core/expression/RBAIsLowerThanOperator.hpp +++ b/src/core/expression/RBAIsLowerThanOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsOn.cpp b/src/core/expression/RBAIsOn.cpp index af60c20..004dc98 100644 --- a/src/core/expression/RBAIsOn.cpp +++ b/src/core/expression/RBAIsOn.cpp @@ -19,7 +19,7 @@ */ #include "RBAIsOn.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" #include "RBASceneImpl.hpp" @@ -44,7 +44,7 @@ RBAIsOn::getModelElementType() const bool RBAIsOn::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsOn.hpp b/src/core/expression/RBAIsOn.hpp index 9f3f778..d1f9de9 100644 --- a/src/core/expression/RBAIsOn.hpp +++ b/src/core/expression/RBAIsOn.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsTypeOfOperator.cpp b/src/core/expression/RBAIsTypeOfOperator.cpp index 7520f26..06b1f83 100644 --- a/src/core/expression/RBAIsTypeOfOperator.cpp +++ b/src/core/expression/RBAIsTypeOfOperator.cpp @@ -42,7 +42,7 @@ RBAModelElementType RBAIsTypeOfOperator::getModelElementType() const { return RBAModelElementType::IsTypeOfOperator; } -bool RBAIsTypeOfOperator::executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +bool RBAIsTypeOfOperator::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { bool isPassed {false}; LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAIsTypeOfOperator.hpp b/src/core/expression/RBAIsTypeOfOperator.hpp index e91c8e0..c3b8364 100644 --- a/src/core/expression/RBAIsTypeOfOperator.hpp +++ b/src/core/expression/RBAIsTypeOfOperator.hpp @@ -40,7 +40,7 @@ class DLL_EXPORT RBAIsTypeOfOperator : public RBAOperator void setTag(const std::string& tag); void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBALambdaContext.cpp b/src/core/expression/RBALambdaContext.cpp index 7d68513..fe10e4c 100644 --- a/src/core/expression/RBALambdaContext.cpp +++ b/src/core/expression/RBALambdaContext.cpp @@ -56,7 +56,7 @@ RBALambdaContext::createHierarchy() RBAConstraintInfo dummyInfo; // Since it is not referenced by "AllInstanceOf..." or "SetOfOperator" // used for the set of "For-All" or "Exists", nullptr is no problem - RBAArbitrator* dummyArb = nullptr; + RBAArbitratorImpl* dummyArb = nullptr; const RBARuleObject* objset = setObj->getReferenceObject(&dummyInfo, dummyArb); std::vector<const RBARuleObject*> objs; if(objset) { diff --git a/src/core/expression/RBALambdaExpression.cpp b/src/core/expression/RBALambdaExpression.cpp index 7638faa..df1aad4 100644 --- a/src/core/expression/RBALambdaExpression.cpp +++ b/src/core/expression/RBALambdaExpression.cpp @@ -20,7 +20,7 @@ #include "RBALambdaExpression.hpp" #include "RBAVariable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAModelElementType.hpp" @@ -58,7 +58,7 @@ RBALambdaExpression::getModelElementType() const } bool -RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { getX()->setRuleObj(ruleObj_); @@ -74,7 +74,7 @@ RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) c const RBARuleObject* RBALambdaExpression::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { getX()->setRuleObj(ruleObj_); @@ -88,7 +88,7 @@ RBALambdaExpression::getReferenceObjectCore(RBAConstraintInfo* info, } std::int32_t RBALambdaExpression::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { getX()->setRuleObj(ruleObj_); diff --git a/src/core/expression/RBALambdaExpression.hpp b/src/core/expression/RBALambdaExpression.hpp index 76958e7..fea5604 100644 --- a/src/core/expression/RBALambdaExpression.hpp +++ b/src/core/expression/RBALambdaExpression.hpp @@ -26,7 +26,7 @@ namespace rba { -class RBAArbitrator; +class RBAArbitratorImpl; class RBAConstraintInfo; class RBAVariable; class RBARuleObject; @@ -48,11 +48,11 @@ public: RBAExpression* const getBodyText() const; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setRuleObj(const RBARuleObject* const ruleObj); void clearRuleObj(); diff --git a/src/core/expression/RBALetStatement.cpp b/src/core/expression/RBALetStatement.cpp index f64cc18..4c6d0cb 100644 --- a/src/core/expression/RBALetStatement.cpp +++ b/src/core/expression/RBALetStatement.cpp @@ -44,7 +44,7 @@ RBALetStatement::accept(RBAExpressionVisitor& visitor) visitor.visit(*this); } -void RBALetStatement::setVariable(RBAArbitrator* const arb) +void RBALetStatement::setVariable(RBAArbitratorImpl* const arb) { RBAConstraintInfo* const info {variable_->createConstraintInfo()}; variable_->setRuleObj(getLhsOperand()->getReferenceObject(info, arb)); diff --git a/src/core/expression/RBALetStatement.hpp b/src/core/expression/RBALetStatement.hpp index 636b07d..7c4055f 100644 --- a/src/core/expression/RBALetStatement.hpp +++ b/src/core/expression/RBALetStatement.hpp @@ -42,7 +42,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; void setVariable(RBAVariable* const var); - void setVariable(RBAArbitrator* const arb); + void setVariable(RBAArbitratorImpl* const arb); private: RBAVariable* variable_; diff --git a/src/core/expression/RBAMaxOperator.cpp b/src/core/expression/RBAMaxOperator.cpp index 46d5ed1..08f56f4 100644 --- a/src/core/expression/RBAMaxOperator.cpp +++ b/src/core/expression/RBAMaxOperator.cpp @@ -21,7 +21,7 @@ #include "RBAMaxOperator.hpp" #include "RBAAllocatable.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" @@ -44,7 +44,7 @@ RBAMaxOperator::getModelElementType() const } const RBARuleObject* RBAMaxOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAMaxOperator.hpp b/src/core/expression/RBAMaxOperator.hpp index 046cec9..c32c894 100644 --- a/src/core/expression/RBAMaxOperator.hpp +++ b/src/core/expression/RBAMaxOperator.hpp @@ -39,7 +39,7 @@ class RBAMaxOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAMinOperator.cpp b/src/core/expression/RBAMinOperator.cpp index 923088b..09ebfa2 100644 --- a/src/core/expression/RBAMinOperator.cpp +++ b/src/core/expression/RBAMinOperator.cpp @@ -19,7 +19,7 @@ #include "RBAMinOperator.hpp" #include "RBAAllocatable.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALambdaExpression.hpp" @@ -42,7 +42,7 @@ RBAMinOperator::getModelElementType() const } const RBARuleObject* RBAMinOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAMinOperator.hpp b/src/core/expression/RBAMinOperator.hpp index b128877..4df1749 100644 --- a/src/core/expression/RBAMinOperator.hpp +++ b/src/core/expression/RBAMinOperator.hpp @@ -37,7 +37,7 @@ class RBAMinOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBANotOperator.cpp b/src/core/expression/RBANotOperator.cpp index afcf3c8..73f6c0e 100644 --- a/src/core/expression/RBANotOperator.cpp +++ b/src/core/expression/RBANotOperator.cpp @@ -41,7 +41,7 @@ RBANotOperator::getModelElementType() const bool RBANotOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBANotOperator.hpp b/src/core/expression/RBANotOperator.hpp index 4af1461..efaba2e 100644 --- a/src/core/expression/RBANotOperator.hpp +++ b/src/core/expression/RBANotOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAObjectCompare.cpp b/src/core/expression/RBAObjectCompare.cpp index 5ed900c..f9aa283 100644 --- a/src/core/expression/RBAObjectCompare.cpp +++ b/src/core/expression/RBAObjectCompare.cpp @@ -43,7 +43,7 @@ RBAObjectCompare::getModelElementType() const bool RBAObjectCompare::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAObjectCompare.hpp b/src/core/expression/RBAObjectCompare.hpp index c7c345d..160eca8 100644 --- a/src/core/expression/RBAObjectCompare.hpp +++ b/src/core/expression/RBAObjectCompare.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAObjectReference.cpp b/src/core/expression/RBAObjectReference.cpp index aefe83c..18df1e9 100644 --- a/src/core/expression/RBAObjectReference.cpp +++ b/src/core/expression/RBAObjectReference.cpp @@ -43,7 +43,7 @@ RBAObjectReference::getModelElementType() const const RBARuleObject* RBAObjectReference::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* obj {refObject_}; if (obj->isModelElementType(RBAModelElementType::Variable)) { diff --git a/src/core/expression/RBAObjectReference.hpp b/src/core/expression/RBAObjectReference.hpp index 2eb38df..79c84d3 100644 --- a/src/core/expression/RBAObjectReference.hpp +++ b/src/core/expression/RBAObjectReference.hpp @@ -38,7 +38,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setRefObject(const RBARuleObject* const newRefObject); // Log diff --git a/src/core/expression/RBAOrOperator.cpp b/src/core/expression/RBAOrOperator.cpp index d55e4a0..5f105be 100644 --- a/src/core/expression/RBAOrOperator.cpp +++ b/src/core/expression/RBAOrOperator.cpp @@ -41,7 +41,7 @@ RBAOrOperator::getModelElementType() const bool RBAOrOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAOrOperator.hpp b/src/core/expression/RBAOrOperator.hpp index a52aca4..c6a59e3 100644 --- a/src/core/expression/RBAOrOperator.hpp +++ b/src/core/expression/RBAOrOperator.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAOrOperator : public RBALogicalOperator public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAPreviousModifier.cpp b/src/core/expression/RBAPreviousModifier.cpp index 53a7112..05bd457 100644 --- a/src/core/expression/RBAPreviousModifier.cpp +++ b/src/core/expression/RBAPreviousModifier.cpp @@ -55,7 +55,7 @@ RBAPreviousModifier::getObjReference() const const RBARuleObject* RBAPreviousModifier::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { previousObj_->setRefObject(objReference_->getReferenceObject(info, arb)); return previousObj_.get(); diff --git a/src/core/expression/RBAPreviousModifier.hpp b/src/core/expression/RBAPreviousModifier.hpp index ff34deb..e9dd0c2 100644 --- a/src/core/expression/RBAPreviousModifier.hpp +++ b/src/core/expression/RBAPreviousModifier.hpp @@ -44,7 +44,7 @@ public: void setObjReference(RBAExpression* const newObjRef); RBAExpression* const getObjReference() const; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBASelectOperator.cpp b/src/core/expression/RBASelectOperator.cpp index be74fa5..cdd345f 100644 --- a/src/core/expression/RBASelectOperator.cpp +++ b/src/core/expression/RBASelectOperator.cpp @@ -53,7 +53,7 @@ RBASelectOperator::getModelElementType() const } const RBARuleObject* RBASelectOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBASelectOperator.hpp b/src/core/expression/RBASelectOperator.hpp index 9c85fb0..0166bb7 100644 --- a/src/core/expression/RBASelectOperator.hpp +++ b/src/core/expression/RBASelectOperator.hpp @@ -42,7 +42,7 @@ class RBASelectOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBASetOfOperator.cpp b/src/core/expression/RBASetOfOperator.cpp index 03e82eb..8bf7e82 100644 --- a/src/core/expression/RBASetOfOperator.cpp +++ b/src/core/expression/RBASetOfOperator.cpp @@ -54,7 +54,7 @@ RBASetOfOperator::getModelElementType() const const RBARuleObject* RBASetOfOperator::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { allocatableSet_->clear(); contentSet_->clear(); @@ -105,7 +105,7 @@ RBASetOfOperator::getReferenceObjectCore(RBAConstraintInfo* info, } void -RBASetOfOperator::doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) +RBASetOfOperator::doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) { // Add itself to Constraint hierarchy for coverage LOG_addHierarchy("SetOf"); diff --git a/src/core/expression/RBASetOfOperator.hpp b/src/core/expression/RBASetOfOperator.hpp index d73e1f7..967d583 100644 --- a/src/core/expression/RBASetOfOperator.hpp +++ b/src/core/expression/RBASetOfOperator.hpp @@ -52,8 +52,8 @@ public: protected: const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; - void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) override; + RBAArbitratorImpl* arb) const override; + void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) override; private: #ifdef _MSC_VER diff --git a/src/core/expression/RBASizeOperator.cpp b/src/core/expression/RBASizeOperator.cpp index c928bcf..4b65057 100644 --- a/src/core/expression/RBASizeOperator.cpp +++ b/src/core/expression/RBASizeOperator.cpp @@ -38,7 +38,7 @@ RBAModelElementType RBASizeOperator::getModelElementType() const return RBAModelElementType::SizeOperator; } std::int32_t RBASizeOperator::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); std::int32_t returnValue {-99}; diff --git a/src/core/expression/RBASizeOperator.hpp b/src/core/expression/RBASizeOperator.hpp index 26f22fa..af8e8f4 100644 --- a/src/core/expression/RBASizeOperator.hpp +++ b/src/core/expression/RBASizeOperator.hpp @@ -38,7 +38,7 @@ class RBASizeOperator : public RBASetOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - std::int32_t getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + std::int32_t getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; const std::string getExpressionText() const override; diff --git a/src/core/expression/RBAStateValue.cpp b/src/core/expression/RBAStateValue.cpp index 77d14b5..a143e50 100644 --- a/src/core/expression/RBAStateValue.cpp +++ b/src/core/expression/RBAStateValue.cpp @@ -18,7 +18,7 @@ #include <string> #include "RBAStateValue.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" @@ -45,7 +45,7 @@ RBAStateValue::getModelElementType() const } std::int32_t -RBAStateValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAStateValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { std::int32_t result { -99 }; const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAStateValue.hpp b/src/core/expression/RBAStateValue.hpp index 52cf8fc..0cb96c3 100644 --- a/src/core/expression/RBAStateValue.hpp +++ b/src/core/expression/RBAStateValue.hpp @@ -39,7 +39,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG |