eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

give ExprInheritFrom a handle to what its standing in for

Browse source 
Change-Id: I12088e0b618407e5432523bbc97be63c8d6fce62
This commit is contained in:
Qyriad 2024-07-02 17:29:19 -06:00
parent e040b762a4
commit 4f0c27abe1
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/nixexpr.hh
View file

@ -144,7 +144,10 @@ struct ExprVar : Expr
*/ */
struct ExprInheritFrom : ExprVar struct ExprInheritFrom : ExprVar
{ {
ExprInheritFrom(PosIdx pos, Displacement displ): ExprVar(pos, {}) ref<Expr> fromExpr;
ExprInheritFrom(PosIdx pos, Displacement displ, ref<Expr> fromExpr)
: ExprVar(pos, {}), fromExpr(fromExpr)
{ {
this->level = 0; this->level = 0;
this->displ = displ; this->displ = displ;
@ -222,7 +225,7 @@ struct ExprAttrs : Expr
}; };
typedef std::map<Symbol, AttrDef> AttrDefs; typedef std::map<Symbol, AttrDef> AttrDefs;
AttrDefs attrs; AttrDefs attrs;
std::unique_ptr<std::vector<std::unique_ptr<Expr>>> inheritFromExprs; std::unique_ptr<std::vector<ref<Expr>>> inheritFromExprs;
struct DynamicAttrDef { struct DynamicAttrDef {
std::unique_ptr<Expr> nameExpr, valueExpr; std::unique_ptr<Expr> nameExpr, valueExpr;
PosIdx pos; PosIdx pos;

15
src/libexpr/parser/parser.cc
View file

@ -317,18 +317,23 @@ template<> struct BuildAST<grammar::inherit> : change_head<InheritState> {
}); });
} }
} }
if (auto fromE = std::move(s.from)) { if (s.from != nullptr) {
if (!b.attrs.inheritFromExprs) if (!b.attrs.inheritFromExprs)
b.attrs.inheritFromExprs = std::make_unique<std::vector<std::unique_ptr<Expr>>>(); b.attrs.inheritFromExprs = std::make_unique<std::vector<ref<Expr>>>();
b.attrs.inheritFromExprs->push_back(std::move(fromE)); auto fromExpr = ref<Expr>(std::move(s.from));
b.attrs.inheritFromExprs->push_back(fromExpr);
for (auto & [i, iPos] : s.attrs) { for (auto & [i, iPos] : s.attrs) {
if (attrs.find(i.symbol) != attrs.end()) if (attrs.find(i.symbol) != attrs.end())
ps.dupAttr(i.symbol, iPos, attrs[i.symbol].pos); ps.dupAttr(i.symbol, iPos, attrs[i.symbol].pos);
auto from = std::make_unique<ExprInheritFrom>(s.fromPos, b.attrs.inheritFromExprs->size() - 1); auto inheritFrom = std::make_unique<ExprInheritFrom>(
s.fromPos,
b.attrs.inheritFromExprs->size() - 1,
fromExpr
);
attrs.emplace( attrs.emplace(
i.symbol, i.symbol,
ExprAttrs::AttrDef( ExprAttrs::AttrDef(
std::make_unique<ExprSelect>(iPos, std::move(from), i.symbol), std::make_unique<ExprSelect>(iPos, std::move(inheritFrom), i.symbol),
iPos, iPos,
ExprAttrs::AttrDef::Kind::InheritedFrom)); ExprAttrs::AttrDef::Kind::InheritedFrom));
} }

2
src/libexpr/parser/state.hh
View file

@ -103,7 +103,7 @@ inline void State::addAttr(ExprAttrs * attrs, AttrPath && attrPath, std::unique_
auto * jAttrs = dynamic_cast<ExprAttrs *>(j->second.e.get()); auto * jAttrs = dynamic_cast<ExprAttrs *>(j->second.e.get());
if (jAttrs && ae) { if (jAttrs && ae) {
if (ae->inheritFromExprs && !jAttrs->inheritFromExprs) if (ae->inheritFromExprs && !jAttrs->inheritFromExprs)
jAttrs->inheritFromExprs = std::make_unique<std::vector<std::unique_ptr<Expr>>>(); jAttrs->inheritFromExprs = std::make_unique<std::vector<ref<Expr>>>();
for (auto & ad : ae->attrs) { for (auto & ad : ae->attrs) {
auto j2 = jAttrs->attrs.find(ad.first); auto j2 = jAttrs->attrs.find(ad.first);
if (j2 != jAttrs->attrs.end()) // Attr already defined in iAttrs, error. if (j2 != jAttrs->attrs.end()) // Attr already defined in iAttrs, error.