Ticket #31: signed_char_7_7.6

File signed_char_7_7.6, 7.6 kB (added by arend, 3 years ago)

Remove signed_mark_string()

Line 
1diff -u engine/board.c engine/board.c
2--- engine/board.c      7 Oct 2005 19:30:51 -0000
3+++ engine/board.c      7 Oct 2005 21:28:28 -0000
4@@ -2968,17 +2968,0 @@
5-  ASSERT1(IS_STONE(board[str]), str);
6-
7-  do {
8-    mx[pos] = mark;
9-    pos = NEXT_STONE(pos);
10-  } while (pos != str);
11-}
12-
13-
14-/* Signed char variant of the function above.
15- * FIXME: Do we want to convert all mark_string() to signed char?
16- */
17-void
18-signed_mark_string(int str, signed char mx[BOARDMAX], signed char mark)
19-{
20-  int pos = str;
21-
22diff -u engine/board.h engine/board.h
23--- engine/board.h      7 Oct 2005 19:30:51 -0000
24+++ engine/board.h      7 Oct 2005 21:28:28 -0000
25@@ -291,7 +291,6 @@
26 int same_string(int str1, int str2);
27 int adjacent_strings(int str1, int str2);
28 void mark_string(int str, signed char mx[BOARDMAX], signed char mark);
29-void signed_mark_string(int str, signed char mx[BOARDMAX], signed char mark);
30 int are_neighbors(int pos1, int pos2);
31 
32 /* Count and/or find liberties at (pos). */
33diff -u engine/dragon.c engine/dragon.c
34--- engine/dragon.c     7 Oct 2005 19:30:51 -0000
35+++ engine/dragon.c     7 Oct 2005 21:28:29 -0000
36@@ -2291,7 +2291,7 @@
37   int w;
38   for (w = first_worm_in_dragon(dragon[pos].origin); w != NO_MOVE;
39        w = next_worm_in_dragon(w))
40-    signed_mark_string(w, mx, mark);
41+    mark_string(w, mx, mark);
42 }
43 
44 
45diff -u engine/move_reasons.c engine/move_reasons.c
46--- engine/move_reasons.c       7 Oct 2005 19:30:51 -0000
47+++ engine/move_reasons.c       7 Oct 2005 21:28:32 -0000
48@@ -1420,7 +1420,7 @@
49      * move is unsafe.
50      */
51     if (move_reasons[r].type == DEFEND_MOVE)
52-      signed_mark_string(worm[what].origin, saved, 1);
53+      mark_string(worm[what].origin, saved, 1);
54     else if (move_reasons[r].type == OWL_DEFEND_MOVE_LOSS) {
55       int origin = dragon[what].origin;
56       int kworm = worm[what].origin;
57@@ -1428,7 +1428,7 @@
58       for (ii = BOARDMIN; ii < BOARDMAX; ii++)
59        if (IS_STONE(board[ii]) && dragon[ii].origin == origin
60            && worm[ii].origin != kworm)
61-         signed_mark_string(worm[ii].origin, saved, 1);
62+         mark_string(worm[ii].origin, saved, 1);
63     }
64   }   
65 }
66diff -u engine/owl.c engine/owl.c
67--- engine/owl.c        7 Oct 2005 19:30:52 -0000
68+++ engine/owl.c        7 Oct 2005 21:28:36 -0000
69@@ -4759,8 +4759,8 @@
70 
71       for (k = 0; k < num_cuts; k++)
72        if (component[k] == c_id) {
73-         signed_mark_string(cuts[k], this_goal, 1);
74-         signed_mark_string(cuts[k], component2, c_id);
75+         mark_string(cuts[k], this_goal, 1);
76+         mark_string(cuts[k], component2, c_id);
77        }
78       init_connection_data(color, this_goal, NO_MOVE, FP(3.01),
79                           conn_data + c_id, 1);
80@@ -4785,7 +4785,7 @@
81       }
82       /* FIXME: What to do if no close component found? */
83       if (closest_component != -1) {
84-       signed_mark_string(pos, component2, closest_component);
85+       mark_string(pos, component2, closest_component);
86        component_size[closest_component] += countstones(pos);
87       }
88     }
89diff -u engine/persistent.c engine/persistent.c
90--- engine/persistent.c 7 Oct 2005 19:30:52 -0000
91+++ engine/persistent.c 7 Oct 2005 21:28:36 -0000
92@@ -638,7 +638,7 @@
93   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
94     active[pos] = goal[pos];
95 
96-  signed_mark_string(entry->apos, active, 1);
97+  mark_string(entry->apos, active, 1);
98 
99   /* To be safe, also add the successful move. */
100   if (entry->result != 0 && entry->move != 0)
101@@ -655,7 +655,7 @@
102        || (ON_BOARD(NORTH(pos)) && active[NORTH(pos)] == 1)
103        || (ON_BOARD(EAST(pos)) && active[EAST(pos)] == 1)) {
104       if (IS_STONE(board[pos]))
105-       signed_mark_string(pos, active, 2);
106+       mark_string(pos, active, 2);
107       else
108        active[pos] = 2;
109     }
110@@ -861,8 +861,8 @@
111   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
112     active[pos] = connection_shadow[pos];
113 
114-  signed_mark_string(entry->apos, active, 1);
115-  signed_mark_string(entry->bpos, active, 1);
116+  mark_string(entry->apos, active, 1);
117+  mark_string(entry->bpos, active, 1);
118 
119   /* To be safe, also add the successful move. */
120   if (entry->result != 0 && entry->move != 0)
121@@ -880,7 +880,7 @@
122        if (board[pos] == EMPTY)
123          active[pos] = k + 1;
124        else
125-         signed_mark_string(pos, active, (signed char) (k + 1));
126+         mark_string(pos, active, (signed char) (k + 1));
127       }
128     }
129   }
130@@ -892,7 +892,7 @@
131     for (r = 0; r < 4; r++) {
132       int pos2 = pos + delta[r];
133       if (ON_BOARD(pos2) && board[pos2] != other && active[pos2] != 0) {
134-       signed_mark_string(pos, active, 1);
135+       mark_string(pos, active, 1);
136        break;
137       }
138     }
139@@ -916,7 +916,7 @@
140        */
141       adj = chainlinks(pos, adjs);
142       for (r = 0; r < adj; r++) {
143-       signed_mark_string(adjs[r], active, -1);
144+       mark_string(adjs[r], active, -1);
145        if (countlib(adjs[r]) <= 3) {
146          int s;
147          int adjs2[MAXCHAIN];
148@@ -926,7 +926,7 @@
149            active[libs[s]] = 1;
150          adj2 = chainlinks(pos, adjs2);
151          for (s = 0; s < adj2; s++)
152-           signed_mark_string(adjs2[s], active, -1);
153+           mark_string(adjs2[s], active, -1);
154        }
155       }
156     }
157@@ -1010,7 +1010,7 @@
158   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
159     active[pos] = breakin_shadow[pos];
160 
161-  signed_mark_string(entry->apos, active, 1);
162+  mark_string(entry->apos, active, 1);
163 
164   /* To be safe, also add the successful move. */
165   if (entry->result != 0 && entry->move != 0)
166@@ -1028,7 +1028,7 @@
167        if (board[pos] == EMPTY)
168          active[pos] = k + 1;
169        else
170-         signed_mark_string(pos, active, (signed char) (k + 1));
171+         mark_string(pos, active, (signed char) (k + 1));
172       }
173     }
174   }
175@@ -1042,7 +1042,7 @@
176       if (ON_BOARD(pos2)
177          && board[pos2] != other
178          && active[pos2] && active[pos2] <= 2) {
179-       signed_mark_string(pos, active, 1);
180+       mark_string(pos, active, 1);
181        break;
182       }
183     }
184@@ -1066,7 +1066,7 @@
185        */
186       adj = chainlinks(pos, adjs);
187       for (r = 0; r < adj; r++) {
188-       signed_mark_string(adjs[r], active, -1);
189+       mark_string(adjs[r], active, -1);
190        if (countlib(adjs[r]) <= 3) {
191          int s;
192          int adjs2[MAXCHAIN];
193@@ -1076,7 +1076,7 @@
194            active[libs[s]] = 1;
195          adj2 = chainlinks(pos, adjs2);
196          for (s = 0; s < adj2; s++)
197-           signed_mark_string(adjs2[s], active, -1);
198+           mark_string(adjs2[s], active, -1);
199        }
200       }
201     }
202@@ -1162,7 +1162,7 @@
203        if (board[pos] == EMPTY)
204          active[pos] = k + 1;
205        else
206-         signed_mark_string(pos, active, (signed char) (k + 1));
207+         mark_string(pos, active, (signed char) (k + 1));
208       }
209     }
210   }
211@@ -1174,7 +1174,7 @@
212     for (r = 0; r < 4; r++) {
213       int pos2 = pos + delta[r];
214       if (ON_BOARD(pos2) && board[pos2] != other && active[pos2] != 0) {
215-       signed_mark_string(pos, active, 1);
216+       mark_string(pos, active, 1);
217        break;
218       }
219     }
220@@ -1198,7 +1198,7 @@
221        */
222       adj = chainlinks(pos, adjs);
223       for (r = 0; r < adj; r++) {
224-       signed_mark_string(adjs[r], active, -1);
225+       mark_string(adjs[r], active, -1);
226        if (countlib(adjs[r]) <= 3) {
227          int s;
228          int adjs2[MAXCHAIN];
229@@ -1208,7 +1208,7 @@
230            active[libs[s]] = 1;
231          adj2 = chainlinks(pos, adjs2);
232          for (s = 0; s < adj2; s++)
233-           signed_mark_string(adjs2[s], active, -1);
234+           mark_string(adjs2[s], active, -1);
235        }
236       }
237     }
238diff -u engine/readconnect.c engine/readconnect.c
239--- engine/readconnect.c        7 Oct 2005 19:30:52 -0000
240+++ engine/readconnect.c        7 Oct 2005 21:28:41 -0000
241@@ -2756,7 +2756,7 @@
242        if (goal[stones[i]]) {
243          str2 = find_origin(stones[i]);
244          TRACE("%oUsing %1m as secondary target.\n", str2);
245-         signed_mark_string(str2, breakin_shadow, 1);
246+         mark_string(str2, breakin_shadow, 1);
247          break;
248        }
249       }
250diff -u engine/worm.c engine/worm.c
251--- engine/worm.c       7 Oct 2005 19:30:52 -0000
252+++ engine/worm.c       7 Oct 2005 21:28:41 -0000
253@@ -1712,7 +1712,7 @@
254       if (worm[ii].attack_codes[0] == 0
255          || (board[ii] == color
256              && worm[ii].defense_codes[0] != 0))
257-       signed_mark_string(ii, safe_stones, 1);
258+       mark_string(ii, safe_stones, 1);
259     }
260 }
261