refactor(tvix): Clean up MixEvalArgs internals
Previously, MixEvalArgs (a generic data type used to handle --arg, --argstr, and -I arguments to `nix-build`, `nix eval`, etc.) was storing the difference between --arg and --argstr by prepending a single character (either 'E' or 'S') to the value of the arg. This is messy and un-type-safe, so this commit refactors that to use a proper enum and a std::pair, which allows us to add a switch and get totality checking. yay, types! Change-Id: I883f8db3136d05dda190fac0a1b494386c2ff87b Reviewed-on: https://cl.tvl.fyi/c/depot/+/1862 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
parent
4ff9d5dee8
commit
3bada1d41e
2 changed files with 23 additions and 13 deletions
32
third_party/nix/src/libexpr/common-eval-args.cc
vendored
32
third_party/nix/src/libexpr/common-eval-args.cc
vendored
|
@ -12,15 +12,17 @@ MixEvalArgs::MixEvalArgs() {
|
|||
.longName("arg")
|
||||
.description("argument to be passed to Nix functions")
|
||||
.labels({"name", "expr"})
|
||||
.handler(
|
||||
[&](std::vector<std::string> ss) { autoArgs[ss[0]] = 'E' + ss[1]; });
|
||||
.handler([&](std::vector<std::string> ss) {
|
||||
auto_args_[ss[0]] = std::make_pair(kArgTypeExpr, ss[1]);
|
||||
});
|
||||
|
||||
mkFlag()
|
||||
.longName("argstr")
|
||||
.description("string-valued argument to be passed to Nix functions")
|
||||
.labels({"name", "string"})
|
||||
.handler(
|
||||
[&](std::vector<std::string> ss) { autoArgs[ss[0]] = 'S' + ss[1]; });
|
||||
.handler([&](std::vector<std::string> ss) {
|
||||
auto_args_[ss[0]] = std::make_pair(kArgTypeString, ss[1]);
|
||||
});
|
||||
|
||||
mkFlag()
|
||||
.shortName('I')
|
||||
|
@ -33,16 +35,22 @@ MixEvalArgs::MixEvalArgs() {
|
|||
}
|
||||
|
||||
std::unique_ptr<Bindings> MixEvalArgs::getAutoArgs(EvalState& state) {
|
||||
auto res = Bindings::New(autoArgs.size());
|
||||
for (auto& i : autoArgs) {
|
||||
auto res = Bindings::New(auto_args_.size());
|
||||
for (auto& [arg, arg_value] : auto_args_) {
|
||||
Value* v = state.allocValue();
|
||||
if (i.second[0] == 'E') {
|
||||
state.mkThunk_(*v, state.parseExprFromString(std::string(i.second, 1),
|
||||
absPath(".")));
|
||||
} else {
|
||||
mkString(*v, std::string(i.second, 1));
|
||||
switch (arg_value.first) {
|
||||
case kArgTypeExpr: {
|
||||
state.mkThunk_(
|
||||
*v, state.parseExprFromString(arg_value.second, absPath(".")));
|
||||
break;
|
||||
}
|
||||
case kArgTypeString: {
|
||||
mkString(*v, arg_value.second);
|
||||
break;
|
||||
}
|
||||
}
|
||||
res->push_back(Attr(state.symbols.Create(i.first), v));
|
||||
|
||||
res->push_back(Attr(state.symbols.Create(arg), v));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -8,6 +8,8 @@ class Store;
|
|||
class EvalState;
|
||||
class Bindings;
|
||||
|
||||
enum ArgType { kArgTypeString, kArgTypeExpr };
|
||||
|
||||
struct MixEvalArgs : virtual Args {
|
||||
MixEvalArgs();
|
||||
|
||||
|
@ -16,7 +18,7 @@ struct MixEvalArgs : virtual Args {
|
|||
Strings searchPath;
|
||||
|
||||
private:
|
||||
std::map<std::string, std::string> autoArgs;
|
||||
std::map<std::string, std::pair<ArgType, std::string>> auto_args_;
|
||||
};
|
||||
|
||||
Path lookupFileArg(EvalState& state, std::string s);
|
||||
|
|
Loading…
Reference in a new issue