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

Allow to iterate over generators

Browse Source
This commit is contained in:
Alexander A. Klimov 2020-01-28 10:14:11 +01:00
parent cbd94e060d
commit c4ce4010d1
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/config/vmops.hpp
View File

@ -11,6 +11,7 @@
#include "base/debuginfo.hpp" #include "base/debuginfo.hpp"
#include "base/array.hpp" #include "base/array.hpp"
#include "base/dictionary.hpp" #include "base/dictionary.hpp"
#include "base/generator.hpp"
#include "base/namespace.hpp" #include "base/namespace.hpp"
#include "base/function.hpp" #include "base/function.hpp"
#include "base/scriptglobal.hpp" #include "base/scriptglobal.hpp"
@ -18,6 +19,7 @@
#include "base/convert.hpp" #include "base/convert.hpp"
#include "base/objectlock.hpp" #include "base/objectlock.hpp"
#include <map> #include <map>
#include <utility>
#include <vector> #include <vector>
namespace icinga namespace icinga
@ -187,6 +189,18 @@ public:
ExpressionResult res = expression->Evaluate(frame); ExpressionResult res = expression->Evaluate(frame);
CHECK_RESULT_LOOP(res); CHECK_RESULT_LOOP(res);
} }
} else if (value.IsObjectType<Generator>()) {
if (!fvvar.IsEmpty())
BOOST_THROW_EXCEPTION(ScriptError("Cannot use dictionary iterator for generator.", debugInfo));
Generator::Ptr gen = value;
Value buf;
while (gen->GetNext(buf)) {
frame.Locals->Set(fkvar, std::move(buf));
ExpressionResult res = expression->Evaluate(frame);
CHECK_RESULT_LOOP(res);
}
} else if (value.IsObjectType<Dictionary>()) { } else if (value.IsObjectType<Dictionary>()) {
if (fvvar.IsEmpty()) if (fvvar.IsEmpty())
BOOST_THROW_EXCEPTION(ScriptError("Cannot use array iterator for dictionary.", debugInfo)); BOOST_THROW_EXCEPTION(ScriptError("Cannot use array iterator for dictionary.", debugInfo));