zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace TRUE/FALSE with C99 true/false throughout.

Browse Source 
This commit removes the old #defines of TRUE and FALSE from puzzles.h,
and does a mechanical search-and-replace throughout the code to
replace them with the C99 standard lowercase spellings.
This commit is contained in:
Simon Tatham
2018-11-13 21:44:02 +00:00
parent 064da87682
commit a550ea0a47
64 changed files with 2111 additions and 2118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
latin.c
View File

@ -43,21 +43,21 @@ void latin_solver_place(struct latin_solver *solver, int x, int y, int n)
*/
for (i = 1; i <= o; i++)
if (i != n)
cube(x,y,i) = FALSE;
cube(x,y,i) = false;
/*
* Rule out this number in all other positions in the row.
*/
for (i = 0; i < o; i++)
if (i != y)
cube(x,i,n) = FALSE;
cube(x,i,n) = false;
/*
* Rule out this number in all other positions in the column.
*/
for (i = 0; i < o; i++)
if (i != x)
cube(i,y,n) = FALSE;
cube(i,y,n) = false;
/*
* Enter the number in the result grid.
@ -68,7 +68,7 @@ void latin_solver_place(struct latin_solver *solver, int x, int y, int n)
* Cross out this number from the list of numbers left to place
* in its row, its column and its block.
*/
solver->row[y*o+n-1] = solver->col[x*o+n-1] = TRUE;
solver->row[y*o+n-1] = solver->col[x*o+n-1] = true;
}
int latin_solver_elim(struct latin_solver *solver, int start, int step
@ -170,8 +170,8 @@ int latin_solver_set(struct latin_solver *solver,
* any row with a solitary 1 - and discarding that row and the
* column containing the 1.
*/
memset(rowidx, TRUE, o);
memset(colidx, TRUE, o);
memset(rowidx, true, o);
memset(colidx, true, o);
for (i = 0; i < o; i++) {
int count = 0, first = -1;
for (j = 0; j < o; j++)
@ -180,7 +180,7 @@ int latin_solver_set(struct latin_solver *solver,
if (count == 0) return -1;
if (count == 1)
rowidx[i] = colidx[first] = FALSE;
rowidx[i] = colidx[first] = false;
}
/*
@ -226,10 +226,10 @@ int latin_solver_set(struct latin_solver *solver,
*/
int rows = 0;
for (i = 0; i < n; i++) {
int ok = TRUE;
int ok = true;
for (j = 0; j < n; j++)
if (set[j] && grid[i*o+j]) {
ok = FALSE;
ok = false;
break;
}
if (ok)
@ -261,7 +261,7 @@ int latin_solver_set(struct latin_solver *solver,
}
if (rows >= n - count) {
int progress = FALSE;
int progress = false;
/*
* We've got one! Now, for each row which _doesn't_
@ -275,10 +275,10 @@ int latin_solver_set(struct latin_solver *solver,
* positions in the cube to meddle with.
*/
for (i = 0; i < n; i++) {
int ok = TRUE;
int ok = true;
for (j = 0; j < n; j++)
if (set[j] && grid[i*o+j]) {
ok = FALSE;
ok = false;
break;
}
if (!ok) {
@ -310,8 +310,8 @@ int latin_solver_set(struct latin_solver *solver,
names[pn-1], px+1, py+1);
}
#endif
progress = TRUE;
solver->cube[fpos] = FALSE;
progress = true;
solver->cube[fpos] = false;
}
}
}
@ -522,7 +522,7 @@ int latin_solver_forcing(struct latin_solver *solver,
xt+1, yt+1);
}
#endif
cube(xt, yt, orign) = FALSE;
cube(xt, yt, orign) = false;
return 1;
}
}
@ -570,12 +570,12 @@ void latin_solver_alloc(struct latin_solver *solver, digit *grid, int o)
solver->o = o;
solver->cube = snewn(o*o*o, unsigned char);
solver->grid = grid; /* write straight back to the input */
memset(solver->cube, TRUE, o*o*o);
memset(solver->cube, true, o*o*o);
solver->row = snewn(o*o, unsigned char);
solver->col = snewn(o*o, unsigned char);
memset(solver->row, FALSE, o*o);
memset(solver->col, FALSE, o*o);
memset(solver->row, false, o*o);
memset(solver->col, false, o*o);
for (x = 0; x < o; x++)
for (y = 0; y < o; y++)