@@ -973,7 +973,7 @@ struct action<wide_string_literal>
973
973
} \
974
974
};
975
975
976
- #define bool_op_action (Rule, id, operation ) \
976
+ #define bool_op_action (Rule, id, operation, logical_op ) \
977
977
template <> \
978
978
struct action <Rule> \
979
979
{ \
@@ -1011,10 +1011,10 @@ struct action<wide_string_literal>
1011
1011
} \
1012
1012
else if (TK_BOOLEAN == pt) \
1013
1013
{ \
1014
- bool value = promote<bool >(s2) operation promote<bool >(s1); \
1014
+ bool value = promote<bool >(s2) logical_op promote<bool >(s1); \
1015
1015
xdata->set_boolean_value (MEMBER_ID_INVALID, value); \
1016
1016
std::cout << " =========" << std::endl; \
1017
- std::cout << #operation << " : " << value << std::endl; \
1017
+ std::cout << #logical_op << " : " << value << std::endl; \
1018
1018
std::cout << " =========" << std::endl; \
1019
1019
} \
1020
1020
else \
@@ -1034,9 +1034,9 @@ struct action<wide_string_literal>
1034
1034
} \
1035
1035
};
1036
1036
1037
- bool_op_action (or_exec, or , |)
1038
- bool_op_action (xor_exec, xor , ^)
1039
- bool_op_action (and_exec, and , &)
1037
+ bool_op_action (or_exec, or , |, || )
1038
+ bool_op_action (xor_exec, xor , ^, != )
1039
+ bool_op_action (and_exec, and , &, && )
1040
1040
int_op_action (rshift_exec, >>, >>)
1041
1041
int_op_action (lshift_exec, <<, <<)
1042
1042
int_op_action (mod_exec, mod, %)
@@ -1586,7 +1586,7 @@ struct action<case_label>
1586
1586
else
1587
1587
{
1588
1588
EPROSIMA_LOG_ERROR (IDLPARSER, " Unsupported case label data type: " << xtype->get_kind ());
1589
- throw std::runtime_error (" Unsupported case label data type: " + xtype->get_kind ());
1589
+ throw std::runtime_error (" Unsupported case label data type: " + std::to_string ( xtype->get_kind () ));
1590
1590
}
1591
1591
1592
1592
if (state[" union_labels" ].empty () || state[" union_labels" ].back () == ' ;' )
0 commit comments