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:
Andreas Rumpf 2018-01-31 08:01:07 +01:00
commit 7648eb45b3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/sempass2.nim
View file

@ -747,7 +747,7 @@ proc track(tracked: PEffects, n: PNode) =
# may not look like an assignment, but it is: # may not look like an assignment, but it is:
let arg = n.sons[1] let arg = n.sons[1]
initVarViaNew(tracked, arg) initVarViaNew(tracked, arg)
if {tfNeedsInit} * arg.typ.lastSon.flags != {}: if arg.typ.len != 0 and {tfNeedsInit} * arg.typ.lastSon.flags != {}:
if a.sym.magic == mNewSeq and n[2].kind in {nkCharLit..nkUInt64Lit} and if a.sym.magic == mNewSeq and n[2].kind in {nkCharLit..nkUInt64Lit} and
n[2].intVal == 0: n[2].intVal == 0:
# var s: seq[notnil]; newSeq(s, 0) is a special case! # var s: seq[notnil]; newSeq(s, 0) is a special case!

6
lib/system.nim
View file

@ -3025,9 +3025,9 @@ when not defined(JS): #and not defined(nimscript):
proc endOfFile*(f: File): bool {.tags: [], benign.} proc endOfFile*(f: File): bool {.tags: [], benign.}
## Returns true iff `f` is at the end. ## Returns true iff `f` is at the end.
proc readChar*(f: File): char {.tags: [ReadIOEffect], deprecated.} proc readChar*(f: File): char {.tags: [ReadIOEffect].}
## Reads a single character from the stream `f`. **Deprecated** since ## Reads a single character from the stream `f`. Should not be used in
## version 0.16.2. Use some variant of ``readBuffer`` instead. ## performance sensitive code.
proc flushFile*(f: File) {.tags: [WriteIOEffect].} proc flushFile*(f: File) {.tags: [WriteIOEffect].}
## Flushes `f`'s buffer. ## Flushes `f`'s buffer.