3rd-party/libfort
1
0
Fork 0
Code Releases Activity

Merge pull request #59 from seleznevae/issues-58

Browse Source 
Fix `ft_printf_ln` when it is used for position which has empty cells before it.
This commit is contained in:
Seleznev Anton 2020-12-01 20:02:57 +03:00 committed by GitHub
commit 8c4bc8cce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.md
View File

@ -4,6 +4,10 @@
- Add function `ft_col_count()` to get number of columns in the table.
### Bug fixes
- Fix `ft_printf_ln` when it is used for position which have empty cells before it.
## v0.4.2
### Internal

5
lib/fort.c
View File

@ -5499,6 +5499,11 @@ f_status swap_row(f_row_t *cur_row, f_row_t *ins_row, size_t pos)
return FT_SUCCESS;
}
// Append empty cells to `cur_row` if needed.
while (vector_size(cur_row->cells) < pos) {
create_cell_in_position(cur_row, vector_size(cur_row->cells));
}
return vector_swap(cur_row->cells, ins_row->cells, pos);
}

5
src/row.c
View File

@ -213,6 +213,11 @@ f_status swap_row(f_row_t *cur_row, f_row_t *ins_row, size_t pos)
return FT_SUCCESS;
}
// Append empty cells to `cur_row` if needed.
while (vector_size(cur_row->cells) < pos) {
create_cell_in_position(cur_row, vector_size(cur_row->cells));
}
return vector_swap(cur_row->cells, ins_row->cells, pos);
}

37
tests/bb_tests/test_table_basic.c
View File

@ -296,6 +296,43 @@ void test_bug_fixes(void)
assert_str_equal(table_str, table_str_etalon);
ft_destroy_table(table);
}
SCENARIO("Issue 58 - https://github.com/seleznevae/libfort/issues/58") {
{
ft_table_t *table = ft_create_table();
ft_printf_ln(table, "00|01");
ft_printf_ln(table, "10|11");
ft_set_cur_cell(table, 0, 5);
ft_printf_ln(table, "05");
const char *table_str = ft_to_string(table);
assert_true(table_str != NULL);
const char *table_str_etalon =
"+----+----+--+--+--+----+\n"
"| 00 | 01 | | | | 05 |\n"
"| 10 | 11 | | | | |\n"
"+----+----+--+--+--+----+\n";
assert_str_equal(table_str, table_str_etalon);
ft_destroy_table(table);
}
{
ft_table_t *table = ft_create_table();
ft_printf_ln(table, "00|01|02|03|04|05");
ft_printf_ln(table, "10|11|12|13|14|15");
ft_set_cur_cell(table, 0, 4);
ft_printf_ln(table, "24|25|26|27|28|29|30");
const char *table_str = ft_to_string(table);
assert_true(table_str != NULL);
const char *table_str_etalon =
"+----+----+----+----+----+----+----+----+----+----+----+\n"
"| 00 | 01 | 02 | 03 | 24 | 25 | 26 | 27 | 28 | 29 | 30 |\n"
"| 10 | 11 | 12 | 13 | 14 | 15 | | | | | |\n"
"+----+----+----+----+----+----+----+----+----+----+----+\n";
assert_str_equal(table_str, table_str_etalon);
ft_destroy_table(table);
}
}
}
void test_table_basic(void)