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

Fix #15858 (#15887)

Browse source 
* fix #15858
* fix space
* fix #15629
* Revert "fix #15629"
This commit is contained in:
cooldome 2020-11-09 11:21:56 +00:00 • committed by GitHub
commit d5a0a5dfff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semtypes.nim
View file

@ -306,7 +306,7 @@ proc semArrayIndex(c: PContext, n: PNode): PType =
result = makeRangeWithStaticExpr(c, e) result = makeRangeWithStaticExpr(c, e)
if c.inGenericContext > 0: result.flags.incl tfUnresolved if c.inGenericContext > 0: result.flags.incl tfUnresolved
elif e.kind in (nkCallKinds + {nkBracketExpr}) and hasUnresolvedArgs(c, e): elif e.kind in (nkCallKinds + {nkBracketExpr}) and hasUnresolvedArgs(c, e):
if not isOrdinalType(e.typ): if not isOrdinalType(e.typ.skipTypes({tyStatic, tyAlias, tyGenericInst, tySink})):
localError(c.config, n[1].info, errOrdinalTypeExpected) localError(c.config, n[1].info, errOrdinalTypeExpected)
# This is an int returning call, depending on an # This is an int returning call, depending on an
# yet unknown generic param (see tgenericshardcases). # yet unknown generic param (see tgenericshardcases).

8
tests/statictypes/tstatictypes.nim
View file

@ -349,3 +349,11 @@ type
a: array[n, int] a: array[n, int]
Tile = TileCT #Commenting this out to make it work Tile = TileCT #Commenting this out to make it work
#------------------------------------------------------------------------------------------
# issue #15858
proc fn(N1: static int, N2: static int, T: typedesc): array[N1 * N2, T] =
doAssert(len(result) == N1 * N2)
let yy = fn(5, 10, float)