diff --git a/Jupiter/Functions.c b/Jupiter/Functions.c index f6c8d33..d8bf2f8 100644 --- a/Jupiter/Functions.c +++ b/Jupiter/Functions.c @@ -70,7 +70,7 @@ char *getTimeFormat(const char *format) return rtime; } -/** Character to integer conversion table */ +/** Character to integer conversion tables */ const unsigned char base_table[] = { @@ -124,6 +124,48 @@ const signed char octal_table[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; +/** Integer to string (hexadecimal) conversion tables */ + +const char hexadecimal_rep_table_upper[][3] = +{ + "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0A", "0B", "0C", "0D", "0E", "0F", + "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1A", "1B", "1C", "1D", "1E", "1F", + "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2A", "2B", "2C", "2D", "2E", "2F", + "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3A", "3B", "3C", "3D", "3E", "3F", + "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4A", "4B", "4C", "4D", "4E", "4F", + "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5A", "5B", "5C", "5D", "5E", "5F", + "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6A", "6B", "6C", "6D", "6E", "6F", + "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7A", "7B", "7C", "7D", "7E", "7F", + "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8A", "8B", "8C", "8D", "8E", "8F", + "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9A", "9B", "9C", "9D", "9E", "9F", + "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "AA", "AB", "AC", "AD", "AE", "AF", + "B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "BA", "BB", "BC", "BD", "BE", "BF", + "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "C8", "C9", "CA", "CB", "CC", "CD", "CE", "CF", + "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "D8", "D9", "DA", "DB", "DC", "DD", "DE", "DF", + "E0", "E1", "E2", "E3", "E4", "E5", "E6", "E7", "E8", "E9", "EA", "EB", "EC", "ED", "EE", "EF", + "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA", "FB", "FC", "FD", "FE", "FF" +}; + +const char hexadecimal_rep_table_lower[][3] = +{ + "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", + "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f", + "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f", + "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f", + "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f", + "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f", + "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f", + "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f", + "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f", + "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f", + "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af", + "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf", + "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf", + "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df", + "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef", + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff" +}; + /** Single character functions */ bool Jupiter_isBase(unsigned char chr, int base) @@ -169,6 +211,16 @@ int Jupiter_getOctal(unsigned char chr) return octal_table[chr]; } +const char *Jupiter_asHex_upper(uint8_t oct) +{ + return hexadecimal_rep_table_upper[oct]; +} + +const char *Jupiter_asHex_lower(uint8_t oct) +{ + return hexadecimal_rep_table_lower[oct]; +} + /** Unsafe string converters */ int Jupiter_strtoi(const char *str, int base) diff --git a/Jupiter/Functions.h b/Jupiter/Functions.h index d19afa0..160304a 100644 --- a/Jupiter/Functions.h +++ b/Jupiter/Functions.h @@ -144,7 +144,7 @@ JUPITER_API uint64_t getPowerTwo64(uint64_t number); * @brief Checks if a character is a digit character of a specified radix. * Note: The maximum base is 36 (0-9 and a-z) * -* @param c Character to check. +* @param chr Character to check. * @return True if the character is a hexadecimal digit, false otherwise. */ JUPITER_API bool Jupiter_isBase(unsigned char chr, int base); @@ -152,7 +152,7 @@ JUPITER_API bool Jupiter_isBase(unsigned char chr, int base); /** * @brief Checks if a character is a hexadecimal digit character. (base 16) * -* @param c Character to check. +* @param chr Character to check. * @return True if the character is a hexadecimal digit, false otherwise. */ JUPITER_API bool Jupiter_isHex(unsigned char chr); @@ -160,7 +160,7 @@ JUPITER_API bool Jupiter_isHex(unsigned char chr); /** * @brief Checks if a character is a decimal digit character. (base 10) * -* @param c Character to check. +* @param chr Character to check. * @return True if the character is a decimal digit, false otherwise. */ JUPITER_API bool Jupiter_isDecimal(unsigned char chr); @@ -168,7 +168,7 @@ JUPITER_API bool Jupiter_isDecimal(unsigned char chr); /** * @brief Checks if a character is an octal digit character. (base 10) * -* @param c Character to check. +* @param chr Character to check. * @return True if the character is a octal digit, false otherwise. */ JUPITER_API bool Jupiter_isOctal(unsigned char chr); @@ -177,7 +177,7 @@ JUPITER_API bool Jupiter_isOctal(unsigned char chr); * @brief Fetches a character's represented integral value. * Note: The maximum base is 36 (0-9 and a-z) * -* @param c Character to fetch value of. +* @param chr Character to fetch value of. * @param base Base of the representation. * @return A character's represented integral value on success, -1 otherwise. */ @@ -186,7 +186,7 @@ JUPITER_API int Jupiter_getBase(unsigned char chr, int base); /** * @brief Fetches a hexadecimal character's represented integral value. (base 16) * -* @param c Character to fetch value of. +* @param chr Character to fetch value of. * @return A character's represented integral value on success, -1 otherwise. */ JUPITER_API int Jupiter_getHex(unsigned char chr); @@ -194,7 +194,7 @@ JUPITER_API int Jupiter_getHex(unsigned char chr); /** * @brief Fetches a decimal character's represented integral value. (base 10) * -* @param c Character to fetch value of. +* @param chr Character to fetch value of. * @return A character's represented integral value on success, -1 otherwise. */ JUPITER_API int Jupiter_getDecimal(unsigned char chr); @@ -202,11 +202,29 @@ JUPITER_API int Jupiter_getDecimal(unsigned char chr); /** * @brief Fetches a octal character's represented integral value. (base 8) * -* @param c Character to fetch value of. +* @param chr Character to fetch value of. * @return A character's represented integral value on success, -1 otherwise. */ JUPITER_API int Jupiter_getOctal(unsigned char chr); +/** +* @brief Fetches the string hexadecimal representation of an octet. +* Note: This function returns the upper-case hexadecimal notation +* +* @param oct Octet to fetch hexadecimal representation of +* @return The octet's hexadecimal representation as a string +*/ +JUPITER_API const char *Jupiter_asHex_upper(uint8_t oct); + +/** +* @brief Fetches the string hexadecimal representation of an octet. +* Note: This function returns the lower-case hexadecimal notation +* +* @param oct Octet to fetch hexadecimal representation of +* @return The octet's hexadecimal representation as a string +*/ +JUPITER_API const char *Jupiter_asHex_lower(uint8_t oct); + /** * @brief Interprets a string into an integer. * diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib index 92dee01..300100a 100644 Binary files a/Release/Jupiter.lib and b/Release/Jupiter.lib differ