diff options
author | Shea Levy <shea@shealevy.com> | 2014-03-09T18·41-0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-10T09·14+0100 |
commit | 049a379ec6ca755bcc077fd0e8da186ff76b8679 (patch) | |
tree | 66552a4997d66ce61d87f822d96b8786fe0c62e4 /src/libexpr/nixexpr.hh | |
parent | 908e9ce259710037ae9824a3246143e46e27e867 (diff) |
The expr of AttrNames/DynamicAttrDefs is always an ExprConcatStrings
Diffstat (limited to 'src/libexpr/nixexpr.hh')
-rw-r--r-- | src/libexpr/nixexpr.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index 7586fffb83d4..a5c5d0533cc9 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -50,16 +50,16 @@ struct Env; struct Value; class EvalState; struct StaticEnv; -struct Expr; +struct ExprConcatStrings; /* An attribute path is a sequence of attribute names. */ struct AttrName { Symbol symbol; - Expr *expr; + ExprConcatStrings * expr; AttrName(const Symbol & s) : symbol(s) {}; - AttrName(Expr *e) : expr(e) {}; + AttrName(ExprConcatStrings * e) : expr(e) {}; }; typedef std::vector<AttrName> AttrPath; @@ -174,10 +174,10 @@ struct ExprAttrs : Expr typedef std::map<Symbol, AttrDef> AttrDefs; AttrDefs attrs; struct DynamicAttrDef { - Expr * nameExpr; + ExprConcatStrings * nameExpr; Expr * valueExpr; Pos pos; - DynamicAttrDef(Expr * nameExpr, Expr * valueExpr, const Pos & pos) : nameExpr(nameExpr), valueExpr(valueExpr), pos(pos) { }; + DynamicAttrDef(ExprConcatStrings * nameExpr, Expr * valueExpr, const Pos & pos) : nameExpr(nameExpr), valueExpr(valueExpr), pos(pos) { }; }; typedef std::vector<DynamicAttrDef> DynamicAttrDefs; DynamicAttrDefs dynamicAttrs; |