FIX: Report source locations instead of offsets in diagnostics.

- Replace byte offsets with source locations in diagnostic output.
- Add missing support for Classic macOS (CR) line endings.

Fixes #12

Author: nos1dot618

.gitignore

@@ -9,3 +9,4 @@ dump/
 
 .lbd_history
 .direnv.ps1
+examples/debug.lbd

include/lbd/source/BufferManager.hpp

@@ -4,6 +4,7 @@
 #include <string>
 #include <unordered_map>
 #include <lbd/source/Buffer.hpp>
+#include <lbd/source/Range.hpp>
 
 namespace lbd::source
 {
@@ -36,6 +37,10 @@ namespace lbd::source
 
     [[nodiscard]] std::string_view getLine(BufferId id, Offset offset) const noexcept;
 
+    void printLocation(std::ostream &outputStream, BufferId id, Location location) const noexcept;
+
+    void printRange(std::ostream &outputStream, BufferId id, Range range) const noexcept;
+
     // Optional utilities.
     [[nodiscard]] bool isBufferLoaded(const std::string &name) const;
 

src/diagnostics/DiagnosticRenderer.cpp

@@ -49,8 +49,9 @@ namespace lbd::diagnostics
     // ReSharper disable once CppUseStructuredBinding
     const source::Location endLocation = diagnostic.getRange().getEnd();
     const source::BufferId bufferId = beginLocation.bufferId;
-    outputStream << "    " << topLeft << horizontal << " " << sourceManager.getBufferName(bufferId)
-        << ':' << diagnostic.getRange() << '\n';
+    outputStream << "    " << topLeft << horizontal << " " << sourceManager.getBufferName(bufferId) << ':';
+    sourceManager.printRange(outputStream, bufferId, diagnostic.getRange());
+    outputStream << '\n';
 
     // Source line.
     outputStream << "    " << vertical << '\n';

src/source/Buffer.cpp

@@ -12,9 +12,20 @@ namespace lbd::source
   {
     m_lineOffsets.clear();
     m_lineOffsets.push_back(0);
-    for (uint32_t i = 0; i < m_contents.size(); ++i)
+
+    for (Offset i = 0; i < m_contents.size(); ++i)
     {
-      if (m_contents[i] == '\n') m_lineOffsets.push_back(i + 1);
+      if (m_contents[i] == '\r')
+      {
+        // CRLF
+        if (i + 1 < m_contents.size() && m_contents[i + 1] == '\n') ++i;
+        // else CR
+        m_lineOffsets.push_back(i + 1);
+      } else if (m_contents[i] == '\n')
+      {
+        // LF
+        m_lineOffsets.push_back(i + 1);
+      }
     }
   }
 }

src/source/BufferManager.cpp

@@ -65,6 +65,19 @@ namespace lbd::source
     return contents.substr(lineStart, lineEnd - lineStart);
   }
 
+  void BufferManager::printLocation(std::ostream &outputStream, const BufferId id,
+                                    const Location location) const noexcept
+  {
+    outputStream << getRow(id, location.offset) << ':' << getColumn(id, location.offset);
+  }
+
+  void BufferManager::printRange(std::ostream &outputStream, const BufferId id, const Range range) const noexcept
+  {
+    printLocation(outputStream, id, range.getBegin());
+    outputStream << "..";
+    printLocation(outputStream, id, range.getEnd());
+  }
+
   bool BufferManager::isBufferLoaded(const std::string &name) const
   {
     const std::string absolutePath = getAbsolutePath(name);

tests/diagnostics/type_error.test.toml

@@ -5,6 +5,6 @@ exit_code = 1
 stderr_contains = [
     "ERROR: Invalid inputs to native function `add`.",
     "`add` signature: Float -> Float -> Float",
-    "type_error.lbd:7..22",
+    "type_error.lbd:1:8..1:23",
     "(print (add \"hello\" 5))",
 ]

tests/diagnostics/unexpected_token.test.toml

@@ -4,6 +4,6 @@ file = "unexpected_token.lbd"
 exit_code = 1
 stderr_contains = [
     "ERROR: Unexpected character `;`.",
-    "unexpected_token.lbd:13..13",
+    "unexpected_token.lbd:1:14..1:14",
     "a: Number = 1;",
 ]