diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-09 14:24:47 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-10 10:14:50 +0100 |
| commit | 908e9ce259710037ae9824a3246143e46e27e867 (patch) | |
| tree | e4cd887779b88b20e224cc4baff1145490743e74 | |
| parent | 2caab8166045135bb78fd93dc9778a4d25d9499f (diff) | |
| download | guix-908e9ce259710037ae9824a3246143e46e27e867.tar.gz | |
If a dynamic attribute name evaluates to null, remove it from the set
| -rw-r--r-- | src/libexpr/eval.cc | 10 | ||||
| -rw-r--r-- | tests/lang/eval-okay-null-dynamic-attrs.exp | 1 | ||||
| -rw-r--r-- | tests/lang/eval-okay-null-dynamic-attrs.nix | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 350a4fbe14..730b431cf2 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -642,7 +642,15 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v) /* dynamic attrs apply *after* rec and __overrides */ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs) { Value nameVal; - i->nameExpr->eval(state, *dynamicEnv, nameVal); + assert(dynamic_cast<ExprConcatStrings *>(i->nameExpr)); + ExprConcatStrings * nameExpr = static_cast<ExprConcatStrings *>(i->nameExpr); + if (nameExpr->es->size() == 1) { + nameExpr->es->front()->eval(state, *dynamicEnv, nameVal); + state.forceValue(nameVal); + if (nameVal.type == tNull) + continue; + } + nameExpr->eval(state, *dynamicEnv, nameVal); state.forceStringNoCtx(nameVal); Symbol nameSym = state.symbols.create(nameVal.string.s); Bindings::iterator j = v.attrs->find(nameSym); diff --git a/tests/lang/eval-okay-null-dynamic-attrs.exp b/tests/lang/eval-okay-null-dynamic-attrs.exp new file mode 100644 index 0000000000..27ba77ddaf --- /dev/null +++ b/tests/lang/eval-okay-null-dynamic-attrs.exp @@ -0,0 +1 @@ +true diff --git a/tests/lang/eval-okay-null-dynamic-attrs.nix b/tests/lang/eval-okay-null-dynamic-attrs.nix new file mode 100644 index 0000000000..b060c0bc98 --- /dev/null +++ b/tests/lang/eval-okay-null-dynamic-attrs.nix @@ -0,0 +1 @@ +{ ${null} = true; } == {} |