1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

ERM: fix string concatenations and bit operations

This commit is contained in:
Andrii Danylchenko
2021-04-09 23:41:50 +03:00
parent bd31a87133
commit 35566d7748
3 changed files with 237 additions and 11 deletions

View File

@@ -367,8 +367,7 @@ namespace ERM
trigger %= cmdName >> -identifier >> -condition > qi::lit(";"); /////
string %= qi::lexeme['^' >> *(qi::char_ - '^') >> '^'];
// VRLogic %= qi::char_("&|X") >> iexp;
VRLogic %= qi::char_("&") >> iexp;
VRLogic %= qi::char_("&|") >> iexp;
VRarithmetic %= qi::char_("+*:/%-") >> iexp;
semiCompare %= +qi::char_("<=>") >> iexp;
curStr %= iexp >> string;