summary refs log tree commit diff
path: root/src/libexpr/common-opts.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-08-06 13:02:55 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-08-06 13:02:55 +0000
commit54945a2950174ded83d58336061b4a9990cdbbfd (patch)
tree8789c505f73551e9a40d745cbb2858ddc683cd9c /src/libexpr/common-opts.cc
parentc8606664abe952f74985503c831d31ae7a7369bc (diff)
downloadguix-54945a2950174ded83d58336061b4a9990cdbbfd.tar.gz
* Refactoring: move parseExprFromFile() and parseExprFromString() into
  the EvalState class.

Diffstat (limited to 'src/libexpr/common-opts.cc')
-rw-r--r--src/libexpr/common-opts.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libexpr/common-opts.cc b/src/libexpr/common-opts.cc
index c364aa9cb5..bab31f4935 100644
--- a/src/libexpr/common-opts.cc
+++ b/src/libexpr/common-opts.cc
@@ -1,7 +1,6 @@
 #include "common-opts.hh"
 #include "../libmain/shared.hh"
 #include "util.hh"
-#include "parser.hh"
 
 
 namespace nix {
@@ -25,7 +24,7 @@ bool parseOptionArg(const string & arg, Strings::iterator & i,
     autoArgs.push_back(Attr(state.symbols.create(name), v));
 
     if (arg == "--arg")
-        state.mkThunk_(*v, parseExprFromString(state, value, absPath(".")));
+        state.mkThunk_(*v, state.parseExprFromString(value, absPath(".")));
     else
         mkString(*v, value);