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:
Griffin Smith 2020-08-27 11:28:43 -04:00 committed by glittershark
parent 4ff9d5dee8
commit 3bada1d41e
2 changed files with 23 additions and 13 deletions

View file

@ -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);