remove columnrange; switch to fmt in error.cc

2 files changed, 36 insertions, 43 deletions

diff --git a/src/libutil/error.cc b/src/libutil/error.cc
index 8ab4a2dea..106ea127e 100644
--- a/src/libutil/error.cc
+++ b/src/libutil/error.cc
@@ -10,10 +10,10 @@ std::optional<string> ErrorInfo::programName = std::nullopt;
 
 string showErrLine(ErrLine &errLine)
 {
-    if (errLine.columnRange.has_value()) {
-        return (format("(%1%:%2%)") % errLine.lineNumber % errLine.columnRange->start).str();
+    if (errLine.column > 0) {
+        return fmt("(%1%:%2%)", errLine.lineNumber, errLine.column);
     } else {
-        return (format("(%1%)") % errLine.lineNumber).str();
+        return fmt("(%1%)", errLine.lineNumber);
     };
 }
 
@@ -23,45 +23,45 @@ void printCodeLines(string &prefix, NixCode &nixCode)
     if (nixCode.errLine.has_value()) {
         // previous line of code.
         if (nixCode.errLine->prevLineOfCode.has_value()) {
-            std::cout << format("%1% %|2$5d|| %3%")
-                      %    prefix
-                      % (nixCode.errLine->lineNumber - 1)
-                      % *nixCode.errLine->prevLineOfCode
+            std::cout << fmt("%1% %|2$5d|| %3%",
+                             prefix,
+                             (nixCode.errLine->lineNumber - 1),
+                             *nixCode.errLine->prevLineOfCode)
                       << std::endl;
         }
 
         // line of code containing the error.%2$+5d%
-        std::cout << format("%1% %|2$5d|| %3%")
-                  %    prefix
-                  % (nixCode.errLine->lineNumber)
-                  % nixCode.errLine->errLineOfCode
+        std::cout << fmt("%1% %|2$5d|| %3%",
+                         prefix,
+                         (nixCode.errLine->lineNumber),
+                         nixCode.errLine->errLineOfCode)
                   << std::endl;
 
         // error arrows for the column range.
-        if (nixCode.errLine->columnRange.has_value()) {
-            int start = nixCode.errLine->columnRange->start;
+        if (nixCode.errLine->column > 0) {
+            int start = nixCode.errLine->column;
             std::string spaces;
             for (int i = 0; i < start; ++i) {
                 spaces.append(" ");
             }
 
-            int len = nixCode.errLine->columnRange->len;
-            std::string arrows;
-            for (int i = 0; i < len; ++i) {
-                arrows.append("^");
-            }
+            // for now, length of 1.
+            std::string arrows("^");
 
-            std::cout << format("%1%      |%2%" ANSI_RED "%3%" ANSI_NORMAL) % prefix % spaces % arrows << std::endl;
+            std::cout << fmt("%1%      |%2%" ANSI_RED "%3%" ANSI_NORMAL,
+                             prefix,
+                             spaces,
+                             arrows) << std::endl;
         }
 
 
 
         // next line of code.
         if (nixCode.errLine->nextLineOfCode.has_value()) {
-            std::cout << format("%1% %|2$5d|| %3%")
-                      %    prefix
-                      % (nixCode.errLine->lineNumber + 1)
-                      % *nixCode.errLine->nextLineOfCode
+            std::cout << fmt("%1% %|2$5d|| %3%",
+                             prefix,
+                             (nixCode.errLine->lineNumber + 1),
+                             *nixCode.errLine->nextLineOfCode)
                       << std::endl;
         }
 
@@ -89,7 +89,7 @@ void printErrorInfo(ErrorInfo &einfo)
         break;
     }
     default: {
-        levelString = (format("invalid error level: %1%") % einfo.level).str();
+        levelString = fmt("invalid error level: %1%", einfo.level);
         break;
     }
     }
@@ -102,13 +102,13 @@ void printErrorInfo(ErrorInfo &einfo)
         dashes.append("-");
 
     // divider.
-    std::cout << format("%1%%2%" ANSI_BLUE " %3% %4% %5% %6%" ANSI_NORMAL)
-              % prefix
-              % levelString
-              % "---"
-              % einfo.name
-              % dashes
-              % einfo.programName.value_or("")
+    std::cout << fmt("%1%%2%" ANSI_BLUE " %3% %4% %5% %6%" ANSI_NORMAL
+                     , prefix
+                     , levelString
+                     , "---"
+                     , einfo.name
+                     , dashes
+                     , einfo.programName.value_or(""))
               << std::endl;
 
     // filename.
@@ -118,11 +118,11 @@ void printErrorInfo(ErrorInfo &einfo)
                            ? string(" ") + showErrLine(*einfo.nixCode->errLine)
                            : "";
 
-            std::cout << format("%1%in file: " ANSI_BLUE "%2%%3%" ANSI_NORMAL)
-                      % prefix % *einfo.nixCode->nixFile % eline << std::endl;
+            std::cout << fmt("%1%in file: " ANSI_BLUE "%2%%3%" ANSI_NORMAL
+                             , prefix, *einfo.nixCode->nixFile, eline) << std::endl;
             std::cout << prefix << std::endl;
         } else {
-            std::cout << format("%1%from command line argument") % prefix << std::endl;
+            std::cout << fmt("%1%from command line argument", prefix) << std::endl;
             std::cout << prefix << std::endl;
         }
     }
diff --git a/src/libutil/error.hh b/src/libutil/error.hh
index 57a9944be..664bfbb5a 100644
--- a/src/libutil/error.hh
+++ b/src/libutil/error.hh
@@ -17,20 +17,13 @@ typedef enum {
     elError
 } ErrLevel;
 
-class ColumnRange
-{
-public:
-    unsigned int start;
-    unsigned int len;
-};
-
 class ErrorInfo;
 
 class ErrLine
 {
 public:
     int lineNumber;
-    std::optional<ColumnRange> columnRange;
+    int column;
     std::optional<string> prevLineOfCode;
     string errLineOfCode;
     std::optional<string> nextLineOfCode;
@@ -159,7 +152,7 @@ public:
     {
         GetEI().ensureNixCode().nixFile = aPos.file;
         GetEI().ensureNixCode().ensureErrLine().lineNumber = aPos.line;
-        GetEI().ensureNixCode().ensureErrLine().columnRange = { .start = aPos.column, .len = 1 };
+        GetEI().ensureNixCode().ensureErrLine().column = aPos.column;
         return *this;
     }
 protected: