Change default value definition

tier4 · Nov 28, 2024 · b4ff043 · b4ff043
1 parent 2c91138
commit b4ff043
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/trigger.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/trigger.hpp
@@ -53,8 +53,8 @@ struct Trigger : public std::list<ConditionGroup>
 
   auto evaluate() -> Object;
 
-  // Utility variables for some default triggers that are always evaluated to be true
-  static const Trigger always_true;
+  // Utility function for some default triggers that are always evaluated to be true
+  static auto truthy() noexcept -> Trigger;
 };
 
 auto operator<<(boost::json::object &, const Trigger &) -> boost::json::object &;

diff --git a/openscenario/openscenario_interpreter/src/syntax/act.cpp b/openscenario/openscenario_interpreter/src/syntax/act.cpp
@@ -24,7 +24,7 @@ inline namespace syntax
 Act::Act(const pugi::xml_node & node, Scope & scope)
 : Scope(readAttribute<String>("name", node, scope), scope),
   StoryboardElement(
-    readElement<Trigger>("StartTrigger", node, local(), Trigger::always_true),
+    readElement<Trigger>("StartTrigger", node, local(), Trigger::truthy()),
     readElement<Trigger>("StopTrigger", node, local()))
 {
   traverse<1, unbounded>(node, "ManeuverGroup", [&](auto && node) {

diff --git a/openscenario/openscenario_interpreter/src/syntax/event.cpp b/openscenario/openscenario_interpreter/src/syntax/event.cpp
@@ -26,7 +26,7 @@ Event::Event(const pugi::xml_node & node, Scope & scope, Maneuver & maneuver)
   StoryboardElement(
     readAttribute<UnsignedInt>("maximumExecutionCount", node, local(), UnsignedInt(1)),
     // If there is no "StartTrigger" in the "Event", the default StartTrigger that always returns true is used.
-    readElement<Trigger>("StartTrigger", node, local(), Trigger::always_true)),
+    readElement<Trigger>("StartTrigger", node, local(), Trigger::truthy())),
   priority(readAttribute<Priority>("priority", node, local())),
   parent_maneuver(maneuver)
 {

diff --git a/openscenario/openscenario_interpreter/src/syntax/trigger.cpp b/openscenario/openscenario_interpreter/src/syntax/trigger.cpp
@@ -24,7 +24,7 @@ Trigger::Trigger(const pugi::xml_node & node, Scope & scope)
   traverse<0, unbounded>(node, "ConditionGroup", [&](auto && node) { emplace_back(node, scope); });
 }
 
-const Trigger Trigger::always_true = Trigger{{ConditionGroup()}};
+auto Trigger::truthy() noexcept -> Trigger { return Trigger{{ConditionGroup()}}; }
 
 auto Trigger::evaluate() -> Object
 {