From 37ac424e9a5a1564055f99ffcc0fa6ff4321d5f4 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Fri, 11 Apr 2014 12:33:53 -0400 Subject: Added Windows implementation of getFileInfo procedures --- lib/pure/os.nim | 123 ++++++++++++++++++++++++++++++++++++++++-------- lib/windows/winlean.nim | 1 + 2 files changed, 104 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/pure/os.nim b/lib/pure/os.nim index faca17e98..11c84570f 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -448,6 +448,8 @@ proc getLastAccessTime*(file: string): TTime {.rtl, extern: "nos$1".} = proc getCreationTime*(file: string): TTime {.rtl, extern: "nos$1".} = ## Returns the `file`'s creation time. + ## Note that under posix OS's, the returned time may actually be the time at + ## which the file's attribute's were last modified. when defined(posix): var res: TStat if stat(file, res) < 0'i32: osError(osLastError()) @@ -777,6 +779,25 @@ proc isAbsolute*(path: string): bool {.rtl, noSideEffect, extern: "nos$1".} = elif defined(posix): result = path[0] == '/' +when defined(Windows): + proc openHandle(path: string, followSymlink=true): THandle = + var flags = FILE_FLAG_BACKUP_SEMANTICS or FILE_ATTRIBUTE_NORMAL + if not followSymlink: + flags = flags or FILE_FLAG_OPEN_REPARSE_POINT + + when useWinUnicode: + result = createFileW( + newWideCString(path), 0'i32, + FILE_SHARE_DELETE or FILE_SHARE_READ or FILE_SHARE_WRITE, + nil, OPEN_EXISTING, flags, 0 + ) + else: + result = createFileA( + path, 0'i32, + FILE_SHARE_DELETE or FILE_SHARE_READ or FILE_SHARE_WRITE, + nil, OPEN_EXISTING, flags, 0 + ) + proc sameFile*(path1, path2: string): bool {.rtl, extern: "nos$1", tags: [FReadDir].} = ## Returns True if both pathname arguments refer to the same physical @@ -787,26 +808,8 @@ proc sameFile*(path1, path2: string): bool {.rtl, extern: "nos$1", ## sym-linked paths to the same file or directory. when defined(Windows): var success = true - - when useWinUnicode: - var p1 = newWideCString(path1) - var p2 = newWideCString(path2) - template openHandle(path: expr): expr = - createFileW(path, 0'i32, FILE_SHARE_DELETE or FILE_SHARE_READ or - FILE_SHARE_WRITE, nil, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS or FILE_ATTRIBUTE_NORMAL, 0) - - var f1 = openHandle(p1) - var f2 = openHandle(p2) - - else: - template openHandle(path: expr): expr = - createFileA(path, 0'i32, FILE_SHARE_DELETE or FILE_SHARE_READ or - FILE_SHARE_WRITE, nil, OPEN_EXISTING, - FILE_FLAG_BACKUP_SEMANTICS or FILE_ATTRIBUTE_NORMAL, 0) - - var f1 = openHandle(path1) - var f2 = openHandle(path2) + var f1 = openHandle(path1) + var f2 = openHandle(path2) var lastErr: TOSErrorCode if f1 != INVALID_HANDLE_VALUE and f2 != INVALID_HANDLE_VALUE: @@ -1747,4 +1750,84 @@ proc expandTilde*(path: string): string = else: result = path +when defined(Windows): + type + DeviceId = int32 + FileId = int64 +type + FileInfo = object + ## Contains information associated with a file object. + id: tuple[device: DeviceId, file: FileId] # Device and file id. + kind: TPathComponent # Kind of file object - directory, symlink, etc. + size: BiggestInt # Size of file. + permissions: set[TFilePermission] # File permissions + linkCount: BiggestInt # Number of hard links the file object has. + lastAccessTime: TTime # Time file was last accessed. + lastWriteTime: TTime # Time file was last modified/written to. + creationTime: TTime # Time file was created. Not supported on all systems! + + +proc getFileInfo*(handle: THandle, result: var FileInfo) = + ## Retrieves file information for the file object represented by the given + ## handle. + ## + ## If the information cannot be retrieved, such as when the file handle + ## is invalid, an error will be thrown. + # Done: ID, Kind, Size, Permissions, Link Count + when defined(Windows): + template toTime(e): expr = winTimeToUnixTime(rdFileTime(e)) + var info: TBY_HANDLE_FILE_INFORMATION + if getFileInformationByHandle(handle, addr info) == 0: + osError(osLastError()) + result.id.device = info.dwVolumeSerialNumber + result.id.file = info.nFileIndexLow or (info.nFileIndexHigh shl 32) + result.size = info.nFileSizeLow or (info.nFileSizeHigh shl 32) + result.linkCount = info.nNumberOfLinks + result.lastAccessTime = toTime(info.ftLastAccessTime) + result.lastWriteTime = toTime(info.ftLastWriteTime) + result.creationTime = toTime(info.ftCreationTime) + + # Retrieve permissions + # TODO - Use a more accurate method of getting permissions? + if (info.dwFileAttributes and FILE_ATTRIBUTE_READONLY) != 0'i32: + result.permissions = {fpUserExec, fpUserRead, fpGroupExec, fpGroupRead, + fpOthersExec, fpOthersRead} + else: + result.permissions = {fpUserExec..fpOthersRead} + + # Retrieve file kind + # Should we include more file kinds? + result.kind = pcFile + if (info.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: + result.kind = pcDir + # Should we optimize for the case when it's definately known that the file + # isn't a symlink (see the below procedure's "followSymlink") + if (info.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: + result.kind = succ(result.kind) + + else: + var rawInfo: TStat + if stat(handle, rawInfo) < 0'i32: osError(osLastError()) + +proc getFileInfo*(path: string, followSymlink = true): FileInfo = + ## Retrieves file information for the file object pointed to by `path`. + ## + ## Due to intrinsic differences between operating systems, the information + ## contained by the returned `FileInfo` structure will be slightly different + ## across platforms, and in some cases, incomplete or inaccurate. + ## + ## When `followSymlink` is true, symlinks are followed and the information + ## retrieved is information related to the symlink's target. Otherwise, + ## information on the symlink itself is retrieved. + ## + ## If the information cannot be retrieved, such as when the path doesn't + ## exist, or when permission restrictions prevent the program from retrieving + ## file information, an error will be thrown. + when defined(Windows): + var handle = openHandle(path, followSymlink) + if handle == INVALID_HANDLE_VALUE: + osError(osLastError()) + getFileInfo(handle, result) + closeHandle(handle) + {.pop.} diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index 69a3c5c81..51b6021ae 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -581,6 +581,7 @@ const INVALID_FILE_SIZE* = -1'i32 FILE_FLAG_BACKUP_SEMANTICS* = 33554432'i32 + FILE_FLAG_OPEN_REPARSE_POINT* = 0x00200000'i32 # Error Constants const -- cgit 1.4.1-2-gfad0 From 8af083c847c4f4b233f165d63a1e0994301196ef Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Sat, 12 Apr 2014 23:05:40 -0400 Subject: Added Posix implementation of getFileInfo, organized code. --- lib/pure/os.nim | 97 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 66 insertions(+), 31 deletions(-) (limited to 'lib') diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 11c84570f..25f3b940e 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -1754,6 +1754,11 @@ when defined(Windows): type DeviceId = int32 FileId = int64 +else: + type + DeviceId = TDev + FileId = TIno + type FileInfo = object ## Contains information associated with a file object. @@ -1766,48 +1771,76 @@ type lastWriteTime: TTime # Time file was last modified/written to. creationTime: TTime # Time file was created. Not supported on all systems! - -proc getFileInfo*(handle: THandle, result: var FileInfo) = - ## Retrieves file information for the file object represented by the given - ## handle. - ## - ## If the information cannot be retrieved, such as when the file handle - ## is invalid, an error will be thrown. - # Done: ID, Kind, Size, Permissions, Link Count +proc rawToFormalFileInfo(rawInfo, formalInfo): expr = + ## 'rawInfo' is either a 'TBY_HANDLE_FILE_INFORMATION' structure on Windows, + ## or a 'TStat' structure on posix when defined(Windows): template toTime(e): expr = winTimeToUnixTime(rdFileTime(e)) - var info: TBY_HANDLE_FILE_INFORMATION - if getFileInformationByHandle(handle, addr info) == 0: - osError(osLastError()) - result.id.device = info.dwVolumeSerialNumber - result.id.file = info.nFileIndexLow or (info.nFileIndexHigh shl 32) - result.size = info.nFileSizeLow or (info.nFileSizeHigh shl 32) - result.linkCount = info.nNumberOfLinks - result.lastAccessTime = toTime(info.ftLastAccessTime) - result.lastWriteTime = toTime(info.ftLastWriteTime) - result.creationTime = toTime(info.ftCreationTime) + template merge(a, b): expr = a or (b shl 32) + formalInfo.id.device = rawInfo.dwVolumeSerialNumber + formalInfo.id.file = merge(rawInfo.nFileIndexLow, rawInfo.nFileIndexHigh) + formalInfo.size = merge(rawInfo.nFileSizeLow, rawInfo.nFileSizeHigh) + formalInfo.linkCount = rawInfo.nNumberOfLinks + formalInfo.lastAccessTime = toTime(rawInfo.ftLastAccessTime) + formalInfo.lastWriteTime = toTime(rawInfo.ftLastWriteTime) + formalInfo.creationTime = toTime(rawInfo.ftCreationTime) - # Retrieve permissions - # TODO - Use a more accurate method of getting permissions? + # Retrieve basic permissions if (info.dwFileAttributes and FILE_ATTRIBUTE_READONLY) != 0'i32: - result.permissions = {fpUserExec, fpUserRead, fpGroupExec, fpGroupRead, - fpOthersExec, fpOthersRead} + formalInfo.permissions = {fpUserExec, fpUserRead, fpGroupExec, + fpGroupRead, fpOthersExec, fpOthersRead} else: result.permissions = {fpUserExec..fpOthersRead} - # Retrieve file kind - # Should we include more file kinds? + # Retrieve basic file kind result.kind = pcFile if (info.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: - result.kind = pcDir - # Should we optimize for the case when it's definately known that the file - # isn't a symlink (see the below procedure's "followSymlink") + formalInfo.kind = pcDir if (info.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: - result.kind = succ(result.kind) - + formalInfo.kind = succ(result.kind) + + else: + formalInfo.id = (rawInfo.st_dev, rawInfo.st_ino) + formalInfo.size = getFileSize(handle) + formalInfo.linkCount = BiggestInt(rawInfo.st_Nlink) + formalInfo.lastAccessTime = rawInfo.st_atime + formalInfo.lastWriteTime = rawInfo.st_mtime + formalInfo.creationTime = rawInfo.st_ctime + + result.permissions = {} + if (a.st_mode and S_IRUSR) != 0'i32: result.incl(fpUserRead) + if (a.st_mode and S_IWUSR) != 0'i32: result.incl(fpUserWrite) + if (a.st_mode and S_IXUSR) != 0'i32: result.incl(fpUserExec) + + if (a.st_mode and S_IRGRP) != 0'i32: result.incl(fpGroupRead) + if (a.st_mode and S_IWGRP) != 0'i32: result.incl(fpGroupWrite) + if (a.st_mode and S_IXGRP) != 0'i32: result.incl(fpGroupExec) + + if (a.st_mode and S_IROTH) != 0'i32: result.incl(fpOthersRead) + if (a.st_mode and S_IWOTH) != 0'i32: result.incl(fpOthersWrite) + if (a.st_mode and S_IXOTH) != 0'i32: result.incl(fpOthersExec) + + result.kind = pcFile + if S_ISDIR(s.st_mode): result.kind = pcDir + if S_ISLNK(s.st_mode): succ(result.kind) + +proc getFileInfo*(handle: THandle, result: var FileInfo) = + ## Retrieves file information for the file object represented by the given + ## handle. + ## + ## If the information cannot be retrieved, such as when the file handle + ## is invalid, an error will be thrown. + # Done: ID, Kind, Size, Permissions, Link Count + when defined(Windows): + var rawInfo: TBY_HANDLE_FILE_INFORMATION + if getFileInformationByHandle(handle, addr rawInfo) == 0: + osError(osLastError()) + rawToFormalFileInfo(rawInfo, result) else: var rawInfo: TStat - if stat(handle, rawInfo) < 0'i32: osError(osLastError()) + if fstat(handle, rawInfo) < 0'i32: + osError(osLastError()) + rawToFormalFileInfo(rawInfo, result) proc getFileInfo*(path: string, followSymlink = true): FileInfo = ## Retrieves file information for the file object pointed to by `path`. @@ -1828,6 +1861,8 @@ proc getFileInfo*(path: string, followSymlink = true): FileInfo = if handle == INVALID_HANDLE_VALUE: osError(osLastError()) getFileInfo(handle, result) - closeHandle(handle) + discard closeHandle(handle) + else: + var {.pop.} -- cgit 1.4.1-2-gfad0 From 79f0c66b4de25d5b75d729106f7b6f80835ca0ac Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Sun, 13 Apr 2014 19:03:42 -0400 Subject: Completed Linux/Posix implementation of getFileInfo Moved parts of getFileInfo into a helper template. --- lib/pure/os.nim | 64 +++++++++++++++++++++++++++++++------------------ lib/windows/winlean.nim | 3 +++ 2 files changed, 44 insertions(+), 23 deletions(-) (limited to 'lib') diff --git a/lib/pure/os.nim b/lib/pure/os.nim index 25f3b940e..bfc63dfc6 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -1771,7 +1771,8 @@ type lastWriteTime: TTime # Time file was last modified/written to. creationTime: TTime # Time file was created. Not supported on all systems! -proc rawToFormalFileInfo(rawInfo, formalInfo): expr = +template rawToFormalFileInfo(rawInfo, formalInfo): expr = + ## Transforms the native file info structure into the one nimrod uses. ## 'rawInfo' is either a 'TBY_HANDLE_FILE_INFORMATION' structure on Windows, ## or a 'TStat' structure on posix when defined(Windows): @@ -1786,7 +1787,7 @@ proc rawToFormalFileInfo(rawInfo, formalInfo): expr = formalInfo.creationTime = toTime(rawInfo.ftCreationTime) # Retrieve basic permissions - if (info.dwFileAttributes and FILE_ATTRIBUTE_READONLY) != 0'i32: + if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_READONLY) != 0'i32: formalInfo.permissions = {fpUserExec, fpUserRead, fpGroupExec, fpGroupRead, fpOthersExec, fpOthersRead} else: @@ -1794,37 +1795,40 @@ proc rawToFormalFileInfo(rawInfo, formalInfo): expr = # Retrieve basic file kind result.kind = pcFile - if (info.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: + if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_DIRECTORY) != 0'i32: formalInfo.kind = pcDir - if (info.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: + if (rawInfo.dwFileAttributes and FILE_ATTRIBUTE_REPARSE_POINT) != 0'i32: formalInfo.kind = succ(result.kind) else: + template checkAndIncludeMode(rawMode, formalMode: expr) = + if (rawInfo.st_mode and rawMode) != 0'i32: + formalInfo.permissions.incl(formalMode) formalInfo.id = (rawInfo.st_dev, rawInfo.st_ino) - formalInfo.size = getFileSize(handle) - formalInfo.linkCount = BiggestInt(rawInfo.st_Nlink) + formalInfo.size = rawInfo.st_size + formalInfo.linkCount = rawInfo.st_Nlink formalInfo.lastAccessTime = rawInfo.st_atime formalInfo.lastWriteTime = rawInfo.st_mtime formalInfo.creationTime = rawInfo.st_ctime result.permissions = {} - if (a.st_mode and S_IRUSR) != 0'i32: result.incl(fpUserRead) - if (a.st_mode and S_IWUSR) != 0'i32: result.incl(fpUserWrite) - if (a.st_mode and S_IXUSR) != 0'i32: result.incl(fpUserExec) + checkAndIncludeMode(S_IRUSR, fpUserRead) + checkAndIncludeMode(S_IWUSR, fpUserWrite) + checkAndIncludeMode(S_IXUSR, fpUserExec) - if (a.st_mode and S_IRGRP) != 0'i32: result.incl(fpGroupRead) - if (a.st_mode and S_IWGRP) != 0'i32: result.incl(fpGroupWrite) - if (a.st_mode and S_IXGRP) != 0'i32: result.incl(fpGroupExec) + checkAndIncludeMode(S_IRGRP, fpGroupRead) + checkAndIncludeMode(S_IWGRP, fpGroupWrite) + checkAndIncludeMode(S_IXGRP, fpGroupExec) - if (a.st_mode and S_IROTH) != 0'i32: result.incl(fpOthersRead) - if (a.st_mode and S_IWOTH) != 0'i32: result.incl(fpOthersWrite) - if (a.st_mode and S_IXOTH) != 0'i32: result.incl(fpOthersExec) + checkAndIncludeMode(S_IROTH, fpOthersRead) + checkAndIncludeMode(S_IWOTH, fpOthersWrite) + checkAndIncludeMode(S_IXOTH, fpOthersExec) - result.kind = pcFile - if S_ISDIR(s.st_mode): result.kind = pcDir - if S_ISLNK(s.st_mode): succ(result.kind) + formalInfo.kind = pcFile + if S_ISDIR(rawInfo.st_mode): formalInfo.kind = pcDir + if S_ISLNK(rawInfo.st_mode): formalInfo.kind.inc() -proc getFileInfo*(handle: THandle, result: var FileInfo) = +proc getFileInfo*(handle: TFileHandle, result: var FileInfo) = ## Retrieves file information for the file object represented by the given ## handle. ## @@ -1833,7 +1837,10 @@ proc getFileInfo*(handle: THandle, result: var FileInfo) = # Done: ID, Kind, Size, Permissions, Link Count when defined(Windows): var rawInfo: TBY_HANDLE_FILE_INFORMATION - if getFileInformationByHandle(handle, addr rawInfo) == 0: + # We have to use the super special '_get_osfhandle' call (wrapped above) + # To transform the C file descripter to a native file handle. + var realHandle = get_osfhandle(handle) + if getFileInformationByHandle(realHandle, addr rawInfo) == 0: osError(osLastError()) rawToFormalFileInfo(rawInfo, result) else: @@ -1857,12 +1864,23 @@ proc getFileInfo*(path: string, followSymlink = true): FileInfo = ## exist, or when permission restrictions prevent the program from retrieving ## file information, an error will be thrown. when defined(Windows): - var handle = openHandle(path, followSymlink) + var + handle = openHandle(path, followSymlink) + rawInfo: TBY_HANDLE_FILE_INFORMATION if handle == INVALID_HANDLE_VALUE: osError(osLastError()) - getFileInfo(handle, result) + if getFileInformationByHandle(handle, addr rawInfo) == 0: + osError(osLastError()) + rawToFormalFileInfo(rawInfo, result) discard closeHandle(handle) else: - var + var rawInfo: TStat + if followSymlink: + if lstat(path, rawInfo) < 0'i32: + osError(osLastError()) + else: + if stat(path, rawInfo) < 0'i32: + osError(osLastError()) + rawToFormalFileInfo(rawInfo, result) {.pop.} diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index 51b6021ae..683f8cc23 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -716,3 +716,6 @@ proc WSASend*(s: TSocketHandle, buf: ptr TWSABuf, bufCount: DWORD, bytesSent: PDWord, flags: DWORD, lpOverlapped: POverlapped, completionProc: POVERLAPPED_COMPLETION_ROUTINE): cint {. stdcall, importc: "WSASend", dynlib: "Ws2_32.dll".} + +proc get_osfhandle*(fd:TFileHandle): THandle {. + importc:"__get_osfhandle", header:"".} \ No newline at end of file -- cgit 1.4.1-2-gfad0 From 73570cbe38e46362210ab829100f13429c90eef0 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Tue, 15 Apr 2014 02:28:50 -0400 Subject: Allowed getFileInfo to accept TFile objects. --- lib/pure/os.nim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pure/os.nim b/lib/pure/os.nim index bfc63dfc6..30a5ae949 100644 --- a/lib/pure/os.nim +++ b/lib/pure/os.nim @@ -1828,7 +1828,7 @@ template rawToFormalFileInfo(rawInfo, formalInfo): expr = if S_ISDIR(rawInfo.st_mode): formalInfo.kind = pcDir if S_ISLNK(rawInfo.st_mode): formalInfo.kind.inc() -proc getFileInfo*(handle: TFileHandle, result: var FileInfo) = +proc getFileInfo*(handle: TFileHandle): FileInfo = ## Retrieves file information for the file object represented by the given ## handle. ## @@ -1849,6 +1849,9 @@ proc getFileInfo*(handle: TFileHandle, result: var FileInfo) = osError(osLastError()) rawToFormalFileInfo(rawInfo, result) +proc getFileInfo*(file: TFile): FileInfo = + result = getFileInfo(file.fileHandle()) + proc getFileInfo*(path: string, followSymlink = true): FileInfo = ## Retrieves file information for the file object pointed to by `path`. ## -- cgit 1.4.1-2-gfad0 From 733b289209ef4c665d158a5fd69a483920c71272 Mon Sep 17 00:00:00 2001 From: Clay Sweetser Date: Tue, 15 Apr 2014 02:29:37 -0400 Subject: Fixed _get_osfhandle declaration. --- lib/windows/winlean.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim index 683f8cc23..3449a3eba 100644 --- a/lib/windows/winlean.nim +++ b/lib/windows/winlean.nim @@ -718,4 +718,4 @@ proc WSASend*(s: TSocketHandle, buf: ptr TWSABuf, bufCount: DWORD, stdcall, importc: "WSASend", dynlib: "Ws2_32.dll".} proc get_osfhandle*(fd:TFileHandle): THandle {. - importc:"__get_osfhandle", header:"".} \ No newline at end of file + importc:"_get_osfhandle", header:"".} \ No newline at end of file -- cgit 1.4.1-2-gfad0 From dad99376a55e61f83606956a0c1cab289387d1d5 Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Sun, 20 Apr 2014 22:08:03 +0100 Subject: Param name and type combos now work in type sig. sugar. --- lib/pure/future.nim | 11 +++++++++-- tests/closure/tclosuremacro.nim | 8 ++++---- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/pure/future.nim b/lib/pure/future.nim index 2401c4f72..349ee2dcc 100644 --- a/lib/pure/future.nim +++ b/lib/pure/future.nim @@ -26,8 +26,15 @@ proc createProcType(p, b: PNimrodNode): PNimrodNode {.compileTime.} = for i in 0 .. x + y) noReturn(() -> void => echo("noReturn")) -when false: - proc pass2(f: (int, int) -> int): (int) -> int = - (x: int) -> int => f(2, x) +proc pass2(f: (int, int) -> int): (int) -> int = + (x: int) -> int => f(2, x) - #echo pass2((x, y) => x + y) +echo pass2((x, y) => x + y)(4) -- cgit 1.4.1-2-gfad0 From 443fdd6d694b4fe5508fff12394aca62855fa684 Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Sun, 20 Apr 2014 22:17:56 +0100 Subject: Fixed docs in future module. --- lib/pure/future.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/pure/future.nim b/lib/pure/future.nim index 349ee2dcc..73c20e708 100644 --- a/lib/pure/future.nim +++ b/lib/pure/future.nim @@ -54,7 +54,7 @@ proc createProcType(p, b: PNimrodNode): PNimrodNode {.compileTime.} = macro `=>`*(p, b: expr): expr {.immediate.} = ## Syntax sugar for anonymous procedures. ## - ## ..code-block:: nimrod + ## .. code-block:: nimrod ## ## proc passTwoAndTwo(f: (int, int) -> int): int = ## f(2, 2) @@ -105,7 +105,7 @@ macro `=>`*(p, b: expr): expr {.immediate.} = macro `->`*(p, b: expr): expr {.immediate.} = ## Syntax sugar for procedure types. ## - ## ..code-block:: nimrod + ## .. code-block:: nimrod ## ## proc pass2(f: (float, float) -> float): float = ## f(2, 2) -- cgit 1.4.1-2-gfad0 From ca2b73f64a9ed49f4914dcf37bfa1b3727317f6b Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Sun, 20 Apr 2014 22:35:17 +0100 Subject: Revert 4b09baa0a and 33fcd1123. --- lib/system/sysstr.nim | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim index eb9d2000b..4244bae4c 100644 --- a/lib/system/sysstr.nim +++ b/lib/system/sysstr.nim @@ -252,10 +252,8 @@ proc nimIntToStr(x: int): string {.compilerRtl.} = proc nimFloatToStr(x: float): string {.compilerproc.} = var buf: array [0..59, char] - c_sprintf(buf, "%#.f", x) - result = $buf - if result[len(result)-1] == '.': - result.add("0") + c_sprintf(buf, "%#.16e", x) + return $buf proc nimInt64ToStr(x: int64): string {.compilerRtl.} = result = newString(sizeof(x)*4) -- cgit 1.4.1-2-gfad0