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

Fixes #6853 (#7188)

Browse source 
* Fixes #6853
* Add a test for a const empty array
This commit is contained in:
cooldome 2018-02-10 15:44:41 +00:00 • committed by Andreas Rumpf
commit 51d81c4e23
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/sigmatch.nim
View file

@ -1145,7 +1145,12 @@ proc typeRelImpl(c: var TCandidate, f, aOrig: PType,
fRange = prev fRange = prev
let ff = f.sons[1].skipTypes({tyTypeDesc}) let ff = f.sons[1].skipTypes({tyTypeDesc})
let aa = a.sons[1].skipTypes({tyTypeDesc}) let aa = a.sons[1].skipTypes({tyTypeDesc})
result = typeRel(c, ff, aa)
if f.sons[0].kind != tyGenericParam and aa.kind == tyEmpty:
result = isGeneric
else:
result = typeRel(c, ff, aa)
if result < isGeneric: if result < isGeneric:
if nimEnableCovariance and if nimEnableCovariance and
trNoCovariance notin flags and trNoCovariance notin flags and

8
tests/array/tarray.nim
View file

@ -38,3 +38,11 @@ var found: array[0..filesToCreate.high, bool]
echo found.len echo found.len
# make sure empty arrays are assignable (bug #6853)
const arr1: array[0, int] = []
const arr2 = []
let arr3: array[0, string] = []
doAssert(arr1.len == 0)
doAssert(arr2.len == 0)
doAssert(arr3.len == 0)