From 4619ee70580b6dfb12dc3f8063173d5e0c07b9be Mon Sep 17 00:00:00 2001 From: cooldome Date: Mon, 11 Jun 2018 23:20:31 +0100 Subject: remove underscores --- compiler/sigmatch.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index bdae01d7d..3e278b3dc 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -633,19 +633,19 @@ proc procTypeRel(c: var TCandidate, f, a: PType): TTypeRelation = else: discard proc typeRangeRel(f, a: PType): TTypeRelation {.noinline.} = - template check_range[T](a_first, a_last, f_first, f_last: T): TTypeRelation = - if a_first == f_first and a_last == f_last: + template checkRange[T](afirst, alast, ffirst, flast: T): TTypeRelation = + if afirst == ffirst and alast == flast: isEqual - elif a_first >= f_first and a_last <= f_last: + elif afirst >= ffirst and alast <= flast: 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) isConvertible else: isNone if f.isOrdinalType: - check_range(firstOrd(a), lastOrd(a), firstOrd(f), lastOrd(f)) + checkRange(firstOrd(a), lastOrd(a), firstOrd(f), lastOrd(f)) else: check_range(firstFloat(a), lastFloat(a), firstFloat(f), lastFloat(f)) -- cgit 1.4.1-2-gfad0