mirror of
https://github.com/NixOS/nix
synced 2025-06-28 05:21:16 +02:00
* Refactoring: move parseExprFromFile() and parseExprFromString() into
the EvalState class.
This commit is contained in:
parent
c8606664ab
commit
54945a2950
10 changed files with 37 additions and 52 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue