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

remove underscores

Browse source
This commit is contained in:
cooldome 2018-06-11 23:20:31 +01:00
commit 4619ee7058
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/sigmatch.nim
View file

@ -633,19 +633,19 @@ proc procTypeRel(c: var TCandidate, f, a: PType): TTypeRelation =
else: discard else: discard
proc typeRangeRel(f, a: PType): TTypeRelation {.noinline.} = proc typeRangeRel(f, a: PType): TTypeRelation {.noinline.} =
template check_range[T](a_first, a_last, f_first, f_last: T): TTypeRelation = template checkRange[T](afirst, alast, ffirst, flast: T): TTypeRelation =
if a_first == f_first and a_last == f_last: if afirst == ffirst and alast == flast:
isEqual isEqual
elif a_first >= f_first and a_last <= f_last: elif afirst >= ffirst and alast <= flast:
isConvertible isConvertible
elif a_first <= f_last and f_first <= a_last: elif afirst <= flast and ffirst <= a_last:
# X..Y and C..D overlap iff (X <= D and C <= Y) # X..Y and C..D overlap iff (X <= D and C <= Y)
isConvertible isConvertible
else: else:
isNone isNone
if f.isOrdinalType: if f.isOrdinalType:
check_range(firstOrd(a), lastOrd(a), firstOrd(f), lastOrd(f)) checkRange(firstOrd(a), lastOrd(a), firstOrd(f), lastOrd(f))
else: else:
check_range(firstFloat(a), lastFloat(a), firstFloat(f), lastFloat(f)) check_range(firstFloat(a), lastFloat(a), firstFloat(f), lastFloat(f))