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

tyOrdinal now means "integral types". tyTypeClass created to take care of type constraints

Browse source
This commit is contained in:
Zahary Karadjov 2012-03-22 16:24:12 +02:00
commit 296ef07955
7 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/sigmatch.nim
View file

@ -340,11 +340,10 @@ proc typeRel(mapping: var TIdTable, f, a: PType): TTypeRelation =
result = typeRel(mapping, f.sons[0], a.sons[0])
if result < isGeneric: result = isNone
else: nil
of tyOrdinal:
if f.sons[0].kind != tyGenericParam:
# some constraint:
result = constraintRel(mapping, f.sons[0], a)
elif isOrdinalType(a):
of tyTypeClass:
result = constraintRel(mapping, f.sons[0], a)
of tyOrdinal:
if isOrdinalType(a):
var x = if a.kind == tyOrdinal: a.sons[0] else: a
result = typeRel(mapping, f.sons[0], x)
if result < isGeneric: result = isNone