lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

remove util.hh from deps

Browse source
This commit is contained in:
Ben Burdette 2020-03-27 10:55:09 -06:00
parent 00eb3fcb7a
commit 759f39800b
4 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libutil/ansicolor.hh Normal file
View file

@ -0,0 +1,13 @@
#pragma once
namespace nix
{
/* Some ANSI escape sequences. */
#define ANSI_NORMAL "\e[0m"
#define ANSI_BOLD "\e[1m"
#define ANSI_FAINT "\e[2m"
#define ANSI_RED "\e[31;1m"
#define ANSI_GREEN "\e[32;1m"
#define ANSI_YELLOW "\e[33;1m"
#define ANSI_BLUE "\e[34;1m"
}

2
src/libutil/error.cc
View file

@ -104,7 +104,7 @@ void printErrorInfo(ErrorInfo &einfo)
}
default:
{
levelString = format("invalid error level: %1%") % einfo.level;
levelString = (format("invalid error level: %1%") % einfo.level).str();
break;
}
}

25
src/libutil/error.hh
View file

@ -1,11 +1,13 @@
#pragma once
#include "util.hh"
#include "ansicolor.hh"
#include <string>
#include <optional>
#include <iostream>
#include <iomanip>
#include <boost/format.hpp>
using std::string;
using std::optional;
using boost::format;
@ -251,8 +253,14 @@ class AddHint : private T
// --------------------------------------------------------
// error types
typedef AddName<AddDescription<AddHint<EIError>>> StandardError;
typedef AddName<AddDescription<AddHint<EIWarning>>> StandardWarning;
typedef AddName<
AddDescription<
AddHint<
EIError>>> StandardError;
typedef AddName<
AddDescription<
AddHint<
EIWarning>>> StandardWarning;
typedef AddName<
AddDescription<
@ -260,13 +268,16 @@ typedef AddName<
AddLineNumber<
AddColumnRange<
AddLOC<
AddHint<EIError>>>>>>> MkNixError;
AddHint<
EIError>>>>>>> MkNixError;
typedef AddName<
AddDescription<
AddNixFile<
AddLineNumber<
AddColumnRange<
AddLOC<EIWarning>>>>>> MkNixWarning;
AddLOC<
AddHint<
EIWarning>>>>>>> MkNixWarning;
// --------------------------------------------------------
@ -274,9 +285,5 @@ typedef AddName<
void printErrorInfo(ErrorInfo &einfo);
string showErrLine(ErrLine &errLine);
void printCodeLines(string &prefix, NixCode &nixCode);
}

10
src/libutil/util.hh
View file

@ -2,6 +2,7 @@
#include "types.hh"
#include "logging.hh"
#include "ansicolor.hh"
#include <sys/types.h>
#include <sys/stat.h>
@ -423,15 +424,6 @@ std::string shellEscape(const std::string & s);
void ignoreException();
/* Some ANSI escape sequences. */
#define ANSI_NORMAL "\e[0m"
#define ANSI_BOLD "\e[1m"
#define ANSI_FAINT "\e[2m"
#define ANSI_RED "\e[31;1m"
#define ANSI_GREEN "\e[32;1m"
#define ANSI_YELLOW "\e[33;1m"
#define ANSI_BLUE "\e[34;1m"
/* Truncate a string to 'width' printable characters. If 'filterAll'
is true, all ANSI escape sequences are filtered out. Otherwise,