guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The expr of AttrNames/DynamicAttrDefs is always an ExprConcatStrings

Browse Source
This commit is contained in:
Shea Levy
2014-03-10 10:14:50 +01:00
committed by Eelco Dolstra
parent 908e9ce259
commit 049a379ec6
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libexpr/nixexpr.hh
+5 -5
View File
@@ -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;