Ticket #145: board.h.patch

gnugo/engine/board.h

@@ -135 +135 @@
 
 /* Note that POS(-1, -1) == 0
  * DELTA() is defined so that POS(i+di, j+dj) = POS(i, j) + DELTA(di, dj).
+ * For details look in the documentation.
  */
 #define BOARDSIZE     ((MAX_BOARD + 2) * (MAX_BOARD + 1) + 1)
 #define BOARDMIN      (MAX_BOARD + 2)
@@ -148 +149 @@
 #define NS            (MAX_BOARD + 1)
 #define WE            1
 #define SOUTH(pos)    ((pos) + NS)
-#define WEST(pos)     ((pos) - 1)
+#define WEST(pos)     ((pos) - WE)
 #define NORTH(pos)    ((pos) - NS)
-#define EAST(pos)     ((pos) + 1)
-#define SW(pos)       ((pos) + NS - 1)
-#define NW(pos)       ((pos) - NS - 1)
-#define NE(pos)       ((pos) - NS + 1)
-#define SE(pos)       ((pos) + NS + 1)
+#define EAST(pos)     ((pos) + WE)
+#define SW(pos)       ((pos) + NS - WE)
+#define NW(pos)       ((pos) - NS - WE)
+#define NE(pos)       ((pos) - NS + WE)
+#define SE(pos)       ((pos) + NS + WE)
 #define SS(pos)       ((pos) + 2 * NS)
-#define WW(pos)       ((pos) - 2)
+#define WW(pos)       ((pos) - 2 * WE)
 #define NN(pos)       ((pos) - 2 * NS)
-#define EE(pos)       ((pos) + 2)
+#define EE(pos)       ((pos) + 2 * WE)
 
 #define DIRECT_NEIGHBORS(pos1, pos2)            \
   ((pos1) == SOUTH(pos2)                        \
@@ -175 +176 @@
 #define BOARD(i, j)   board[POS(i, j)]
 
 
+/* Macro for scanning a board. As a parameter an user should specify
+   a code, which would be run for each position on board that isn't
+   GRAY, and a name of the variable, which holds position, to use in
+   the passed code.
+   All lines in _code like "int x,...,y;" has to be changed to
+   "int x; int ...; int y;". Otherwise there will be compilation
+   error.
+   No semicolon is needed on the end. */
+#define scan_board(_pos_var, _code) \
+  { \
+    int __n_, __row_ = 0; \
+        const int __n_fields_ = board_size * board_size; \
+        _pos_var = BOARDMIN - 1; \
+    for (__n_ = 0; __n_ < __n_fields_; ++__n_) \
+    { \
+          if (__row_ == board_size) \
+          { \
+            __row_ = 1; \
+            _pos_var += board_nextrow; \
+          } \
+          else \
+          { \
+            ++__row_; \
+                ++_pos_var; \
+          } \
+          { _code } \
+    } \
+  }
+
+
 #define MIRROR_MOVE(pos) POS(board_size - 1 - I(pos), board_size - 1 - J(pos))
 
 /* ================================================================ */
@@ -183 +214 @@
 
 /* The board and the other parameters deciding the current position. */
 extern int          board_size;             /* board size (usually 19) */
+extern int          board_nextrow;  /* distance (in board array indexes) from
+                                                                           end of one row to begining of next row;
+                                                                           used for faster scanning of the board
+                                                                           array */
 extern Intersection board[BOARDSIZE];       /* go board */
 extern int          board_ko_pos;
 extern int          black_captured;   /* num. of black stones captured */
@@ -271 +306 @@
 void restore_board(struct board_state *state);
 
 /* Information about the permanent board. */
-int get_last_move(void);
+inline int get_last_move(void);
 int get_last_player(void);
 int get_last_opponent_move(int color);
 int stones_on_board(int color);