multiple-evalution-of-args-safe versions of repeat() { } and for_range() { } macros

[svn/Cll1h/.git] / cll1.h

diff --git a/cll1.h b/cll1.h
index 07c918993c0c32fff03977e56aec9929ab49b545..356d70d716d3ce295dc8af6293917e40d9e22830 100644 (file)
--- a/cll1.h
+++ b/cll1.h
@@ -151,8 +151,8 @@ extern  unsigned RANDOM_SEED;
   /  7. C<<1 builtin iterators and conditionals, updated 2008-01-26 xCh.
  '----------------------------------------------------------------------- */
 #define loop while(TRUE)
-#define repeat(N) _NEW(I,0) while(_I++<N)
-#define for_range(VAR,FROM,TO) for( VAR=FROM ; FROM<=TO?VAR<=TO:VAR>=TO ; FROM<=TO?VAR++:VAR--)
+#define repeat(N) _NEW(I,0) _NEW(J,N) while(_I++<_J)
+#define for_range(VAR,FROM,TO) _NEW(I,FROM) _NEW(J,TO) for( VAR=_I ; _I<=_J?VAR<=_J:VAR>=_J ; _I<=_J?VAR++:VAR--)
 #define for_each(NODE,HEAD) for(NODE=HEAD; NODE; NODE=NODE->__next)
 #define for_search(NODE,HEAD,EXPR) for_each(NODE,HEAD) if(EXPR)
 #define for_file_lines(STR,FNAME) /* _NEW(CTX,get_context()) file_read(FNAME) for(use_context(_CTX),STR=file_line(_F);release_context(_M),(*S && !feof(_F));STR=file_line(_F),end_context()) _CATCH */
@@ -231,6 +231,7 @@ extern  _DECLARE_STRSTR;
   /  10. C<<1 private infrastructure, updated 2008-02-03 by xCh.
  '----------------------------------------------------------------------- */
 #define _I (_Iatom->I)
+#define _J (_Jatom->J)
 #define _S (_Satom->S)
 #define _F (_Fatom->F)
 #define _CTX (_CTXatom->CTX)
@@ -242,8 +243,9 @@ extern  _DECLARE_STRSTR;
 #define _FOR_VALID_COLUMNS(A,B,C) _NEW(I,0) for( prefix(A,B,C) ; A ; ((A!=B)&&prefix(A,B,C))||(A=NULL) ) if(*A&&++_I) 
 #define _NEW(NAME,VALUE) for(_##NAME##atom=get_mem(_##NAME##Atom),_##NAME##atom->NAME=(VALUE),_##NAME##atom->c=1,push(_##NAME##atom,_##NAME##stack);_##NAME##atom->c||(pop(_##NAME##atom,_##NAME##stack),0);_##NAME##atom->c--)
 #define _ANYSTACK(NAME) _##NAME##Atom _##NAME##atom,_##NAME##stack=NULL;
-#define _EXPORT_STACKS _ANYSTACK(I) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX)
+#define _EXPORT_STACKS _ANYSTACK(I) _ANYSTACK(J) _ANYSTACK(S) _ANYSTACK(F) _ANYSTACK(CTX)
 _ANYATOM(int,I);
+_ANYATOM(int,J);
 _ANYATOM(str,S);
 _ANYATOM(FILE *,F);
 _ANYATOM(void *,CTX);