add pos to errorinfo, remove from hints

1 files changed, 8 insertions, 3 deletions

diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 19a806cc1..7e2cca2f9 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -35,10 +35,15 @@ typedef enum {
 } Verbosity;
 
 struct ErrPos {
-    int line;
-    int column;
+    int line = 0;
+    int column = 0;
     string file;
 
+    operator bool() const
+    {
+        return line != 0;
+    }
+
     template <class P>
     ErrPos& operator=(const P &pos)
     {
@@ -58,7 +63,7 @@ struct ErrPos {
 struct NixCode {
     ErrPos errPos;
     std::optional<string> prevLineOfCode;
-    string errLineOfCode;
+    std::optional<string> errLineOfCode;
     std::optional<string> nextLineOfCode;
 };