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

Make sure that field usage preserves the original line info (#19751)

Browse source 
Currently `struct.field` will generate a node with `info` that points to the
symbol definition instead of having the actual node location.
This commit is contained in:
Ivan Yonchovski 2022-04-29 12:16:07 +03:00 • committed by GitHub
commit e4a2c2d474
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/semexprs.nim
View file

@ -1436,8 +1436,10 @@ proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode =
# is the access to a public field or in the same module or in a friend? # is the access to a public field or in the same module or in a friend?
markUsed(c, n[1].info, f) markUsed(c, n[1].info, f)
onUse(n[1].info, f) onUse(n[1].info, f)
let info = n[1].info
n[0] = makeDeref(n[0]) n[0] = makeDeref(n[0])
n[1] = newSymNode(f) # we now have the correct field n[1] = newSymNode(f) # we now have the correct field
n[1].info = info # preserve the original info
n.typ = f.typ n.typ = f.typ
if check == nil: if check == nil:
result = n result = n

15
nimsuggest/tests/tuse_structure.nim Normal file
View file

@ -0,0 +1,15 @@
# tests for use and structures
type
Foo* = ref object of RootObj
bar*: string
proc test(f: Foo) =
echo f.#[!]#bar
discard """
$nimsuggest --tester $file
>use $1
def skField tuse_structure.Foo.bar string $file 5 4 "" 100
use skField tuse_structure.Foo.bar string $file 8 9 "" 100
"""