+2024-09-15 Bruno Haible <bruno@clisp.org>
+
+ unigbrk tests: Modernize code.
+ * tests/unigbrk/test-uc-grapheme-breaks.c (main): Reduce the scope of
+ local variables. Add comments.
+ * tests/unigbrk/test-uc-is-grapheme-break.c (main): Likewise.
+
2024-09-15 Bruno Haible <bruno@clisp.org>
unilbrk: Fix conflicts between rules.
main (int argc, char *argv[])
{
const char *filename;
- char line[1024];
FILE *stream;
int lineno;
+ char line[1024];
if (argc != 2)
{
}
lineno = 0;
- while (fgets (line, sizeof line, stream))
+ while (fgets (line, sizeof (line), stream))
{
- char *comment;
- const char *p;
- ucs4_t s[16];
- char breaks[16];
- size_t i = 0;
-
lineno++;
- comment = strchr (line, '#');
+ /* Cut off the trailing comment, if any. */
+ char *comment = strchr (line, '#');
if (comment != NULL)
*comment = '\0';
+ /* Is the remaining line blank? */
if (line[strspn (line, " \t\r\n")] == '\0')
continue;
+ const char *p;
+ ucs4_t s[16];
+ char breaks[16];
+ size_t i = 0;
+
s[0] = 0;
p = line;
do
main (int argc, char *argv[])
{
const char *filename;
- char line[1024];
- int exit_code;
FILE *stream;
+ int exit_code;
int lineno;
+ char line[1024];
if (argc != 2)
{
exit_code = 0;
lineno = 0;
- while (fgets (line, sizeof line, stream))
+ while (fgets (line, sizeof (line), stream))
{
- char *comment;
+ lineno++;
+
+ /* Cut off the trailing comment, if any. */
+ char *comment = strchr (line, '#');
+ if (comment != NULL)
+ *comment = '\0';
+ /* Is the remaining line blank? */
+ if (line[strspn (line, " \t\r\n")] == '\0')
+ continue;
+
const char *p;
ucs4_t prev;
int last_char_prop;
bool emoji_modifier_sequence_before_last_char;
size_t ri_count;
- lineno++;
-
- comment = strchr (line, '#');
- if (comment != NULL)
- *comment = '\0';
- if (line[strspn (line, " \t\r\n")] == '\0')
- continue;
-
last_char_prop = -1;
incb_consonant_extended = false;
incb_consonant_extended_linker = false;