Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP

Author: facontidavide

CMakeLists.txt

@@ -187,6 +187,8 @@ else()
     target_compile_options(${BTCPP_LIBRARY} PRIVATE -Wall -Wextra)
 endif()
 
+add_library(BT::${BTCPP_LIBRARY} ALIAS ${BTCPP_LIBRARY})
+
 #############################################################
 message( STATUS "BTCPP_LIB_DESTINATION:   ${BTCPP_LIB_DESTINATION} " )
 message( STATUS "BTCPP_INCLUDE_DESTINATION: ${BTCPP_INCLUDE_DESTINATION} " )

include/behaviortree_cpp/scripting/operators.hpp

@@ -150,6 +150,7 @@ struct ExprBinaryArithmetic : ExprBase
     minus,
     times,
     div,
+    concat,
 
     bit_and,
     bit_or,
@@ -171,6 +172,8 @@ struct ExprBinaryArithmetic : ExprBase
         return "*";
       case div:
         return "/";
+      case concat:
+        return "..";
       case bit_and:
         return "&";
       case bit_or:
@@ -276,6 +279,12 @@ struct ExprBinaryArithmetic : ExprBase
     {
       return Any(lhs_v.cast<std::string>() + rhs_v.cast<std::string>());
     }
+    else if(op == concat && ((rhs_v.isString() && lhs_v.isString()) ||
+                             (rhs_v.isString() && lhs_v.isNumber()) ||
+                             (rhs_v.isNumber() && lhs_v.isString())))
+    {
+      return Any(lhs_v.cast<std::string>() + rhs_v.cast<std::string>());
+    }
     else
     {
       throw RuntimeError("Operation not permitted");
@@ -726,6 +735,16 @@ struct Expression : lexy::expression_production
     using operand = math_product;
   };
 
+  // x .. y
+  struct string_concat : dsl::infix_op_left
+  {
+    static constexpr auto op = [] {
+      return dsl::op<Ast::ExprBinaryArithmetic::concat>(LEXY_LIT(".."));
+    }();
+
+    using operand = math_sum;
+  };
+
   // ~x
   struct bit_prefix : dsl::prefix_op
   {
@@ -789,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 = comparison;
+    using operand = dsl::groups<string_concat, comparison>;
   };
 
   // x ? y : z