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

manual merge 2

Browse source
This commit is contained in:
cooldome 2018-06-12 23:23:21 +01:00
commit 101f23f3a6
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/sigmatch.nim
View file

@ -649,7 +649,7 @@ proc typeRangeRel(f, a: PType): TTypeRelation {.noinline.} =
isNone isNone
if f.isOrdinalType: if f.isOrdinalType:
checkRange(firstOrd(a), lastOrd(a), firstOrd(f), lastOrd(f)) checkRange(firstOrd(nil, a), lastOrd(nil, a), firstOrd(nil, f), lastOrd(nil, f))
else: else:
checkRange(firstFloat(a), lastFloat(a), firstFloat(f), lastFloat(f)) checkRange(firstFloat(a), lastFloat(a), firstFloat(f), lastFloat(f))

4
compiler/types.nim
View file

@ -643,7 +643,7 @@ proc firstFloat*(t: PType): BiggestFloat =
internalError(newPartialConfigRef(), "invalid kind for firstFloat(" & $t.kind & ')') internalError(newPartialConfigRef(), "invalid kind for firstFloat(" & $t.kind & ')')
NaN NaN
proc lastOrd*(t: PType; fixedUnsigned = false): BiggestInt = proc lastOrd*(conf: ConfigRef; t: PType; fixedUnsigned = false): BiggestInt =
case t.kind case t.kind
of tyBool: result = 1 of tyBool: result = 1
of tyChar: result = 255 of tyChar: result = 255
@ -699,7 +699,7 @@ proc lastFloat*(t: PType): BiggestFloat =
NaN NaN
proc lengthOrd*(t: PType): BiggestInt = proc lengthOrd*(conf: ConfigRef; t: PType): BiggestInt =
case t.kind case t.kind
of tyInt64, tyInt32, tyInt: result = lastOrd(conf, t) of tyInt64, tyInt32, tyInt: result = lastOrd(conf, t)
of tyDistinct: result = lengthOrd(conf, t.sons[0]) of tyDistinct: result = lengthOrd(conf, t.sons[0])