FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow the not operator in expressions

Browse Source
This commit is contained in:
Frederic Bouvier 2012-03-04 21:24:54 +01:00
parent 1e889c4d07
commit 92074f0d3c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
simgear/structure/SGExpression.cxx
View File

@ -866,6 +866,23 @@ Expression* logicopParser(const SGPropertyNode* exp, Parser* parser)
ExpParserRegistrar andRegistrar("and", logicopParser<AndExpression>); ExpParserRegistrar andRegistrar("and", logicopParser<AndExpression>);
ExpParserRegistrar orRegistrar("or", logicopParser<OrExpression>); ExpParserRegistrar orRegistrar("or", logicopParser<OrExpression>);
Expression* notLogicopParser(const SGPropertyNode* exp, Parser* parser)
{
using namespace boost;
vector<Expression*> children;
parser->readChildren(exp, children);
vector<Expression*>::iterator notBool =
find_if(children.begin(), children.end(),
boost::bind(&Expression::getType, _1) != BOOL);
if (notBool != children.end() || children.size() != 1)
throw("non boolean operand to not expression");
NotExpression *expr = new NotExpression;
expr->setOperand(static_cast< ::SGExpression<bool>*>(children[0]));
return expr;
}
ExpParserRegistrar notRegistrar("not", notLogicopParser);
int BindingLayout::addBinding(const string& name, Type type) int BindingLayout::addBinding(const string& name, Type type)
{ {
//XXX error checkint //XXX error checkint