The R Project SVN – R – Diff – /branches/R-exp-API/src/main/arithmetic.c

 /* i1 = i % n1; i2 = i % n2;
  * this macro is quite a bit faster than having real modulo calls
  * in the loop (tested on Intel and Sparc)
  */
 #define mod_iterate(n1,n2,i1,i2) for (i=i1=i2=0; i<n; \
+	i1 = (++i1 == n1) ? 0 : i1,\
-(++i1, (i1==n1)&&(i1=0), ++i2, (i2==n2)&&(i2=0), ++i))
+	i2 = (++i2 == n2) ? 0 : i2,\
+	++i)
 static SEXP integer_binary(int code, SEXP s1, SEXP s2)
+{
     int i, i1, i2, n, n1, n2;
     int x1, x2;
     UNPROTECT(2);
     return a;
+}
 #define mod_iterate3(n1,n2,n3,i1,i2,i3) for (i=i1=i2=i3=0; i<n; \
-	(++i1, (i1==n1)&&(i1=0),\
+	 i1 = (++i1==n1) ? 0 : i1,\
-	 ++i2, (i2==n2)&&(i2=0),\
+	 i2 = (++i2==n2) ? 0 : i2,\
-	 ++i3, (i3==n3)&&(i3=0), ++i))
+	 i3 = (++i3==n3) ? 0 : i3,\
+	 ++i)
 static SEXP math3(SEXP op, SEXP sa, SEXP sb, SEXP sc, double (*f)())
+{
     SEXP sy;
     int i, ia, ib, ic, n, na, nb, nc;
+    }
     return op;			/* never used; to keep -Wall happy */
 } /* do_math3() */
 #define mod_iterate4(n1,n2,n3,n4,i1,i2,i3,i4) for (i=i1=i2=i3=i4=0; i<n; \
+	 i1 = (++i1==n1) ? 0 : i1,\
-(++i1, (i1==n1)&&(i1=0), ++i2, (i2==n2)&&(i2=0),\
+	 i2 = (++i2==n2) ? 0 : i2,\
+	 i3 = (++i3==n3) ? 0 : i3,\
- ++i3, (i3==n3)&&(i3=0), ++i4, (i4==n4)&&(i4=0), ++i))
+	 i4 = (++i4==n4) ? 0 : i4,\
+	 ++i)
 static SEXP math4(SEXP op, SEXP sa, SEXP sb, SEXP sc, SEXP sd, double (*f)())
+{
     SEXP sy;
     int i, ia, ib, ic, id, n, na, nb, nc, nd;

The R Project SVN R