diff options
| author | Ben Burdette <bburdette@protonmail.com> | 2022-05-19 10:48:10 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@protonmail.com> | 2022-05-19 10:48:10 -0600 |
| commit | 357fb84dbaad0b056704915c6a43764cda63ee7f (patch) | |
| tree | b6dbcfeb43b8090d46b8f33621c0ae89fd929590 /src/libexpr/nixexpr.hh | |
| parent | 86ba0a702c63b4a8ff79a07f9303318feb330642 (diff) | |
use an expr->StaticEnv table in evalState
Diffstat (limited to 'src/libexpr/nixexpr.hh')
| -rw-r--r-- | src/libexpr/nixexpr.hh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index c4a509f31..e923f36a4 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -144,18 +144,17 @@ struct Expr { virtual ~Expr() { }; virtual void show(const SymbolTable & symbols, std::ostream & str) const; - virtual void bindVars(const EvalState & es, const std::shared_ptr<const StaticEnv> & env); + virtual void bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> & env); virtual void eval(EvalState & state, Env & env, Value & v); virtual Value * maybeThunk(EvalState & state, Env & env); virtual void setName(Symbol name); - std::shared_ptr<const StaticEnv> staticEnv; virtual PosIdx getPos() const { return noPos; } }; #define COMMON_METHODS \ void show(const SymbolTable & symbols, std::ostream & str) const; \ void eval(EvalState & state, Env & env, Value & v); \ - void bindVars(const EvalState & es, const std::shared_ptr<const StaticEnv> & env); + void bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> & env); struct ExprInt : Expr { @@ -402,7 +401,7 @@ struct ExprOpNot : Expr { \ str << "("; e1->show(symbols, str); str << " " s " "; e2->show(symbols, str); str << ")"; \ } \ - void bindVars(const EvalState & es, const std::shared_ptr<const StaticEnv> & env) \ + void bindVars(EvalState & es, const std::shared_ptr<const StaticEnv> & env) \ { \ e1->bindVars(es, env); e2->bindVars(es, env); \ } \ |