Corpus lookup returns Expected

#improvement

Author: alandefreitas

include/mrdocs/Corpus.hpp

@@ -90,12 +90,12 @@ class MRDOCS_VISIBLE
     /** Return the Info for the matching string in a given context.
     */
     virtual
-    Info const*
+    Expected<Info const*>
     lookup(SymbolID const& context, std::string_view name) const = 0;
 
     /** Return the Info for the matching string in the global context.
     */
-    Info const*
+    Expected<Info const*>
     lookup(std::string_view name) const
     {
         return lookup(SymbolID::global, name);

src/lib/Lib/CorpusImpl.cpp

@@ -221,22 +221,22 @@ isTransparent(Info const& info)
 }
 }
 
-Info const*
+Expected<Info const*>
 CorpusImpl::
-lookup(SymbolID const& context, std::string_view name) const
+lookup(SymbolID const& context, std::string_view const name) const
 {
     return lookupImpl(*this, context, name);
 }
 
-Info const*
+Expected<Info const*>
 CorpusImpl::
 lookup(SymbolID const& context, std::string_view name)
 {
     return lookupImpl(*this, context, name);
 }
 
 template <class Self>
-Info const*
+Expected<Info const*>
 CorpusImpl::
 lookupImpl(Self&& self, SymbolID const& context, std::string_view name)
 {
@@ -246,16 +246,33 @@ lookupImpl(Self&& self, SymbolID const& context, std::string_view name)
     }
     if (auto [info, found] = self.lookupCacheGet(context, name); found)
     {
+        if (!info)
+        {
+            return Unexpected(formatError(
+                "Failed to find '{}' from context '{}'",
+                name,
+                self.Corpus::qualifiedName(*self.find(context))));
+        }
         return info;
     }
     Expected<ParsedRef> const s = parseRef(name);
     if (!s)
     {
-        report::warn("Failed to parse '{}'\n     {}", name, s.error().reason());
-        self.lookupCacheSet(context, name, nullptr);
-        return nullptr;
+        return Unexpected(formatError("Failed to parse '{}'\n     {}", name, s.error().reason()));
     }
     Info const* res = lookupImpl(self, context, *s, name, false);
+    if (!res)
+    {
+        auto const contextPtr = self.find(context);
+        if (!contextPtr)
+        {
+            return Unexpected(formatError("Failed to find '{}'", context));
+        }
+        return Unexpected(formatError(
+            "Failed to find '{}' from context '{}'",
+            name,
+            self.Corpus::qualifiedName(*contextPtr)));
+    }
     return res;
 }
 
@@ -600,7 +617,6 @@ CorpusImpl::finalize()
     report::debug("Finalizing javadoc");
     JavadocFinalizer finalizer(*this);
     finalizer.build();
-    finalizer.emitWarnings();
 }
 
 

src/lib/Lib/CorpusImpl.hpp

@@ -91,10 +91,10 @@ class CorpusImpl final : public Corpus
     Info const*
     find(SymbolID const& id) const noexcept override;
 
-    Info const*
+    Expected<Info const*>
     lookup(SymbolID const& context, std::string_view name) const override;
 
-    Info const*
+    Expected<Info const*>
     lookup(SymbolID const& context, std::string_view name);
 
     /** Build metadata for a set of translation units.
@@ -141,7 +141,7 @@ class CorpusImpl final : public Corpus
 
     template <class Self>
     static
-    Info const*
+    Expected<Info const*>
     lookupImpl(
         Self&& self,
         SymbolID const& context,