From 40d535d3de793936f3884bb34d66ca60b7cd9a45 Mon Sep 17 00:00:00 2001
From: Aglargil <34728006+Aglargil@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:20:20 +0800
Subject: [PATCH 1/2] fix script parse error while 'A==-1' (#896)

Co-authored-by: wangzheng <wangz@oasisrobotics.tech>
---
 examples/t09_scripting.cpp                       | 2 +-
 include/behaviortree_cpp/scripting/operators.hpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/t09_scripting.cpp b/examples/t09_scripting.cpp
index c8be35c5a..bca9774bb 100644
--- a/examples/t09_scripting.cpp
+++ b/examples/t09_scripting.cpp
@@ -10,7 +10,7 @@ static const char* xml_text = R"(
         <Sequence>
             <Script code=" msg:='hello world' " />
             <Script code=" A:=THE_ANSWER; B:=3.14; color:=RED " />
-            <Precondition if="A>B && color != BLUE" else="FAILURE">
+            <Precondition if="A>-B && color != BLUE" else="FAILURE">
                 <Sequence>
                   <SaySomething message="{A}"/>
                   <SaySomething message="{B}"/>
diff --git a/include/behaviortree_cpp/scripting/operators.hpp b/include/behaviortree_cpp/scripting/operators.hpp
index 30c4844ea..f44b0d4ea 100644
--- a/include/behaviortree_cpp/scripting/operators.hpp
+++ b/include/behaviortree_cpp/scripting/operators.hpp
@@ -796,9 +796,9 @@ struct Expression : lexy::expression_production
                                dsl::op<Ast::ExprComparison::greater_equal>(LEXY_LIT(">"
                                                                                     "="));
 
-    // The use of dsl::groups ensures that an expression can either contain math or bit
+    // The use of dsl::groups ensures that an expression can either contain math or bit or string
     // operators. Mixing requires parenthesis.
-    using operand = dsl::groups<math_sum, bit_or>;
+    using operand = dsl::groups<math_sum, bit_or, string_concat>;
   };
 
   // Logical operators,  || and &&
@@ -808,7 +808,7 @@ struct Expression : lexy::expression_production
         dsl::op<Ast::ExprBinaryArithmetic::logic_or>(LEXY_LIT("||")) /
         dsl::op<Ast::ExprBinaryArithmetic::logic_and>(LEXY_LIT("&&"));
 
-    using operand = dsl::groups<string_concat, comparison>;
+    using operand = comparison;
   };
 
   // x ? y : z

From d4d8ae13fabe82c88de7c1885ce226272015325a Mon Sep 17 00:00:00 2001
From: AndyZe <andyz@utexas.edu>
Date: Fri, 13 Dec 2024 04:25:02 -0600
Subject: [PATCH 2/2] Additional XML verification for ReactiveSequence nodes
 (#885)

* Additional XML verification for Control nodes

* Parse for async nodes based on node name

* Add a unit test

* Improve the check by counting num async children

* Minor update (const)

---------

Co-authored-by: AndyZe <andyzelenak@apptronik.com>
---
 src/xml_parsing.cpp      | 23 +++++++++++++++++++++++
 tests/gtest_reactive.cpp | 28 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/xml_parsing.cpp b/src/xml_parsing.cpp
index 32a1e42ab..31e2f28f7 100644
--- a/src/xml_parsing.cpp
+++ b/src/xml_parsing.cpp
@@ -541,6 +541,29 @@ void VerifyXML(const std::string& xml_text,
           ThrowError(line_number,
                      std::string("The node <") + name + "> must have 1 or more children");
         }
+        if(name == "ReactiveSequence")
+        {
+          size_t async_count = 0;
+          for(auto child = node->FirstChildElement(); child != nullptr;
+              child = child->NextSiblingElement())
+          {
+            const std::string child_name = node->FirstChildElement()->Name();
+            const auto child_search = registered_nodes.find(child_name);
+            const auto child_type = child_search->second;
+            if(child_type == NodeType::CONTROL &&
+               ((child_name == "ThreadedAction") ||
+                (child_name == "StatefulActionNode") ||
+                (child_name == "CoroActionNode") || (child_name == "AsyncSequence")))
+            {
+              ++async_count;
+              if(async_count > 1)
+              {
+                ThrowError(line_number, std::string("A ReactiveSequence cannot have more "
+                                                    "than one async child."));
+              }
+            }
+          }
+        }
       }
     }
     //recursion
diff --git a/tests/gtest_reactive.cpp b/tests/gtest_reactive.cpp
index b393c03e8..47e4435ae 100644
--- a/tests/gtest_reactive.cpp
+++ b/tests/gtest_reactive.cpp
@@ -156,3 +156,31 @@ TEST(Reactive, TestLogging)
   ASSERT_EQ(observer.getStatistics("testA").success_count, num_ticks);
   ASSERT_EQ(observer.getStatistics("success").success_count, num_ticks);
 }
+
+TEST(Reactive, TwoAsyncNodesInReactiveSequence)
+{
+  static const char* reactive_xml_text = R"(
+<root BTCPP_format="4" >
+  <BehaviorTree ID="MainTree">
+    <ReactiveSequence>
+      <AsyncSequence name="first">
+        <TestA/>
+        <TestB/>
+        <TestC/>
+      </AsyncSequence>
+      <AsyncSequence name="second">
+        <TestD/>
+        <TestE/>
+        <TestF/>
+      </AsyncSequence>
+    </ReactiveSequence>
+  </BehaviorTree>
+</root>
+)";
+
+  BT::BehaviorTreeFactory factory;
+  std::array<int, 6> counters;
+  RegisterTestTick(factory, "Test", counters);
+
+  EXPECT_ANY_THROW(auto tree = factory.createTreeFromText(reactive_xml_text));
+}