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

fix #997

Browse source
This commit is contained in:
Zahary Karadjov 2014-03-15 19:43:50 +02:00
commit 7dcf6ff50b
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/sigmatch.nim
View file

@ -1046,12 +1046,13 @@ proc paramTypesMatchAux(m: var TCandidate, f, argType: PType,
# put(m.bindings, f, argType) # put(m.bindings, f, argType)
return argSemantized return argSemantized
var evaluated = c.semTryConstExpr(c, arg) if argType.kind != tyStatic:
if evaluated != nil: var evaluated = c.semTryConstExpr(c, arg)
arg.typ = newTypeS(tyStatic, c) if evaluated != nil:
arg.typ.sons = @[evaluated.typ] arg.typ = newTypeS(tyStatic, c)
arg.typ.n = evaluated arg.typ.sons = @[evaluated.typ]
argType = arg.typ arg.typ.n = evaluated
argType = arg.typ
var var
a = if c.inTypeClass > 0: argType.skipTypes({tyTypeDesc, tyFieldAccessor}) a = if c.inTypeClass > 0: argType.skipTypes({tyTypeDesc, tyFieldAccessor})

9
tests/metatype/tstaticparams.nim
View file

@ -1,6 +1,6 @@
discard """ discard """
file: "tstaticparams.nim" file: "tstaticparams.nim"
output: "abracadabra\ntest\n3\n15\4" output: "abracadabra\ntest\n3\n15\n4\n2"
""" """
type type
@ -49,3 +49,10 @@ proc getRows(mtx: Matrix): int =
result = mtx.M result = mtx.M
echo getRows(m) echo getRows(m)
# issue 997
type TTest[T: static[int], U: static[int]] = array[0..T*U, int]
type TTestSub[N: static[int]] = TTest[1, N]
var x: TTestSub[2]
echo x.high