diff options
| author | Andy Davidoff <disruptek@users.noreply.github.com> | 2020-08-29 08:06:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 08:06:11 -0400 |
| commit | b5424b826e57c791a751bf31b69549c7d8daab0b (patch) | |
| tree | ad9cf07510a17ae3c26a4097f40aff3900a92093 | |
| parent | 13e659cfec83eb3c2c3c2bbbf10d01ba59bc0d5b (diff) | |
| download | Nim-b5424b826e57c791a751bf31b69549c7d8daab0b.tar.gz | |
template hygiene (#15240)
| -rw-r--r-- | lib/pure/os.nim | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 8bbceddeb..e7087acf7 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -3080,14 +3080,15 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped = formalInfo.permissions = {fpUserExec, fpUserRead, fpGroupExec, fpGroupRead, fpOthersExec, fpOthersRead} else: - result.permissions = {fpUserExec..fpOthersRead} + formalInfo.permissions = {fpUserExec..fpOthersRead} # Retrieve basic file kind - result.kind = pcFile if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: formalInfo.kind = pcDir + else: + formalInfo.kind = pcFile if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: - formalInfo.kind = succ(result.kind) + formalInfo.kind = succ(formalInfo.kind) else: template checkAndIncludeMode(rawMode, formalMode: untyped) = @@ -3100,7 +3101,7 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped = formalInfo.lastWriteTime = rawInfo.st_mtim.toTime formalInfo.creationTime = rawInfo.st_ctim.toTime - result.permissions = {} + formalInfo.permissions = {} checkAndIncludeMode(S_IRUSR, fpUserRead) checkAndIncludeMode(S_IWUSR, fpUserWrite) checkAndIncludeMode(S_IXUSR, fpUserExec) @@ -3113,12 +3114,14 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped = checkAndIncludeMode(S_IWOTH, fpOthersWrite) checkAndIncludeMode(S_IXOTH, fpOthersExec) - formalInfo.kind = pcFile - if S_ISDIR(rawInfo.st_mode): - formalInfo.kind = pcDir - elif S_ISLNK(rawInfo.st_mode): - assert(path != "") # symlinks can't occur for file handles - formalInfo.kind = getSymlinkFileKind(path) + formalInfo.kind = + if S_ISDIR(rawInfo.st_mode): + pcDir + elif S_ISLNK(rawInfo.st_mode): + assert(path != "") # symlinks can't occur for file handles + getSymlinkFileKind(path) + else: + pcFile when defined(js): when not declared(FileHandle): |