Skip to content

Commit

Permalink
1.26.03
Browse files Browse the repository at this point in the history
  • Loading branch information
@rparolin
rparolin committed Jul 10, 2019
1 parent 6a9978f commit 6f4edf1
Show file tree
Hide file tree
Showing 35 changed files with 1,446 additions and 1,558 deletions.
66 changes: 31 additions & 35 deletions include/EAStdC/EACType.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,108 +38,104 @@
#include <EAStdC/internal/Config.h>


#ifndef EA_WCHAR_UNIQUE
#define EA_WCHAR_UNIQUE 0
#endif


namespace EA
{
namespace StdC
{

EASTDC_API int Isalnum(char8_t c);
EASTDC_API int Isalnum(char c);
EASTDC_API int Isalnum(char16_t c);
EASTDC_API int Isalnum(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isalnum(wchar_t c);
#endif

EASTDC_API int Isalpha(char8_t c);
EASTDC_API int Isalpha(char c);
EASTDC_API int Isalpha(char16_t c);
EASTDC_API int Isalpha(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isalpha(wchar_t c);
#endif

EASTDC_API int Isdigit(char8_t c);
EASTDC_API int Isdigit(char c);
EASTDC_API int Isdigit(char16_t c);
EASTDC_API int Isdigit(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isdigit(wchar_t c);
#endif

EASTDC_API int Isxdigit(char8_t c);
EASTDC_API int Isxdigit(char c);
EASTDC_API int Isxdigit(char16_t c);
EASTDC_API int Isxdigit(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isxdigit(wchar_t c);
#endif

EASTDC_API int Isgraph(char8_t c);
EASTDC_API int Isgraph(char c);
EASTDC_API int Isgraph(char16_t c);
EASTDC_API int Isgraph(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isgraph(wchar_t c);
#endif

EASTDC_API int Islower(char8_t c);
EASTDC_API int Islower(char c);
EASTDC_API int Islower(char16_t c);
EASTDC_API int Islower(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Islower(wchar_t c);
#endif

EASTDC_API char8_t Tolower(char8_t c);
EASTDC_API char Tolower(char c);
EASTDC_API char16_t Tolower(char16_t c);
EASTDC_API char32_t Tolower(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API wchar_t Tolower(wchar_t c);
#endif

EASTDC_API int Isupper(char8_t c);
EASTDC_API int Isupper(char c);
EASTDC_API int Isupper(char16_t c);
EASTDC_API int Isupper(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isupper(wchar_t c);
#endif

EASTDC_API char8_t Toupper(char8_t c);
EASTDC_API char Toupper(char c);
EASTDC_API char16_t Toupper(char16_t c);
EASTDC_API char32_t Toupper(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API wchar_t Toupper(wchar_t c);
#endif

EASTDC_API int Isprint(char8_t c);
EASTDC_API int Isprint(char c);
EASTDC_API int Isprint(char16_t c);
EASTDC_API int Isprint(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isprint(wchar_t c);
#endif

EASTDC_API int Ispunct(char8_t c);
EASTDC_API int Ispunct(char c);
EASTDC_API int Ispunct(char16_t c);
EASTDC_API int Ispunct(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Ispunct(wchar_t c);
#endif

EASTDC_API int Isspace(char8_t c);
EASTDC_API int Isspace(char c);
EASTDC_API int Isspace(char16_t c);
EASTDC_API int Isspace(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Isspace(wchar_t c);
#endif

EASTDC_API int Iscntrl(char8_t c);
EASTDC_API int Iscntrl(char c);
EASTDC_API int Iscntrl(char16_t c);
EASTDC_API int Iscntrl(char32_t c);
#if EA_WCHAR_UNIQUE
EASTDC_API int Iscntrl(wchar_t c);
#endif

EASTDC_API int Isascii(char8_t c);
EASTDC_API int Isascii(char c);
EASTDC_API int Isascii(char16_t c);
EASTDC_API int Isascii(char32_t c);
#if EA_WCHAR_UNIQUE
Expand Down Expand Up @@ -183,7 +179,7 @@ namespace StdC



inline int Isalnum(char8_t c) // char8_t is the same as char -- it is a signed or unsigned 8 bit value
inline int Isalnum(char c) // char is the same as char -- it is a signed or unsigned 8 bit value
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_ALNUM;
}
Expand All @@ -207,7 +203,7 @@ namespace StdC



inline int Isalpha(char8_t c)
inline int Isalpha(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_ALPHA;
}
Expand All @@ -230,7 +226,7 @@ namespace StdC
#endif


inline int Isdigit(char8_t c)
inline int Isdigit(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_DIGIT;

Expand Down Expand Up @@ -263,7 +259,7 @@ namespace StdC



inline int Isxdigit(char8_t c)
inline int Isxdigit(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_XDIGIT;
}
Expand All @@ -287,7 +283,7 @@ namespace StdC



inline int Isgraph(char8_t c)
inline int Isgraph(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_GRAPH;
}
Expand All @@ -310,7 +306,7 @@ namespace StdC
#endif


inline int Islower(char8_t c)
inline int Islower(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_LOWER;
}
Expand All @@ -334,9 +330,9 @@ namespace StdC



inline char8_t Tolower(char8_t c)
inline char Tolower(char c)
{
return (char8_t)EASTDC_WLOWER_MAP[(uint8_t)c];
return (char)EASTDC_WLOWER_MAP[(uint8_t)c];
}

inline char16_t Tolower(char16_t c)
Expand All @@ -357,9 +353,9 @@ namespace StdC
#endif


inline int Isupper(char8_t c)
inline int Isupper(char c)
{
return (char8_t)EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_UPPER;
return (char)EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_UPPER;
}

inline int Isupper(char16_t c)
Expand All @@ -380,9 +376,9 @@ namespace StdC
#endif


inline char8_t Toupper(char8_t c)
inline char Toupper(char c)
{
return (char8_t)EASTDC_WUPPER_MAP[(uint8_t)c];
return (char)EASTDC_WUPPER_MAP[(uint8_t)c];
}

inline char16_t Toupper(char16_t c)
Expand All @@ -403,7 +399,7 @@ namespace StdC
#endif


inline int Isprint(char8_t c)
inline int Isprint(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_PRINT;
}
Expand All @@ -426,7 +422,7 @@ namespace StdC
#endif


inline int Ispunct(char8_t c)
inline int Ispunct(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_PUNCT;
}
Expand All @@ -449,7 +445,7 @@ namespace StdC
#endif


inline int Isspace(char8_t c)
inline int Isspace(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_SPACE;
}
Expand All @@ -472,7 +468,7 @@ namespace StdC
#endif


inline int Iscntrl(char8_t c)
inline int Iscntrl(char c)
{
return EASTDC_WCTYPE_MAP[(uint8_t)c] & EASTDC_WCTYPE_CONTROL;
}
Expand All @@ -495,7 +491,7 @@ namespace StdC
#endif


inline int Isascii(char8_t c)
inline int Isascii(char c)
{
return (uint8_t)c < 0x80;
}
Expand Down
2 changes: 1 addition & 1 deletion include/EAStdC/EADateTime.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ namespace StdC
/// The returned string isn't guaranteed to match equivalent results from other platforms.
/// The return value will be false in the case that EASTDC_UTC_TIME_AVAILABLE == 0.
enum { kTimeZoneNameCapacity = 64 };
EASTDC_API bool GetTimeZoneName(char8_t* pName, bool bDaylightSavingsName);
EASTDC_API bool GetTimeZoneName(char* pName, bool bDaylightSavingsName);

/// DateTimeToTm
/// Converts a DateTime to a C tm struct.
Expand Down
10 changes: 5 additions & 5 deletions include/EAStdC/EAHashString.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
/////////////////////////////////////////////////////////////////////////////
// Defines the following:
// uint32_t FNV1 (const void* pData, size_t nLength, uint32_t nInitialValue = kFNV1InitialValue);
// uint32_t FNV1_String8 (const char8_t* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
// uint32_t FNV1_String8 (const char* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
// uint32_t FNV1_String16(const char16_t* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
//
// uint64_t FNV64 (const void* pData, size_t nLength, uint64_t nInitialValue = kFNV1InitialValue);
// uint64_t FNV64_String8 (const char8_t* pData, uint64_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
// uint64_t FNV64_String8 (const char* pData, uint64_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
// uint64_t FNV64_String16(const char16_t* pData, uint64_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
//
// template<> class CTStringHash;
Expand Down Expand Up @@ -78,7 +78,7 @@ namespace StdC
const uint32_t kFNV1InitialValue = 2166136261U;

EASTDC_API uint32_t FNV1 (const void* pData, size_t nLength, uint32_t nInitialValue = kFNV1InitialValue);
EASTDC_API uint32_t FNV1_String8 (const char8_t* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint32_t FNV1_String8 (const char* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint32_t FNV1_String16(const char16_t* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint32_t FNV1_String32(const char32_t* pData, uint32_t nInitialValue = kFNV1InitialValue, CharCase charCase = kCharCaseAny);

Expand All @@ -88,7 +88,7 @@ namespace StdC
const uint64_t kFNV64InitialValue = UINT64_C(14695981039346656037);

EASTDC_API uint64_t FNV64 (const void* pData, size_t nLength, uint64_t nInitialValue = kFNV64InitialValue);
EASTDC_API uint64_t FNV64_String8 (const char8_t* pData, uint64_t nInitialValue = kFNV64InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint64_t FNV64_String8 (const char* pData, uint64_t nInitialValue = kFNV64InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint64_t FNV64_String16(const char16_t* pData, uint64_t nInitialValue = kFNV64InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint64_t FNV64_String32(const char32_t* pData, uint64_t nInitialValue = kFNV64InitialValue, CharCase charCase = kCharCaseAny);

Expand All @@ -98,7 +98,7 @@ namespace StdC
const uint32_t kDJB2InitialValue = 5381;

EASTDC_API uint32_t DJB2 (const void* pData, size_t nLength, uint32_t nInitialValue = kDJB2InitialValue);
EASTDC_API uint32_t DJB2_String8 (const char8_t* pData, uint32_t nInitialValue = kDJB2InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint32_t DJB2_String8 (const char* pData, uint32_t nInitialValue = kDJB2InitialValue, CharCase charCase = kCharCaseAny);
EASTDC_API uint32_t DJB2_String16(const char16_t* pData, uint32_t nInitialValue = kDJB2InitialValue, CharCase charCase = kCharCaseAny);


Expand Down
Loading

0 comments on commit 6f4edf1

Please sign in to comment.