diff --git a/src/libexpr-tests/value/print.cc b/src/libexpr-tests/value/print.cc index 6cadbc70a..20a6f8614 100644 --- a/src/libexpr-tests/value/print.cc +++ b/src/libexpr-tests/value/print.cc @@ -112,7 +112,7 @@ TEST_F(ValuePrintingTests, vLambda) auto body = ExprInt(0); auto formals = Formals{}; - ExprLambda eLambda(posIdx, createSymbol("a"), &formals, &body); + ExprLambda eLambda(state.mem.exprs.alloc, posIdx, createSymbol("a"), formals, &body); Value vLambda; vLambda.mkLambda(&env, &eLambda); @@ -502,7 +502,7 @@ TEST_F(ValuePrintingTests, ansiColorsLambda) auto body = ExprInt(0); auto formals = Formals{}; - ExprLambda eLambda(posIdx, createSymbol("a"), &formals, &body); + ExprLambda eLambda(state.mem.exprs.alloc, posIdx, createSymbol("a"), formals, &body); Value vLambda; vLambda.mkLambda(&env, &eLambda); diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 8a03084ee..7f16ddf8f 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1496,7 +1496,7 @@ void EvalState::callFunction(Value & fun, std::span args, Value & vRes, ExprLambda & lambda(*vCur.lambda().fun); - auto size = (!lambda.arg ? 0 : 1) + (lambda.hasFormals() ? lambda.formals->formals.size() : 0); + auto size = (!lambda.arg ? 0 : 1) + lambda.nFormals; Env & env2(mem.allocEnv(size)); env2.up = vCur.lambda().env; @@ -1520,7 +1520,7 @@ void EvalState::callFunction(Value & fun, std::span args, Value & vRes, there is no matching actual argument but the formal argument has a default, use the default. */ size_t attrsUsed = 0; - for (auto & i : lambda.formals->formals) { + for (auto & i : lambda.getFormals()) { auto j = args[0]->attrs()->get(i.name); if (!j) { if (!i.def) { @@ -1542,13 +1542,13 @@ void EvalState::callFunction(Value & fun, std::span args, Value & vRes, /* Check that each actual argument is listed as a formal argument (unless the attribute match specifies a `...'). */ - if (!lambda.formals->ellipsis && attrsUsed != args[0]->attrs()->size()) { + if (!lambda.ellipsis && attrsUsed != args[0]->attrs()->size()) { /* Nope, so show the first unexpected argument to the user. */ for (auto & i : *args[0]->attrs()) - if (!lambda.formals->has(i.name)) { + if (!lambda.hasFormal(i.name)) { StringSet formalNames; - for (auto & formal : lambda.formals->formals) + for (auto & formal : lambda.getFormals()) formalNames.insert(std::string(symbols[formal.name])); auto suggestions = Suggestions::bestMatches(formalNames, symbols[i.name]); error( @@ -1752,9 +1752,9 @@ void EvalState::autoCallFunction(const Bindings & args, Value & fun, Value & res return; } - auto attrs = buildBindings(std::max(static_cast(fun.lambda().fun->formals->formals.size()), args.size())); + auto attrs = buildBindings(std::max(static_cast(fun.lambda().fun->nFormals), args.size())); - if (fun.lambda().fun->formals->ellipsis) { + if (fun.lambda().fun->ellipsis) { // If the formals have an ellipsis (eg the function accepts extra args) pass // all available automatic arguments (which includes arguments specified on // the command line via --arg/--argstr) @@ -1762,7 +1762,7 @@ void EvalState::autoCallFunction(const Bindings & args, Value & fun, Value & res attrs.insert(v); } else { // Otherwise, only pass the arguments that the function accepts - for (auto & i : fun.lambda().fun->formals->formals) { + for (auto & i : fun.lambda().fun->getFormals()) { auto j = args.get(i.name); if (j) { attrs.insert(*j); diff --git a/src/libexpr/include/nix/expr/nixexpr.hh b/src/libexpr/include/nix/expr/nixexpr.hh index 26d5addd5..56c378660 100644 --- a/src/libexpr/include/nix/expr/nixexpr.hh +++ b/src/libexpr/include/nix/expr/nixexpr.hh @@ -481,16 +481,6 @@ struct Formals formals.begin(), formals.end(), arg, [](const Formal & f, const Symbol & sym) { return f.name < sym; }); return it != formals.end() && it->name == arg; } - - std::vector lexicographicOrder(const SymbolTable & symbols) const - { - std::vector result(formals.begin(), formals.end()); - std::sort(result.begin(), result.end(), [&](const Formal & a, const Formal & b) { - std::string_view sa = symbols[a.name], sb = symbols[b.name]; - return sa < sb; - }); - return result; - } }; struct ExprLambda : Expr @@ -498,21 +488,42 @@ struct ExprLambda : Expr PosIdx pos; Symbol name; Symbol arg; - Formals * formals; + + bool ellipsis; + uint16_t nFormals; + Formal * formalsStart; + Expr * body; DocComment docComment; - ExprLambda(PosIdx pos, Symbol arg, Formals * formals, Expr * body) + ExprLambda( + std::pmr::polymorphic_allocator & alloc, PosIdx pos, Symbol arg, const Formals & formals, Expr * body) : pos(pos) , arg(arg) - , formals(formals) - , body(body) {}; - - ExprLambda(PosIdx pos, Formals * formals, Expr * body) - : pos(pos) - , formals(formals) + , ellipsis(formals.ellipsis) + , nFormals(formals.formals.size()) + , formalsStart(alloc.allocate_object(nFormals)) , body(body) { + std::ranges::copy(formals.formals, formalsStart); + }; + + ExprLambda(std::pmr::polymorphic_allocator & alloc, PosIdx pos, Symbol arg, Expr * body) + : pos(pos) + , arg(arg) + , nFormals(0) + , formalsStart(nullptr) + , body(body) {}; + + ExprLambda(std::pmr::polymorphic_allocator & alloc, PosIdx pos, Formals formals, Expr * body) + : ExprLambda(alloc, pos, Symbol(), formals, body) {}; + + bool hasFormal(Symbol arg) const + { + auto formals = getFormals(); + auto it = std::lower_bound( + formals.begin(), formals.end(), arg, [](const Formal & f, const Symbol & sym) { return f.name < sym; }); + return it != formals.end() && it->name == arg; } void setName(Symbol name) override; @@ -520,7 +531,17 @@ struct ExprLambda : Expr inline bool hasFormals() const { - return formals != nullptr; + return nFormals > 0; + } + + std::vector getFormalsLexicographic(const SymbolTable & symbols) const + { + std::vector result(getFormals().begin(), getFormals().end()); + std::sort(result.begin(), result.end(), [&](const Formal & a, const Formal & b) { + std::string_view sa = symbols[a.name], sb = symbols[b.name]; + return sa < sb; + }); + return result; } PosIdx getPos() const override @@ -528,6 +549,11 @@ struct ExprLambda : Expr return pos; } + std::span getFormals() const + { + return {formalsStart, nFormals}; + } + virtual void setDocComment(DocComment docComment) override; COMMON_METHODS }; diff --git a/src/libexpr/include/nix/expr/parser-state.hh b/src/libexpr/include/nix/expr/parser-state.hh index 18d2051d0..4d1312443 100644 --- a/src/libexpr/include/nix/expr/parser-state.hh +++ b/src/libexpr/include/nix/expr/parser-state.hh @@ -93,7 +93,7 @@ struct ParserState void addAttr( ExprAttrs * attrs, AttrPath && attrPath, const ParserLocation & loc, Expr * e, const ParserLocation & exprLoc); void addAttr(ExprAttrs * attrs, AttrPath & attrPath, const Symbol & symbol, ExprAttrs::AttrDef && def); - Formals * validateFormals(Formals * formals, PosIdx pos = noPos, Symbol arg = {}); + void validateFormals(Formals & formals, PosIdx pos = noPos, Symbol arg = {}); Expr * stripIndentation(const PosIdx pos, std::vector>> && es); PosIdx at(const ParserLocation & loc); }; @@ -213,17 +213,17 @@ ParserState::addAttr(ExprAttrs * attrs, AttrPath & attrPath, const Symbol & symb } } -inline Formals * ParserState::validateFormals(Formals * formals, PosIdx pos, Symbol arg) +inline void ParserState::validateFormals(Formals & formals, PosIdx pos, Symbol arg) { - std::sort(formals->formals.begin(), formals->formals.end(), [](const auto & a, const auto & b) { + std::sort(formals.formals.begin(), formals.formals.end(), [](const auto & a, const auto & b) { return std::tie(a.name, a.pos) < std::tie(b.name, b.pos); }); std::optional> duplicate; - for (size_t i = 0; i + 1 < formals->formals.size(); i++) { - if (formals->formals[i].name != formals->formals[i + 1].name) + for (size_t i = 0; i + 1 < formals.formals.size(); i++) { + if (formals.formals[i].name != formals.formals[i + 1].name) continue; - std::pair thisDup{formals->formals[i].name, formals->formals[i + 1].pos}; + std::pair thisDup{formals.formals[i].name, formals.formals[i + 1].pos}; duplicate = std::min(thisDup, duplicate.value_or(thisDup)); } if (duplicate) @@ -231,11 +231,9 @@ inline Formals * ParserState::validateFormals(Formals * formals, PosIdx pos, Sym {.msg = HintFmt("duplicate formal function argument '%1%'", symbols[duplicate->first]), .pos = positions[duplicate->second]}); - if (arg && formals->has(arg)) + if (arg && formals.has(arg)) throw ParseError( {.msg = HintFmt("duplicate formal function argument '%1%'", symbols[arg]), .pos = positions[pos]}); - - return formals; } inline Expr * diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc index a77e42356..2fadc5e33 100644 --- a/src/libexpr/nixexpr.cc +++ b/src/libexpr/nixexpr.cc @@ -160,7 +160,7 @@ void ExprLambda::show(const SymbolTable & symbols, std::ostream & str) const // the natural Symbol ordering is by creation time, which can lead to the // same expression being printed in two different ways depending on its // context. always use lexicographic ordering to avoid this. - for (auto & i : formals->lexicographicOrder(symbols)) { + for (auto & i : getFormalsLexicographic(symbols)) { if (first) first = false; else @@ -171,7 +171,7 @@ void ExprLambda::show(const SymbolTable & symbols, std::ostream & str) const i.def->show(symbols, str); } } - if (formals->ellipsis) { + if (ellipsis) { if (!first) str << ", "; str << "..."; @@ -451,8 +451,7 @@ void ExprLambda::bindVars(EvalState & es, const std::shared_ptr if (es.debugRepl) es.exprEnvs.insert(std::make_pair(this, env)); - auto newEnv = - std::make_shared(nullptr, env, (hasFormals() ? formals->formals.size() : 0) + (!arg ? 0 : 1)); + auto newEnv = std::make_shared(nullptr, env, nFormals + (!arg ? 0 : 1)); Displacement displ = 0; @@ -460,12 +459,12 @@ void ExprLambda::bindVars(EvalState & es, const std::shared_ptr newEnv->vars.emplace_back(arg, displ++); if (hasFormals()) { - for (auto & i : formals->formals) + for (auto & i : getFormals()) newEnv->vars.emplace_back(i.name, displ++); newEnv->sort(); - for (auto & i : formals->formals) + for (auto & i : getFormals()) if (i.def) i.def->bindVars(es, newEnv); } diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 51c82efe5..49cd534d7 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -131,7 +131,7 @@ static Expr * makeCall(PosIdx pos, Expr * fn, Expr * arg) { %type expr_pipe_from expr_pipe_into %type > list %type binds binds1 -%type formals formal_set +%type formals formal_set %type formal %type > attrpath %type >> attrs @@ -179,26 +179,30 @@ expr: expr_function; expr_function : ID ':' expr_function - { auto me = new ExprLambda(CUR_POS, state->symbols.create($1), 0, $3); + { auto me = new ExprLambda(state->alloc, CUR_POS, state->symbols.create($1), $3); $$ = me; SET_DOC_POS(me, @1); } | formal_set ':' expr_function[body] - { auto me = new ExprLambda(CUR_POS, state->validateFormals($formal_set), $body); + { + state->validateFormals($formal_set); + auto me = new ExprLambda(state->alloc, CUR_POS, std::move($formal_set), $body); $$ = me; SET_DOC_POS(me, @1); } | formal_set '@' ID ':' expr_function[body] { auto arg = state->symbols.create($ID); - auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formal_set, CUR_POS, arg), $body); + state->validateFormals($formal_set, CUR_POS, arg); + auto me = new ExprLambda(state->alloc, CUR_POS, arg, std::move($formal_set), $body); $$ = me; SET_DOC_POS(me, @1); } | ID '@' formal_set ':' expr_function[body] { auto arg = state->symbols.create($ID); - auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formal_set, CUR_POS, arg), $body); + state->validateFormals($formal_set, CUR_POS, arg); + auto me = new ExprLambda(state->alloc, CUR_POS, arg, std::move($formal_set), $body); $$ = me; SET_DOC_POS(me, @1); } @@ -490,18 +494,18 @@ list ; formal_set - : '{' formals ',' ELLIPSIS '}' { $$ = $formals; $$->ellipsis = true; } - | '{' ELLIPSIS '}' { $$ = new Formals; $$->ellipsis = true; } - | '{' formals ',' '}' { $$ = $formals; $$->ellipsis = false; } - | '{' formals '}' { $$ = $formals; $$->ellipsis = false; } - | '{' '}' { $$ = new Formals; $$->ellipsis = false; } + : '{' formals ',' ELLIPSIS '}' { $$ = std::move($formals); $$.ellipsis = true; } + | '{' ELLIPSIS '}' { $$.ellipsis = true; } + | '{' formals ',' '}' { $$ = std::move($formals); $$.ellipsis = false; } + | '{' formals '}' { $$ = std::move($formals); $$.ellipsis = false; } + | '{' '}' { $$.ellipsis = false; } ; formals : formals[accum] ',' formal - { $$ = $accum; $$->formals.emplace_back(std::move($formal)); } + { $$ = std::move($accum); $$.formals.emplace_back(std::move($formal)); } | formal - { $$ = new Formals; $$->formals.emplace_back(std::move($formal)); } + { $$.formals.emplace_back(std::move($formal)); } ; formal diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index c8e49cd29..35670f451 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -3368,7 +3368,7 @@ static void prim_functionArgs(EvalState & state, const PosIdx pos, Value ** args return; } - const auto & formals = args[0]->lambda().fun->formals->formals; + const auto & formals = args[0]->lambda().fun->getFormals(); auto attrs = state.buildBindings(formals.size()); for (auto & i : formals) attrs.insert(i.name, state.getBool(i.def), i.pos); diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index 31400e439..7865e25dc 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -149,10 +149,10 @@ static void printValueAsXML( XMLAttrs attrs; if (v.lambda().fun->arg) attrs["name"] = state.symbols[v.lambda().fun->arg]; - if (v.lambda().fun->formals->ellipsis) + if (v.lambda().fun->ellipsis) attrs["ellipsis"] = "1"; XMLOpenElement _(doc, "attrspat", attrs); - for (auto & i : v.lambda().fun->formals->lexicographicOrder(state.symbols)) + for (auto & i : v.lambda().fun->getFormalsLexicographic(state.symbols)) doc.writeEmptyElement("attr", singletonAttrs("name", state.symbols[i.name])); } else doc.writeEmptyElement("varpat", singletonAttrs("name", state.symbols[v.lambda().fun->arg])); diff --git a/src/libflake/flake.cc b/src/libflake/flake.cc index 2aec0fac4..dec39f738 100644 --- a/src/libflake/flake.cc +++ b/src/libflake/flake.cc @@ -282,7 +282,7 @@ static Flake readFlake( expectType(state, nFunction, *outputs->value, outputs->pos); if (outputs->value->isLambda() && outputs->value->lambda().fun->hasFormals()) { - for (auto & formal : outputs->value->lambda().fun->formals->formals) { + for (auto & formal : outputs->value->lambda().fun->getFormals()) { if (formal.name != state.s.self) flake.inputs.emplace( state.symbols[formal.name], diff --git a/src/nix/nix-build/nix-build.cc b/src/nix/nix-build/nix-build.cc index ab65fba7e..f5c7884a9 100644 --- a/src/nix/nix-build/nix-build.cc +++ b/src/nix/nix-build/nix-build.cc @@ -416,7 +416,7 @@ static void main_nix_build(int argc, char ** argv) } bool add = false; if (v.type() == nFunction && v.lambda().fun->hasFormals()) { - for (auto & i : v.lambda().fun->formals->formals) { + for (auto & i : v.lambda().fun->getFormals()) { if (state->symbols[i.name] == "inNixShell") { add = true; break;