From: Kevin Day Date: Sun, 17 Nov 2024 23:24:51 +0000 (-0600) Subject: Cleanup: The f_iki_read() using digits for wrapped rather than f_true and f_false. X-Git-Tag: 0.6.13~34 X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=a026b3a2f4e8acfe5b4e3b0bab1e4ad02240955e;p=fll Cleanup: The f_iki_read() using digits for wrapped rather than f_true and f_false. This brings in changes introduced upstream commit 60d4e0c667860574659e9a7966ac0c591054f61a. The `wrapped` is changed to use `0x0` and `0x1` rather than `F_false` and `F_true`. These are functionally identical but the code is more consistent when having `0x0`, `0x1`, and `0x2` instead of `F_false`, `F_true`, and `0x2`. --- diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index c2d42d3..22dcde1 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -98,7 +98,7 @@ extern "C" { const f_array_length_t delimits_used = data->delimits.used; uint8_t quote = 0; - uint8_t wrapped = F_false; // 0x0 (false) = not wrapped, 0x1 (true) = wrapped, 0x2 = valid wrapped. + uint8_t wrapped = 0x0; // 0x0 = not wrapped, 0x1 = wrapped, 0x2 = valid wrapped. do { @@ -149,10 +149,10 @@ extern "C" { found_vocabulary.start = range->start; found_vocabulary.stop = range->start; - wrapped = F_true; + wrapped = 0x1; } else if (wrapped) { - wrapped = F_false; + wrapped = 0x0; } status = f_utf_buffer_increment(*buffer, range, 1); @@ -181,7 +181,7 @@ extern "C" { if (buffer->string[range->start] == f_iki_syntax_separator_s.string[0]) { // Wrapped must close in a wrap close before the separator. - if (wrapped == F_true) { + if (wrapped == 0x1) { status = F_next; break; @@ -267,7 +267,7 @@ extern "C" { break; } - else if (wrapped == F_true && buffer->string[range->start] == f_iki_syntax_wrap_close_s.string[0]) { + else if (wrapped == 0x1 && buffer->string[range->start] == f_iki_syntax_wrap_close_s.string[0]) { wrapped = 0x2; found_vocabulary.stop = range->start; } @@ -317,7 +317,7 @@ extern "C" { if (status == F_next) { quote = 0; - wrapped = F_false; + wrapped = 0x0; continue; } @@ -454,7 +454,7 @@ extern "C" { } // while quote = 0; - wrapped = F_false; + wrapped = 0x0; } if (F_status_is_error(status) || range->start > range->stop || range->start >= buffer->used) break;