From bb2dee0069d753a79201c629fb1a1528fae960e5 Mon Sep 17 00:00:00 2001
From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Thu, 10 Nov 2016 11:13:19 +0100
Subject: [PATCH] Simplify debug printing

The duplicats of each print statement to the engine to (optionally) print
debug information are now generated automatically by a single macro EPRINT.
---
 UCI2WB.c |   39 +++++++++++++++++++--------------------
 1 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/UCI2WB.c b/UCI2WB.c
index cf2f8e4..ebbc301 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -34,6 +34,7 @@
 #define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"
 
 #define DPRINT if(debug) printf
+#define EPRINT(X) { char f[999]; sprintf X; DPRINT("%s", f); fprintf(toE, "%s", f + 2*(*f == '#')); /* strip optional # prefix */ }
 
 #define WHITE 0
 #define BLACK 1
@@ -147,15 +148,14 @@ StartSearch(char *ponder)
 	int t = (flob ? inc + myTime/40 : 1000*byo*(byo>0)); // byoyomi time 
 	if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent
 	if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering
-	fprintf(toE, "go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
-	DPRINT(    "# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t);
-	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
-	if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }
+	EPRINT((f, "# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t))
+	if(sTime > 0) EPRINT((f, " movetime %d", sTime)) else
+	if(mps) EPRINT((f, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2))
 	if(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi
-	if(inc && !*suffix) { fprintf(toE, " %s %d %s %d", wInc, inc, bInc, inc); DPRINT(" %s %d %s %d", wInc, inc, bInc, inc); }
-	if(depth > 0) { fprintf(toE, " depth %d", depth); DPRINT(" depth %d", depth); }
-        if(*suffix) { fprintf(toE, suffix, inc); DPRINT(suffix, inc); }
-	fprintf(toE, "\n"); DPRINT("\n");
+	if(inc && !*suffix) EPRINT((f, " %s %d %s %d", wInc, inc, bInc, inc))
+	if(depth > 0) EPRINT((f, " depth %d", depth))
+        if(*suffix) EPRINT((f, suffix, inc))
+	EPRINT((f, "\n"))
 }
 
 void
@@ -163,7 +163,7 @@ StopPonder(int pondering)
 {
 	if(!pondering) return;
 	pause = 1;
-	fprintf(toE, "stop\n"); fflush(toE); DPRINT("# stop\n"); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
+	EPRINT((f, "# stop\n")) fflush(toE); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
 	Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.
 }
 
@@ -177,10 +177,9 @@ LoadPos(int moveNr)
 	    stm = (!strstr(iniPos+4, " b ") ^ lastCapt & 1 ? 'w' :  'b');
 	    sprintf(buf, "position fen %s", ToFEN(stm)); pos = buf; // send it as FEN (with "position" in UCCI!)
 	}
-	fprintf(toE, "%s moves", pos);
-	DPRINT(    "# %s moves", pos);
-	for(j=lastCapt; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
-	fprintf(toE, "\n"); DPRINT("\n");
+	EPRINT((f, "# %s moves", pos))
+	for(j=lastCapt; j<moveNr; j++) EPRINT((f, " %s", move[j]))
+	EPRINT((f, "\n"))
 }
 
 void
@@ -407,12 +406,12 @@ GUI2Engine()
 	    // and set engine thinking (note USI swaps colors!)
 	    startTime = GetTickCount(); mySide = stm; // remember side we last played for
 	    if(computer == ANALYZE) {
-		fprintf(toE, "go infinite"); DPRINT("# go infinite");
+		EPRINT((f, "# go infinite"))
 		if(sm & 1) { // some moves are disabled
-		    fprintf(toE, " searchmoves"); DPRINT(" searchmoves");
-		    for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }
+		    EPRINT((f, " searchmoves"))
+		    for(i=1; i<nr; i++) if(on[i]) EPRINT((f, " %s", moveMap[i]))
 		}
-		fprintf(toE, "\n"); DPRINT("\n"); searching = 1; // suppresses spurious commands during analysis starting new searches
+		EPRINT((f, "\n")) searching = 1; // suppresses spurious commands during analysis starting new searches
 	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking
 	}
       nomove:
@@ -442,7 +441,7 @@ GUI2Engine()
 		if(pondering && !strcmp(command, move[moveNr])) { // ponder hit
 		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    pondering = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now
-		    fprintf(toE, "ponderhit%s\n", draw); DPRINT("# ponderhit%s\n", draw); fflush(toE); fflush(stdout);
+		    EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
 		    Sync(PAUSE); // block input during thinking
 		    goto nomove;
 		}
@@ -465,8 +464,8 @@ GUI2Engine()
 	    if(p = strchr(line, '=')) {
 		*p++ = 0;
 		if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");
-		fprintf(toE, "setoption name %s value %s", line+7, p); DPRINT("# setoption %s%s %s%s", nameWord, line+7, valueWord, p);
-	    } else { fprintf(toE, "setoption %s%s\n", nameWord, line+7); DPRINT("# setoption %s%s\n", nameWord, line+7); }
+		EPRINT((f, "# setoption %s%s %s%s", nameWord, line+7, valueWord, p))
+	    } else EPRINT((f, "# setoption %s%s\n", nameWord, line+7))
 	}
 	else if(!strcmp(command, "protover")) {
 	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
-- 
1.7.0.4