forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made more code portable to Windows

This commit is contained in:
Hackerpilot 2012-06-22 12:41:50 -07:00
parent 3338104b0f
commit de1ff9f24a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.d
View File

@ -83,16 +83,16 @@ string findAbsPath(string[] dirs, string moduleName)
// For file names
if (endsWith(moduleName, ".d") || endsWith(moduleName, ".di"))
{
if (startsWith(moduleName, "/"))
if (isAbsolute(moduleName))
return moduleName;
else
return getcwd() ~ "/" ~ moduleName;
return buildPath(getcwd(), moduleName);
}
// Try to find the file name from a module name like "std.stdio"
foreach(dir; dirs)
{
string fileLocation = dir ~ "/" ~ replace(moduleName, ".", "/");
string fileLocation = buildPath(dir, replace(moduleName, ".", dirSeparator));
string dfile = fileLocation ~ ".d";
if (exists(dfile) && isFile(dfile))
{
@ -109,14 +109,14 @@ string findAbsPath(string[] dirs, string moduleName)
string[] loadConfig()
{
string path = expandTilde("~/.dscanner");
string path = expandTilde("~" ~ dirSeparator ~ ".dscanner");
string[] dirs;
if (exists(path))
{
auto f = File(path, "r");
scope(exit) f.close();
auto trimRegex = ctRegex!("\\s*$");
auto trimRegex = ctRegex!(`\s*$`);
foreach(string line; lines(f))
{
dirs ~= replace(line, trimRegex, "");