jyapayne/Nim
Watch
1
0
Fork
You've already forked Nim
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #4737

Browse source
This commit is contained in:
Zahary Karadjov 2017-06-19 22:07:54 +03:00 • committed by Andreas Rumpf
commit a6006e56a7
1 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/types.nim
View file

@ -440,6 +440,13 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
result = t.sym.name.s & " literal(" & $t.n.intVal & ")"
elif prefer == preferName or t.sym.owner.isNil:
result = t.sym.name.s
if t.kind == tyGenericParam and t.sons != nil and t.sonsLen > 0:
result.add ": "
var first = true
for son in t.sons:
if not first: result.add " or "
result.add son.typeToString
first = false
else:
result = t.sym.owner.name.s & '.' & t.sym.name.s
result.addTypeFlags(t)
@ -461,7 +468,7 @@ proc typeToString(typ: PType, prefer: TPreferedDesc = preferName): string =
add(result, ']')
of tyTypeDesc:
if t.sons[0].kind == tyNone: result = "typedesc"
else: result = "typedesc[" & typeToString(t.sons[0]) & "]"
else: result = "type " & typeToString(t.sons[0])
of tyStatic:
internalAssert t.len > 0
if prefer == preferGenericArg and t.n != nil: