haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UTF8::uni_iter made leaner.

This commit is contained in:
Dick Hollenbeck 2013-12-06 07:32:33 -06:00
parent 391ff6699a
commit a0623d9584
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/UTF8.cpp
View File

@ -59,11 +59,11 @@ public:
return wxString( c_str(), wxConvUTF8 ); return wxString( c_str(), wxConvUTF8 );
} }
static int uni_forward( const_iterator it, uint32_t* result ) static int uni_forward( unsigned char* it, uint32_t* result )
{ {
// @todo: have this read UTF8 characters into result, not bytes. // @todo: have this read UTF8 characters into result, not bytes.
// What's here now is scaffolding, reading single byte characters only. // What's here now is scaffolding, reading single byte characters only.
*result = (unsigned char) *it; *result = *it;
return 1; return 1;
} }
@ -74,13 +74,13 @@ public:
* they return a uint32_t holding the unicode character appropriate for respective * they return a uint32_t holding the unicode character appropriate for respective
* operation. * operation.
*/ */
class uni_iter : public std::string::const_iterator class uni_iter
{ {
const_iterator it; unsigned char* it;
public: public:
uni_iter( const_iterator start ) : uni_iter( const char* start ) :
it( start ) it( (unsigned char*) start )
{ {
} }
@ -138,12 +138,12 @@ public:
uni_iter ubegin() const uni_iter ubegin() const
{ {
return uni_iter( begin() ); return uni_iter( data() );
} }
uni_iter uend() const uni_iter uend() const
{ {
return uni_iter( end() ); return uni_iter( data() + size() );
} }
}; };