Update: Optimize away the isdigit(), isalpha(), isalnum(), and isxdigit().

I did some research and learned that the "is*()" functions can greatly affect performance due to locale and other manners.
I originally used these to allow for well established optimization to take place.

Replace these with some mathematical operations that should increase performance.
This also means no function call on the stack.
This project is already function stack heavy by design and so reducing functions when easy is a great thing.

Start using literal characters rather than the standard strings for the UTF related functions.
In these cases the ASCII expectation is guaranteed.
The ability to override these is also not practical as the meaning should not change.

I have not looked at all of the "is*()" functions and I may address any remaining ones at a later time.
I potentially may also investigate mapping tables to further improve performance.

These math calculations can be used in a lot of the non-ASCII UTF ranges as well.
I opted to not do these just yet given that such work will take a large amount of time.

I have not done any performance analysis yet but I plan to do so.

diff --git a/level_0/f_utf/c/private-utf_digit.c b/level_0/f_utf/c/private-utf_digit.c
index f3a87173cab2bc7d88a1bee6b516e36c09cb9838..b9d88753f3e8aee01d031c04fc5aaa0ac9d4d7ba 100644 (file)
--- a/level_0/f_utf/c/private-utf_digit.c
+++ b/level_0/f_utf/c/private-utf_digit.c
@@ -6266,59 +6266,25 @@ extern "C" {
 #if !defined(_di_f_utf_character_is_alphabetic_digit_) || !defined(_di_f_utf_character_is_digit_) || !defined(_di_f_utf_character_is_word_) || !defined(_di_f_utf_character_is_word_dash_) || !defined(_di_f_utf_character_is_word_dash_plus_) || !defined(_di_f_utf_is_alphabetic_digit_) || !defined(_di_f_utf_is_digit_) || !defined(_di_f_utf_is_word_) || !defined(_di_f_utf_is_word_dash_) || !defined(_di_f_utf_is_word_dash_plus_)
   f_status_t private_f_utf_character_is_digit_for_ascii(const f_char_t character, uint64_t * const value) {
 
-    if (isdigit(character)) {
+    uint16_t result = (uint16_t) (character - '0');
+
+    if (result < 10) {
       if (value) {
-        if (character == f_string_ascii_0_s.string[0]) {
-          *value = 0;
-        }
-        else if (character == f_string_ascii_1_s.string[0]) {
-          *value = 1;
-        }
-        else if (character == f_string_ascii_2_s.string[0]) {
-          *value = 2;
-        }
-        else if (character == f_string_ascii_3_s.string[0]) {
-          *value = 3;
-        }
-        else if (character == f_string_ascii_4_s.string[0]) {
-          *value = 4;
-        }
-        else if (character == f_string_ascii_5_s.string[0]) {
-          *value = 5;
-        }
-        else if (character == f_string_ascii_6_s.string[0]) {
-          *value = 6;
-        }
-        else if (character == f_string_ascii_7_s.string[0]) {
-          *value = 7;
-        }
-        else if (character == f_string_ascii_8_s.string[0]) {
-          *value = 8;
-        }
-        else if (character == f_string_ascii_9_s.string[0]) {
-          *value = 9;
-        }
-        else if (character == f_string_ascii_a_s.string[0] || character == f_string_ascii_A_s.string[0]) {
-          *value = 10;
-        }
-        else if (character == f_string_ascii_b_s.string[0] || character == f_string_ascii_B_s.string[0]) {
-          *value = 11;
-        }
-        else if (character == f_string_ascii_c_s.string[0] || character == f_string_ascii_C_s.string[0]) {
-          *value = 12;
-        }
-        else if (character == f_string_ascii_d_s.string[0] || character == f_string_ascii_D_s.string[0]) {
-          *value = 13;
-        }
-        else if (character == f_string_ascii_e_s.string[0] || character == f_string_ascii_E_s.string[0]) {
-          *value = 14;
-        }
-        else if (character == f_string_ascii_f_s.string[0] || character == f_string_ascii_F_s.string[0]) {
-          *value = 15;
-        }
-        else {
-          *value = F_type_size_max_64_unsigned_d;
-        }
+        *value = (uint64_t) result;
+      }
+
+      return F_true;
+    }
+
+    result = (uint16_t) (character - 'A');
+
+    if (result > 5) {
+      result = (uint16_t) (character - 'a');
+    }
+
+    if (result < 6) {
+      if (value) {
+        *value = (uint64_t) (10 + result);
       }
 
       return F_true;

diff --git a/level_0/f_utf/c/private-utf_digit.h b/level_0/f_utf/c/private-utf_digit.h
index d3ee4508a43aeeaa5f95bcfff428441bf7a32cb7..a3f7ca8d085a7c77aca0fc615d98d3a3e0d51c9a 100644 (file)
--- a/level_0/f_utf/c/private-utf_digit.h
+++ b/level_0/f_utf/c/private-utf_digit.h
@@ -67,8 +67,6 @@ extern "C" {
  *   F_true if a UTF-8 decimal character.
  *   F_false if not a UTF-8 decimal character.
  *
- * @see isdigit()
- *
  * @see f_utf_character_is_alphabetic_digit()
  * @see f_utf_character_is_digit()
  * @see f_utf_character_is_word()

diff --git a/level_0/f_utf/c/utf/convert.c b/level_0/f_utf/c/utf/convert.c
index c881e0db27bf7815e48dc0435e73fccc1ff20ae7..9f705b26271f55cd31bab44d5b15431ad8036557 100644 (file)
--- a/level_0/f_utf/c/utf/convert.c
+++ b/level_0/f_utf/c/utf/convert.c
@@ -154,12 +154,12 @@ extern "C" {
         i = length;
       }
       else {
-        if (macro_f_utf_char_t_to_char_1(string[i]) == f_string_ascii_u_s.string[0] || macro_f_utf_char_t_to_char_1(string[i]) == f_string_ascii_U_s.string[0]) {
+        if (macro_f_utf_char_t_to_char_1(string[i]) == 'u' || macro_f_utf_char_t_to_char_1(string[i]) == 'U') {
           do {
             ++i;
           } while (i < length && !string[i]);
 
-          if (i < length && !macro_f_utf_char_t_width_is(string[i]) && macro_f_utf_char_t_to_char_1(string[i]) == f_string_ascii_plus_s.string[0]) {
+          if (i < length && !macro_f_utf_char_t_width_is(string[i]) && macro_f_utf_char_t_to_char_1(string[i]) == '+') {
             ++i;
           }
           else {
@@ -316,12 +316,12 @@ extern "C" {
     } // while
 
     if (i < length) {
-      if (string[i] == f_string_ascii_u_s.string[0] || string[i] == f_string_ascii_U_s.string[0]) {
+      if (string[i] == 'u' || string[i] == 'U') {
         do {
           ++i;
         } while (i < length && !string[i]);
 
-        if (i < length && string[i] == f_string_ascii_plus_s.string[0]) {
+        if (i < length && string[i] == '+') {
           ++i;
         }
         else {

diff --git a/level_0/f_utf/c/utf/is.c b/level_0/f_utf/c/utf/is.c
index 3a482065a4a30bcd030783463d3971bdcfcc1faf..b4fada076ccd3da89eb09201aa7fe4429529a5f8 100644 (file)
--- a/level_0/f_utf/c/utf/is.c
+++ b/level_0/f_utf/c/utf/is.c
@@ -55,9 +55,9 @@ extern "C" {
       return private_f_utf_character_is_alphabetic(utf);
     }
 
-    if (isalpha(*sequence)) return F_true;
-
-    return F_false;
+    return (uint16_t) ((*sequence) - 'a') < 26 || (uint16_t) ((*sequence) - 'A') < 26
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_alphabetic_
 
@@ -86,9 +86,11 @@ extern "C" {
       return private_f_utf_character_is_alphabetic_digit(utf, value);
     }
 
-    if (isalpha(*sequence)) return F_true;
+    if (private_f_utf_character_is_digit_for_ascii(*sequence, value)) return F_true;
 
-    return private_f_utf_character_is_digit_for_ascii(*sequence, value);
+    return (uint16_t) (*sequence - 'a') < 26 || (uint16_t) (*sequence - 'A') < 26
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_alphabetic_digit_
 
@@ -117,9 +119,9 @@ extern "C" {
       return private_f_utf_character_is_alphabetic_numeric(utf);
     }
 
-    if (isalnum(*sequence)) return F_true;
-
-    return F_false;
+    return (uint16_t) (*sequence - 'a') < 26 || (uint16_t) (*sequence - 'A') < 26 || (uint16_t) (*sequence - '0') < 10
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_alphabetic_numeric_
 
@@ -439,9 +441,7 @@ extern "C" {
       return private_f_utf_character_is_numeric(utf);
     }
 
-    if (isdigit(*sequence)) return F_true;
-
-    return F_false;
+    return (uint16_t) (*sequence - '0') < 10 ? F_true : F_false;
   }
 #endif // _di_f_utf_is_numeric_
 
@@ -899,11 +899,9 @@ extern "C" {
       return private_f_utf_character_is_word(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (*sequence - 'a') < 26 || (uint16_t) (*sequence - 'A') < 26 || (uint16_t) (*sequence - '0') < 10 || *sequence == '_'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_word_
 
@@ -932,11 +930,9 @@ extern "C" {
       return private_f_utf_character_is_word_dash(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (*sequence - 'a') < 26 || (uint16_t) (*sequence - 'A') < 26 || (uint16_t) (*sequence - '0') < 10 || *sequence == '_' || *sequence == '-'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_word_dash_
 
@@ -964,11 +960,9 @@ extern "C" {
       return private_f_utf_character_is_word_dash_plus(utf, strict);
     }
 
-    if (isalnum(*sequence) || *sequence == f_string_ascii_underscore_s.string[0] || *sequence == f_string_ascii_minus_s.string[0] || *sequence == f_string_ascii_plus_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (*sequence - 'a') < 26 || (uint16_t) (*sequence - 'A') < 26 || (uint16_t) (*sequence - '0') < 10 || *sequence == '_' || *sequence == '-' || *sequence == '+'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_is_word_dash_plus_
 

diff --git a/level_0/f_utf/c/utf/is.h b/level_0/f_utf/c/utf/is.h
index be8868f39671631d1b56e08ab6bb5fbc9c423c33..7cc98929d4a303f15f6dd552d491ff765bb8efe7 100644 (file)
--- a/level_0/f_utf/c/utf/is.h
+++ b/level_0/f_utf/c/utf/is.h
@@ -50,8 +50,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalpha()
  */
 #ifndef _di_f_utf_is_alphabetic_
   extern f_status_t f_utf_is_alphabetic(const f_string_t sequence, const f_array_length_t width_max);
@@ -86,9 +84,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalpha()
- * @see isdigit()
  */
 #ifndef _di_f_utf_is_alphabetic_digit_
   extern f_status_t f_utf_is_alphabetic_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value);
@@ -113,8 +108,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_is_alphabetic_numeric_
   extern f_status_t f_utf_is_alphabetic_numeric(const f_string_t sequence, const f_array_length_t width_max);
@@ -294,8 +287,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isdigit()
  */
 #ifndef _di_f_utf_is_digit_
   extern f_status_t f_utf_is_digit(const f_string_t sequence, const f_array_length_t width_max, uint64_t * const value);
@@ -399,8 +390,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isdigit()
  */
 #ifndef _di_f_utf_is_numeric_
   extern f_status_t f_utf_is_numeric(const f_string_t sequence, const f_array_length_t width_max);
@@ -760,8 +749,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_is_word_
   extern f_status_t f_utf_is_word(const f_string_t sequence, const f_array_length_t width_max, const bool strict);
@@ -795,8 +782,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_is_word_dash_
   extern f_status_t f_utf_is_word_dash(const f_string_t sequence, const f_array_length_t width_max, const bool strict);
@@ -832,8 +817,6 @@ extern "C" {
  *   F_complete_not_utf (with error bit set) if character is an incomplete UTF-8 sequence.
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if Unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_is_word_dash_plus_
   extern f_status_t f_utf_is_word_dash_plus(const f_string_t sequence, const f_array_length_t width_max, const bool strict);

diff --git a/level_0/f_utf/c/utf/is_character.c b/level_0/f_utf/c/utf/is_character.c
index 4050abc38efed1bc86c60d178de47dbba3d2e782..e1e77ad1b3edd144f13a5933e6eb41322462a76e 100644 (file)
--- a/level_0/f_utf/c/utf/is_character.c
+++ b/level_0/f_utf/c/utf/is_character.c
@@ -49,11 +49,9 @@ extern "C" {
       return private_f_utf_character_is_alphabetic(sequence);
     }
 
-    if (isalpha(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_alphabetic_
 
@@ -68,9 +66,11 @@ extern "C" {
       return private_f_utf_character_is_alphabetic_digit(sequence, value);
     }
 
-    if (isalpha(macro_f_utf_char_t_to_char_1(sequence))) return F_true;
+    if (private_f_utf_character_is_digit_for_ascii(macro_f_utf_char_t_to_char_1(sequence), value)) return F_true;
 
-    return private_f_utf_character_is_digit_for_ascii(macro_f_utf_char_t_to_char_1(sequence), value);
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_alphabetic_digit_
 
@@ -85,11 +85,9 @@ extern "C" {
       return private_f_utf_character_is_alphabetic_numeric(sequence);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - '0') < 10
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_alphabetic_numeric_
 
@@ -269,11 +267,7 @@ extern "C" {
       return private_f_utf_character_is_numeric(sequence);
     }
 
-    if (isdigit(macro_f_utf_char_t_to_char_1(sequence))) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - '0') < 10 ? F_true : F_false;
   }
 #endif // _di_f_utf_character_is_numeric_
 
@@ -531,11 +525,9 @@ extern "C" {
       return private_f_utf_character_is_word(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - '0') < 10 || macro_f_utf_char_t_to_char_1(sequence) == '_'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_word_
 
@@ -550,11 +542,9 @@ extern "C" {
       return private_f_utf_character_is_word_dash(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - '0') < 10 || macro_f_utf_char_t_to_char_1(sequence) == '_' || macro_f_utf_char_t_to_char_1(sequence) == '-'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_word_dash_
 
@@ -569,11 +559,9 @@ extern "C" {
       return private_f_utf_character_is_word_dash_plus(sequence, strict);
     }
 
-    if (isalnum(macro_f_utf_char_t_to_char_1(sequence)) || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_underscore_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_minus_s.string[0] || macro_f_utf_char_t_to_char_1(sequence) == f_string_ascii_plus_s.string[0]) {
-      return F_true;
-    }
-
-    return F_false;
+    return (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'a') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - 'A') < 26 || (uint16_t) (macro_f_utf_char_t_to_char_1(sequence) - '0') < 10 || macro_f_utf_char_t_to_char_1(sequence) == '_' || macro_f_utf_char_t_to_char_1(sequence) == '-' || macro_f_utf_char_t_to_char_1(sequence) == '+'
+      ? F_true
+      : F_false;
   }
 #endif // _di_f_utf_character_is_word_dash_plus_
 

diff --git a/level_0/f_utf/c/utf/is_character.h b/level_0/f_utf/c/utf/is_character.h
index e1075033d8859a2b895877cf46980c73e68022ac..816e17d2cacc338d35f9d9138b340105f40690ac 100644 (file)
--- a/level_0/f_utf/c/utf/is_character.h
+++ b/level_0/f_utf/c/utf/is_character.h
@@ -48,8 +48,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalpha()
  */
 #ifndef _di_f_utf_character_is_alphabetic_
   extern f_status_t f_utf_character_is_alphabetic(const f_utf_char_t sequence);
@@ -79,9 +77,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalpha()
- * @see isdigit()
  */
 #ifndef _di_f_utf_character_is_alphabetic_digit_
   extern f_status_t f_utf_character_is_alphabetic_digit(const f_utf_char_t sequence, uint64_t * const value);
@@ -101,8 +96,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_character_is_alphabetic_numeric_
   extern f_status_t f_utf_character_is_alphabetic_numeric(const f_utf_char_t sequence);
@@ -250,8 +243,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isdigit()
  */
 #ifndef _di_f_utf_character_is_digit_
   extern f_status_t f_utf_character_is_digit(const f_utf_char_t sequence, uint64_t * const value);
@@ -343,8 +334,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isdigit()
  */
 #ifndef _di_f_utf_character_is_numeric_
   extern f_status_t f_utf_character_is_numeric(const f_utf_char_t sequence);
@@ -637,8 +626,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_character_is_word_
   extern f_status_t f_utf_character_is_word(const f_utf_char_t sequence, const bool strict);
@@ -667,8 +654,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_character_is_word_dash_
   extern f_status_t f_utf_character_is_word_dash(const f_utf_char_t sequence, const bool strict);
@@ -699,8 +684,6 @@ extern "C" {
  *
  *   F_utf_fragment (with error bit) if character is a UTF-8 fragment.
  *   F_utf_not (with error bit) if unicode is an invalid Unicode character.
- *
- * @see isalnum()
  */
 #ifndef _di_f_utf_character_is_word_dash_plus_
   extern f_status_t f_utf_character_is_word_dash_plus(const f_utf_char_t sequence, const bool strict);

diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c
index 92a1822be295ed85f7ef2d608cff732156446f38..6fa233a206ff1218d06950074295eb905ae2d843 100644 (file)
--- a/level_1/fl_string/c/string.c
+++ b/level_1/fl_string/c/string.c
@@ -628,7 +628,7 @@ extern "C" {
           return F_found_not;
         }
 
-        if (isxdigit(buffer.string[range->start])) {
+        if ((uint16_t) (buffer.string[range->start] - 'a') < 6 || (uint16_t) (buffer.string[range->start] - 'A') < 6 || (uint16_t) (buffer.string[range->start] - '0') < 10) {
           number[j] = buffer.string[range->start];
         }
         else {

diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h
index ed2a882340b4bf524ee6c0cac4d9e9f47bc2eacb..c9ccb4abd27e83f5ba891866d9cca0a64c6de1ae 100644 (file)
--- a/level_1/fl_string/c/string.h
+++ b/level_1/fl_string/c/string.h
@@ -1081,8 +1081,6 @@ extern "C" {
  *   F_parameter (with error bit) from: f_utf_is_whitespace().
  *   F_parameter (with error bit) from: f_utf_is_word().
  *
- * @see isxdigit()
- *
  * @see f_utf_is_combining()
  * @see f_utf_is_whitespace()
  * @see f_utf_is_word()

diff --git a/level_2/fll_execute/c/private-execute.c b/level_2/fll_execute/c/private-execute.c
index 763cfd37c424a75250d9cb61015089a9481028e3..83ea102002c939670db4b31e2d58f8ab0aad7f69 100644 (file)
--- a/level_2/fll_execute/c/private-execute.c
+++ b/level_2/fll_execute/c/private-execute.c
@@ -278,7 +278,7 @@ extern "C" {
 
       f_file_read_block(file, &response);
 
-      if (!response.used || response.string[0] == f_string_ascii_1_s.string[0]) {
+      if (!response.used || response.string[0] == '1') {
         f_string_dynamic_resize(0, &response);
 
         close(descriptors[0]);

diff --git a/level_3/fake/c/private-make-operate_process.c b/level_3/fake/c/private-make-operate_process.c
index 11acaf166d3d9d6769c1e63fff6efa085d318b12..62d0d032389df4ee956c5c219e7cf8f45730a557 100644 (file)
--- a/level_3/fake/c/private-make-operate_process.c
+++ b/level_3/fake/c/private-make-operate_process.c
@@ -182,7 +182,7 @@ extern "C" {
 
             for (uint8_t j = 2; i < source.used && j < 8; ) {
 
-              if (!isdigit(source.string[i])) {
+              if ((uint16_t) (source.string[i] - '0') > 9) {
                 if (!(source.string[i] == f_string_ascii_A_s.string[0] ||
                       source.string[i] == f_string_ascii_B_s.string[0] ||
                       source.string[i] == f_string_ascii_C_s.string[0] ||

diff --git a/level_3/fake/c/private-make-operate_validate.c b/level_3/fake/c/private-make-operate_validate.c
index c0f7cc908c0b91f2a19249a03c1421fed39c96b0..18ebc153d93c7332ce41bd625741b6da8ff316ca 100644 (file)
--- a/level_3/fake/c/private-make-operate_validate.c
+++ b/level_3/fake/c/private-make-operate_validate.c
@@ -93,14 +93,14 @@ extern "C" {
 
     if (!name.used) return F_none;
 
-    if (!isalpha(name.string[0]) && name.string[0] != '_') {
-      return F_false;
+    if (!((uint16_t) (name.string[0] - 'a') < 26 || (uint16_t) (name.string[0] - 'A') < 26)) {
+      if (name.string[0] != '_') return F_false;
     }
 
     for (f_array_length_t i = 1; i < name.used; ++i) {
 
-      if (!isalnum(name.string[i]) && name.string[i] != '_') {
-        return F_false;
+      if (!((uint16_t) (name.string[i] - 'a') < 26 || (uint16_t) (name.string[i] - 'A') < 26 || (uint16_t) (name.string[i] - '0') < 10)) {
+        if (name.string[i] != '_') return F_false;
       }
     } // for
 

diff --git a/level_3/fake/c/private-make-operate_validate.h b/level_3/fake/c/private-make-operate_validate.h
index 52c36e70eae8d68de2ac4dd703318c6c69a6c302..baaff65bb3507b841a4263059504151441a8a548 100644 (file)
--- a/level_3/fake/c/private-make-operate_validate.h
+++ b/level_3/fake/c/private-make-operate_validate.h
@@ -50,9 +50,6 @@ extern "C" {
  *   F_true on valid.
  *   F_false on invalid.
  *   F_none if there is no string to validate (used = 0).
- *
- * @see isalpha()
- * @see isalnum()
  */
 #ifndef _di_fake_make_operate_validate_define_name_
   extern f_status_t fake_make_operate_validate_define_name(const f_string_static_t name) F_attribute_visibility_internal_d;