From 049a379ec6ca755bcc077fd0e8da186ff76b8679 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 9 Mar 2014 14:41:02 -0400 Subject: The expr of AttrNames/DynamicAttrDefs is always an ExprConcatStrings --- src/libexpr/eval.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/libexpr/eval.cc') diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 730b431cf255..04c3418a0d45 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -642,15 +642,13 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v) /* dynamic attrs apply *after* rec and __overrides */ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs) { Value nameVal; - assert(dynamic_cast(i->nameExpr)); - ExprConcatStrings * nameExpr = static_cast(i->nameExpr); - if (nameExpr->es->size() == 1) { - nameExpr->es->front()->eval(state, *dynamicEnv, nameVal); + if (i->nameExpr->es->size() == 1) { + i->nameExpr->es->front()->eval(state, *dynamicEnv, nameVal); state.forceValue(nameVal); if (nameVal.type == tNull) continue; } - nameExpr->eval(state, *dynamicEnv, nameVal); + i->nameExpr->eval(state, *dynamicEnv, nameVal); state.forceStringNoCtx(nameVal); Symbol nameSym = state.symbols.create(nameVal.string.s); Bindings::iterator j = v.attrs->find(nameSym); -- cgit 1.4.1