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

fixes broken merge

Browse source
This commit is contained in:
Araq 2015-07-02 16:29:22 +02:00
commit 560cfd48fc
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/sigmatch.nim
View file

@ -158,11 +158,15 @@ proc sumGeneric(t: PType): int =
t = t.sons[0] t = t.sons[0]
inc result inc result
inc isvar inc isvar
of tyTypeDesc:
t = t.lastSon
if t.kind == tyEmpty: break
inc result
of tyGenericInvocation, tyTuple: of tyGenericInvocation, tyTuple:
result += ord(t.kind == tyGenericInvocation) result += ord(t.kind == tyGenericInvocation)
for i in 0 .. <t.len: result += t.sons[i].sumGeneric for i in 0 .. <t.len: result += t.sons[i].sumGeneric
break break
of tyGenericParam, tyExpr, tyStatic, tyStmt, tyTypeDesc: break of tyGenericParam, tyExpr, tyStatic, tyStmt: break
of tyBool, tyChar, tyEnum, tyObject, tyProc, tyPointer, of tyBool, tyChar, tyEnum, tyObject, tyProc, tyPointer,
tyString, tyCString, tyInt..tyInt64, tyFloat..tyFloat128, tyString, tyCString, tyInt..tyInt64, tyFloat..tyFloat128,
tyUInt..tyUInt64: tyUInt..tyUInt64:

4
tests/generics/moverloading_typedesc.nim
View file

@ -5,7 +5,7 @@ type
FBar* = object FBar* = object
proc new*(_: typedesc[FFoo]): int = 2 proc new*(_: typedesc[FFoo]): int = 2
#proc new*[T](_: typedesc[T]): int = 3 proc new*[T](_: typedesc[T]): int = 3
#proc new*(_: typedesc): int = 4 proc new*(_: typedesc): int = 4
proc new*(_: typedesc[seq[Table[int, seq[Table[int, string]]]]]): int = 5 proc new*(_: typedesc[seq[Table[int, seq[Table[int, string]]]]]): int = 5
proc new*(_: typedesc[seq[Table[int, seq[Table[int, typedesc]]]]]): int = 6 proc new*(_: typedesc[seq[Table[int, seq[Table[int, typedesc]]]]]): int = 6

2
tests/generics/toverloading_typedesc.nim
View file

@ -10,7 +10,7 @@ type
when isMainModule: when isMainModule:
# doAssert FBar.new() == 3 doAssert FBar.new() == 3
proc new(_: typedesc[LFoo]): int = 0 proc new(_: typedesc[LFoo]): int = 0
proc new[T](_: typedesc[T]): int = 1 proc new[T](_: typedesc[T]): int = 1