3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Rename isValidChar() -> isValidByte() 

- Minor adjustments to mimic styling of surrounding code
  P.S.: a .clang-format file would be nice ;-)
This commit is contained in:
Ludger Sprenker 2016-02-06 16:38:25 +01:00
parent 0837427e00
commit 5300004f50
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/internal/catch_xmlwriter.hpp
View File

@ -22,7 +22,7 @@ namespace Catch {
// (see: https://en.wikipedia.org/wiki/UTF-8#Codepage_layout) // (see: https://en.wikipedia.org/wiki/UTF-8#Codepage_layout)
namespace Utf8 { namespace Utf8 {
inline bool isSingleByteChar(unsigned char b) { inline bool isSingleByteChar( unsigned char b ) {
// Plain ASCII chars // Plain ASCII chars
return b <= 0x7F; return b <= 0x7F;
} }
@ -31,23 +31,23 @@ namespace Catch {
return b >= 0x80 && b <= 0xBF; return b >= 0x80 && b <= 0xBF;
} }
inline bool isFirstInTwoByteChar(unsigned char b) { inline bool isFirstInTwoByteChar( unsigned char b ) {
return b >= 0xC2 && b <= 0xDF; return b >= 0xC2 && b <= 0xDF;
} }
inline bool isFirstInThreeByteChar(unsigned char b) { inline bool isFirstInThreeByteChar( unsigned char b ) {
return b >= 0xE0 && b <= 0xEF; return b >= 0xE0 && b <= 0xEF;
} }
inline bool isFirstInFourByteChar(unsigned char b) { inline bool isFirstInFourByteChar( unsigned char b ) {
return b >= 0xF0 && b <= 0xF4; return b >= 0xF0 && b <= 0xF4;
} }
inline bool isInvalidChar(unsigned char b) { inline bool isInvalidByte( unsigned char b ) {
return b == 0xC0 || b == 0xC1 || b >= 0xF5; return b == 0xC0 || b == 0xC1 || b >= 0xF5;
} }
inline bool isValid(const char* str, size_t len) { inline bool isValid( char const* str, size_t len ) {
int outstandingBytesOfCurrentChar = 0; int outstandingBytesOfCurrentChar = 0;
for( std::size_t i = 0; i < len; ++ i ) { for( std::size_t i = 0; i < len; ++ i ) {
@ -83,15 +83,15 @@ namespace Catch {
return false; return false;
} }
// explicit negative check (sould be fully redundant here) // explicit negative check (should be fully redundant here)
assert( isInvalidChar( b ) == false ); assert( isInvalidByte( b ) == false );
} }
return outstandingBytesOfCurrentChar == 0; return outstandingBytesOfCurrentChar == 0;
} }
inline bool isValid(const std::string& str) { inline bool isValid( std::string const& str ) {
return isValid(str.c_str(), str.size()); return isValid( str.c_str(), str.size() );
} }
} }