File tree 2 files changed +4
-4
lines changed
include/behaviortree_cpp/scripting
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ static const char* xml_text = R"(
10
10
<Sequence>
11
11
<Script code=" msg:='hello world' " />
12
12
<Script code=" A:=THE_ANSWER; B:=3.14; color:=RED " />
13
- <Precondition if="A>B && color != BLUE" else="FAILURE">
13
+ <Precondition if="A>- B && color != BLUE" else="FAILURE">
14
14
<Sequence>
15
15
<SaySomething message="{A}"/>
16
16
<SaySomething message="{B}"/>
Original file line number Diff line number Diff line change @@ -796,9 +796,9 @@ struct Expression : lexy::expression_production
796
796
dsl::op<Ast::ExprComparison::greater_equal>(LEXY_LIT(" >"
797
797
" =" ));
798
798
799
- // The use of dsl::groups ensures that an expression can either contain math or bit
799
+ // The use of dsl::groups ensures that an expression can either contain math or bit or string
800
800
// operators. Mixing requires parenthesis.
801
- using operand = dsl::groups<math_sum, bit_or>;
801
+ using operand = dsl::groups<math_sum, bit_or, string_concat >;
802
802
};
803
803
804
804
// Logical operators, || and &&
@@ -808,7 +808,7 @@ struct Expression : lexy::expression_production
808
808
dsl::op<Ast::ExprBinaryArithmetic::logic_or>(LEXY_LIT(" ||" )) /
809
809
dsl::op<Ast::ExprBinaryArithmetic::logic_and>(LEXY_LIT(" &&" ));
810
810
811
- using operand = dsl::groups<string_concat, comparison> ;
811
+ using operand = comparison;
812
812
};
813
813
814
814
// x ? y : z
You can’t perform that action at this time.
0 commit comments