tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add line number info to duplicate object error message. 

Refs #5825
This commit is contained in:
Gunnar Beutner 2014-03-21 14:48:18 +01:00
parent 7d7c8e8ec9
commit 87e4b24686
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/config/config_parser.yy
View File

@ -392,13 +392,14 @@ object:
} }
object_declaration identifier T_STRING object_inherits_specifier expressionlist object_declaration identifier T_STRING object_inherits_specifier expressionlist
{ {
ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(DebugInfoRange(@2, @6)); DebugInfo di = DebugInfoRange(@2, @6);
ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(di);
ConfigItem::Ptr oldItem = ConfigItem::GetObject($3, $4); ConfigItem::Ptr oldItem = ConfigItem::GetObject($3, $4);
if (oldItem) { if (oldItem) {
std::ostringstream msgbuf; std::ostringstream msgbuf;
msgbuf << "Object '" << $4 << "' of type '" << $3 << "' re-defined; previous definition: " << oldItem->GetDebugInfo(); msgbuf << "Object '" << $4 << "' of type '" << $3 << "' re-defined: " << di << "; previous definition: " << oldItem->GetDebugInfo();
free($3); free($3);
free($4); free($4);
delete $5; delete $5;