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

Merge pull request #9909 from nc-x/fix-regression

Browse source 
Fix enum regression
This commit is contained in:
Andreas Rumpf 2018-12-11 08:36:15 +01:00 • committed by GitHub
commit 03c4231951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/semtypes.nim
View file

@ -90,6 +90,8 @@ proc semEnum(c: PContext, n: PNode, prev: PType): PType =
if sonsLen(v) == 2:
strVal = v.sons[1] # second tuple part is the string value
if skipTypes(strVal.typ, abstractInst).kind in {tyString, tyCString}:
if not isOrdinalType(v.sons[0].typ):
localError(c.config, v.sons[0].info, errOrdinalTypeExpected)
x = getOrdValue(v.sons[0]) # first tuple part is the ordinal
else:
localError(c.config, strVal.info, errStringLiteralExpected)
@ -99,6 +101,8 @@ proc semEnum(c: PContext, n: PNode, prev: PType): PType =
strVal = v
x = counter
else:
if not isOrdinalType(v.typ):
localError(c.config, v.info, errOrdinalTypeExpected)
x = getOrdValue(v)
if i != 1:
if x != counter: incl(result.flags, tfEnumHasHoles)