Skip to content

Commit

Permalink
added UTF16CharTraits and UTF32CharTraits to make everything work on …
Browse files Browse the repository at this point in the history
…platforms without std::wstring
  • Loading branch information
obiltschnig committed May 31, 2014
1 parent 62d69b7 commit 7c6e402
Show file tree
Hide file tree
Showing 2 changed files with 254 additions and 27 deletions.
275 changes: 254 additions & 21 deletions Foundation/include/Poco/UTFString.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,246 @@


#include "Poco/Foundation.h"
#include "Poco/Types.h"
#include <string>


namespace Poco {


// UTF string types
struct UTF16CharTraits
{
typedef std::fpos<mbstate_t> u16streampos;
typedef UInt16 char_type;
typedef int int_type;
typedef std::streamoff off_type;
typedef u16streampos pos_type;
typedef mbstate_t state_type;

static void assign(char_type& c1, const char_type& c2)
{
c1 = c2;
}

static bool eq(char_type c1, char_type c2)
{
return c1 == c2;
}

static bool lt(char_type c1, char_type c2)
{
return c1 < c2;
}

static int compare(const char_type* s1, const char_type* s2, size_t n)
{
for (; n; --n, ++s1, ++s2)
{
if (lt(*s1, *s2))
return -1;
if (lt(*s2, *s1))
return 1;
}
return 0;
}

static size_t length(const char_type* s)
{
size_t len = 0;
for (; !eq(*s, char_type(0)); ++s)
++len;
return len;
}

static const char_type* find(const char_type* s, size_t n, const char_type& a)
{
for (; n; --n)
{
if (eq(*s, a))
return s;
++s;
}
return 0;
}

static char_type* move(char_type* s1, const char_type* s2, size_t n)
{
char_type* r = s1;
if (s1 < s2)
{
for (; n; --n, ++s1, ++s2)
assign(*s1, *s2);
}
else if (s2 < s1)
{
s1 += n;
s2 += n;
for (; n; --n)
assign(*--s1, *--s2);
}
return r;
}

static char_type* copy(char_type* s1, const char_type* s2, size_t n)
{
poco_assert(s2 < s1 || s2 >= s1 + n);
char_type* r = s1;
for (; n; --n, ++s1, ++s2)
assign(*s1, *s2);
return r;
}

static char_type* assign(char_type* s, size_t n, char_type a)
{
char_type* r = s;
for (; n; --n, ++s)
assign(*s, a);
return r;
}

static int_type not_eof(int_type c)
{
return eq_int_type(c, eof()) ? ~eof() : c;
}

static char_type to_char_type(int_type c)
{
return char_type(c);
}

static int_type to_int_type(char_type c)
{
return int_type(c);
}

static bool eq_int_type(int_type c1, int_type c2)
{
return c1 == c2;
}

static int_type eof()
{
return int_type(0xDFFF);
}
};


struct UTF32CharTraits
{
typedef std::fpos<mbstate_t> u32streampos;
typedef UInt32 char_type;
typedef int int_type;
typedef std::streamoff off_type;
typedef u32streampos pos_type;
typedef mbstate_t state_type;

static void assign(char_type& c1, const char_type& c2)
{
c1 = c2;
}

static bool eq(char_type c1, char_type c2)
{
return c1 == c2;
}

static bool lt(char_type c1, char_type c2)
{
return c1 < c2;
}

static int compare(const char_type* s1, const char_type* s2, size_t n)
{
for (; n; --n, ++s1, ++s2)
{
if (lt(*s1, *s2))
return -1;
if (lt(*s2, *s1))
return 1;
}
return 0;
}

static size_t length(const char_type* s)
{
size_t len = 0;
for (; !eq(*s, char_type(0)); ++s)
++len;
return len;
}

static const char_type* find(const char_type* s, size_t n, const char_type& a)
{
for (; n; --n)
{
if (eq(*s, a))
return s;
++s;
}
return 0;
}

static char_type* move(char_type* s1, const char_type* s2, size_t n)
{
char_type* r = s1;
if (s1 < s2)
{
for (; n; --n, ++s1, ++s2)
assign(*s1, *s2);
}
else if (s2 < s1)
{
s1 += n;
s2 += n;
for (; n; --n)
assign(*--s1, *--s2);
}
return r;
}

static char_type* copy(char_type* s1, const char_type* s2, size_t n)
{
poco_assert(s2 < s1 || s2 >= s1 + n);
char_type* r = s1;
for (; n; --n, ++s1, ++s2)
assign(*s1, *s2);
return r;
}

static char_type* assign(char_type* s, size_t n, char_type a)
{
char_type* r = s;
for (; n; --n, ++s)
assign(*s, a);
return r;
}

static int_type not_eof(int_type c)
{
return eq_int_type(c, eof()) ? ~eof() : c;
}

static char_type to_char_type(int_type c)
{
return char_type(c);
}

static int_type to_int_type(char_type c)
{
return int_type(c);
}

static bool eq_int_type(int_type c1, int_type c2)
{
return c1 == c2;
}

static int_type eof()
{
return int_type(0xDFFF);
}
};


//#if defined(POCO_ENABLE_CPP11) //TODO
// typedef char16_t UTF16Char;
Expand All @@ -36,33 +269,33 @@ namespace Poco {
// typedef std::u32string UTF32String;
//#else
#ifdef POCO_NO_WSTRING
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UTF16Char, UTF16CharTraits> UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UTF32Char, UTF32CharTraits> UTF32String;
#else // POCO_NO_WSTRING
#if defined(POCO_OS_FAMILY_WINDOWS)
typedef wchar_t UTF16Char;
typedef std::wstring UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
typedef wchar_t UTF16Char;
typedef std::wstring UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UTF32Char, UTF32CharTraits> UTF32String;
#elif defined(__SIZEOF_WCHAR_T__) //gcc
#if (__SIZEOF_WCHAR_T__ == 2)
typedef wchar_t UTF16Char;
typedef std::wstring UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UInt32> UTF32String;
typedef wchar_t UTF16Char;
typedef std::wstring UTF16String;
typedef UInt32 UTF32Char;
typedef std::basic_string<UTF32Char, UTF32CharTraits> UTF32String;
#elif (__SIZEOF_WCHAR_T__ == 4)
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UTF16Char, UTF16CharTraits> UTF16String;
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
#endif
#else // default to 32-bit wchar_t
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UInt16> UTF16String;
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
typedef Poco::UInt16 UTF16Char;
typedef std::basic_string<UTF16Char, UTF16CharTraits> UTF16String;
typedef wchar_t UTF32Char;
typedef std::wstring UTF32String;
#endif //POCO_OS_FAMILY_WINDOWS
#endif //POCO_NO_WSTRING
//#endif // POCO_ENABLE_CPP11
Expand Down
6 changes: 0 additions & 6 deletions Foundation/src/UnicodeConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
//


#ifndef POCO_NO_WSTRING


#include "Poco/UnicodeConverter.h"
#include "Poco/TextConverter.h"
#include "Poco/TextIterator.h"
Expand Down Expand Up @@ -164,6 +161,3 @@ void UnicodeConverter::convert(const UTF32Char* utf32String, std::string& utf8St


} // namespace Poco


#endif // POCO_NO_WSTRING

0 comments on commit 7c6e402

Please sign in to comment.