Ticket #145: board.c.patch

gnugo/engine/board.c

@@ -425 +425 @@
   
   memset(board, EMPTY, sizeof(board));
   memset(initial_board, EMPTY, sizeof(initial_board));
-  for (k = 0; k < BOARDSIZE; k++) {
+  for (k = 0; k < BOARDSIZE; ++k) {
     if (!ON_BOARD2(I(k), J(k))) {
       board[k] = GRAY;
       initial_board[k] = GRAY;
     }
   }
 
+  board_nextrow = MAX_BOARD - board_size + 2;
+
   board_ko_pos = NO_MOVE;
   white_captured = 0;
   black_captured = 0;
@@ -448 +450 @@
 
   handicap = 0;
   
-  hashdata_recalc(&board_hash, board, board_ko_pos);
+  hashdata_recalc(&board_hash, board, NO_MOVE);
   new_position();
 }
 
@@ -1026 +1028 @@
 /* Return the last move done by anyone. Both if no move was found or
  * if the last move was a pass, PASS_MOVE is returned.
  */
-int
+inline int
 get_last_move()
 {
   if (move_history_pointer == 0)
@@ -3149 +3151 @@
     int pos;
     white_stones = 0;
     black_stones = 0;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    scan_board(pos,
       if (board[pos] == WHITE)
         white_stones++;
       else if (board[pos] == BLACK)
         black_stones++;
-    }
+        )
     
     stone_count_for_position = position_number;
   }
@@ -3206 +3208 @@
   int pos;
   int s;
 
-  position_number++;
+  ++position_number;
   next_string = 0;
   liberty_mark = 0;
   string_mark = 0;
@@ -3221 +3223 @@
   /* propagate_string relies on non-assigned stones to have
    * string_number -1.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos))
-      string_number[pos] = -1;
+  scan_board(pos,
+    string_number[pos] = -1;
+  )
 
   /* Find the existing strings. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (IS_STONE(board[pos]) && string_number[pos] == -1) {
       string_number[pos] = next_string;
       string[next_string].size = propagate_string(pos, pos);
       string[next_string].color = board[pos];
       string[next_string].origin = pos;
       string[next_string].mark = 0;
-      next_string++;
+      ++next_string;
       PARANOID1(next_string < MAX_STRINGS, pos);
     }
-  }
+  )
   
   /* Fill in liberty and neighbor info. */
-  for (s = 0; s < next_string; s++) {
+  for (s = 0; s < next_string; ++s) {
     find_liberties_and_neighbors(s);
   }
 }
@@ -3260 +3260 @@
   int s;
   int i;
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (board[pos] == EMPTY)
       fprintf(stderr, " . ");
     else
       fprintf(stderr, "%2d ", string_number[pos]);
     fprintf(stderr, "\n");
-  }
+  )
 
   for (s = 0; s < next_string; s++) {
     if (board[string[s].origin] == EMPTY)