* Use a map to lookup primops.

* Various performance improvements in the evaluator.
* Do not link against unused (and missing!) libraries (-lsglr, etc.).

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libexpr/parser.hh b/src/libexpr/parser.hh
index 461dae08cd..2af5385f62 100644
--- a/src/libexpr/parser.hh
+++ b/src/libexpr/parser.hh
@@ -1,15 +1,15 @@
 #ifndef __PARSER_H
 #define __PARSER_H
 
-#include "nixexpr.hh"
+#include "eval.hh"
 
 
 /* Parse a Nix expression from the specified file.  If `path' refers
    to a directory, the "/default.nix" is appended. */
-Expr parseExprFromFile(Path path);
+Expr parseExprFromFile(EvalState & state, Path path);
 
 /* Parse a Nix expression from the specified string. */
-Expr parseExprFromString(const string & s,
+Expr parseExprFromString(EvalState & state, const string & s,
     const Path & basePath);