Arav/aoc2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring ISDIGIT macro in part 1 of the day 3 as well.

Browse Source
This commit is contained in:
Alexander Andreev 2023-12-03 19:01:32 +04:00
parent 2c30c9e195
commit 2d3e387f4f
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
day3/p1.c
View File

@ -4,7 +4,8 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <ctype.h>
#define ISDIGIT(c) (c >= 0x30 && c <= 0x39)
int main(int argc, char **argv) { int main(int argc, char **argv) {
FILE *input; FILE *input;
@ -44,22 +45,22 @@ int main(int argc, char **argv) {
for (ssize_t i = engine_lines-1; i >= 0; --i) { for (ssize_t i = engine_lines-1; i >= 0; --i) {
for (ssize_t j = engine_line_size-1; j >= 0; --j) { for (ssize_t j = engine_line_size-1; j >= 0; --j) {
if (isdigit(engine[i][j])) { if (ISDIGIT(engine[i][j])) {
n += (engine[i][j]&0xf) * multiplier; n += (engine[i][j]&0xf) * multiplier;
multiplier *= 10; multiplier *= 10;
if (adjacent == false && ((j+1 <= engine_line_size-1 && !isdigit(engine[i][j+1]) && engine[i][j+1] != '.') || if (adjacent == false && ((j+1 <= engine_line_size-1 && !ISDIGIT(engine[i][j+1]) && engine[i][j+1] != '.') ||
(j-1 >=0 && !isdigit(engine[i][j-1]) && engine[i][j-1] != '.') || (j-1 >=0 && !ISDIGIT(engine[i][j-1]) && engine[i][j-1] != '.') ||
(i+1 <= engine_lines-1 && !isdigit(engine[i+1][j]) && engine[i+1][j] != '.') || (i+1 <= engine_lines-1 && !ISDIGIT(engine[i+1][j]) && engine[i+1][j] != '.') ||
(i-1 >= 0 && !isdigit(engine[i-1][j]) && engine[i-1][j] != '.') || (i-1 >= 0 && !ISDIGIT(engine[i-1][j]) && engine[i-1][j] != '.') ||
((i+1 <= engine_lines-1 && j+1 <= engine_line_size-1) && !isdigit(engine[i+1][j+1]) && engine[i+1][j+1] != '.') || ((i+1 <= engine_lines-1 && j+1 <= engine_line_size-1) && !ISDIGIT(engine[i+1][j+1]) && engine[i+1][j+1] != '.') ||
((i+1 <= engine_lines-1 && j-1 >= 0) && !isdigit(engine[i+1][j-1]) && engine[i+1][j-1] != '.') || ((i+1 <= engine_lines-1 && j-1 >= 0) && !ISDIGIT(engine[i+1][j-1]) && engine[i+1][j-1] != '.') ||
((i-1 >= 0 && j+1 <= engine_line_size-1) && !isdigit(engine[i-1][j+1]) && engine[i-1][j+1] != '.') || ((i-1 >= 0 && j+1 <= engine_line_size-1) && !ISDIGIT(engine[i-1][j+1]) && engine[i-1][j+1] != '.') ||
((i-1 >= 0 && j-1 >= 0) && !isdigit(engine[i-1][j-1]) && engine[i-1][j-1] != '.'))) { ((i-1 >= 0 && j-1 >= 0) && !ISDIGIT(engine[i-1][j-1]) && engine[i-1][j-1] != '.'))) {
adjacent = true; adjacent = true;
} }
} }
if ((!isdigit(engine[i][j]) || j == 0) && n != 0) { if ((!ISDIGIT(engine[i][j]) || j == 0) && n != 0) {
if (adjacent) if (adjacent)
part_number += n; part_number += n;
n = 0; n = 0;