]> granicus.if.org Git - icinga2/commitdiff
Add line number info to duplicate object error message.
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 21 Mar 2014 13:48:18 +0000 (14:48 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 21 Mar 2014 13:48:18 +0000 (14:48 +0100)
Refs #5825

lib/config/config_parser.yy

index b8835ac954f7040b63dde162c401c002a60fc304..caab7f11638feb09a1aa99d3d0882779f856346a 100644 (file)
@@ -392,13 +392,14 @@ object:
        }
        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);
 
                if (oldItem) {
                        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($4);
                        delete $5;