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

styleCheck fix: type naming: s/outType/OutType/ (#11749)

Browse source
This commit is contained in:
Kaushal Modi 2019-07-16 15:22:34 -04:00 • committed by Miran
commit 0b511b15ea
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pure/collections/sequtils.nim
View file

@ -609,18 +609,18 @@ template anyIt*(s, pred: untyped): bool =
template toSeq1(s: not iterator): untyped = template toSeq1(s: not iterator): untyped =
# overload for typed but not iterator # overload for typed but not iterator
type outType = type(items(s)) type OutType = type(items(s))
when compiles(s.len): when compiles(s.len):
block: block:
evalOnceAs(s2, s, compiles((let _ = s))) evalOnceAs(s2, s, compiles((let _ = s)))
var i = 0 var i = 0
var result = newSeq[outType](s2.len) var result = newSeq[OutType](s2.len)
for it in s2: for it in s2:
result[i] = it result[i] = it
i += 1 i += 1
result result
else: else:
var result: seq[outType] = @[] var result: seq[OutType] = @[]
for it in s: for it in s:
result.add(it) result.add(it)
result result
@ -636,8 +636,8 @@ template toSeq2(iter: iterator): untyped =
inc i inc i
result result
else: else:
type outType = type(iter2()) type OutType = type(iter2())
var result: seq[outType] = @[] var result: seq[OutType] = @[]
when compiles(iter2()): when compiles(iter2()):
evalOnceAs(iter4, iter, false) evalOnceAs(iter4, iter, false)
let iter3 = iter4() let iter3 = iter4()
@ -819,12 +819,12 @@ template mapIt*(s: typed, op: untyped): untyped =
assert strings == @["4", "8", "12", "16"] assert strings == @["4", "8", "12", "16"]
when defined(nimHasTypeof): when defined(nimHasTypeof):
type outType = typeof(( type OutType = typeof((
block: block:
var it{.inject.}: typeof(items(s), typeOfIter); var it{.inject.}: typeof(items(s), typeOfIter);
op), typeOfProc) op), typeOfProc)
else: else:
type outType = type(( type OutType = type((
block: block:
var it{.inject.}: type(items(s)); var it{.inject.}: type(items(s));
op)) op))
@ -836,13 +836,13 @@ template mapIt*(s: typed, op: untyped): untyped =
evalOnceAs(s2, s, compiles((let _ = s))) evalOnceAs(s2, s, compiles((let _ = s)))
var i = 0 var i = 0
var result = newSeq[outType](s2.len) var result = newSeq[OutType](s2.len)
for it {.inject.} in s2: for it {.inject.} in s2:
result[i] = op result[i] = op
i += 1 i += 1
result result
else: else:
var result: seq[outType] = @[] var result: seq[OutType] = @[]
for it {.inject.} in s: for it {.inject.} in s:
result.add(op) result.add(op)
result result