mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-15 16:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

redefining field variables is disabled

Browse Source
This commit is contained in:
ringabout
2024-10-22 21:51:19 +08:00
parent aca59572c7
commit 8af81e3d24
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/semfields.nim
View File

@@ -17,7 +17,7 @@ type
field: PSym
replaceByFieldName: bool
c: PContext
leftPartOfAssign: bool
leftPartOfDefinition: bool
proc instFieldLoopBody(c: var TFieldInstCtx, n: PNode, forLoop: PNode): PNode =
if c.field != nil and isEmptyType(c.field.typ):
@@ -29,6 +29,9 @@ proc instFieldLoopBody(c: var TFieldInstCtx, n: PNode, forLoop: PNode): PNode =
result = n
let ident = considerQuotedIdent(c.c, n)
if c.replaceByFieldName:
if c.leftPartOfDefinition:
localError(c.c.config, n.info,
"redefine field variable '$1' in a 'fields' loop" % [ident.s])
if ident.id == considerQuotedIdent(c.c, forLoop[0]).id:
let fieldName = if c.tupleType.isNil: c.field.name.s
elif c.tupleType.n.isNil: "Field" & $c.tupleIndex
@@ -38,9 +41,9 @@ proc instFieldLoopBody(c: var TFieldInstCtx, n: PNode, forLoop: PNode): PNode =
# other fields:
for i in ord(c.replaceByFieldName)..<forLoop.len-2:
if ident.id == considerQuotedIdent(c.c, forLoop[i]).id:
if c.leftPartOfAssign:
if c.leftPartOfDefinition:
localError(c.c.config, n.info,
"field variable '$1' is not allowed to be used as a lvalue in a 'fields' loop" % [ident.s])
"redefine field variable '$1' in a 'fields' loop" % [ident.s])
var call = forLoop[^2]
var tupl = call[i+1-ord(c.replaceByFieldName)]
if c.field.isNil:
@@ -52,12 +55,11 @@ proc instFieldLoopBody(c: var TFieldInstCtx, n: PNode, forLoop: PNode): PNode =
result.add(tupl)
result.add(newSymNode(c.field, n.info))
break
of nkIdentDefs, nkVarTuple, nkConstDef,
nkAsgn, nkFastAsgn, nkSinkAsgn:
of nkIdentDefs, nkVarTuple, nkConstDef:
result = shallowCopy(n)
c.leftPartOfAssign = true
c.leftPartOfDefinition = true
result[0] = instFieldLoopBody(c, n[0], forLoop)
c.leftPartOfAssign = false
c.leftPartOfDefinition = false
for i in 1..<n.len:
result[i] = instFieldLoopBody(c, n[i], forLoop)
else: