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

it's spelt callsite

Browse source
This commit is contained in:
Andreas Rumpf 2019-02-22 18:28:40 +01:00
commit 15c208cd29
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ast.nim
View file

@ -271,7 +271,7 @@ type
# language; for interfacing with Objective C # language; for interfacing with Objective C
sfDiscardable, # returned value may be discarded implicitly sfDiscardable, # returned value may be discarded implicitly
sfOverriden, # proc is overriden sfOverriden, # proc is overriden
sfCallSideLineinfo# A flag for template symbols to tell the sfCallsite # A flag for template symbols to tell the
# compiler it should use line information from # compiler it should use line information from
# the calling side of the macro, not from the # the calling side of the macro, not from the
# implementation. # implementation.

2
compiler/evaltempl.nim
View file

@ -186,7 +186,7 @@ proc evalTemplate*(n: PNode, tmpl, genSymOwner: PSym;
renderTree(result, {renderNoComments})) renderTree(result, {renderNoComments}))
else: else:
result = copyNode(body) result = copyNode(body)
ctx.instLines = sfCallSideLineinfo in tmpl.flags ctx.instLines = sfCallsite in tmpl.flags
if ctx.instLines: if ctx.instLines:
result.info = n.info result.info = n.info
for i in countup(0, safeLen(body) - 1): for i in countup(0, safeLen(body) - 1):

5
compiler/semtempl.nim
View file

@ -559,8 +559,9 @@ proc semTemplateDef(c: PContext, n: PNode): PNode =
else: else:
s = semIdentVis(c, skTemplate, n.sons[0], {}) s = semIdentVis(c, skTemplate, n.sons[0], {})
if s.owner != nil and s.owner.name.s == "system" and s.name.s in ["!=", ">=", ">", "incl", "excl", "in", "notin", "isnot"]: if s.owner != nil and sfSystemModule in s.owner.flags and
incl(s.flags, sfCallSideLineinfo) s.name.s in ["!=", ">=", ">", "incl", "excl", "in", "notin", "isnot"]:
incl(s.flags, sfCallsite)
styleCheckDef(c.config, s) styleCheckDef(c.config, s)
onDef(n[0].info, s) onDef(n[0].info, s)