From 54945a2950174ded83d58336061b4a9990cdbbfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 6 Aug 2011 13:02:55 +0000 Subject: * Refactoring: move parseExprFromFile() and parseExprFromString() into the EvalState class. --- src/libexpr/eval.hh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/libexpr/eval.hh') diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 7b7fea934501..e900217fa457 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -218,6 +218,13 @@ public: EvalState(); ~EvalState(); + /* Parse a Nix expression from the specified file. If `path' + refers to a directory, then "/default.nix" is appended. */ + Expr * parseExprFromFile(Path path); + + /* 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); @@ -296,6 +303,9 @@ private: friend class ExprAttrs; friend class ExprLet; + Expr * parse(const char * text, + const Path & path, const Path & basePath); + public: /* Do a deep equality test between two values. That is, list -- cgit 1.4.1