bugfixes: macros; splitFile; strutils.split; iterator.method

1 files changed, 6 insertions, 1 deletions

diff --git a/nim/sem.pas b/nim/sem.pas
index 64cdbd436..a5d28d734 100755
--- a/nim/sem.pas
+++ b/nim/sem.pas
@@ -130,12 +130,17 @@ begin
   end
 end;
 
+{$include 'semtempl.pas'}
+
 function semMacroExpr(c: PContext; n: PNode; sym: PSym;
                       semCheck: bool = true): PNode;
 var
   p: PEvalContext;
   s: PStackFrame;
 begin
+  inc(evalTemplateCounter);
+  if evalTemplateCounter > 100 then
+    liMessage(n.info, errTemplateInstantiationTooNested);
   markUsed(n, sym);
   p := newEvalContext(c.module, '', false);
   s := newStackFrame();
@@ -150,9 +155,9 @@ begin
   if cyclicTree(result) then liMessage(n.info, errCyclicTree);
   if semCheck then
     result := semAfterMacroCall(c, result, sym);
+  dec(evalTemplateCounter);
 end;
 
-{$include 'semtempl.pas'}
 {$include 'seminst.pas'}
 {$include 'sigmatch.pas'}