moraxyc/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

uncrustify formatting

Browse source
This commit is contained in:
Ben Burdette 2020-04-29 10:14:32 -06:00
parent 22e6490311
commit e2f61263eb
6 changed files with 3050 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2989
.uncrustify.cfg Normal file
View file

File diff suppressed because it is too large Load diff

3
src/libexpr/nixexpr.hh
View file

@ -234,7 +234,8 @@ struct ExprLambda : Expr
: pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body) : pos(pos), arg(arg), matchAttrs(matchAttrs), formals(formals), body(body)
{ {
if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end()) if (!arg.empty() && formals && formals->argNames.find(arg) != formals->argNames.end())
throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos); }; throw ParseError("duplicate formal function argument '%1%' at %2%", arg, pos);
};
void setName(Symbol & name); void setName(Symbol & name);
string showNamePos() const; string showNamePos() const;
COMMON_METHODS COMMON_METHODS

12
src/libutil/logging.cc
View file

@ -111,8 +111,7 @@ Activity::Activity(Logger & logger, Verbosity lvl, ActivityType type,
logger.startActivity(id, lvl, type, s, fields, parent); logger.startActivity(id, lvl, type, s, fields, parent);
} }
struct JSONLogger : Logger struct JSONLogger : Logger {
{
Logger & prevLogger; Logger & prevLogger;
JSONLogger(Logger & prevLogger) : prevLogger(prevLogger) { } JSONLogger(Logger & prevLogger) : prevLogger(prevLogger) { }
@ -160,12 +159,10 @@ struct JSONLogger : Logger
// TODO: make a json obj that goes into json["msg"]? // TODO: make a json obj that goes into json["msg"]?
json["name"] = ei.name; json["name"] = ei.name;
json["description"] = ei.description; json["description"] = ei.description;
if (ei.hint.has_value()) if (ei.hint.has_value()) {
{
json["hint"] = ei.hint->str(); json["hint"] = ei.hint->str();
} }
if (ei.nixCode.has_value()) if (ei.nixCode.has_value()) {
{
if (ei.nixCode->errPos.line != 0) if (ei.nixCode->errPos.line != 0)
json["line"] = ei.nixCode->errPos.line; json["line"] = ei.nixCode->errPos.line;
if (ei.nixCode->errPos.column != 0) if (ei.nixCode->errPos.column != 0)
@ -278,7 +275,8 @@ bool handleJSONLogMessage(const std::string & msg,
return true; return true;
} }
Activity::~Activity() { Activity::~Activity()
{
try { try {
logger.stopActivity(id); logger.stopActivity(id);
} catch (...) { } catch (...) {