Include node ID in the VerifyXML failure message

This should help users localize where the issue is, especially
if they're using a UI to edit their behavior trees and not a text
editor that has line numbers. This required moving the check for whether
or not the ID is empty before the other checks.

Author: EzraBrooks

src/xml_parsing.cpp

@@ -431,67 +431,72 @@ void VerifyXML(const std::string& xml_text,
 
     if(name == "Decorator")
     {
-      if(children_count != 1)
-      {
-        ThrowError(line_number, "The tag <Decorator> must have exactly 1 "
-                                "child");
-      }
       if(ID.empty())
       {
         ThrowError(line_number, "The tag <Decorator> must have the "
                                 "attribute [ID]");
       }
+      if(children_count != 1)
+      {
+        ThrowError(line_number, "The tag <Decorator> with ID '" + ID +
+                                    "' must have exactly 1 "
+                                    "child");
+      }
     }
     else if(name == "Action")
     {
-      if(children_count != 0)
-      {
-        ThrowError(line_number, "The tag <Action> must not have any "
-                                "child");
-      }
       if(ID.empty())
       {
         ThrowError(line_number, "The tag <Action> must have the "
                                 "attribute [ID]");
       }
-    }
-    else if(name == "Condition")
-    {
       if(children_count != 0)
       {
-        ThrowError(line_number, "The tag <Condition> must not have any "
-                                "child");
+        ThrowError(line_number, "The tag <Action> with ID '" + ID +
+                                    "' must not have any "
+                                    "child");
       }
+    }
+    else if(name == "Condition")
+    {
       if(ID.empty())
       {
         ThrowError(line_number, "The tag <Condition> must have the "
                                 "attribute [ID]");
       }
+      if(children_count != 0)
+      {
+        ThrowError(line_number, "The tag <Condition> with ID '" + ID +
+                                    "' must not have any "
+                                    "child");
+      }
     }
     else if(name == "Control")
     {
-      if(children_count == 0)
-      {
-        ThrowError(line_number, "The tag <Control> must have at least 1 "
-                                "child");
-      }
       if(ID.empty())
       {
         ThrowError(line_number, "The tag <Control> must have the "
                                 "attribute [ID]");
       }
+      if(children_count == 0)
+      {
+        ThrowError(line_number, "The tag <Control> with ID '" + ID +
+                                    "' must have at least 1 "
+                                    "child");
+      }
     }
     else if(name == "SubTree")
     {
-      if(children_count != 0)
-      {
-        ThrowError(line_number, "<SubTree> should not have any child");
-      }
       if(ID.empty())
       {
         ThrowError(line_number, "The tag <SubTree> must have the "
                                 "attribute [ID]");
       }
+      if(children_count != 0)
+      {
+        ThrowError(line_number,
+                   "<SubTree> with ID '" + ID + "' should not have any child");
+      }
       if(registered_nodes.count(ID) != 0)
       {
         ThrowError(line_number, "The attribute [ID] of tag <SubTree> must "
@@ -505,16 +510,17 @@ void VerifyXML(const std::string& xml_text,
         ThrowError(line_number, "The tag <BehaviorTree> must have the "
                                 "attribute [ID]");
       }
-      if(children_count != 1)
-      {
-        ThrowError(line_number, "The tag <BehaviorTree> must have exactly 1 "
-                                "child");
-      }
       if(registered_nodes.count(ID) != 0)
       {
         ThrowError(line_number, "The attribute [ID] of tag <BehaviorTree> "
                                 "must not use the name of a registered Node");
       }
+      if(children_count != 1)
+      {
+        ThrowError(line_number, "The tag <BehaviorTree> with ID '" + ID +
+                                    "' must have exactly 1 "
+                                    "child");
+      }
     }
     else
     {
@@ -530,16 +536,16 @@ void VerifyXML(const std::string& xml_text,
       {
         if(children_count != 1)
         {
-          ThrowError(line_number,
-                     std::string("The node <") + name + "> must have exactly 1 child");
+          ThrowError(line_number, std::string("The node <") + name + "> with ID '" + ID +
+                                      "' must have exactly 1 child");
         }
       }
       else if(search->second == NodeType::CONTROL)
       {
         if(children_count == 0)
         {
-          ThrowError(line_number,
-                     std::string("The node <") + name + "> must have 1 or more children");
+          ThrowError(line_number, std::string("The node <") + name + "> with ID '" + ID +
+                                      "' must have 1 or more children");
         }
         if(name == "ReactiveSequence")
         {
@@ -563,7 +569,8 @@ void VerifyXML(const std::string& xml_text,
               ++async_count;
               if(async_count > 1)
               {
-                ThrowError(line_number, std::string("A ReactiveSequence cannot have more "
+                ThrowError(line_number, std::string("A ReactiveSequence with ID '" + ID +
+                                                    "' cannot have more "
                                                     "than one async child."));
               }
             }