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

columnRange -> column

Browse source
This commit is contained in:
Ben Burdette 2020-04-07 14:36:32 -06:00
parent 55c96b64e4
commit 00c507cc52
2 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/error.hh
View file

@ -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;
@ -107,6 +100,8 @@ public:
static std::optional<string> programName;
ErrorInfo& set_name(const string &name) { this->name = name; return *this; }
static ErrorInfo ProgramError(const string &name,
const string &description,
const std::optional<hintformat> &hf);
@ -165,7 +160,7 @@ private:
ErrLine errline;
errline.lineNumber = pos.line;
errline.columnRange = { .start = pos.column, .len = 1 };
errline.column = pos.column;
errline.prevLineOfCode = prevloc;
errline.errLineOfCode = loc;
errline.nextLineOfCode = nextloc;