diff options
| author | Shea Levy <shea@shealevy.com> | 2013-07-15T21·10-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-26T09·31+0200 |
| commit | afc6c1bad63e27d68adf49e673f8aafd36495a8a (patch) | |
| tree | 9cfe21245d123b5d7e525aa2722b1e155d29e736 /src/libexpr/parser.y | |
| parent | 6cd6ce56083d0077485896a761520812d039bf10 (diff) | |
Simplify inherited attribute handling
This reduces the difference between inherited and non-inherited attribute handling to the choice of which env to use (in recs and lets) by setting the AttrDef::e to a new ExprVar in the parser rather than carrying a separate AttrDef::v VarRef member. As an added bonus, this allows inherited attributes that inherit from a with to delay forcing evaluation of the with's attributes. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'src/libexpr/parser.y')
| -rw-r--r-- | src/libexpr/parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 7690271a86d3..0e3086004271 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -413,7 +413,7 @@ binds if ($$->attrs.find(*i) != $$->attrs.end()) dupAttr(*i, makeCurPos(@3, data), $$->attrs[*i].pos); Pos pos = makeCurPos(@3, data); - $$->attrs[*i] = ExprAttrs::AttrDef(*i, pos); + $$->attrs[*i] = ExprAttrs::AttrDef(new ExprVar(*i), pos, true); } } | binds INHERIT '(' expr ')' attrs ';' |