tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some incorrectly generated code

Browse Source 
refs #7699
This commit is contained in:
Gunnar Beutner 2014-11-21 07:37:20 +01:00
parent aef7c487cf
commit abe583f7d9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/config/expression-codegen.cpp
View File

@ -201,18 +201,18 @@ void NotInExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp)
void LogicalAndExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) const void LogicalAndExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) const
{ {
fp << "("; fp << "Value(";
m_Operand1->GenerateCode(definitions, fp); m_Operand1->GenerateCode(definitions, fp);
fp << ").ToBool() && ("; fp << ").ToBool() && Value(";
m_Operand2->GenerateCode(definitions, fp); m_Operand2->GenerateCode(definitions, fp);
fp << ").ToBool()"; fp << ").ToBool()";
} }
void LogicalOrExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) const void LogicalOrExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) const
{ {
fp << "("; fp << "Value(";
m_Operand1->GenerateCode(definitions, fp); m_Operand1->GenerateCode(definitions, fp);
fp << ").ToBool() || ("; fp << ").ToBool() || Value(";
m_Operand2->GenerateCode(definitions, fp); m_Operand2->GenerateCode(definitions, fp);
fp << ").ToBool()"; fp << ").ToBool()";
} }
@ -282,7 +282,7 @@ void DictExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp)
<< " result->Set(\"__parent\", ucontext);" << "\n" << " result->Set(\"__parent\", ucontext);" << "\n"
<< " Object::Ptr context = result;" << "\n"; << " Object::Ptr context = result;" << "\n";
} else } else
df << "Object::Ptr context = ucontext;" << "\n"; df << " Object::Ptr context = ucontext;" << "\n";
df << " do {" << "\n"; df << " do {" << "\n";
@ -290,7 +290,7 @@ void DictExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp)
df << " "; df << " ";
expression->GenerateCode(definitions, df); expression->GenerateCode(definitions, df);
df << ";" << "\n" df << ";" << "\n"
<< " if (Expression::HasField(context, \"__result\"))" << "\n" << " if (VMOps::HasField(context, \"__result\"))" << "\n"
<< " break;" << "\n"; << " break;" << "\n";
} }
@ -346,7 +346,7 @@ void SetExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) c
if (i != m_Indexer.size() - 1) { if (i != m_Indexer.size() - 1) {
df << " if (object.IsEmpty()) {" << "\n" df << " if (object.IsEmpty()) {" << "\n"
<< " object = new Dictionary();" << "\n" << " object = new Dictionary();" << "\n"
<< " Expression::SetField(parent, tempindex, object);" << "\n" << " VMOps::SetField(parent, tempindex, object);" << "\n"
<< " }" << "\n"; << " }" << "\n";
} }
} }
@ -378,7 +378,7 @@ void SetExpression::GenerateCode(DefinitionMap& definitions, std::ostream& fp) c
df << " right = object " << opcode << " right;" << "\n"; df << " right = object " << opcode << " right;" << "\n";
} }
df << " Expression::SetField(parent, index, right);" << "\n" df << " VMOps::SetField(parent, index, right);" << "\n"
<< " return right;" << "\n" << " return right;" << "\n"
<< "}" << "\n"; << "}" << "\n";