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

Allow rterms as object names.

Browse Source 
Refs #5846
This commit is contained in:
Gunnar Beutner 2014-03-23 22:41:37 +01:00
parent ddc548bb5d
commit 9adc63737a
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/config/config_parser.yy
View File

@ -157,6 +157,7 @@ using namespace icinga;
%type <slist> object_inherits_list %type <slist> object_inherits_list
%type <slist> object_inherits_specifier %type <slist> object_inherits_specifier
%type <variant> rterm %type <variant> rterm
%type <variant> rterm_scope
%type <variant> lterm %type <variant> lterm
%type <num> variable_decl %type <num> variable_decl
%left T_LOGICAL_OR %left T_LOGICAL_OR
@ -410,35 +411,38 @@ object:
{ {
m_Abstract = false; m_Abstract = false;
} }
object_declaration identifier T_STRING object_inherits_specifier rterm object_declaration identifier rterm object_inherits_specifier rterm_scope
{ {
DebugInfo di = DebugInfoRange(@2, @6); DebugInfo di = DebugInfoRange(@2, @6);
ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(di); ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(di);
ConfigItem::Ptr oldItem = ConfigItem::GetObject($3, $4); AExpression::Ptr aexpr = static_cast<AExpression::Ptr>(*$4);
delete $4;
String name = aexpr->Evaluate(m_ModuleScope);
ConfigItem::Ptr oldItem = ConfigItem::GetObject($3, name);
if (oldItem) { if (oldItem) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Object '" << $4 << "' of type '" << $3 << "' re-defined: " << di << "; previous definition: " << oldItem->GetDebugInfo(); msgbuf << "Object '" << name << "' of type '" << $3 << "' re-defined: " << di << "; previous definition: " << oldItem->GetDebugInfo();
free($3); free($3);
free($4);
delete $5; delete $5;
BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(di)); BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(di));
} }
item->SetType($3); item->SetType($3);
if (strchr($4, '!') != NULL) { if (name.FindFirstOf("!") != String::NPos) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Name for object '" << $4 << "' of type '" << $3 << "' is invalid: Object names may not contain '!'"; msgbuf << "Name for object '" << name << "' of type '" << $3 << "' is invalid: Object names may not contain '!'";
free($3); free($3);
BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(@4)); BOOST_THROW_EXCEPTION(ConfigError(msgbuf.str()) << errinfo_debuginfo(@4));
} }
free($3); free($3);
item->SetName($4); item->SetName(name);
free($4);
if ($5) { if ($5) {
BOOST_FOREACH(const String& parent, *$5) { BOOST_FOREACH(const String& parent, *$5) {
@ -633,6 +637,12 @@ rbinary_op: '+'
} }
; ;
rterm_scope: '{' lterm_items '}'
{
$$ = new Value(make_shared<AExpression>(&AExpression::OpDict, Array::Ptr($2), DebugInfoRange(@1, @3)));
}
;
rterm: T_STRING rterm: T_STRING
{ {
$$ = new Value(make_shared<AExpression>(&AExpression::OpLiteral, $1, @1)); $$ = new Value(make_shared<AExpression>(&AExpression::OpLiteral, $1, @1));
@ -677,9 +687,9 @@ rterm: T_STRING
{ {
$$ = new Value(make_shared<AExpression>(&AExpression::OpArray, Array::Ptr($2), DebugInfoRange(@1, @3))); $$ = new Value(make_shared<AExpression>(&AExpression::OpArray, Array::Ptr($2), DebugInfoRange(@1, @3)));
} }
| '{' lterm_items '}' | rterm_scope
{ {
$$ = new Value(make_shared<AExpression>(&AExpression::OpDict, Array::Ptr($2), DebugInfoRange(@1, @3))); $$ = $1;
} }
| '(' rterm ')' | '(' rterm ')'
{ {