1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-30 04:55:25 +03:00

Reformat for 4-space indentation

Specifically, with
  clang-format --style='{ IndentWidth: 4, BreakBeforeBraces: Mozilla, ColumnLimit: 120, PointerAlignment: Middle }'
which was the clang-format invocation that produced the fewest diffs on
the nix source out of ~20 that I tried.
This commit is contained in:
Chuck 2019-09-06 09:45:05 -07:00 committed by Linus Heckemann
parent 74f05df671
commit 4af8dbf896
3 changed files with 534 additions and 529 deletions

View file

@ -21,7 +21,8 @@ using nix::Strings;
using std::string;
// From nix/src/libexpr/attr-path.cc
Strings parseAttrPath(const string &s) {
Strings parseAttrPath(const string & s)
{
Strings res;
string cur;
string::const_iterator i = s.begin();
@ -33,8 +34,7 @@ Strings parseAttrPath(const string &s) {
++i;
while (1) {
if (i == s.end())
throw Error(format("missing closing quote in selection path '%1%'") %
s);
throw Error(format("missing closing quote in selection path '%1%'") % s);
if (*i == '"')
break;
cur.push_back(*i++);
@ -49,21 +49,23 @@ Strings parseAttrPath(const string &s) {
}
// From nix/src/nix/repl.cc
bool isVarName(const string &s) {
bool isVarName(const string & s)
{
if (s.size() == 0)
return false;
char c = s[0];
if ((c >= '0' && c <= '9') || c == '-' || c == '\'')
return false;
for (auto & i : s)
if (!((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') ||
(i >= '0' && i <= '9') || i == '_' || i == '-' || i == '\''))
if (!((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_' || i == '-' ||
i == '\''))
return false;
return true;
}
// From nix/src/nix/repl.cc
std::ostream &printStringValue(std::ostream &str, const char *string) {
std::ostream & printStringValue(std::ostream & str, const char * string)
{
str << "\"";
for (const char * i = string; *i; i++)
if (*i == '\"' || *i == '\\')

View file

@ -42,17 +42,22 @@ using nix::UsageError;
using nix::Value;
// An ostream wrapper to handle nested indentation
class Out {
class Out
{
public:
class Separator {};
class Separator
{};
const static Separator sep;
enum LinePolicy { ONE_LINE, MULTI_LINE };
explicit Out(std::ostream &ostream)
: ostream(ostream), policy(ONE_LINE), write_since_sep(true) {}
Out(Out &o, std::string const &start, std::string const &end,
LinePolicy policy);
enum LinePolicy
{
ONE_LINE,
MULTI_LINE
};
explicit Out(std::ostream & ostream) : ostream(ostream), policy(ONE_LINE), write_since_sep(true) {}
Out(Out & o, std::string const & start, std::string const & end, LinePolicy policy);
Out(Out & o, std::string const & start, std::string const & end, int count)
: Out(o, start, end, count < 2 ? ONE_LINE : MULTI_LINE) {}
: Out(o, start, end, count < 2 ? ONE_LINE : MULTI_LINE)
{}
Out(Out const &) = delete;
Out(Out &&) = default;
Out & operator=(Out const &) = delete;
@ -68,7 +73,8 @@ private:
template <typename T> friend Out & operator<<(Out & o, T thing);
};
template <typename T> Out &operator<<(Out &o, T thing) {
template <typename T> Out & operator<<(Out & o, T thing)
{
if (!o.write_since_sep && o.policy == Out::MULTI_LINE) {
o.ostream << o.indentation;
}
@ -77,30 +83,28 @@ template <typename T> Out &operator<<(Out &o, T thing) {
return o;
}
template <>
Out &operator<<<Out::Separator>(Out &o, Out::Separator /* thing */) {
template <> Out & operator<<<Out::Separator>(Out & o, Out::Separator /* thing */)
{
o.ostream << (o.policy == Out::ONE_LINE ? " " : "\n");
o.write_since_sep = false;
return o;
}
Out::Out(Out &o, std::string const &start, std::string const &end,
LinePolicy policy)
: ostream(o.ostream),
indentation(policy == ONE_LINE ? o.indentation : o.indentation + " "),
end(policy == ONE_LINE ? end : o.indentation + end), policy(policy),
write_since_sep(true) {
Out::Out(Out & o, std::string const & start, std::string const & end, LinePolicy policy)
: ostream(o.ostream), indentation(policy == ONE_LINE ? o.indentation : o.indentation + " "),
end(policy == ONE_LINE ? end : o.indentation + end), policy(policy), write_since_sep(true)
{
o << start;
*this << Out::sep;
}
// Stuff needed for evaluation
struct Context {
Context(EvalState *state, Bindings *autoArgs, Value options_root,
Value config_root)
: state(state), autoArgs(autoArgs), options_root(options_root),
config_root(config_root),
underscore_type(state->symbols.create("_type")) {}
struct Context
{
Context(EvalState * state, Bindings * autoArgs, Value options_root, Value config_root)
: state(state), autoArgs(autoArgs), options_root(options_root), config_root(config_root),
underscore_type(state->symbols.create("_type"))
{}
EvalState * state;
Bindings * autoArgs;
Value options_root;
@ -108,7 +112,8 @@ struct Context {
Symbol underscore_type;
};
Value evaluateValue(Context *ctx, Value *v) {
Value evaluateValue(Context * ctx, Value * v)
{
ctx->state->forceValue(*v);
if (ctx->autoArgs->empty()) {
return *v;
@ -118,7 +123,8 @@ Value evaluateValue(Context *ctx, Value *v) {
return called;
}
bool isOption(Context *ctx, Value const &v) {
bool isOption(Context * ctx, Value const & v)
{
if (v.type != tAttrs) {
return false;
}
@ -141,7 +147,8 @@ bool isOption(Context *ctx, Value const &v) {
// These are needed for paths like:
// fileSystems."/".fsType
// systemd.units."dbus.service".text
std::string quoteAttribute(std::string const &attribute) {
std::string quoteAttribute(std::string const & attribute)
{
if (isVarName(attribute)) {
return attribute;
}
@ -150,21 +157,19 @@ std::string quoteAttribute(std::string const &attribute) {
return buf.str();
}
std::string const appendPath(std::string const &prefix,
std::string const &suffix) {
std::string const appendPath(std::string const & prefix, std::string const & suffix)
{
if (prefix.empty()) {
return quoteAttribute(suffix);
}
return prefix + "." + quoteAttribute(suffix);
}
bool forbiddenRecursionName(std::string name) {
return (!name.empty() && name[0] == '_') || name == "haskellPackages";
}
bool forbiddenRecursionName(std::string name) { return (!name.empty() && name[0] == '_') || name == "haskellPackages"; }
void recurse(const std::function<bool(std::string const &path,
std::variant<Value, Error>)> &f,
Context *ctx, Value v, std::string const &path) {
void recurse(const std::function<bool(std::string const & path, std::variant<Value, Error>)> & f, Context * ctx,
Value v, std::string const & path)
{
std::variant<Value, Error> evaluated;
try {
evaluated = evaluateValue(ctx, &v);
@ -190,12 +195,11 @@ void recurse(const std::function<bool(std::string const &path,
}
// Calls f on all the option names
void mapOptions(const std::function<void(std::string const &path)> &f,
Context *ctx, Value root) {
void mapOptions(const std::function<void(std::string const & path)> & f, Context * ctx, Value root)
{
recurse(
[f, ctx](std::string const & path, std::variant<Value, Error> v) {
bool isOpt = std::holds_alternative<Error>(v) ||
isOption(ctx, std::get<Value>(v));
bool isOpt = std::holds_alternative<Error>(v) || isOption(ctx, std::get<Value>(v));
if (isOpt) {
f(path);
}
@ -225,22 +229,19 @@ void mapOptions(const std::function<void(std::string const &path)> &f,
// users.users.nixbld1 = ... .. ...
// ...
// users.users.systemd-timesync = ... .. ...
void mapConfigValuesInOption(
const std::function<void(std::string const &path,
std::variant<Value, Error> v)> &f,
std::string const &path, Context *ctx) {
void mapConfigValuesInOption(const std::function<void(std::string const & path, std::variant<Value, Error> v)> & f,
std::string const & path, Context * ctx)
{
Value * option;
try {
option =
findAlongAttrPath(*ctx->state, path, *ctx->autoArgs, ctx->config_root);
option = findAlongAttrPath(*ctx->state, path, *ctx->autoArgs, ctx->config_root);
} catch (Error & e) {
f(path, e);
return;
}
recurse(
[f, ctx](std::string const & path, std::variant<Value, Error> v) {
bool leaf = std::holds_alternative<Error>(v) ||
std::get<Value>(v).type != tAttrs ||
bool leaf = std::holds_alternative<Error>(v) || std::get<Value>(v).type != tAttrs ||
ctx->state->isDerivation(std::get<Value>(v));
if (!leaf) {
return true; // Keep digging
@ -253,31 +254,30 @@ void mapConfigValuesInOption(
std::string describeError(Error const & e) { return "«error: " + e.msg() + "»"; }
void describeDerivation(Context *ctx, Out &out, Value v) {
void describeDerivation(Context * ctx, Out & out, Value v)
{
// Copy-pasted from nix/src/nix/repl.cc :(
Bindings::iterator i = v.attrs->find(ctx->state->sDrvPath);
PathSet pathset;
try {
Path drvPath = i != v.attrs->end()
? ctx->state->coerceToPath(*i->pos, *i->value, pathset)
: "???";
Path drvPath = i != v.attrs->end() ? ctx->state->coerceToPath(*i->pos, *i->value, pathset) : "???";
out << "«derivation " << drvPath << "»";
} catch (Error & e) {
out << describeError(e);
}
}
Value parseAndEval(EvalState *state, std::string const &expression,
std::string const &path) {
Value parseAndEval(EvalState * state, std::string const & expression, std::string const & path)
{
Value v{};
state->eval(state->parseExprFromString(expression, absPath(path)), v);
return v;
}
void printValue(Context *ctx, Out &out, std::variant<Value, Error> maybe_value,
std::string const &path);
void printValue(Context * ctx, Out & out, std::variant<Value, Error> maybe_value, std::string const & path);
void printUnsortedList(Context *ctx, Out &out, Value &v) {
void printUnsortedList(Context * ctx, Out & out, Value & v)
{
Out list_out(out, "[", "]", v.listSize());
for (unsigned int n = 0; n < v.listSize(); ++n) {
printValue(ctx, list_out, *v.listElems()[n], "");
@ -285,7 +285,8 @@ void printUnsortedList(Context *ctx, Out &out, Value &v) {
}
}
void printSortedList(Context *ctx, Out &out, Value &v) {
void printSortedList(Context * ctx, Out & out, Value & v)
{
std::vector<std::string> results;
for (unsigned int n = 0; n < v.listSize(); ++n) {
std::ostringstream buf;
@ -300,7 +301,8 @@ void printSortedList(Context *ctx, Out &out, Value &v) {
}
}
bool shouldSort(Context *ctx, Value &v) {
bool shouldSort(Context * ctx, Value & v)
{
// Some lists should clearly be printed in sorted order, like
// environment.systemPackages. Some clearly should not, like
// services.xserver.multitouch.buttonsMap. As a conservative heuristic, sort
@ -308,7 +310,8 @@ bool shouldSort(Context *ctx, Value &v) {
return v.listSize() > 0 && ctx->state->isDerivation(*v.listElems()[0]);
}
void printList(Context *ctx, Out &out, Value &v) {
void printList(Context * ctx, Out & out, Value & v)
{
if (shouldSort(ctx, v)) {
printSortedList(ctx, out, v);
} else {
@ -316,7 +319,8 @@ void printList(Context *ctx, Out &out, Value &v) {
}
}
void printAttrs(Context *ctx, Out &out, Value &v, std::string const &path) {
void printAttrs(Context * ctx, Out & out, Value & v, std::string const & path)
{
Out attrs_out(out, "{", "}", v.attrs->size());
for (const auto & a : v.attrs->lexicographicOrder()) {
std::string name = a->name;
@ -326,7 +330,8 @@ void printAttrs(Context *ctx, Out &out, Value &v, std::string const &path) {
}
}
void multiLineStringEscape(Out &out, std::string const &s) {
void multiLineStringEscape(Out & out, std::string const & s)
{
int i;
for (i = 1; i < s.size(); i++) {
if (s[i - 1] == '$' && s[i] == '{') {
@ -344,7 +349,8 @@ void multiLineStringEscape(Out &out, std::string const &s) {
}
}
void printMultiLineString(Out &out, Value const &v) {
void printMultiLineString(Out & out, Value const & v)
{
std::string s = v.string.s;
Out str_out(out, "''", "''", Out::MULTI_LINE);
std::string::size_type begin = 0;
@ -360,8 +366,8 @@ void printMultiLineString(Out &out, Value const &v) {
}
}
void printValue(Context *ctx, Out &out, std::variant<Value, Error> maybe_value,
std::string const &path) {
void printValue(Context * ctx, Out & out, std::variant<Value, Error> maybe_value, std::string const & path)
{
try {
if (std::holds_alternative<Error>(maybe_value)) {
throw Error{std::get<Error>(maybe_value)};
@ -373,8 +379,7 @@ void printValue(Context *ctx, Out &out, std::variant<Value, Error> maybe_value,
printList(ctx, out, v);
} else if (v.type == tAttrs) {
printAttrs(ctx, out, v, path);
} else if (v.type == tString &&
std::string(v.string.s).find('\n') != std::string::npos) {
} else if (v.type == tString && std::string(v.string.s).find('\n') != std::string::npos) {
printMultiLineString(out, v);
} else {
ctx->state->forceValueDeep(v);
@ -396,19 +401,19 @@ void printValue(Context *ctx, Out &out, std::variant<Value, Error> maybe_value,
}
}
void printConfigValue(Context *ctx, Out &out, std::string const &path,
std::variant<Value, Error> v) {
void printConfigValue(Context * ctx, Out & out, std::string const & path, std::variant<Value, Error> v)
{
out << path << " = ";
printValue(ctx, out, std::move(v), path);
out << ";\n";
}
void printAll(Context *ctx, Out &out) {
void printAll(Context * ctx, Out & out)
{
mapOptions(
[ctx, &out](std::string const & option_path) {
mapConfigValuesInOption(
[ctx, &out](std::string const &config_path,
std::variant<Value, Error> v) {
[ctx, &out](std::string const & config_path, std::variant<Value, Error> v) {
printConfigValue(ctx, out, config_path, v);
},
option_path, ctx);
@ -416,18 +421,17 @@ void printAll(Context *ctx, Out &out) {
ctx, ctx->options_root);
}
void printAttr(Context *ctx, Out &out, std::string const &path, Value *root) {
void printAttr(Context * ctx, Out & out, std::string const & path, Value * root)
{
try {
printValue(ctx, out,
*findAlongAttrPath(*ctx->state, path, *ctx->autoArgs, *root),
path);
printValue(ctx, out, *findAlongAttrPath(*ctx->state, path, *ctx->autoArgs, *root), path);
} catch (Error & e) {
out << describeError(e);
}
}
void printOption(Context *ctx, Out &out, std::string const &path,
Value *option) {
void printOption(Context * ctx, Out & out, std::string const & path, Value * option)
{
out << "Value:\n";
printAttr(ctx, out, path, &ctx->config_root);
@ -451,7 +455,8 @@ void printOption(Context *ctx, Out &out, std::string const &path,
out << "\n";
}
void printListing(Out &out, Value *v) {
void printListing(Out & out, Value * v)
{
// Print this header on stderr rather than stdout because the old shell script
// implementation did. I don't know why.
std::cerr << "This attribute set contains:\n";
@ -465,7 +470,8 @@ void printListing(Out &out, Value *v) {
// Carefully walk an option path, looking for sub-options when a path walks past
// an option value.
Value findAlongOptionPath(Context *ctx, std::string const &path) {
Value findAlongOptionPath(Context * ctx, std::string const & path)
{
Strings tokens = parseAttrPath(path);
Value v = ctx->options_root;
for (auto i = tokens.begin(); i != tokens.end(); i++) {
@ -476,12 +482,10 @@ Value findAlongOptionPath(Context *ctx, std::string const &path) {
throw Error("empty attribute name in selection path '" + path + "'");
}
if (isOption(ctx, v) && !last_attribute) {
Value getSubOptions = evaluateValue(
ctx, findAlongAttrPath(*ctx->state, "type.getSubOptions",
*ctx->autoArgs, v));
Value getSubOptions =
evaluateValue(ctx, findAlongAttrPath(*ctx->state, "type.getSubOptions", *ctx->autoArgs, v));
if (getSubOptions.type != tLambda) {
throw Error("Option's type.getSubOptions isn't a function at '" + attr +
"' in path '" + path + "'");
throw Error("Option's type.getSubOptions isn't a function at '" + attr + "' in path '" + path + "'");
}
Value emptyString{};
nix::mkString(emptyString, "");
@ -489,13 +493,11 @@ Value findAlongOptionPath(Context *ctx, std::string const &path) {
// Note that we've consumed attr, but didn't actually use it.
} else if (v.type != tAttrs) {
throw Error("attribute '" + attr + "' in path '" + path +
"' attempts to index a value that should be a set but is " +
showType(v));
"' attempts to index a value that should be a set but is " + showType(v));
} else {
auto const & next = v.attrs->find(ctx->state->symbols.create(attr));
if (next == v.attrs->end()) {
throw Error("attribute '" + attr + "' in path '" + path +
"' not found");
throw Error("attribute '" + attr + "' in path '" + path + "' not found");
}
v = *next->value;
}
@ -503,7 +505,8 @@ Value findAlongOptionPath(Context *ctx, std::string const &path) {
return v;
}
void printOne(Context *ctx, Out &out, std::string const &path) {
void printOne(Context * ctx, Out & out, std::string const & path)
{
try {
Value option = findAlongOptionPath(ctx, path);
option = evaluateValue(ctx, &option);
@ -520,19 +523,20 @@ void printOne(Context *ctx, Out &out, std::string const &path) {
}
}
int main(int argc, char **argv) {
int main(int argc, char ** argv)
{
bool all = false;
std::string path = ".";
std::string options_expr = "(import <nixpkgs/nixos> {}).options";
std::string config_expr = "(import <nixpkgs/nixos> {}).config";
std::vector<std::string> args;
struct MyArgs : nix::LegacyArgs, nix::MixEvalArgs {
struct MyArgs : nix::LegacyArgs, nix::MixEvalArgs
{
using nix::LegacyArgs::LegacyArgs;
};
MyArgs myArgs(nix::baseNameOf(argv[0]),
[&](Strings::iterator &arg, const Strings::iterator &end) {
MyArgs myArgs(nix::baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--help") {
nix::showManPage("nixos-option");
} else if (*arg == "--version") {
@ -564,8 +568,7 @@ int main(int argc, char **argv) {
Value options_root = parseAndEval(state.get(), options_expr, path);
Value config_root = parseAndEval(state.get(), config_expr, path);
Context ctx{state.get(), myArgs.getAutoArgs(*state), options_root,
config_root};
Context ctx{state.get(), myArgs.getAutoArgs(*state), options_root, config_root};
Out out(std::cout);
if (all) {