bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Cache parse trees to prevent repeated parsing of imported Nix

Browse source 
expressions.
This commit is contained in:
Eelco Dolstra 2010-03-31 16:14:32 +00:00
parent 3d94be61ea
commit 55e207b2dc
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -272,7 +272,14 @@ void EvalState::cloneAttrs(Value & src, Value & dst)
void EvalState::evalFile(const Path & path, Value & v) void EvalState::evalFile(const Path & path, Value & v)
{ {
startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path); startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path);
Expr e = parseExprFromFile(*this, path);
Expr e = parseTrees.get(toATerm(path));
if (!e) {
e = parseExprFromFile(*this, path);
parseTrees.set(toATerm(path), e);
}
try { try {
eval(e, v); eval(e, v);
} catch (Error & e) { } catch (Error & e) {

2
src/libexpr/eval.hh
View file

@ -135,6 +135,8 @@ private:
bool allowUnsafeEquality; bool allowUnsafeEquality;
ATermMap parseTrees;
public: public:
EvalState(); EvalState();

6
src/libexpr/parser.y
View file

@ -526,12 +526,6 @@ Expr parseExprFromFile(EvalState & state, Path path)
{ {
assert(path[0] == '/'); assert(path[0] == '/');
#if 0
/* Perhaps this is already an imploded parse tree? */
Expr e = ATreadFromNamedFile(path.c_str());
if (e) return e;
#endif
/* If `path' is a symlink, follow it. This is so that relative /* If `path' is a symlink, follow it. This is so that relative
path references work. */ path references work. */
struct stat st; struct stat st;