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

Merge branch 'devel' of github.com:nim-lang/Nim into devel

Browse source
This commit is contained in:
Araq 2017-12-17 13:58:51 +01:00
commit 7ab3743d84
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/parsecsv.nim
View file

@ -32,7 +32,7 @@
## import parsecsv ## import parsecsv
## import os ## import os
## # Prepare a file ## # Prepare a file
## var csv_content = """One,Two,Three,Four ## var content = """One,Two,Three,Four
## 1,2,3,4 ## 1,2,3,4
## 10,20,30,40 ## 10,20,30,40
## 100,200,300,400 ## 100,200,300,400

4
lib/pure/terminal.nim
View file

@ -391,8 +391,8 @@ proc eraseLine*(f: File) =
origin.X = 0'i16 origin.X = 0'i16
if setConsoleCursorPosition(h, origin) == 0: if setConsoleCursorPosition(h, origin) == 0:
raiseOSError(osLastError()) raiseOSError(osLastError())
var ht = scrbuf.dwSize.Y - origin.Y var ht: DWORD = scrbuf.dwSize.Y - origin.Y
var wt = scrbuf.dwSize.X - origin.X var wt: DWORD = scrbuf.dwSize.X - origin.X
if fillConsoleOutputCharacter(h, ' ', ht*wt, if fillConsoleOutputCharacter(h, ' ', ht*wt,
origin, addr(numwrote)) == 0: origin, addr(numwrote)) == 0:
raiseOSError(osLastError()) raiseOSError(osLastError())