lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Don't use a search path.

Browse source
This commit is contained in:
Eelco Dolstra 2003-10-30 16:10:56 +00:00
parent 933b3f677d
commit 442b09ea33
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/fix-ng/fix.cc
View file

@ -31,6 +31,7 @@ static Expr evalFile(EvalState & state, const Path & path);
static Expr evalExpr(EvalState & state, Expr e); static Expr evalExpr(EvalState & state, Expr e);
#if 0
static Path searchPath(const Paths & searchDirs, const Path & relPath) static Path searchPath(const Paths & searchDirs, const Path & relPath)
{ {
if (string(relPath, 0, 1) == "/") return relPath; if (string(relPath, 0, 1) == "/") return relPath;
@ -46,6 +47,7 @@ static Path searchPath(const Paths & searchDirs, const Path & relPath)
format("path `%1%' not found in any of the search directories") format("path `%1%' not found in any of the search directories")
% relPath); % relPath);
} }
#endif
static Expr substExpr(string x, Expr rep, Expr e) static Expr substExpr(string x, Expr rep, Expr e)
@ -259,7 +261,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
/* Relative files. */ /* Relative files. */
if (ATmatch(e, "Relative(<str>)", &s1)) { if (ATmatch(e, "Relative(<str>)", &s1)) {
Path srcPath = searchPath(state.searchDirs, s1); Path srcPath = s1;
Path dstPath = addToStore(srcPath); Path dstPath = addToStore(srcPath);
ClosureElem elem; ClosureElem elem;
@ -401,9 +403,8 @@ static Expr evalExpr(EvalState & state, Expr e)
} }
static Expr evalFile(EvalState & state, const Path & relPath) static Expr evalFile(EvalState & state, const Path & path)
{ {
Path path = searchPath(state.searchDirs, relPath);
Nest nest(lvlTalkative, format("evaluating file `%1%'") % path); Nest nest(lvlTalkative, format("evaluating file `%1%'") % path);
Expr e = parseExprFromFile(path); Expr e = parseExprFromFile(path);
return evalExpr(state, e); return evalExpr(state, e);
@ -476,7 +477,7 @@ void run(Strings args)
for (Strings::iterator it = files.begin(); for (Strings::iterator it = files.begin();
it != files.end(); it++) it != files.end(); it++)
{ {
Expr e = evalFile(state, *it); Expr e = evalFile(state, absPath(*it));
printNixExpr(state, e); printNixExpr(state, e);
} }
} }