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

better implementation

Browse source
This commit is contained in:
Araq 2019-09-16 09:03:50 +02:00 • committed by Andreas Rumpf
commit 8b4c17a140
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/semexprs.nim
View file

@ -2019,8 +2019,14 @@ proc semQuoteAst(c: PContext, n: PNode): PNode =
var tmpl = semTemplateDef(c, dummyTemplate) var tmpl = semTemplateDef(c, dummyTemplate)
quotes[0] = tmpl[namePos] quotes[0] = tmpl[namePos]
# This adds a call to newIdentNode("result") as the first argument to the template call # This adds a call to newIdentNode("result") as the first argument to the template call
let identNode = getCompilerProc(c.graph, "newIdentNode") let identNodeSym = getCompilerProc(c.graph, "newIdentNode")
quotes[1] = newNode(nkCall, n.info, @[identNode.newSymNode, newStrNode(nkStrLit, "result")]) # so that new Nim compilers can compile old macros.nim versions, we check for 'nil'
# here and provide the old fallback solution:
let identNode = if identNodeSym == nil:
newIdentNode(getIdent(c.cache, "newIdentNode"), n.info)
else:
identNodeSym.newSymNode
quotes[1] = newNode(nkCall, n.info, @[identNode, newStrNode(nkStrLit, "result")])
result = newNode(nkCall, n.info, @[ result = newNode(nkCall, n.info, @[
createMagic(c.graph, "getAst", mExpandToAst).newSymNode, createMagic(c.graph, "getAst", mExpandToAst).newSymNode,
newNode(nkCall, n.info, quotes)]) newNode(nkCall, n.info, quotes)])