@@ -32,13 +32,13 @@ DEALINGS IN THE SOFTWARE.
32
32
33
33
namespace utf8
34
34
{
35
- namespace unchecked
35
+ namespace unchecked
36
36
{
37
37
template <typename octet_iterator>
38
38
octet_iterator append (uint32_t cp, octet_iterator result)
39
39
{
40
40
if (cp < 0x80 ) // one octet
41
- *(result++) = static_cast <uint8_t >(cp);
41
+ *(result++) = static_cast <uint8_t >(cp);
42
42
else if (cp < 0x800 ) { // two octets
43
43
*(result++) = static_cast <uint8_t >((cp >> 6 ) | 0xc0 );
44
44
*(result++) = static_cast <uint8_t >((cp & 0x3f ) | 0x80 );
@@ -70,28 +70,28 @@ namespace utf8
70
70
cp = ((cp << 6 ) & 0x7ff ) + ((*it) & 0x3f );
71
71
break ;
72
72
case 3 :
73
- ++it;
73
+ ++it;
74
74
cp = ((cp << 12 ) & 0xffff ) + ((utf8::internal::mask8 (*it) << 6 ) & 0xfff );
75
75
++it;
76
76
cp += (*it) & 0x3f ;
77
77
break ;
78
78
case 4 :
79
79
++it;
80
- cp = ((cp << 18 ) & 0x1fffff ) + ((utf8::internal::mask8 (*it) << 12 ) & 0x3ffff );
80
+ cp = ((cp << 18 ) & 0x1fffff ) + ((utf8::internal::mask8 (*it) << 12 ) & 0x3ffff );
81
81
++it;
82
82
cp += (utf8::internal::mask8 (*it) << 6 ) & 0xfff ;
83
83
++it;
84
- cp += (*it) & 0x3f ;
84
+ cp += (*it) & 0x3f ;
85
85
break ;
86
86
}
87
87
++it;
88
- return cp;
88
+ return cp;
89
89
}
90
90
91
91
template <typename octet_iterator>
92
92
uint32_t peek_next (octet_iterator it)
93
93
{
94
- return utf8::unchecked::next (it);
94
+ return utf8::unchecked::next (it);
95
95
}
96
96
97
97
template <typename octet_iterator>
@@ -121,14 +121,14 @@ namespace utf8
121
121
distance (octet_iterator first, octet_iterator last)
122
122
{
123
123
typename std::iterator_traits<octet_iterator>::difference_type dist;
124
- for (dist = 0 ; first < last; ++dist)
124
+ for (dist = 0 ; first < last; ++dist)
125
125
utf8::unchecked::next (first);
126
126
return dist;
127
127
}
128
128
129
129
template <typename u16bit_iterator, typename octet_iterator>
130
130
octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
131
- {
131
+ {
132
132
while (start != end) {
133
133
uint32_t cp = utf8::internal::mask16 (*start++);
134
134
// Take care of surrogate pairs first
@@ -138,7 +138,7 @@ namespace utf8
138
138
}
139
139
result = utf8::unchecked::append (cp, result);
140
140
}
141
- return result;
141
+ return result;
142
142
}
143
143
144
144
template <typename u16bit_iterator, typename octet_iterator>
@@ -176,7 +176,7 @@ namespace utf8
176
176
177
177
// The iterator class
178
178
template <typename octet_iterator>
179
- class iterator : public std ::iterator <std::bidirectional_iterator_tag, uint32_t > {
179
+ class iterator : public std ::iterator <std::bidirectional_iterator_tag, uint32_t > {
180
180
octet_iterator it;
181
181
public:
182
182
iterator () {}
@@ -188,15 +188,15 @@ namespace utf8
188
188
octet_iterator temp = it;
189
189
return utf8::unchecked::next (temp);
190
190
}
191
- bool operator == (const iterator& rhs) const
192
- {
191
+ bool operator == (const iterator& rhs) const
192
+ {
193
193
return (it == rhs.it );
194
194
}
195
195
bool operator != (const iterator& rhs) const
196
196
{
197
197
return !(operator == (rhs));
198
198
}
199
- iterator& operator ++ ()
199
+ iterator& operator ++ ()
200
200
{
201
201
::std::advance (it, utf8::internal::sequence_length(it));
202
202
return *this ;
@@ -206,7 +206,7 @@ namespace utf8
206
206
iterator temp = *this ;
207
207
::std::advance (it, utf8::internal::sequence_length(it));
208
208
return temp;
209
- }
209
+ }
210
210
iterator& operator -- ()
211
211
{
212
212
utf8::unchecked::prior (it);
@@ -221,7 +221,7 @@ namespace utf8
221
221
}; // class iterator
222
222
223
223
} // namespace utf8::unchecked
224
- } // namespace utf8
224
+ } // namespace utf8
225
225
226
226
227
227
#endif // header guard
0 commit comments