wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

programName as static member var

Browse source
This commit is contained in:
Ben Burdette 2020-03-25 10:52:03 -06:00
parent fc310eda3a
commit 3582dc3c88
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/error.cc
View file

@ -1,11 +1,15 @@
#include "error.hh"
#include <iostream>
#include <optional>
namespace nix {
using std::cout;
using std::endl;
using std::nullopt;
optional<string> ErrorInfo::programName = nullopt;
// return basic_format?
string showErrLine(ErrLine &errLine)
@ -98,10 +102,11 @@ void print_error(ErrorInfo &einfo)
{
level_string = "wat:";
break;
}}
}
}
int ndl = level_string.length() + 3 + einfo.name.length() + einfo.program.length();
int dashwidth = errwidth - 3 ? 3 : 80 - ndl;
int ndl = prefix.length() + level_string.length() + 3 + einfo.name.length() + einfo.programName.value_or("").length();
int dashwidth = ndl > (errwidth - 3) ? 3 : 80 - ndl;
string dashes;
for (int i = 0; i < dashwidth; ++i)
@ -114,7 +119,7 @@ void print_error(ErrorInfo &einfo)
% "---"
% einfo.name
% dashes
% einfo.program
% einfo.programName.value_or("")
<< endl;
// filename.