diff options
| author | Neelesh Chandola <neelesh.chandola@outlook.com> | 2018-12-30 14:15:39 +0530 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-12-30 09:45:39 +0100 |
| commit | cbbdcb266962df39bbdacb99ccd2a656ce9c3af7 (patch) | |
| tree | d56c646ee7d1ab0f29ae587234c8735a986a1042 | |
| parent | c5ad4c10cb976960a37656a55ad2fdbb0add8861 (diff) | |
| download | Nim-cbbdcb266962df39bbdacb99ccd2a656ce9c3af7.tar.gz | |
Show deprecation warning for fields of a deprecated enum (#10112)
* Show deprecation warning for fields of a deprecated enum * Add test
| -rw-r--r-- | compiler/suggest.nim | 11 | ||||
| -rw-r--r-- | tests/deprecated/tdeprecated.nim | 18 |
2 files changed, 22 insertions, 7 deletions
diff --git a/compiler/suggest.nim b/compiler/suggest.nim index dfa6e5ddb..f149327ac 100644 --- a/compiler/suggest.nim +++ b/compiler/suggest.nim @@ -462,14 +462,17 @@ proc extractPragma(s: PSym): PNode = doAssert result == nil or result.kind == nkPragma proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) = - let pragmaNode = extractPragma(s) + let pragmaNode = if s.kind == skEnumField: extractPragma(s.owner) else: extractPragma(s) + let name = + if s.kind == skEnumField: "enum '" & s.owner.name.s & "' which contains field '" & s.name.s & "'" + else: s.name.s if pragmaNode != nil: for it in pragmaNode: if whichPragma(it) == wDeprecated and it.safeLen == 2 and it[1].kind in {nkStrLit..nkTripleStrLit}: - message(conf, info, warnDeprecated, it[1].strVal & "; " & s.name.s) + message(conf, info, warnDeprecated, it[1].strVal & "; " & name) return - message(conf, info, warnDeprecated, s.name.s) + message(conf, info, warnDeprecated, name) proc userError(conf: ConfigRef; info: TLineInfo; s: PSym) = let pragmaNode = extractPragma(s) @@ -486,6 +489,8 @@ proc markUsed(conf: ConfigRef; info: TLineInfo; s: PSym; usageSym: var PSym) = incl(s.flags, sfUsed) if s.kind == skEnumField and s.owner != nil: incl(s.owner.flags, sfUsed) + if sfDeprecated in s.owner.flags: + incl(s.flags, sfDeprecated) if {sfDeprecated, sfError} * s.flags != {}: if sfDeprecated in s.flags: warnAboutDeprecated(conf, info, s) if sfError in s.flags: userError(conf, info, s) diff --git a/tests/deprecated/tdeprecated.nim b/tests/deprecated/tdeprecated.nim index 955a7f6ad..920f350cc 100644 --- a/tests/deprecated/tdeprecated.nim +++ b/tests/deprecated/tdeprecated.nim @@ -1,9 +1,19 @@ discard """ - nimout: "a is deprecated [Deprecated]" + nimout: '''tdeprecated.nim(10, 3) Warning: a is deprecated [Deprecated] +tdeprecated.nim(17, 11) Warning: asdf; enum 'Foo' which contains field 'a' is deprecated [Deprecated] +''' """ +block: + var + a {.deprecated.}: array[0..11, int] -var - a {.deprecated.}: array[0..11, int] + a[8] = 1 -a[8] = 1 +block t10111: + type + Foo {.deprecated: "asdf" .} = enum + a + + var _ = a + |