Skip to content

replace collectException(dirEntry()) idiom #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andralex merged 1 commit into from
Jun 18, 2013
Merged

replace collectException(dirEntry()) idiom #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions rdmd.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,9 @@ int main(string[] args)
immutable workDir = getWorkPath(root, compilerFlags);
string objDir = buildPath(workDir, "objs");
yap("stat ", workDir);
DirEntry workDirEntry;
const workDirExists =
collectException(workDirEntry = dirEntry(workDir)) is null;
if (workDirExists)
if (exists(workDir))
{
enforce(dryRun || workDirEntry.isDir,
enforce(dryRun || isDir(workDir),
"Entry `"~workDir~"' exists but is not a directory.");
}
else
Expand Down Expand Up @@ -341,17 +338,14 @@ private @property string myOwnTmpDir()
else tmpRoot = tmpRoot.replace("/", dirSeparator) ~ dirSeparator ~ ".rdmd";
}
yap("stat ", tmpRoot);
DirEntry tmpRootEntry;
const tmpRootExists =
collectException(tmpRootEntry = dirEntry(tmpRoot)) is null;
if (!tmpRootExists)
if (exists(tmpRoot))
{
mkdirRecurse(tmpRoot);
enforce(isDir(tmpRoot),
"Entry `"~tmpRoot~"' exists but is not a directory.");
}
else
{
enforce(tmpRootEntry.isDir,
"Entry `"~tmpRoot~"' exists but is not a directory.");
mkdirRecurse(tmpRoot);
}
return tmpRoot;
}
Expand Down Expand Up @@ -570,15 +564,12 @@ private string[string] getDependencies(string rootModule, string workDir,
if (!force)
{
yap("stat ", depsFilename);
DirEntry depsEntry;
bool depsEntryExists =
collectException(depsEntry = depsFilename.dirEntry) is null;
if (depsEntryExists)
if (exists(depsFilename))
{
// See if the deps file is still in good shape
auto deps = readDepsFile();
auto allDeps = chain(rootModule.only, deps.byKey).array;
bool mustRebuildDeps = allDeps.anyNewerThan(depsEntry.timeLastModified);
bool mustRebuildDeps = allDeps.anyNewerThan(timeLastModified(depsFilename));
if (!mustRebuildDeps)
{
// Cool, we're in good shape
Expand Down Expand Up @@ -797,9 +788,8 @@ string which(string path)
{
string absPath = buildPath(envPath, path ~ extension);
yap("stat ", absPath);
DirEntry e;
const exists = collectException(e = dirEntry(absPath)) is null;
if (exists && e.isFile) return absPath;
if (exists(absPath) && isFile(absPath))
return absPath;
}
}
throw new FileException(path, "File not found in PATH");
Expand Down