diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-02T14·29+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-02T14·29+0200 |
commit | 33972629d76b1b1059de5b89ce68ef37dce45cbd (patch) | |
tree | 97e1a36a5fa4881c3a87f0ea51268a2b284a985e /src/libexpr/eval.hh | |
parent | ac1b75413821c9ebaf317fb3fe1c695599e93818 (diff) |
Fix whitespace
Diffstat (limited to 'src/libexpr/eval.hh')
-rw-r--r-- | src/libexpr/eval.hh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index b7b527bc4e6f..f7b21f7a38c5 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -88,7 +88,7 @@ struct EvalState; std::ostream & operator << (std::ostream & str, const Value & v); -class EvalState +class EvalState { public: SymbolTable symbols; @@ -101,7 +101,7 @@ public: bool repair; private: - SrcToStore srcToStore; + SrcToStore srcToStore; /* A cache from path names to parse trees. */ std::map<Path, Expr *> parseTrees; @@ -119,7 +119,7 @@ private: SearchPath::iterator searchPathInsertionPoint; public: - + EvalState(); ~EvalState(); @@ -131,7 +131,7 @@ public: /* Parse a Nix expression from the specified string. */ Expr * parseExprFromString(const string & s, const Path & basePath); - + /* Evaluate an expression read from the given file to normal form. */ void evalFile(const Path & path, Value & v); @@ -193,21 +193,21 @@ private: unsigned int baseEnvDispl; public: - + /* The same, but used during parsing to resolve variables. */ StaticEnv staticBaseEnv; // !!! should be private private: - + void createBaseEnv(); - + void addConstant(const string & name, Value & v); void addPrimOp(const string & name, unsigned int arity, PrimOpFun primOp); inline Value * lookupVar(Env * env, const VarRef & var, bool noEval); - + friend class ExprVar; friend class ExprAttrs; friend class ExprLet; @@ -216,7 +216,7 @@ private: const Path & path, const Path & basePath); public: - + /* Do a deep equality test between two values. That is, list elements and attributes are compared recursively. */ bool eqValues(Value & v1, Value & v2); @@ -226,7 +226,7 @@ public: /* Automatically call a function for which each argument has a default value or has a binding in the `args' map. */ void autoCallFunction(Bindings & args, Value & fun, Value & res); - + /* Allocation primitives. */ Value * allocValue(); Env & allocEnv(unsigned int size); |