diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-24 14:33:01 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2021-11-04 15:03:45 +0100 |
| commit | bcf47800067243b124569da9019077c81bf71cd5 (patch) | |
| tree | da4e296f2a3c3b152e94f54eccb61912ac6b32ff /src/libexpr/nixexpr.hh | |
| parent | 81e7c40264520b387358917987d101f5f5ae4705 (diff) | |
Add level / displacement types
Diffstat (limited to 'src/libexpr/nixexpr.hh')
| -rw-r--r-- | src/libexpr/nixexpr.hh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index fe12890e9..13256272c 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -133,6 +133,9 @@ struct ExprPath : Expr Value * maybeThunk(EvalState & state, Env & env); }; +typedef uint32_t Level; +typedef uint32_t Displacement; + struct ExprVar : Expr { Pos pos; @@ -148,8 +151,8 @@ struct ExprVar : Expr value is obtained by getting the attribute named `name' from the set stored in the environment that is `level' levels up from the current one.*/ - unsigned int level; - unsigned int displ; + Level level; + Displacement displ; ExprVar(const Symbol & name) : name(name) { }; ExprVar(const Pos & pos, const Symbol & name) : pos(pos), name(name) { }; @@ -183,7 +186,7 @@ struct ExprAttrs : Expr bool inherited; Expr * e; Pos pos; - unsigned int displ; // displacement + Displacement displ; // displacement AttrDef(Expr * e, const Pos & pos, bool inherited=false) : inherited(inherited), e(e), pos(pos) { }; AttrDef() { }; @@ -352,7 +355,7 @@ struct StaticEnv const StaticEnv * up; // Note: these must be in sorted order. - typedef std::vector<std::pair<Symbol, unsigned int>> Vars; + typedef std::vector<std::pair<Symbol, Displacement>> Vars; Vars vars; StaticEnv(bool isWith, const StaticEnv * up, size_t expectedSize = 0) : isWith(isWith), up(up) { |