extern/boxes
1
0
Fork 0
mirror of https://github.com/ascii-boxes/boxes.git synced 2024-12-04 22:11:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems found by unit tests and compiler

Browse Source 
These had been caused by the reimplementation of a module.
This commit is contained in:
Thomas Jensen 2023-07-07 21:55:21 +02:00
parent 4175d72bc8
commit ead517a4d7
No known key found for this signature in database
GPG Key ID: A4ACEE270D0FB7DB
6 changed files with 90 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/boxes.c
View File

@ -278,6 +278,11 @@ static void handle_input()
memcpy(&input, raw_input, sizeof(input_t));
BFREE(raw_input);
}
#ifdef DEBUG
fprintf(stderr, "Effective encoding: %s\n", encoding);
print_input_lines(NULL);
#endif
if (input.num_lines == 0) {
exit(EXIT_SUCCESS);
}

18
src/detect.c
View File

@ -60,12 +60,17 @@ char *comparison_name[] = {
int input_is_mono()
{
int result = 1;
for (size_t line_no = 0; line_no < input.num_lines; line_no++) {
if (input.lines[line_no].text->num_chars_invisible > 0) {
return 0;
result = 0;
break;
}
}
return 1;
#ifdef DEBUG
fprintf(stderr, "Input is %s\n", result ? "mono" : "potentially colored");
#endif
return result;
}
@ -76,13 +81,19 @@ int design_is_mono(design_t *design)
if (isempty(design->shape + scnt)) {
continue;
}
for (size_t line_no = 0; line_no < input.num_lines; line_no++) {
for (size_t line_no = 0; line_no < design->shape[scnt].height; line_no++) {
bxstr_t *shape_line = design->shape[scnt].mbcs[line_no];
if (shape_line->num_chars_invisible > 0) {
#ifdef DEBUG
fprintf(stderr, "Design is potentially colored\n");
#endif
return 0;
}
}
}
#ifdef DEBUG
fprintf(stderr, "Design is mono\n");
#endif
return 1;
}
@ -91,7 +102,6 @@ int design_is_mono(design_t *design)
int comp_type_is_viable(comparison_t comp_type, int mono_input, int mono_design)
{
int result = 1;
/* TODO What if a mono box was drawn around colored text? -> literal would be fine. Be less strict? */
if ((comp_type == literal && mono_input != mono_design)
|| (comp_type == ignore_invisible_input && (mono_input || !mono_design))
|| (comp_type == ignore_invisible_shape && (!mono_input || mono_design))

2
src/generate.c
View File

@ -793,7 +793,7 @@ static int justify_line(line_t *line, int skew)
fprintf(stderr, "justify_line(%c): Input: real: (%02d) \"%s\", text: (%02d) \"%s\", invisible=%d, skew=%d",
opt.justify ? opt.justify : '0', (int) line->text->num_chars, outtext, (int) line->text->num_columns,
line->text->ascii, (int) line->text->num_chars_invisible, skew);
bxs_free(outtext);
BFREE(outtext);
#endif
int result = 0;

4
src/input.c
View File

@ -343,10 +343,6 @@ int analyze_input(input_t *result)
}
}
#ifdef DEBUG
fprintf(stderr, "Effective encoding: %s\n", encoding);
print_input_lines(NULL);
#endif
return 0;
}

108
src/remove.c
View File

@ -158,7 +158,7 @@ static int hmm(shape_line_ctx_t *shapes_relevant, uint32_t *cur_pos, size_t shap
#endif
int result = 0;
// FIXME cat test/117_unicode_ansi_mending.input.tmp | out/boxes -n UTF-8 -d diamonds -ac -m recurses indefinitely with result 0
if (cur_pos > end_pos) {
result = 0; /* last shape tried was too long */
}
@ -190,48 +190,31 @@ static int hmm(shape_line_ctx_t *shapes_relevant, uint32_t *cur_pos, size_t shap
static shape_line_ctx_t *prepare_comp_shapes_horiz(int hside, comparison_t comp_type, size_t shape_line_idx)
{
shape_t start_shape = hside == BTOP ? NW : SW;
shape_t top_side_shapes[SHAPES_PER_SIDE - CORNERS_PER_SIDE] = {NNW, N, NNE};
shape_t bottom_side_shapes[SHAPES_PER_SIDE - CORNERS_PER_SIDE] = {SSW, S, SSE};
shape_t end_shape = hside == BTOP ? NE : SE;
shape_t side_shapes[SHAPES_PER_SIDE - CORNERS_PER_SIDE];
if (hside == BTOP) {
memcpy(side_shapes, top_side_shapes, (SHAPES_PER_SIDE - CORNERS_PER_SIDE) * sizeof(shape_t));
}
else {
memcpy(side_shapes, bottom_side_shapes, (SHAPES_PER_SIDE - CORNERS_PER_SIDE) * sizeof(shape_t));
}
shape_t *side_shapes = hside == BTOP ? north_side : south_side_rev;
shape_line_ctx_t *shapes_relevant = (shape_line_ctx_t *) calloc(SHAPES_PER_SIDE, sizeof(shape_line_ctx_t));
shapes_relevant[0].text = prepare_comp_shape(opt.design, start_shape, shape_line_idx, comp_type, 1, 0);
shapes_relevant[0].length = u32_strlen(shapes_relevant[0].text);
shapes_relevant[0].elastic = 0;
shapes_relevant[0].empty = 0;
for (size_t i = 0; i < SHAPES_PER_SIDE - CORNERS_PER_SIDE; i++) {
shapes_relevant[i + 1].empty = isempty(opt.design->shape + side_shapes[i]);
if (!shapes_relevant[i + 1].empty) {
shapes_relevant[i + 1].text
= prepare_comp_shape(opt.design, side_shapes[i], shape_line_idx, comp_type, 0, 0);
shapes_relevant[i + 1].length = u32_strlen(shapes_relevant[i + 1].text);
shapes_relevant[i + 1].elastic = opt.design->shape[side_shapes[i]].elastic;
for (size_t i = 0; i < SHAPES_PER_SIDE; i++) {
shapes_relevant[i].empty = isempty(opt.design->shape + side_shapes[i]);
if (!shapes_relevant[i].empty) {
shapes_relevant[i].text = prepare_comp_shape(opt.design, side_shapes[i], shape_line_idx, comp_type, 0,
i == SHAPES_PER_SIDE - 1);
shapes_relevant[i].length = u32_strlen(shapes_relevant[i].text);
shapes_relevant[i].elastic = opt.design->shape[side_shapes[i]].elastic;
}
}
shapes_relevant[SHAPES_PER_SIDE - 1].text
= prepare_comp_shape(opt.design, end_shape, shape_line_idx, comp_type, 0, 1);
shapes_relevant[SHAPES_PER_SIDE - 1].length = u32_strlen(shapes_relevant[SHAPES_PER_SIDE - 1].text);
shapes_relevant[SHAPES_PER_SIDE - 1].elastic = 0;
shapes_relevant[SHAPES_PER_SIDE - 1].empty = 0;
return shapes_relevant;
}
// TODO gdb --args out/boxes -n UTF-8 -d diamonds -ac -m test/117_unicode_ansi_mending.input.tmp
static int match_horiz_line(remove_ctx_t *ctx, int hside, size_t input_line_idx, size_t shape_line_idx)
{
#ifdef DEBUG
fprintf(stderr, "match_horiz_line(ctx, %s, %d, %d)\n",
hside == BTOP ? "BTOP" : "BBOT", (int) input_line_idx, (int) shape_line_idx);
#endif
int result = 0;
for (comparison_t comp_type = 0; comp_type < NUM_COMPARISON_TYPES; comp_type++) {
if (!comp_type_is_viable(comp_type, ctx->input_is_mono, ctx->design_is_mono)) {
@ -239,23 +222,59 @@ static int match_horiz_line(remove_ctx_t *ctx, int hside, size_t input_line_idx,
}
shape_line_ctx_t *shapes_relevant = prepare_comp_shapes_horiz(hside, comp_type, shape_line_idx);
#ifdef DEBUG
fprintf(stderr, " shapes_relevant = {");
for (size_t ds = 0; ds < SHAPES_PER_SIDE; ds++) {
if (shapes_relevant[ds].empty) {
fprintf(stderr, "-");
}
else {
char *out_shp_text = u32_strconv_to_output(shapes_relevant[ds].text);
fprintf(stderr, "\"%s\"(%d%s)", out_shp_text, (int) shapes_relevant[ds].length,
shapes_relevant[ds].elastic ? "E" : "");
BFREE(out_shp_text);
}
if (ds < SHAPES_PER_SIDE - 1) {
fprintf(stderr, ", ");
}
}
fprintf(stderr, "}\n");
#endif
uint32_t *cur_pos = NULL;
uint32_t *input_prepped = prepare_comp_input(input_line_idx, 1, comp_type, 0, NULL, NULL);
if (input_prepped != NULL
&& u32_strncmp(input_prepped, shapes_relevant[0].text, shapes_relevant[0].length) == 0)
uint32_t *input_prepped = prepare_comp_input(input_line_idx, 0, comp_type, 0, NULL, NULL);
#ifdef DEBUG
char *out_input_prepped = u32_strconv_to_output(input_prepped);
fprintf(stderr, " input_prepped = \"%s\"\n", out_input_prepped);
BFREE(out_input_prepped);
#endif
if (input_prepped != NULL && (shapes_relevant[0].length == 0
|| u32_strncmp(input_prepped, shapes_relevant[0].text, shapes_relevant[0].length) == 0))
{
cur_pos = input_prepped + shapes_relevant[0].length;
cur_pos = input_prepped + shapes_relevant[0].length; // TODO check cur_pos and end_pos
}
uint32_t *end_pos = NULL;
input_prepped = prepare_comp_input(
input_line_idx, 0, comp_type, shapes_relevant[SHAPES_PER_SIDE - 1].length, NULL, NULL);
if (input_prepped != NULL && u32_strncmp(input_prepped, shapes_relevant[SHAPES_PER_SIDE - 1].text,
shapes_relevant[SHAPES_PER_SIDE - 1].length) == 0)
{
end_pos = input_prepped;
if (input_prepped != NULL) {
if (shapes_relevant[SHAPES_PER_SIDE - 1].length == 0) {
end_pos = input_prepped + u32_strlen(input_prepped); // point to NUL terminator
}
else if (u32_strncmp(input_prepped, shapes_relevant[SHAPES_PER_SIDE - 1].text,
shapes_relevant[SHAPES_PER_SIDE - 1].length) == 0)
{
end_pos = input_prepped;
}
}
#ifdef DEBUG
char *out_cur_pos = u32_strconv_to_output(cur_pos);
char *out_end_pos = u32_strconv_to_output(end_pos);
fprintf(stderr, " cur_pos = \"%s\" (index %d)\n", out_cur_pos, (int) BMAX(cur_pos - input_prepped, 0));
fprintf(stderr, " end_pos = \"%s\" (index %d)\n", out_end_pos, (int) BMAX(end_pos - input_prepped, 0));
BFREE(out_cur_pos);
BFREE(out_end_pos);
#endif
if (cur_pos && end_pos) {
result = hmm(shapes_relevant, cur_pos, 1, end_pos);
@ -586,6 +605,11 @@ static void detect_design_if_needed()
exit(EXIT_FAILURE);
}
}
#ifdef DEBUG
else {
fprintf(stderr, "Design was chosen by user: %s\n", opt.design->name);
}
#endif
}
@ -783,6 +807,10 @@ int remove_box()
ctx->empty_side[BRIG] = empty_side(opt.design->shape, BRIG);
ctx->empty_side[BBOT] = empty_side(opt.design->shape, BBOT);
ctx->empty_side[BLEF] = empty_side(opt.design->shape, BLEF);
#ifdef DEBUG
fprintf(stderr, "Empty sides? Top: %d, Right: %d, Bottom: %d, Left: %d\n",
ctx->empty_side[BTOP], ctx->empty_side[BRIG], ctx->empty_side[BBOT], ctx->empty_side[BLEF]);
#endif
ctx->design_is_mono = design_is_mono(opt.design);
ctx->input_is_mono = input_is_mono();

4
src/tools.c
View File

@ -534,14 +534,14 @@ char *nspaces(const size_t n)
*/
void print_input_lines(const char *heading)
{
fprintf(stderr, "Input Lines%s:\n", heading != NULL ? heading : "");
fprintf(stderr, "%d Input Lines%s:\n", (int) input.num_lines, heading != NULL ? heading : "");
fprintf(stderr, " [num_chars] \"real text\" [num_cols] \"ascii_text\"\n");
for (size_t i = 0; i < input.num_lines; ++i) {
char *outtext = bxs_to_output(input.lines[i].text);
fprintf(stderr, "%4d [%02d] \"%s\" [%02d] \"%s\"", (int) i,
(int) input.lines[i].text->num_chars, outtext,
(int) input.lines[i].text->num_columns, input.lines[i].text->ascii);
bxs_free(outtext);
BFREE(outtext);
fprintf(stderr, "\tTabs: [");
if (input.lines[i].tabpos != NULL) {
for (size_t j = 0; j < input.lines[i].tabpos_len; ++j) {