diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2016-01-30 23:09:55 +0100 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2016-01-30 23:09:55 +0100 |
commit | a2db3c24d11c5f6caedf8ac6a24e664d75ba7f80 (patch) | |
tree | c89f3fd878481a5c6b8d1bff4e2dafe7ca8f8e9a | |
parent | 3e33084da7ed51818335ba785c2de837a4d653db (diff) | |
download | Nim-a2db3c24d11c5f6caedf8ac6a24e664d75ba7f80.tar.gz |
fixes #3799
-rw-r--r-- | compiler/semcall.nim | 13 | ||||
-rw-r--r-- | tests/converter/tgenericconverter2.nim | 49 |
2 files changed, 56 insertions, 6 deletions
diff --git a/compiler/semcall.nim b/compiler/semcall.nim index 8445b24d9..a0d0db3ad 100644 --- a/compiler/semcall.nim +++ b/compiler/semcall.nim @@ -255,12 +255,13 @@ proc resolveOverloads(c: PContext, n, orig: PNode, proc instGenericConvertersArg*(c: PContext, a: PNode, x: TCandidate) = - if a.kind == nkHiddenCallConv and a.sons[0].kind == nkSym and - isGenericRoutine(a.sons[0].sym): - let finalCallee = generateInstance(c, a.sons[0].sym, x.bindings, a.info) - a.sons[0].sym = finalCallee - a.sons[0].typ = finalCallee.typ - #a.typ = finalCallee.typ.sons[0] + if a.kind == nkHiddenCallConv and a.sons[0].kind == nkSym: + let s = a.sons[0].sym + if s.ast != nil and s.ast[genericParamsPos].kind != nkEmpty: + let finalCallee = generateInstance(c, s, x.bindings, a.info) + a.sons[0].sym = finalCallee + a.sons[0].typ = finalCallee.typ + #a.typ = finalCallee.typ.sons[0] proc instGenericConvertersSons*(c: PContext, n: PNode, x: TCandidate) = assert n.kind in nkCallKinds diff --git a/tests/converter/tgenericconverter2.nim b/tests/converter/tgenericconverter2.nim new file mode 100644 index 000000000..ae064d852 --- /dev/null +++ b/tests/converter/tgenericconverter2.nim @@ -0,0 +1,49 @@ +# bug #3799 + +import macros + +const nmax = 500 + +type + Complex*[T] = object + re*: T + im*: T + +converter toComplex*[T](x: tuple[re, im: T]): Complex[T] = + result.re = x.re + result.im = x.im + + +proc julia*[T](z0, c: Complex[T], er2: T, nmax: int): int = + result = 0 + var z = z0 + var sre = z0.re * z0.re + var sim = z0.im * z0.im + while (result < nmax) and (sre + sim < er2): + z.im = z.re * z.im + z.im = z.im + z.im + z.im = z.im + c.im + z.re = sre - sim + c.re + sre = z.re * z.re + sim = z.im * z.im + inc result + +template dendriteFractal*[T](z0: Complex[T], er2: T, nmax: int): int = + julia(z0, (T(0.0), T(1.0)), er2, nmax) + +iterator stepIt[T](start, step: T, iterations: int): T = + for i in 0 .. iterations: + yield start + T(i) * step + + +let c = (0.36237, 0.32) +for y in stepIt(2.0, -0.0375, 107): + var row = "" + for x in stepIt(-2.0, 0.025, 160): + #let n = julia((x, y), c, 4.0, nmax) ### this works + let n = dendriteFractal((x, y), 4.0, nmax) + if n < nmax: + row.add($(n mod 10)) + else: + row.add(' ') + echo row |