1 files changed, 155 insertions, 3 deletions

@@ -48,6 +48,9 @@ class Validator {
     for (const auto& [prog_name, prog_info] : info_.progressives) {
       ValidateProgressive(prog_name, prog_info);
     }
+    for (const auto& [group_name, group_info] : info_.door_groups) {
+      ValidateDoorGroup(group_name, group_info);
+    }
   }
 
  private:
@@ -103,7 +106,8 @@ class Validator {
       return false;
     }
 
-    if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0) {
+    if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0 ||
+        h_door.complete_at() > 0) {
       return true;
     }
 
@@ -172,6 +176,15 @@ class Validator {
            door_info.progressives_referenced_by) {
         std::cout << "    PROGRESSIVE " << prog_name << std::endl;
       }
+
+      for (const std::string& group_name :
+           door_info.door_groups_referenced_by) {
+        std::cout << "    DOOR GROUP " << group_name << std::endl;
+      }
+
+      if (door_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (door_info.definitions.size() > 1) {
       std::cout << "Door " << door_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -215,6 +228,17 @@ class Validator {
                   << " is a location that depends on double_letters."
                   << std::endl;
       }
+
+      bool needs_id = (h_door.type() != DoorType::EVENT);
+      if (door_info.has_id != needs_id) {
+        if (needs_id) {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " is missing an AP ID." << std::endl;
+        } else {
+          std::cout << "Door " << door_identifier.ShortDebugString()
+                    << " should not have an AP ID." << std::endl;
+        }
+      }
     }
   }
 
@@ -233,6 +257,22 @@ class Validator {
       std::cout << "Port " << port_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
     }
+
+    if (!port_info.target_connections_referenced_by.empty()) {
+      for (const HumanPort& port : port_info.definitions) {
+        if (port.has_required_door()) {
+          std::cout << "Port " << port_identifier.ShortDebugString()
+                    << " has a required door but is the target of a connection:"
+                    << std::endl;
+
+          for (const HumanConnection& connection :
+               port_info.target_connections_referenced_by) {
+            std::cout << "    CONNECTION " << connection.ShortDebugString()
+                      << std::endl;
+          }
+        }
+      }
+    }
   }
 
   void ValidatePainting(const PaintingIdentifier& painting_identifier,
@@ -256,6 +296,22 @@ class Validator {
       std::cout << "Painting " << painting_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
     }
+
+    if (!painting_info.target_connections_referenced_by.empty()) {
+      for (const HumanPainting& painting : painting_info.definitions) {
+        if (painting.has_required_door()) {
+          std::cout << "Painting " << painting_identifier.ShortDebugString()
+                    << " has a required door but is the target of a connection:"
+                    << std::endl;
+
+          for (const HumanConnection& connection :
+               painting_info.target_connections_referenced_by) {
+            std::cout << "    CONNECTION " << connection.ShortDebugString()
+                      << std::endl;
+          }
+        }
+      }
+    }
   }
 
   void ValidatePanel(const PanelIdentifier& panel_identifier,
@@ -280,6 +336,10 @@ class Validator {
         std::cout << "    CONNECTION " << connection.ShortDebugString()
                   << std::endl;
       }
+
+      if (panel_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (panel_info.definitions.size() > 1) {
       std::cout << "Panel " << panel_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
@@ -308,6 +368,27 @@ class Validator {
                   << "\" was defined multiple times." << std::endl;
       }
     }
+
+    if (!panel_info.has_id) {
+      std::cout << "Panel " << panel_identifier.ShortDebugString()
+                << " is missing an AP ID." << std::endl;
+    }
+
+    if (!panel_info.target_connections_referenced_by.empty()) {
+      for (const HumanPanel& panel : panel_info.definitions) {
+        if (panel.has_required_door()) {
+          std::cout << "Panel " << panel_identifier.ShortDebugString()
+                    << " has a required door but is the target of a connection:"
+                    << std::endl;
+
+          for (const HumanConnection& connection :
+               panel_info.target_connections_referenced_by) {
+            std::cout << "    CONNECTION " << connection.ShortDebugString()
+                      << std::endl;
+          }
+        }
+      }
+    }
   }
 
   void ValidateKeyholder(const KeyholderIdentifier& keyholder_identifier,
@@ -321,10 +402,28 @@ class Validator {
         std::cout << "    DOOR " << door_identifier.ShortDebugString()
                   << std::endl;
       }
+
+      if (keyholder_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (keyholder_info.definitions.size() > 1) {
       std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;
     }
+
+    for (const HumanKeyholder& h_keyholder : keyholder_info.definitions) {
+      bool needs_id = (h_keyholder.has_key());
+
+      if (needs_id != keyholder_info.has_id) {
+        if (needs_id) {
+          std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                    << " is missing an AP ID." << std::endl;
+        } else {
+          std::cout << "Keyholder " << keyholder_identifier.ShortDebugString()
+                    << " should not have an AP ID." << std::endl;
+        }
+      }
+    }
   }
 
   void ValidateLetter(const LetterIdentifier& letter_identifier,
@@ -332,7 +431,14 @@ class Validator {
     std::string letter_name = std::string(1, std::get<0>(letter_identifier)) +
                               (std::get<1>(letter_identifier) ? "2" : "1");
 
-    if (letter_info.defined_in.size() > 1) {
+    if (letter_info.defined_in.empty()) {
+      std::cout << "Letter " << letter_name
+                << " has no definition, but was referenced:" << std::endl;
+
+      if (letter_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
+    } else if (letter_info.defined_in.size() > 1) {
       std::cout << "Letter " << letter_name
                 << " was defined in multiple places:" << std::endl;
 
@@ -340,6 +446,11 @@ class Validator {
         std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
       }
     }
+
+    if (!letter_info.has_id) {
+      std::cout << "Letter " << letter_name << " is missing an AP ID."
+                << std::endl;
+    }
   }
 
   void ValidateEnding(const std::string& ending_name,
@@ -353,6 +464,10 @@ class Validator {
         std::cout << "    DOOR " << door_identifier.ShortDebugString()
                   << std::endl;
       }
+
+      if (ending_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
     } else if (ending_info.defined_in.size() > 1) {
       std::cout << "Ending " << ending_name
                 << " was defined in multiple places:" << std::endl;
@@ -361,6 +476,11 @@ class Validator {
         std::cout << "    " << room_identifier.ShortDebugString() << std::endl;
       }
     }
+
+    if (!ending_info.has_id) {
+      std::cout << "Ending " << ending_name << " is missing an AP ID."
+                << std::endl;
+    }
   }
 
   void ValidatePanelName(const std::string& panel_name,
@@ -379,10 +499,42 @@ class Validator {
 
   void ValidateProgressive(const std::string& prog_name,
                            const ProgressiveInfo& prog_info) const {
-    if (prog_info.definitions.size() > 1) {
+    if (prog_info.definitions.empty()) {
+      std::cout << "Progressive \"" << prog_name
+                << "\" has no definition, but was referenced:" << std::endl;
+
+      if (prog_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
+    } else if (prog_info.definitions.size() > 1) {
       std::cout << "Progressive \"" << prog_name
                 << "\" has multiple definitions." << std::endl;
     }
+
+    if (!prog_info.has_id) {
+      std::cout << "Progressive \"" << prog_name << "\" is missing an AP ID."
+                << std::endl;
+    }
+  }
+
+  void ValidateDoorGroup(const std::string& group_name,
+                         const DoorGroupInfo& group_info) const {
+    if (group_info.definitions.empty()) {
+      std::cout << "Door group \"" << group_name
+                << "\" has no definition, but was referenced:" << std::endl;
+
+      if (group_info.has_id) {
+        std::cout << "    An AP ID is present." << std::endl;
+      }
+    } else if (group_info.definitions.size() > 1) {
+      std::cout << "Door group \"" << group_name
+                << "\" has multiple definitions." << std::endl;
+    }
+
+    if (!group_info.has_id) {
+      std::cout << "Door group \"" << group_name << "\" is missing an AP ID."
+                << std::endl;
+    }
   }
 
   const CollectedInfo& info_;