lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

rename valmap

Browse source
This commit is contained in:
Ben Burdette 2022-05-05 15:43:23 -06:00
parent 09fcfee925
commit f400c5466d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval.cc
View file

@ -772,7 +772,7 @@ void printEnvBindings(const SymbolTable & st, const Expr & expr, const Env & env
printEnvBindings(st, *expr.staticEnv.get(), env, 0);
}
void mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env, valmap & vm)
void mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env, ValMap & vm)
{
// add bindings for the next level up first, so that the bindings for this level
// override the higher levels.
@ -795,9 +795,9 @@ void mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const En
}
}
std::unique_ptr<valmap> mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env)
std::unique_ptr<ValMap> mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env)
{
auto vm = std::make_unique<valmap>();
auto vm = std::make_unique<ValMap>();
mapStaticEnvBindings(st, se, env, *vm);
return vm;
}

4
src/libexpr/eval.hh
View file

@ -37,7 +37,7 @@ struct PrimOp
const char * doc = nullptr;
};
typedef std::map<std::string, Value *> valmap;
typedef std::map<std::string, Value *> ValMap;
struct Env
{
@ -47,7 +47,7 @@ struct Env
Value * values[0];
};
std::unique_ptr<valmap> mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env);
std::unique_ptr<ValMap> mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env);
void copyContext(const Value & v, PathSet & context);