diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T13·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T13·59+0000 |
| commit | 8032f26ca0bd2233de066ce5786ff976bbd641ae (patch) | |
| tree | 954b2ecdce037dcf47b0376616ac05dbad8542ab /src/libexpr/parser.hh | |
| parent | 4750065ada362bd46e85879975a3148e18df5b0c (diff) | |
| parent | bd25ac2260267abd2181324e1650820da70e5e60 (diff) | |
* Merged the `fast-eval' branch.
Diffstat (limited to 'src/libexpr/parser.hh')
| -rw-r--r-- | src/libexpr/parser.hh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libexpr/parser.hh b/src/libexpr/parser.hh index 334822b5e0e4..c8c8ad8090be 100644 --- a/src/libexpr/parser.hh +++ b/src/libexpr/parser.hh @@ -8,12 +8,11 @@ namespace nix { /* Parse a Nix expression from the specified file. If `path' refers - to a directory, the "/default.nix" is appended. */ -Expr parseExprFromFile(EvalState & state, Path path); + to a directory, then "/default.nix" is appended. */ +Expr * parseExprFromFile(EvalState & state, Path path); /* Parse a Nix expression from the specified string. */ -Expr parseExprFromString(EvalState & state, const string & s, - const Path & basePath); +Expr * parseExprFromString(EvalState & state, const string & s, const Path & basePath); } |