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

fixes #3048, fixes #3047

Browse source
This commit is contained in:
Araq 2015-07-03 10:31:49 +02:00
commit 2d196442fa
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/semtypes.nim
View file

@ -251,19 +251,21 @@ proc semArrayIndex(c: PContext, n: PNode): PType =
proc semArray(c: PContext, n: PNode, prev: PType): PType = proc semArray(c: PContext, n: PNode, prev: PType): PType =
var base: PType var base: PType
result = newOrPrevType(tyArray, prev, c)
if sonsLen(n) == 3: if sonsLen(n) == 3:
# 3 = length(array indx base) # 3 = length(array indx base)
var indx = semArrayIndex(c, n[1]) let indx = semArrayIndex(c, n[1])
addSonSkipIntLit(result, indx) var indxB = indx
if indx.kind == tyGenericInst: indx = lastSon(indx) if indxB.kind == tyGenericInst: indxB = lastSon(indxB)
if indx.kind notin {tyGenericParam, tyStatic, tyFromExpr}: if indxB.kind notin {tyGenericParam, tyStatic, tyFromExpr}:
if not isOrdinalType(indx): if not isOrdinalType(indxB):
localError(n.sons[1].info, errOrdinalTypeExpected) localError(n.sons[1].info, errOrdinalTypeExpected)
elif enumHasHoles(indx): elif enumHasHoles(indxB):
localError(n.sons[1].info, errEnumXHasHoles, localError(n.sons[1].info, errEnumXHasHoles,
typeToString(indx.skipTypes({tyRange}))) typeToString(indxB.skipTypes({tyRange})))
base = semTypeNode(c, n.sons[2], nil) base = semTypeNode(c, n.sons[2], nil)
# ensure we only construct a tyArray when there was no error (bug #3048):
result = newOrPrevType(tyArray, prev, c)
addSonSkipIntLit(result, indx)
addSonSkipIntLit(result, base) addSonSkipIntLit(result, base)
else: else:
localError(n.info, errArrayExpectsTwoTypeParams) localError(n.info, errArrayExpectsTwoTypeParams)