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

Support quoted attribute names in -A

Browse source 
This is requires if you have attribute names with dots in them.  So
you can now say:

  $ nix-instantiate '<nixos>' -A 'config.systemd.units."postgresql.service".text' --eval-only

Fixes #151.
This commit is contained in:
Eelco Dolstra 2013-11-18 10:21:12 +00:00
parent a478e8a7bb
commit 90b5e69284
3 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/libexpr/attr-path.cc
View file

@ -6,23 +6,44 @@
namespace nix {
static Strings parseAttrPath(const string & s)
{
Strings res;
string cur;
string::const_iterator i = s.begin();
while (i != s.end()) {
if (*i == '.') {
res.push_back(cur);
cur.clear();
} else if (*i == '"') {
++i;
while (1) {
if (i == s.end())
throw Error(format("missing closing quote in selection path `%1%'") % s);
if (*i == '"') break;
cur.push_back(*i++);
}
} else
cur.push_back(*i);
++i;
}
if (!cur.empty()) res.push_back(cur);
return res;
}
Value * findAlongAttrPath(EvalState & state, const string & attrPath,
Bindings & autoArgs, Value & vIn)
{
Strings tokens = tokenizeString<Strings>(attrPath, ".");
Strings tokens = parseAttrPath(attrPath);
Error attrError =
Error(format("attribute selection path `%1%' does not match expression") % attrPath);
string curPath;
Value * v = &vIn;
foreach (Strings::iterator, i, tokens) {
if (!curPath.empty()) curPath += ".";
curPath += *i;
/* Is *i an index (integer) or a normal attribute name? */
enum { apAttr, apIndex } apType = apAttr;
string attr = *i;
@ -43,11 +64,14 @@ Value * findAlongAttrPath(EvalState & state, const string & attrPath,
if (v->type != tAttrs)
throw TypeError(
format("the expression selected by the selection path `%1%' should be a set but is %2%")
% curPath % showType(*v));
% attrPath % showType(*v));
if (attr.empty())
throw Error(format("empty attribute name in selection path `%1%'") % attrPath);
Bindings::iterator a = v->attrs->find(state.symbols.create(attr));
if (a == v->attrs->end())
throw Error(format("attribute `%1%' in selection path `%2%' not found") % attr % curPath);
throw Error(format("attribute `%1%' in selection path `%2%' not found") % attr % attrPath);
v = &*a->value;
}
@ -56,10 +80,10 @@ Value * findAlongAttrPath(EvalState & state, const string & attrPath,
if (v->type != tList)
throw TypeError(
format("the expression selected by the selection path `%1%' should be a list but is %2%")
% curPath % showType(*v));
% attrPath % showType(*v));
if (attrIndex >= v->list.length)
throw Error(format("list index %1% in selection path `%2%' is out of range") % attrIndex % curPath);
throw Error(format("list index %1% in selection path `%2%' is out of range") % attrIndex % attrPath);
v = v->list.elems[attrIndex];
}