Reject declarations shadowing imports

1 files changed, 11 insertions, 5 deletions

diff --git a/boot/result.cc b/boot/result.cc
index d25b85b..635a121 100644
--- a/boot/result.cc
+++ b/boot/result.cc
@@ -75,6 +75,11 @@ namespace elna::boot
         return m_errors;
     }
 
+    const std::deque<std::unique_ptr<diagnostic>>& diagnostic_container::errors() const
+    {
+        return m_errors;
+    }
+
     bool diagnostic_container::has_errors() const
     {
         return !m_errors.empty();
@@ -131,12 +136,13 @@ namespace elna::boot
         return this->m_exported;
     }
 
-    std::optional<std::pair<std::string, source_position>> previous_declaration_note(
-            const std::optional<source_position>& original, std::string_view label)
+    std::optional<diagnostic_note> previous_declaration_note(
+            const std::optional<source_position>& original, std::string_view label,
+            const std::filesystem::path& file)
     {
         if (original.has_value() && original.value().start().available())
         {
-            return std::make_pair(std::string(label), original.value());
+            return diagnostic_note{ .message = std::string(label), .position = original.value(), .file = file };
         }
         else
         {
@@ -144,13 +150,13 @@ namespace elna::boot
         }
     }
 
-    std::optional<std::pair<std::string, source_position>> identifier_list_note(
+    std::optional<diagnostic_note> identifier_list_note(
             const std::vector<identifier>& identifiers)
     {
         auto position_span = source_position(identifiers.front().position().start(),
                 identifiers.back().position().end());
 
-        return std::make_optional(std::make_pair(join(identifiers), position_span));
+        return diagnostic_note{ .message = join(identifiers), .position = position_span, .file = {} };
     }
 
     std::vector<identifier> extract_identifiers(const std::vector<identifier_definition>& identifiers)