King_DuckZ/utfcpp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed some superfluous code

Browse source 
git-svn-id: http://svn.code.sf.net/p/utfcpp/code@126 a809a056-fc17-0410-9590-b4f493f8b08e
This commit is contained in:
ntrifunovic 2011-10-16 03:06:05 +00:00 committed by King_DuckZ
parent 352ae366cd
commit 76cc24e2b4
1 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
source/utf8/core.h
View file

@ -150,79 +150,69 @@ namespace internal
/// get_sequence_x functions decode utf-8 sequences of the length x /// get_sequence_x functions decode utf-8 sequences of the length x
template <typename octet_iterator> template <typename octet_iterator>
utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t* code_point) utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
{ {
if (it == end) if (it == end)
return NOT_ENOUGH_ROOM; return NOT_ENOUGH_ROOM;
if (code_point) code_point = utf8::internal::mask8(*it);
*code_point = utf8::internal::mask8(*it);
return UTF8_OK; return UTF8_OK;
} }
template <typename octet_iterator> template <typename octet_iterator>
utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t* code_point) utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
{ {
if (it == end) if (it == end)
return NOT_ENOUGH_ROOM; return NOT_ENOUGH_ROOM;
uint32_t cp = utf8::internal::mask8(*it); code_point = utf8::internal::mask8(*it);
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f); code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
if (code_point)
*code_point = cp;
return UTF8_OK; return UTF8_OK;
} }
template <typename octet_iterator> template <typename octet_iterator>
utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t* code_point) utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
{ {
if (it == end) if (it == end)
return NOT_ENOUGH_ROOM; return NOT_ENOUGH_ROOM;
uint32_t cp = utf8::internal::mask8(*it); code_point = utf8::internal::mask8(*it);
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff); code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp += (*it) & 0x3f; code_point += (*it) & 0x3f;
if (code_point)
*code_point = cp;
return UTF8_OK; return UTF8_OK;
} }
template <typename octet_iterator> template <typename octet_iterator>
utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t* code_point) utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
{ {
if (it == end) if (it == end)
return NOT_ENOUGH_ROOM; return NOT_ENOUGH_ROOM;
uint32_t cp = utf8::internal::mask8(*it); code_point = utf8::internal::mask8(*it);
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff); code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp += (utf8::internal::mask8(*it) << 6) & 0xfff; code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end) UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
cp += (*it) & 0x3f; code_point += (*it) & 0x3f;
if (code_point)
*code_point = cp;
return UTF8_OK; return UTF8_OK;
} }
@ -247,16 +237,16 @@ namespace internal
case 0: case 0:
return INVALID_LEAD; return INVALID_LEAD;
case 1: case 1:
err = utf8::internal::get_sequence_1(it, end, &cp); err = utf8::internal::get_sequence_1(it, end, cp);
break; break;
case 2: case 2:
err = utf8::internal::get_sequence_2(it, end, &cp); err = utf8::internal::get_sequence_2(it, end, cp);
break; break;
case 3: case 3:
err = utf8::internal::get_sequence_3(it, end, &cp); err = utf8::internal::get_sequence_3(it, end, cp);
break; break;
case 4: case 4:
err = utf8::internal::get_sequence_4(it, end, &cp); err = utf8::internal::get_sequence_4(it, end, cp);
break; break;
} }