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

use lowercase --define switches (#17283)

Browse source
This commit is contained in:
flywind 2021-03-07 19:08:41 +08:00 • committed by GitHub
commit 0e3ea16554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/fenv.nim
View file

@ -12,7 +12,7 @@
## The types, vars and procs are bindings for the C standard library
## [<fenv.h>](https://en.cppreference.com/w/c/numeric/fenv) header.
when defined(Posix) and not defined(genode):
when defined(posix) and not defined(genode):
{.passl: "-lm".}
var

2
lib/pure/includes/oserr.nim
View file

@ -39,7 +39,7 @@ proc osErrorMsg*(errorCode: OSErrorCode): string =
result = ""
when defined(nimscript):
discard
elif defined(Windows):
elif defined(windows):
if errorCode != OSErrorCode(0'i32):
when useWinUnicode:
var msgbuf: WideCString

2
lib/pure/math.nim
View file

@ -122,7 +122,7 @@ func fac*(n: int): int =
{.push checks: off, line_dir: off, stack_trace: off.}
when defined(Posix) and not defined(genode):
when defined(posix) and not defined(genode):
{.passl: "-lm".}
const

4
lib/pure/nativesockets.nim
View file

@ -19,7 +19,7 @@ import std/private/since
when hostOS == "solaris":
{.passl: "-lsocket -lnsl".}
const useWinVersion = defined(Windows) or defined(nimdoc)
const useWinVersion = defined(windows) or defined(nimdoc)
when useWinVersion:
import winlean
@ -748,6 +748,6 @@ proc accept*(fd: SocketHandle, inheritable = defined(nimInheritHandles)): (Socke
else:
return (sock, $inet_ntoa(sockAddress.sin_addr))
when defined(Windows):
when defined(windows):
var wsa: WSAData
if wsaStartup(0x0101'i16, addr wsa) != 0: raiseOSError(osLastError())

2
lib/pure/net.nim
View file

@ -92,7 +92,7 @@ import ssl_config
export nativesockets.Port, nativesockets.`$`, nativesockets.`==`
export Domain, SockType, Protocol
const useWinVersion = defined(Windows) or defined(nimdoc)
const useWinVersion = defined(windows) or defined(nimdoc)
const defineSsl = defined(ssl) or defined(nimdoc)
when useWinVersion:

34
lib/pure/os.nim
View file

@ -1408,7 +1408,7 @@ proc setCurrentDir*(newDir: string) {.inline, tags: [], noWeirdTarget.} =
## * `getConfigDir proc <#getConfigDir>`_
## * `getTempDir proc <#getTempDir>`_
## * `getCurrentDir proc <#getCurrentDir>`_
when defined(Windows):
when defined(windows):
when useWinUnicode:
if setCurrentDirectoryW(newWideCString(newDir)) == 0'i32:
raiseOSError(osLastError(), newDir)
@ -1512,7 +1512,7 @@ proc normalizedPath*(path: string): string {.rtl, extern: "nos$1", tags: [].} =
assert normalizedPath("a///b//..//c///d") == "a/c/d"
result = pathnorm.normalizePath(path)
when defined(Windows) and not weirdTarget:
when defined(windows) and not weirdTarget:
proc openHandle(path: string, followSymlink=true, writeAccess=false): Handle =
var flags = FILE_FLAG_BACKUP_SEMANTICS or FILE_ATTRIBUTE_NORMAL
if not followSymlink:
@ -1545,7 +1545,7 @@ proc sameFile*(path1, path2: string): bool {.rtl, extern: "nos$1",
##
## See also:
## * `sameFileContent proc <#sameFileContent,string,string>`_
when defined(Windows):
when defined(windows):
var success = true
var f1 = openHandle(path1)
var f2 = openHandle(path2)
@ -1700,7 +1700,7 @@ proc createSymlink*(src, dest: string) {.noWeirdTarget.} =
## * `createHardlink proc <#createHardlink,string,string>`_
## * `expandSymlink proc <#expandSymlink,string>`_
when defined(Windows):
when defined(windows):
const SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE = 2
# allows anyone with developer mode on to create a link
let flag = dirExists(src).int32 or SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
@ -1802,7 +1802,7 @@ proc copyFile*(source, dest: string, options = {cfSymlinkFollow}) {.rtl,
let isSymlink = source.symlinkExists
if isSymlink and (cfSymlinkIgnore in options or defined(windows)):
return
when defined(Windows):
when defined(windows):
when useWinUnicode:
let s = newWideCString(source)
let d = newWideCString(dest)
@ -1866,7 +1866,7 @@ proc copyFileToDir*(source, dir: string, options = {cfSymlinkFollow})
raise newException(ValueError, "dest is empty")
copyFile(source, dir / source.lastPathPart, options)
when not declared(ENOENT) and not defined(Windows):
when not declared(ENOENT) and not defined(windows):
when NoFakeVars:
when not defined(haiku):
const ENOENT = cint(2) # 2 on most systems including Solaris
@ -1875,7 +1875,7 @@ when not declared(ENOENT) and not defined(Windows):
else:
var ENOENT {.importc, header: "<errno.h>".}: cint
when defined(Windows) and not weirdTarget:
when defined(windows) and not weirdTarget:
when useWinUnicode:
template deleteFile(file: untyped): untyped = deleteFileW(file)
template setFileAttributes(file, attrs: untyped): untyped =
@ -1899,7 +1899,7 @@ proc tryRemoveFile*(file: string): bool {.rtl, extern: "nos$1", tags: [WriteDirE
## * `removeFile proc <#removeFile,string>`_
## * `moveFile proc <#moveFile,string,string>`_
result = true
when defined(Windows):
when defined(windows):
when useWinUnicode:
let f = newWideCString(file)
else:
@ -1940,7 +1940,7 @@ proc tryMoveFSObject(source, dest: string): bool {.noWeirdTarget.} =
## Returns false in case of `EXDEV` error.
## In case of other errors `OSError` is raised.
## Returns true in case of success.
when defined(Windows):
when defined(windows):
when useWinUnicode:
let s = newWideCString(source)
let d = newWideCString(dest)
@ -2559,7 +2559,7 @@ proc createHardlink*(src, dest: string) {.noWeirdTarget.} =
##
## See also:
## * `createSymlink proc <#createSymlink,string,string>`_
when defined(Windows):
when defined(windows):
when useWinUnicode:
var wSrc = newWideCString(src)
var wDst = newWideCString(dest)
@ -2604,7 +2604,7 @@ proc copyFileWithPermissions*(source, dest: string,
## * `moveFile proc <#moveFile,string,string>`_
## * `copyDirWithPermissions proc <#copyDirWithPermissions,string,string>`_
copyFile(source, dest, options)
when not defined(Windows):
when not defined(windows):
try:
setFilePermissions(dest, getFilePermissions(source), followSymlinks =
(cfSymlinkFollow in options))
@ -2644,7 +2644,7 @@ proc copyDirWithPermissions*(source, dest: string,
## * `existsOrCreateDir proc <#existsOrCreateDir,string>`_
## * `createDir proc <#createDir,string>`_
createDir(dest)
when not defined(Windows):
when not defined(windows):
try:
setFilePermissions(dest, getFilePermissions(source), followSymlinks =
false)
@ -3178,7 +3178,7 @@ proc getFileSize*(file: string): BiggestInt {.rtl, extern: "nos$1",
close(f)
else: raiseOSError(osLastError(), file)
when defined(Windows) or weirdTarget:
when defined(windows) or weirdTarget:
type
DeviceId* = int32
FileId* = int64
@ -3210,7 +3210,7 @@ template rawToFormalFileInfo(rawInfo, path, formalInfo): untyped =
## Transforms the native file info structure into the one nim uses.
## 'rawInfo' is either a 'BY_HANDLE_FILE_INFORMATION' structure on Windows,
## or a 'Stat' structure on posix
when defined(Windows):
when defined(windows):
template merge(a, b): untyped = a or (b shl 32)
formalInfo.id.device = rawInfo.dwVolumeSerialNumber
formalInfo.id.file = merge(rawInfo.nFileIndexLow, rawInfo.nFileIndexHigh)
@ -3288,7 +3288,7 @@ proc getFileInfo*(handle: FileHandle): FileInfo {.noWeirdTarget.} =
## * `getFileInfo(path) proc <#getFileInfo,string>`_
# Done: ID, Kind, Size, Permissions, Link Count
when defined(Windows):
when defined(windows):
var rawInfo: BY_HANDLE_FILE_INFORMATION
# We have to use the super special '_get_osfhandle' call (wrapped above)
# To transform the C file descriptor to a native file handle.
@ -3330,7 +3330,7 @@ proc getFileInfo*(path: string, followSymlink = true): FileInfo {.noWeirdTarget.
## See also:
## * `getFileInfo(handle) proc <#getFileInfo,FileHandle>`_
## * `getFileInfo(file) proc <#getFileInfo,File>`_
when defined(Windows):
when defined(windows):
var
handle = openHandle(path, followSymlink)
rawInfo: BY_HANDLE_FILE_INFORMATION
@ -3402,7 +3402,7 @@ proc isHidden*(path: string): bool {.noWeirdTarget.} =
assert not "".isHidden
assert ".foo/".isHidden
when defined(Windows):
when defined(windows):
when useWinUnicode:
wrapUnary(attributes, getFileAttributesW, path)
else:

2
lib/pure/osproc.nim
View file

@ -522,7 +522,7 @@ when not defined(useNimRtl):
template streamAccess(p) =
assert poParentStreams notin p.options, "API usage error: stream access not allowed when you use poParentStreams"
when defined(Windows) and not defined(useNimRtl):
when defined(windows) and not defined(useNimRtl):
# We need to implement a handle stream for Windows:
type
FileHandleStream = ref object of StreamObj