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

Fixes #12832 (#12842) [backport]

Browse source 
* Fix #12832
* nimVm -> nimvm in json.nim
* Use suggestSym() instead of markUsed(); Also use styleCheckUse() for finding style violations
This commit is contained in:
Neelesh Chandola 2019-12-09 03:57:25 +05:30 • committed by Andreas Rumpf
commit ff5ef95414
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/semtempl.nim
View file

@ -261,6 +261,11 @@ proc semTemplSymbol(c: PContext, n: PNode, s: PSym; isField: bool): PNode =
else: else:
if isField and sfGenSym in s.flags: result = n if isField and sfGenSym in s.flags: result = n
else: result = newSymNode(s, n.info) else: result = newSymNode(s, n.info)
# Issue #12832
when defined(nimsuggest):
suggestSym(c.config, n.info, s, c.graph.usageSym, false)
if {optStyleHint, optStyleError} * c.config.globalOptions != {}:
styleCheckUse(c.config, n.info, s)
proc semRoutineInTemplName(c: var TemplCtx, n: PNode): PNode = proc semRoutineInTemplName(c: var TemplCtx, n: PNode): PNode =
result = n result = n

2
lib/pure/json.nim
View file

@ -1135,7 +1135,7 @@ when defined(nimFixedForwardGeneric):
when defined js: when defined js:
`tmpSym`.`kindSym` = kindTmp `tmpSym`.`kindSym` = kindTmp
else: else:
when nimVm: when nimvm:
`tmpSym`.`kindSym` = kindTmp `tmpSym`.`kindSym` = kindTmp
else: else:
# fuck it, assign kind field anyway # fuck it, assign kind field anyway