mirror of
https://github.com/NixOS/nix
synced 2025-06-27 16:51:15 +02:00
formatted with astyle
This commit is contained in:
Ben Burdette
parent
1c329ca433
commit
c6b3fcddb0
3 changed files with 308 additions and 282 deletions
|
|
@ -9,41 +9,45 @@
|
|||
|
||||
#include <boost/format.hpp>
|
||||
|
||||
namespace nix {
|
||||
namespace nix
|
||||
{
|
||||
|
||||
typedef enum {
|
||||
typedef enum {
|
||||
elWarning,
|
||||
elError
|
||||
} ErrLevel;
|
||||
|
||||
class ColumnRange {
|
||||
public:
|
||||
unsigned int start;
|
||||
unsigned int len;
|
||||
class ColumnRange
|
||||
{
|
||||
public:
|
||||
unsigned int start;
|
||||
unsigned int len;
|
||||
};
|
||||
|
||||
class ErrorInfo;
|
||||
|
||||
class ErrLine {
|
||||
public:
|
||||
int lineNumber;
|
||||
std::optional<ColumnRange> columnRange;
|
||||
std::optional<string> prevLineOfCode;
|
||||
string errLineOfCode;
|
||||
std::optional<string> nextLineOfCode;
|
||||
class ErrLine
|
||||
{
|
||||
public:
|
||||
int lineNumber;
|
||||
std::optional<ColumnRange> columnRange;
|
||||
std::optional<string> prevLineOfCode;
|
||||
string errLineOfCode;
|
||||
std::optional<string> nextLineOfCode;
|
||||
};
|
||||
|
||||
class NixCode {
|
||||
public:
|
||||
std::optional<string> nixFile;
|
||||
std::optional<ErrLine> errLine;
|
||||
class NixCode
|
||||
{
|
||||
public:
|
||||
std::optional<string> nixFile;
|
||||
std::optional<ErrLine> errLine;
|
||||
|
||||
ErrLine& ensureErrLine()
|
||||
{
|
||||
if (!this->errLine.has_value())
|
||||
this->errLine = std::optional(ErrLine());
|
||||
return *this->errLine;
|
||||
}
|
||||
ErrLine& ensureErrLine()
|
||||
{
|
||||
if (!this->errLine.has_value())
|
||||
this->errLine = std::optional(ErrLine());
|
||||
return *this->errLine;
|
||||
}
|
||||
};
|
||||
|
||||
// -------------------------------------------------
|
||||
|
|
@ -65,149 +69,180 @@ class AddNixFile;
|
|||
template <class T>
|
||||
class AddErrLine;
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddLineNumber;
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddColumnRange;
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddLOC;
|
||||
|
||||
// The error info class itself.
|
||||
class ErrorInfo {
|
||||
public:
|
||||
ErrLevel level;
|
||||
string name;
|
||||
string description;
|
||||
std::optional<NixCode> nixCode;
|
||||
std::optional<string> hint;
|
||||
ErrorInfo& GetEI() { return *this; }
|
||||
class ErrorInfo
|
||||
{
|
||||
public:
|
||||
ErrLevel level;
|
||||
string name;
|
||||
string description;
|
||||
std::optional<NixCode> nixCode;
|
||||
std::optional<string> hint;
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return *this;
|
||||
}
|
||||
|
||||
static std::optional<string> programName;
|
||||
static std::optional<string> programName;
|
||||
|
||||
// give these access to the private constructor,
|
||||
// when they are direct descendants (children but not grandchildren).
|
||||
friend AddName<ErrorInfo>;
|
||||
friend AddDescription<ErrorInfo>;
|
||||
friend AddNixCode<ErrorInfo>;
|
||||
friend AddNixFile<ErrorInfo>;
|
||||
friend AddErrLine<ErrorInfo>;
|
||||
friend AddLineNumber<ErrorInfo>;
|
||||
friend AddColumnRange<ErrorInfo>;
|
||||
friend AddLOC<ErrorInfo>;
|
||||
// give these access to the private constructor,
|
||||
// when they are direct descendants (children but not grandchildren).
|
||||
friend AddName<ErrorInfo>;
|
||||
friend AddDescription<ErrorInfo>;
|
||||
friend AddNixCode<ErrorInfo>;
|
||||
friend AddNixFile<ErrorInfo>;
|
||||
friend AddErrLine<ErrorInfo>;
|
||||
friend AddLineNumber<ErrorInfo>;
|
||||
friend AddColumnRange<ErrorInfo>;
|
||||
friend AddLOC<ErrorInfo>;
|
||||
|
||||
NixCode& ensureNixCode()
|
||||
{
|
||||
if (!this->nixCode.has_value())
|
||||
this->nixCode = std::optional(NixCode());
|
||||
return *this->nixCode;
|
||||
}
|
||||
protected:
|
||||
// constructor is protected, so only the builder classes can create an ErrorInfo.
|
||||
ErrorInfo(ErrLevel level) { this->level = level; }
|
||||
NixCode& ensureNixCode()
|
||||
{
|
||||
if (!this->nixCode.has_value())
|
||||
this->nixCode = std::optional(NixCode());
|
||||
return *this->nixCode;
|
||||
}
|
||||
protected:
|
||||
// constructor is protected, so only the builder classes can create an ErrorInfo.
|
||||
ErrorInfo(ErrLevel level)
|
||||
{
|
||||
this->level = level;
|
||||
}
|
||||
};
|
||||
|
||||
// Init as error
|
||||
class EIError : public ErrorInfo
|
||||
{
|
||||
protected:
|
||||
EIError() : ErrorInfo(elError) {}
|
||||
protected:
|
||||
EIError() : ErrorInfo(elError) {}
|
||||
};
|
||||
|
||||
// Init as warning
|
||||
class EIWarning : public ErrorInfo
|
||||
{
|
||||
protected:
|
||||
EIWarning() : ErrorInfo(elWarning) {}
|
||||
protected:
|
||||
EIWarning() : ErrorInfo(elWarning) {}
|
||||
};
|
||||
|
||||
// Builder class definitions.
|
||||
template <class T>
|
||||
class AddName : private T
|
||||
{
|
||||
public:
|
||||
T& name(const std::string &name){
|
||||
GetEI().name = name;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& name(const std::string &name)
|
||||
{
|
||||
GetEI().name = name;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
class AddDescription : private T
|
||||
class AddDescription : private T
|
||||
{
|
||||
public:
|
||||
T& description(const std::string &description){
|
||||
GetEI().description = description;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& description(const std::string &description)
|
||||
{
|
||||
GetEI().description = description;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddNixFile : private T
|
||||
{
|
||||
public:
|
||||
T& nixFile(string filename) {
|
||||
GetEI().ensureNixCode().nixFile = filename;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& nixFile(string filename)
|
||||
{
|
||||
GetEI().ensureNixCode().nixFile = filename;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddLineNumber : private T
|
||||
{
|
||||
public:
|
||||
T& lineNumber(int lineNumber) {
|
||||
GetEI().ensureNixCode().ensureErrLine().lineNumber = lineNumber;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& lineNumber(int lineNumber)
|
||||
{
|
||||
GetEI().ensureNixCode().ensureErrLine().lineNumber = lineNumber;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddColumnRange : private T
|
||||
{
|
||||
public:
|
||||
T& columnRange(unsigned int start, unsigned int len) {
|
||||
GetEI().ensureNixCode().ensureErrLine().columnRange = { start, len };
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& columnRange(unsigned int start, unsigned int len)
|
||||
{
|
||||
GetEI().ensureNixCode().ensureErrLine().columnRange = { start, len };
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddLOC : private T
|
||||
{
|
||||
public:
|
||||
T& linesOfCode(std::optional<string> prevloc, string loc, std::optional<string> nextloc) {
|
||||
GetEI().ensureNixCode().ensureErrLine().prevLineOfCode = prevloc;
|
||||
GetEI().ensureNixCode().ensureErrLine().errLineOfCode = loc;
|
||||
GetEI().ensureNixCode().ensureErrLine().nextLineOfCode = nextloc;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& linesOfCode(std::optional<string> prevloc, string loc, std::optional<string> nextloc)
|
||||
{
|
||||
GetEI().ensureNixCode().ensureErrLine().prevLineOfCode = prevloc;
|
||||
GetEI().ensureNixCode().ensureErrLine().errLineOfCode = loc;
|
||||
GetEI().ensureNixCode().ensureErrLine().nextLineOfCode = nextloc;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// ----------------------------------------------------------------
|
||||
// format for hints. same as boost format, except templated values
|
||||
// format for hints. same as boost format, except templated values
|
||||
// are always in yellow.
|
||||
|
||||
template <class T>
|
||||
class yellowify
|
||||
{
|
||||
public:
|
||||
yellowify(T &s) : value(s) {}
|
||||
T &value;
|
||||
yellowify(T &s) : value(s) {}
|
||||
T &value;
|
||||
};
|
||||
|
||||
template <class T>
|
||||
|
|
@ -216,69 +251,79 @@ std::ostream& operator<<(std::ostream &out, const yellowify<T> &y)
|
|||
return out << ANSI_YELLOW << y.value << ANSI_NORMAL;
|
||||
}
|
||||
|
||||
class hintfmt
|
||||
class hintfmt
|
||||
{
|
||||
public:
|
||||
hintfmt(string format) :fmt(format) {
|
||||
fmt.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
|
||||
}
|
||||
template<class T>
|
||||
hintfmt& operator%(const T &value) { fmt % yellowify(value); return *this; }
|
||||
public:
|
||||
hintfmt(string format) :fmt(format)
|
||||
{
|
||||
fmt.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
|
||||
}
|
||||
template<class T>
|
||||
hintfmt& operator%(const T &value)
|
||||
{
|
||||
fmt % yellowify(value);
|
||||
return *this;
|
||||
}
|
||||
|
||||
template <typename U>
|
||||
friend class AddHint;
|
||||
private:
|
||||
format fmt;
|
||||
template <typename U>
|
||||
friend class AddHint;
|
||||
private:
|
||||
format fmt;
|
||||
|
||||
};
|
||||
|
||||
// the template layer for adding a hint.
|
||||
template <class T>
|
||||
template <class T>
|
||||
class AddHint : private T
|
||||
{
|
||||
public:
|
||||
T& hint(hintfmt &hfmt) {
|
||||
GetEI().hint = std::optional(hfmt.fmt.str());
|
||||
return *this;
|
||||
}
|
||||
T& nohint() {
|
||||
GetEI().hint = std::nullopt;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI() { return T::GetEI(); }
|
||||
public:
|
||||
T& hint(hintfmt &hfmt)
|
||||
{
|
||||
GetEI().hint = std::optional(hfmt.fmt.str());
|
||||
return *this;
|
||||
}
|
||||
T& nohint()
|
||||
{
|
||||
GetEI().hint = std::nullopt;
|
||||
return *this;
|
||||
}
|
||||
protected:
|
||||
ErrorInfo& GetEI()
|
||||
{
|
||||
return T::GetEI();
|
||||
}
|
||||
};
|
||||
|
||||
// --------------------------------------------------------
|
||||
// error types
|
||||
|
||||
typedef AddName<
|
||||
AddDescription<
|
||||
AddHint<
|
||||
EIError>>> ProgramError;
|
||||
AddDescription<
|
||||
AddHint<
|
||||
EIError>>> ProgramError;
|
||||
|
||||
typedef AddName<
|
||||
AddDescription<
|
||||
AddHint<
|
||||
EIWarning>>> ProgramWarning;
|
||||
AddDescription<
|
||||
AddHint<
|
||||
EIWarning>>> ProgramWarning;
|
||||
|
||||
typedef AddName<
|
||||
AddDescription<
|
||||
AddNixFile<
|
||||
AddLineNumber<
|
||||
AddColumnRange<
|
||||
AddLOC<
|
||||
AddHint<
|
||||
EIError>>>>>>> NixLangError;
|
||||
AddDescription<
|
||||
AddNixFile<
|
||||
AddLineNumber<
|
||||
AddColumnRange<
|
||||
AddLOC<
|
||||
AddHint<
|
||||
EIError>>>>>>> NixLangError;
|
||||
|
||||
typedef AddName<
|
||||
AddDescription<
|
||||
AddNixFile<
|
||||
AddLineNumber<
|
||||
AddColumnRange<
|
||||
AddLOC<
|
||||
AddHint<
|
||||
EIWarning>>>>>>> NixLangWarning;
|
||||
AddDescription<
|
||||
AddNixFile<
|
||||
AddLineNumber<
|
||||
AddColumnRange<
|
||||
AddLOC<
|
||||
AddHint<
|
||||
EIWarning>>>>>>> NixLangWarning;
|
||||
|
||||
|
||||
// --------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue