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

fixes #21207; reports redefinition error in the definition of enums (#21217)

Browse source 
* fixes #21207;  reports redefinition in the enums

* add a test
This commit is contained in:
ringabout 2023-01-03 15:15:10 +08:00 • committed by GitHub
commit 81b7f9108f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/semtypes.nim
View file

@ -73,7 +73,7 @@ proc semEnum(c: PContext, n: PNode, prev: PType): PType =
rawAddSon(result, base) rawAddSon(result, base)
let isPure = result.sym != nil and sfPure in result.sym.flags let isPure = result.sym != nil and sfPure in result.sym.flags
var symbols: TStrTable var symbols: TStrTable
if isPure: initStrTable(symbols) initStrTable(symbols)
var hasNull = false var hasNull = false
for i in 1..<n.len: for i in 1..<n.len:
if n[i].kind == nkEmpty: continue if n[i].kind == nkEmpty: continue
@ -145,7 +145,7 @@ proc semEnum(c: PContext, n: PNode, prev: PType): PType =
addInterfaceOverloadableSymAt(c, c.currentScope, e) addInterfaceOverloadableSymAt(c, c.currentScope, e)
else: else:
declarePureEnumField(c, e) declarePureEnumField(c, e)
if isPure and (let conflict = strTableInclReportConflict(symbols, e); conflict != nil): if (let conflict = strTableInclReportConflict(symbols, e); conflict != nil):
wrongRedefinition(c, e.info, e.name.s, conflict.info) wrongRedefinition(c, e.info, e.name.s, conflict.info)
inc(counter) inc(counter)
if isPure and sfExported in result.sym.flags: if isPure and sfExported in result.sym.flags:

9
tests/enum/tredefinition.nim Normal file
View file

@ -0,0 +1,9 @@
discard """
cmd: '''nim check --hints:off $file'''
action: reject
nimout: '''
tredefinition.nim(9, 25) Error: redefinition of 'Key_a'; previous declaration here: tredefinition.nim(9, 18)
'''
"""
type Key* = enum Key_A, Key_a