summaryrefslogtreecommitdiffstats
path: root/src/core/expression
diff options
context:
space:
mode:
authorKenji Hosokawa <khosokawa@jp.adit-jv.com>2020-10-23 13:04:49 +0900
committerKenji Hosokawa <khosokawa@jp.adit-jv.com>2020-10-23 13:04:49 +0900
commit4680fc4332d939d852592c86546f7bca148dace7 (patch)
treefa1d71082e85e1bbcc6ba3686dfd372311cc8885 /src/core/expression
parentc0ecf677d8ac6ad5cd12e97a294e075f3f8cb249 (diff)
Cosmetic changes to pass compilation
Signed-off-by: Kenji Hosokawa <khosokawa@jp.adit-jv.com>
Diffstat (limited to 'src/core/expression')
-rw-r--r--src/core/expression/RBAActionOperator.cpp2
-rw-r--r--src/core/expression/RBAExecuteResult.hpp2
-rw-r--r--src/core/expression/RBAExpressionMaker.hpp2
-rw-r--r--src/core/expression/RBAExpressionVisitor.hpp4
-rw-r--r--src/core/expression/RBAForAllOperatorMaker.cpp2
-rw-r--r--src/core/expression/RBAForAllOperatorMaker.hpp4
-rw-r--r--src/core/expression/RBAGetAllocatables.cpp2
-rw-r--r--src/core/expression/RBAGetContentsList.cpp2
-rw-r--r--src/core/expression/RBAHasComeEarlierThan.cpp4
-rw-r--r--src/core/expression/RBAIsOn.cpp8
-rw-r--r--src/core/expression/RBAIsTypeOfOperator.cpp2
-rw-r--r--src/core/expression/RBAIsTypeOfOperator.hpp2
-rw-r--r--src/core/expression/RBALogicalOperator.cpp2
-rw-r--r--src/core/expression/RBAObjectCompare.cpp2
-rw-r--r--src/core/expression/RBAStateValue.cpp2
15 files changed, 21 insertions, 21 deletions
diff --git a/src/core/expression/RBAActionOperator.cpp b/src/core/expression/RBAActionOperator.cpp
index 7cd38ec..299ba5e 100644
--- a/src/core/expression/RBAActionOperator.cpp
+++ b/src/core/expression/RBAActionOperator.cpp
@@ -15,7 +15,7 @@
*/
/*
- * Action operator class definition
+ * Action operator class definition
*/
#include "RBAActionOperator.hpp"
diff --git a/src/core/expression/RBAExecuteResult.hpp b/src/core/expression/RBAExecuteResult.hpp
index 1eaf2a5..0dc7591 100644
--- a/src/core/expression/RBAExecuteResult.hpp
+++ b/src/core/expression/RBAExecuteResult.hpp
@@ -30,7 +30,7 @@ enum class RBAExecuteResult : std::uint8_t
FALSE,
EXE, // In case of action is performed by doAction()
// (Excludes SetOfAction and IfAction)
- NOTEXE, // In case of action is NOT performed by doAction()
+ NOTEXE, // In case of action is NOT performed by doAction()
// (Excludes SetOfAction and IfAction)
SKIP // In case of getValue() or getReferenceObject()
};
diff --git a/src/core/expression/RBAExpressionMaker.hpp b/src/core/expression/RBAExpressionMaker.hpp
index 282a093..644b4fa 100644
--- a/src/core/expression/RBAExpressionMaker.hpp
+++ b/src/core/expression/RBAExpressionMaker.hpp
@@ -40,7 +40,7 @@ public:
virtual ~RBAExpressionMaker()=default;
protected:
- /// @brief To set ”Let" expression
+ /// @brief To set "Let" expression
/// @details Generate Let expression from jsonElem and register it in expr.
/// Return the number of variables that have been registered
/// (pushed) to ModelFactory, and pop them when the reference of
diff --git a/src/core/expression/RBAExpressionVisitor.hpp b/src/core/expression/RBAExpressionVisitor.hpp
index e678b42..72a742c 100644
--- a/src/core/expression/RBAExpressionVisitor.hpp
+++ b/src/core/expression/RBAExpressionVisitor.hpp
@@ -102,11 +102,11 @@ class RBAExpressionVisitor {
// Refer to Zone status
virtual void visit(RBAIsOutputted& exp) = 0;
virtual void visit(RBAOutputtingSound& exp) = 0;
- // allocatedContent is common with Area
+ // allocatedContent is common with Area
virtual void visit(RBAIsMuted& exp) = 0;
virtual void visit(RBAIsAttenuated& exp) = 0;
// contentValue is common with Area
- // contentsList is common with Area
+ // contentsList is common with Area
// Refer to sound content status
// isActive is common with display content
diff --git a/src/core/expression/RBAForAllOperatorMaker.cpp b/src/core/expression/RBAForAllOperatorMaker.cpp
index eb1068d..1e5579b 100644
--- a/src/core/expression/RBAForAllOperatorMaker.cpp
+++ b/src/core/expression/RBAForAllOperatorMaker.cpp
@@ -15,7 +15,7 @@
*/
/// @file RBAForAllOperatorMaker.cpp
-/// @brief ForAllOperator object generation class
+/// @brief ForAllOperator object generation class
#include "RBAForAllOperatorMaker.hpp"
#include "RBAJsonElement.hpp"
diff --git a/src/core/expression/RBAForAllOperatorMaker.hpp b/src/core/expression/RBAForAllOperatorMaker.hpp
index 9c5de92..68028fb 100644
--- a/src/core/expression/RBAForAllOperatorMaker.hpp
+++ b/src/core/expression/RBAForAllOperatorMaker.hpp
@@ -15,7 +15,7 @@
*/
/// @file RBAForAllOperatorMaker.hpp
-/// @brief ForAllOperator object generation class header
+/// @brief ForAllOperator object generation class header
#ifndef RBAFORALLOPERATORMAKER_HPP
#define RBAFORALLOPERATORMAKER_HPP
@@ -25,7 +25,7 @@
namespace rba
{
-/// @brief ForAllOperator object generation class
+/// @brief ForAllOperator object generation class
class RBAForAllOperatorMaker : public RBALambdaContextMaker
{
public:
diff --git a/src/core/expression/RBAGetAllocatables.cpp b/src/core/expression/RBAGetAllocatables.cpp
index 8494a01..18d4cf4 100644
--- a/src/core/expression/RBAGetAllocatables.cpp
+++ b/src/core/expression/RBAGetAllocatables.cpp
@@ -87,7 +87,7 @@ RBAGetAllocatables::getExpressionText() const
void
RBAGetAllocatables::createHierarchy()
{
- // No operation because it does not affect structure.
+ // No operation because it does not affect structure.
}
#endif
diff --git a/src/core/expression/RBAGetContentsList.cpp b/src/core/expression/RBAGetContentsList.cpp
index 5f14b33..c106d5f 100644
--- a/src/core/expression/RBAGetContentsList.cpp
+++ b/src/core/expression/RBAGetContentsList.cpp
@@ -79,7 +79,7 @@ RBAGetContentsList::getReferenceObjectCore(RBAConstraintInfo* info,
void
RBAGetContentsList::createHierarchy()
{
- // No operation because it does not affect structure.
+ // No operation because it does not affect structure.
}
#endif
diff --git a/src/core/expression/RBAHasComeEarlierThan.cpp b/src/core/expression/RBAHasComeEarlierThan.cpp
index 4b5482a..ae15a2c 100644
--- a/src/core/expression/RBAHasComeEarlierThan.cpp
+++ b/src/core/expression/RBAHasComeEarlierThan.cpp
@@ -49,7 +49,7 @@ RBAHasComeEarlierThan::executeCore(RBAConstraintInfo* info,
LOG_addHierarchy(LOG_getSymbol());
bool isResult {false};
- // Get content in left side of the expression
+ // Get content in left side of the expression
RBAConstraintInfo* const leftInfo {info->getChild(0U)};
const RBARuleObject* ruleObj {getLhsOperand()->getReferenceObject(leftInfo, arb)};
const RBAContent* contentLhs {nullptr};
@@ -57,7 +57,7 @@ RBAHasComeEarlierThan::executeCore(RBAConstraintInfo* info,
contentLhs = dynamic_cast<const RBAContent*>(ruleObj->getRawObject());
}
- // Get content in right hand side of the expression
+ // Get content in right hand side of the expression
RBAConstraintInfo* const rightInfo {info->getChild(1U)};
ruleObj = getRhsOperand()->getReferenceObject(rightInfo, arb);
const RBAContent* contentRhs {nullptr};
diff --git a/src/core/expression/RBAIsOn.cpp b/src/core/expression/RBAIsOn.cpp
index f8dd769..af60c20 100644
--- a/src/core/expression/RBAIsOn.cpp
+++ b/src/core/expression/RBAIsOn.cpp
@@ -63,8 +63,8 @@ RBAIsOn::executeCore(RBAConstraintInfo* info,
}
} else {
// Currently, there is no expression that returns null as "Scene",
- // so it does not go through this path. But an expression that returns null
- // may be added in the future, so it is described as it is.
+ // so it does not go through this path. But an expression that returns null
+ // may be added in the future, so it is described as it is.
;
}
#ifdef RBA_USE_LOG
@@ -91,8 +91,8 @@ RBAIsOn::executeCore(RBAConstraintInfo* info,
}
} else {
// Currently, there is no expression that returns null as "Scene",
- // so it does not go through this path. But an expression that returns null
- // may be added in the future, so it is described as it is.
+ // so it does not go through this path. But an expression that returns null
+ // may be added in the future, so it is described as it is.
LOG_arbitrateConstraintLogicLogLine(
" " + getPreMsg(ruleObj->isPrevious()) + "Scene[NULL] is not On");
LOG_coverageConstraintExpressionLog(LOG_getCoverageExpressionText(),
diff --git a/src/core/expression/RBAIsTypeOfOperator.cpp b/src/core/expression/RBAIsTypeOfOperator.cpp
index 2104f43..7520f26 100644
--- a/src/core/expression/RBAIsTypeOfOperator.cpp
+++ b/src/core/expression/RBAIsTypeOfOperator.cpp
@@ -15,7 +15,7 @@
*/
//
-// IsTypeOf class defintion file
+// IsTypeOf class definition file
//
#include "RBAIsTypeOfOperator.hpp"
diff --git a/src/core/expression/RBAIsTypeOfOperator.hpp b/src/core/expression/RBAIsTypeOfOperator.hpp
index ce4d213..e91c8e0 100644
--- a/src/core/expression/RBAIsTypeOfOperator.hpp
+++ b/src/core/expression/RBAIsTypeOfOperator.hpp
@@ -15,7 +15,7 @@
*/
//
-// IsTypeOfクラスヘッダファイル
+// IsTypeOf class header file
//
#ifndef RBAISTYPEOFOPERATOR_HPP
diff --git a/src/core/expression/RBALogicalOperator.cpp b/src/core/expression/RBALogicalOperator.cpp
index e931b7a..9e39e97 100644
--- a/src/core/expression/RBALogicalOperator.cpp
+++ b/src/core/expression/RBALogicalOperator.cpp
@@ -16,7 +16,7 @@
*/
/**
- * 論理オペレータクラス定義ファイル
+ * LogicalOperator class definition
*/
#include <sstream>
diff --git a/src/core/expression/RBAObjectCompare.cpp b/src/core/expression/RBAObjectCompare.cpp
index 65bee04..5ed900c 100644
--- a/src/core/expression/RBAObjectCompare.cpp
+++ b/src/core/expression/RBAObjectCompare.cpp
@@ -74,7 +74,7 @@ RBAObjectCompare::executeCore(RBAConstraintInfo* info,
if ((lhobj != nullptr) && (rhobj != nullptr)) {
if (lhobj->getRawObject() == rhobj->getRawObject()) {
isPassed = true;
-          // Even if re-arbitration is performed for "ObjectCompare" that uses
+ // Even if re-arbitration is performed for "ObjectCompare" that uses
// "ObjectRefrence" as an operand, the evaluation result does not
// change from false to True, so it is not necessary to add
// "FalseAllocatable" or "TrueAllocatabe" for re-arbitration.
diff --git a/src/core/expression/RBAStateValue.cpp b/src/core/expression/RBAStateValue.cpp
index f2fe5cb..77d14b5 100644
--- a/src/core/expression/RBAStateValue.cpp
+++ b/src/core/expression/RBAStateValue.cpp
@@ -33,7 +33,7 @@ void RBAStateValue::accept(RBAExpressionVisitor& visitor)
{
// RBASceneAllocatableCollector which is the only existing vistor
// does not pass this path because it does not accept
- // the expression that returns Value. But, in the future,
+ // the expression that returns Value. But, in the future,
// another visitor may accept, so implement this.
visitor.visit(*this);
}