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

allow setting template/macro recursive evaluation limits (#7652)

Browse source 
* allow setting template/macro recursive evaluation limits

* revert setting template/macro eval limits
set them to 1000
This commit is contained in:
jcosborn 2018-04-19 15:39:18 -05:00 • committed by Andreas Rumpf
commit 7e15d5134b
7 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/evaltempl.nim
View file

@ -106,8 +106,9 @@ proc evalTemplateArgs(n: PNode, s: PSym; fromHlo: bool): PNode =
for i in 1 .. genericParams:
result.addSon n.sons[givenRegularParams + i]
# to prevent endless recursion in template instantiation
const evalTemplateLimit* = 1000
var evalTemplateCounter* = 0
# to prevent endless recursion in templates instantiation
proc wrapInComesFrom*(info: TLineInfo; sym: PSym; res: PNode): PNode =
when true:
@ -133,7 +134,7 @@ proc wrapInComesFrom*(info: TLineInfo; sym: PSym; res: PNode): PNode =
proc evalTemplate*(n: PNode, tmpl, genSymOwner: PSym; fromHlo=false): PNode =
inc(evalTemplateCounter)
if evalTemplateCounter > 100:
if evalTemplateCounter > evalTemplateLimit:
globalError(n.info, errTemplateInstantiationTooNested)
result = n