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

added devel/logging; weakrefs test; next steps for proper unsigned support

Browse source
This commit is contained in:
Araq 2012-07-05 00:03:33 +02:00
commit 36247e0947
14 changed files with 243 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/sigmatch.nim
View file

@ -162,7 +162,7 @@ proc handleRange(f, a: PType, min, max: TTypeKind): TTypeRelation =
else:
var k = skipTypes(a, {tyRange}).kind
if k == f.kind: result = isSubtype
elif k == tyInt:
elif k == tyInt and f.kind in {tyRange, tyInt8..tyUInt64}:
# and a.n != nil and a.n.intVal >= firstOrd(f) and
# a.n.intVal <= lastOrd(f):
# integer literal in the proper range; we want ``i16 + 4`` to stay an
@ -188,7 +188,9 @@ proc handleFloatRange(f, a: PType): TTypeRelation =
else:
var k = skipTypes(a, {tyRange}).kind
if k == f.kind: result = isSubtype
elif (k >= tyFloat) and (k <= tyFloat128): result = isConvertible
elif k == tyInt and f.kind >= tyFloat and f.kind <= tyFloat128:
result = isIntConv
elif k >= tyFloat and k <= tyFloat128: result = isConvertible
else: result = isNone
proc isObjectSubtype(a, f: PType): bool =