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

fix #7446 Generics: type mismatch 'SomeunsignedInt or Natural' (#20522)

Browse source 
* fix #7446 Generics: type mismatch 'SomeunsignedInt or Natural'

* try fix
This commit is contained in:
Bung 2022-10-11 17:42:49 +08:00 • committed by GitHub
commit 083ea8f10c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/sigmatch.nim
View file

@ -1595,10 +1595,9 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
c.inheritancePenalty = 0 c.inheritancePenalty = 0
let x = typeRel(c, branch, aOrig, flags) let x = typeRel(c, branch, aOrig, flags)
maxInheritance = max(maxInheritance, c.inheritancePenalty) maxInheritance = max(maxInheritance, c.inheritancePenalty)
# 'or' implies maximum matching result: # 'or' implies maximum matching result:
if x > result: result = x if x > result: result = x
if result >= isSubtype: if result >= isIntConv:
if result > isGeneric: result = isGeneric if result > isGeneric: result = isGeneric
bindingRet result bindingRet result
else: else:

10
tests/generics/t7446.nim Normal file
View file

@ -0,0 +1,10 @@
proc foo(x: Natural or SomeUnsignedInt):int =
when x is int:
result = 1
else:
result = 2
let a = 10
doAssert foo(a) == 1
let b = 10'u8
doAssert foo(b) == 2