games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

ERM: fix string concatenations and bit operations

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

35
scripting/erm/ERMInterpreter.cpp
View File

@ -651,6 +651,22 @@ namespace ERMConverter
}
};
struct VR_X : public GetBodyOption
{
VR_X()
{
}
using GetBodyOption::operator();
std::string operator()(const TIexp & cmp) const override
{
Variable p = boost::apply_visitor(LVL1IexpToVar(), cmp);
return p.str();
}
};
struct VR : public Receiver
{
Variable v;
@ -677,15 +693,12 @@ namespace ERMConverter
case '|':
opcode = "bit.bor";
break;
case 'X':
opcode = "bit.bxor";
break;
default:
throw EInterpreterError("Wrong opcode in VR logic expression!");
break;
}
boost::format fmt("%s = %s %s(%s, %s)");
boost::format fmt("%s = %s(%s, %s)");
fmt % v.str() % opcode % v.str() % rhs.str();
putLine(fmt.str());
}
@ -699,6 +712,8 @@ namespace ERMConverter
switch (trig.opcode)
{
case '+':
opcode = v.name[0] == 'z' ? ".." : "+";
break;
case '-':
case '*':
case '%':
@ -765,6 +780,18 @@ namespace ERMConverter
putLine("--VR:M not implemented");
}
break;
case 'X': //bit xor
{
if(!trig.params.is_initialized() || trig.params.get().size() != 1)
throw EScriptExecError("VR:X option takes exactly 1 parameter!");
std::string opt = boost::apply_visitor(VR_X(), trig.params.get()[0]);
boost::format fmt("%s = bit.bxor(%s, %s)");
fmt % v.str() % v.str() % opt;
putLine(fmt.str());
}
break;
case 'R': //random variables
{
//TODO