Remove the ScopeCurrent constant

fixes #9044

diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index b262f75943af84c471a2debe69256894bf210aca..cf1a03a308c96a7db021458ee4b3776634b89aa6 100644 (file)
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -521,7 +521,7 @@ lterm: library
                FunctionExpression *fexpr = new FunctionExpression(*$4, $6, $7, @$);
                delete $4;
 
-               $$ = new SetExpression(MakeIndexer(ScopeCurrent, $2), OpSetLiteral, fexpr, @$);
+               $$ = new SetExpression(MakeIndexer(ScopeThis, $2), OpSetLiteral, fexpr, @$);
                free($2);
        }
        | T_CONST T_IDENTIFIER T_SET rterm
@@ -780,7 +780,7 @@ rterm_no_side_effect: T_STRING
        | rterm_scope_require_side_effect
        {
                Expression *expr = $1;
-               BindToScope(expr, ScopeCurrent);
+               BindToScope(expr, ScopeThis);
                $$ = expr;
        }
        | '('

diff --git a/lib/config/configitembuilder.cpp b/lib/config/configitembuilder.cpp
index 542c56aab7e6da7edc77d1dc405252aa893f153f..02f244660c672d9466749b62be9451dbc8884028 100644 (file)
--- a/lib/config/configitembuilder.cpp
+++ b/lib/config/configitembuilder.cpp
@@ -94,7 +94,7 @@ ConfigItem::Ptr ConfigItemBuilder::Compile(void)
        Array::Ptr templateArray = new Array();
        templateArray->Add(m_Name);
 
-       exprs.push_back(new SetExpression(MakeIndexer(ScopeCurrent, "templates"), OpSetAdd,
+       exprs.push_back(new SetExpression(MakeIndexer(ScopeThis, "templates"), OpSetAdd,
            new LiteralExpression(templateArray), m_DebugInfo));
 
        DictExpression *dexpr = new DictExpression(m_Expressions, m_DebugInfo);

diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
index 529ec559a30883558c42aaf1c1772218c5450f5d..f690c3b5652da8d9261e0c00401dde26ebb1303f 100644 (file)
--- a/lib/config/expression.cpp
+++ b/lib/config/expression.cpp
@@ -473,8 +473,6 @@ ExpressionResult GetScopeExpression::DoEvaluate(ScriptFrame& frame, DebugHint *d
 {
        if (m_ScopeSpec == ScopeLocal)
                return frame.Locals;
-       else if (m_ScopeSpec == ScopeCurrent)
-               return frame.Self;
        else if (m_ScopeSpec == ScopeThis)
                return frame.Self;
        else if (m_ScopeSpec == ScopeGlobal)

diff --git a/lib/config/expression.hpp b/lib/config/expression.hpp
index 6f7dbfe53b43bb3b5259722a0955aeac2427a0e7..a9bc3795184e1baf4c0b16c53717451ddb8aec6b 100644 (file)
--- a/lib/config/expression.hpp
+++ b/lib/config/expression.hpp
@@ -123,7 +123,6 @@ enum CombinedSetOp
 enum ScopeSpecifier
 {
        ScopeLocal,
-       ScopeCurrent,
        ScopeThis,
        ScopeGlobal
 };

diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
index 14d2b84bfdf102728116e71e2a8faff7c7654322..9f86befc50d8a2f74b01fbbbbf44005fdf1532e7 100644 (file)
--- a/lib/icinga/dependency-apply.cpp
+++ b/lib/icinga/dependency-apply.cpp
@@ -60,16 +60,16 @@ bool Dependency::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, cons
        Service::Ptr service;
        tie(host, service) = GetHostService(checkable);
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "parent_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "child_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "parent_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
 
        if (service)
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "child_service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "child_service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
 
        String zone = checkable->GetZoneName();
 
        if (!zone.IsEmpty())
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "zone"), OpSetLiteral, MakeLiteral(zone), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
 
        builder->AddExpression(new OwnedExpression(rule.GetExpression()));
 

diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
index fd8e5a3b354a8571c1b6536b9024a2ab9e6b5ed6..707cf59d7b5206c5cf549034d29f7d5941be0458 100644 (file)
--- a/lib/icinga/notification-apply.cpp
+++ b/lib/icinga/notification-apply.cpp
@@ -60,15 +60,15 @@ bool Notification::EvaluateApplyRuleInstance(const Checkable::Ptr& checkable, co
        Service::Ptr service;
        tie(host, service) = GetHostService(checkable);
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
 
        if (service)
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
 
        String zone = checkable->GetZoneName();
 
        if (!zone.IsEmpty())
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "zone"), OpSetLiteral, MakeLiteral(zone), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
 
        builder->AddExpression(new OwnedExpression(rule.GetExpression()));
 

diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp
index af581230465b7c76adab12cfa7ebc8bb30a87386..ebbb631dae690f866442d550e8bfdec7e2cb2126 100644 (file)
--- a/lib/icinga/scheduleddowntime-apply.cpp
+++ b/lib/icinga/scheduleddowntime-apply.cpp
@@ -59,15 +59,15 @@ bool ScheduledDowntime::EvaluateApplyRuleInstance(const Checkable::Ptr& checkabl
        Service::Ptr service;
        tie(host, service) = GetHostService(checkable);
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
 
        if (service)
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "service_name"), OpSetLiteral, MakeLiteral(service->GetShortName()), di));
 
        String zone = checkable->GetZoneName();
 
        if (!zone.IsEmpty())
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "zone"), OpSetLiteral, MakeLiteral(zone), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
 
        builder->AddExpression(new OwnedExpression(rule.GetExpression()));
 

diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
index 6af43204b0d36eae363d4156a5ab53f2324dd450..00baa5e65bbd50c9390b87845d899b7a3bf57a75 100644 (file)
--- a/lib/icinga/service-apply.cpp
+++ b/lib/icinga/service-apply.cpp
@@ -54,14 +54,14 @@ bool Service::EvaluateApplyRuleInstance(const Host::Ptr& host, const String& nam
        builder->SetName(name);
        builder->SetScope(frame.Locals->ShallowClone());
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "host_name"), OpSetLiteral, MakeLiteral(host->GetName()), di));
 
-       builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "name"), OpSetLiteral, MakeLiteral(name), di));
+       builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "name"), OpSetLiteral, MakeLiteral(name), di));
 
        String zone = host->GetZoneName();
 
        if (!zone.IsEmpty())
-               builder->AddExpression(new SetExpression(MakeIndexer(ScopeCurrent, "zone"), OpSetLiteral, MakeLiteral(zone), di));
+               builder->AddExpression(new SetExpression(MakeIndexer(ScopeThis, "zone"), OpSetLiteral, MakeLiteral(zone), di));
 
        builder->AddExpression(new OwnedExpression(rule.GetExpression()));