jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

template hygiene (#15240)

Browse source
This commit is contained in:
Andy Davidoff 2020-08-29 08:06:11 -04:00 • committed by GitHub
commit b5424b826e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/os.nim
View file

@ -3080,14 +3080,15 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped =
formalInfo.permissions = {fpUserExec, fpUserRead, fpGroupExec, formalInfo.permissions = {fpUserExec, fpUserRead, fpGroupExec,
fpGroupRead, fpOthersExec, fpOthersRead} fpGroupRead, fpOthersExec, fpOthersRead}
else: else:
result.permissions = {fpUserExec..fpOthersRead} formalInfo.permissions = {fpUserExec..fpOthersRead}
# Retrieve basic file kind # Retrieve basic file kind
result.kind = pcFile
if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32:
formalInfo.kind = pcDir formalInfo.kind = pcDir
else:
formalInfo.kind = pcFile
if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32:
formalInfo.kind = succ(result.kind) formalInfo.kind = succ(formalInfo.kind)
else: else:
template checkAndIncludeMode(rawMode, formalMode: untyped) = template checkAndIncludeMode(rawMode, formalMode: untyped) =
@ -3100,7 +3101,7 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped =
formalInfo.lastWriteTime = rawInfo.st_mtim.toTime formalInfo.lastWriteTime = rawInfo.st_mtim.toTime
formalInfo.creationTime = rawInfo.st_ctim.toTime formalInfo.creationTime = rawInfo.st_ctim.toTime
result.permissions = {} formalInfo.permissions = {}
checkAndIncludeMode(S_IRUSR, fpUserRead) checkAndIncludeMode(S_IRUSR, fpUserRead)
checkAndIncludeMode(S_IWUSR, fpUserWrite) checkAndIncludeMode(S_IWUSR, fpUserWrite)
checkAndIncludeMode(S_IXUSR, fpUserExec) checkAndIncludeMode(S_IXUSR, fpUserExec)
@ -3113,12 +3114,14 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped =
checkAndIncludeMode(S_IWOTH, fpOthersWrite) checkAndIncludeMode(S_IWOTH, fpOthersWrite)
checkAndIncludeMode(S_IXOTH, fpOthersExec) checkAndIncludeMode(S_IXOTH, fpOthersExec)
formalInfo.kind = pcFile formalInfo.kind =
if S_ISDIR(rawInfo.st_mode): if S_ISDIR(rawInfo.st_mode):
formalInfo.kind = pcDir pcDir
elif S_ISLNK(rawInfo.st_mode): elif S_ISLNK(rawInfo.st_mode):
assert(path != "") # symlinks can't occur for file handles assert(path != "") # symlinks can't occur for file handles
formalInfo.kind = getSymlinkFileKind(path) getSymlinkFileKind(path)
else:
pcFile
when defined(js): when defined(js):
when not declared(FileHandle): when not declared(FileHandle):