3 files changed, 16 insertions(+), 5 deletions(-)

M new/include/viua/libs/errors/compile_time.h
M new/src/tools/libs/errors/compile_time.cpp
M new/src/tools/libs/stage.cpp

@@ 159,13 159,20 @@ class Error {
      * Its location is independent of the main lexeme.
      */
     std::string aside_note;
-    viua::libs::lexer::Lexeme aside_lexeme;
+    std::optional<viua::libs::lexer::Lexeme> aside_lexeme;
 
   public:
     Error(viua::libs::lexer::Lexeme, Cause const, std::string = "");
 
-    auto aside(std::string) -> Error&;
+    auto aside(std::string, std::optional<Lexeme> = std::nullopt) -> Error&;
     auto aside() const -> std::string_view;
+    auto aside_character() const -> size_t
+    {
+        if (aside_lexeme.has_value()) {
+            return aside_lexeme->location.character;
+        }
+        return character();
+    }
 
     auto note(std::string) -> Error&;
     auto notes() const -> std::vector<std::string> const&;

@@ 63,9 63,13 @@ Error::Error(viua::libs::lexer::Lexeme lx, Cause const ce, std::string m)
         : cause{ce}, message{std::move(m)}, main_lexeme{lx}
 {}
 
-auto Error::aside(std::string s) -> Error&
+auto Error::aside(std::string s, std::optional<Lexeme> l) -> Error&
 {
     aside_note = std::move(s);
+    aside_lexeme = l;
+    if (l.has_value()) {
+        add(*l);
+    }
     return *this;
 }
 auto Error::aside() const -> std::string_view

@@ 302,11 302,11 @@ auto display_error(std::filesystem::path source_path,
     if (not e.aside().empty()) {
         std::cerr << std::string(ERROR_MARKER.size(), ' ')
                   << std::string(LINE_NO_WIDTH, ' ') << esc(2, COLOR_FG_CYAN)
-                  << SEPARATOR_ASIDE << std::string(e.character(), ' ') << '|'
+                  << SEPARATOR_ASIDE << std::string(e.aside_character(), ' ') << '|'
                   << esc(2, ATTR_RESET) << "\n";
         std::cerr << std::string(ERROR_MARKER.size(), ' ')
                   << std::string(LINE_NO_WIDTH, ' ') << esc(2, COLOR_FG_CYAN)
-                  << SEPARATOR_ASIDE << std::string(e.character(), ' ')
+                  << SEPARATOR_ASIDE << std::string(e.aside_character(), ' ')
                   << e.aside() << esc(2, ATTR_RESET) << "\n";
         std::cerr << esc(2, COLOR_FG_CYAN)
                   << std::string(ERROR_MARKER.size(), ' ')