X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Futf8.cpp;fp=source%2Futf8.cpp;h=c7e1705f814e2d099d3b0180730c57e3aa210d85;hp=dd01150803186dc68a4687668026a94e23b3dee4;hb=5b1368cb791cab043f0435628cacbaff36e39b7b;hpb=36f9e78ae75f5e14b132f37d249340ad3480b8ce

diff --git a/source/utf8.cpp b/source/utf8.cpp
index dd01150..c7e1705 100644
--- a/source/utf8.cpp
+++ b/source/utf8.cpp
@@ -17,25 +17,25 @@ void Utf8::Encoder::encode_char(UnicodeChar ch, string &buf)
 	if(ch<0 || ch>0x10FFFF)
 		return error(ch, buf, "Can't express character in UTF-8");
 
-	unsigned bytes=1;
+	unsigned bytes = 1;
 	if(ch>0xFFFF)
-		bytes=4;
+		bytes = 4;
 	else if(ch>0x7FF)
-		bytes=3;
+		bytes = 3;
 	else if(ch>0x7F)
-		bytes=2;
+		bytes = 2;
 
 	if(bytes==1)
-		buf+=ch;
+		buf += ch;
 	else
 	{
 		char utf[4];
 
-		utf[0]=0xFF<<(8-bytes) | ch>>(bytes*6-6);
+		utf[0] = 0xFF<<(8-bytes) | ch>>(bytes*6-6);
 		for(unsigned j=bytes-1; j>0; --j)
 		{
-			utf[j]=0x80 | (ch&0x3F);
-			ch>>=6;
+			utf[j] = 0x80 | (ch&0x3F);
+			ch >>= 6;
 		}
 
 		buf.append(utf, bytes);
@@ -55,33 +55,33 @@ UnicodeChar Utf8::Decoder::decode_char(const string &str, string::const_iterator
 
 	if((*i&0xC0)==0x80)
 	{
-		UnicodeChar result=error("UTF-8 tail byte found when expecting head");
+		UnicodeChar result = error("UTF-8 tail byte found when expecting head");
 		++i;
 		return result;
 	}
 	else if(*i&0x80)
 	{
-		unsigned bytes=2;
-		unsigned mask=0x20;
+		unsigned bytes = 2;
+		unsigned mask = 0x20;
 		for(; *i&mask; mask>>=1)
 			++bytes;
 
-		string::const_iterator j=i;
+		string::const_iterator j = i;
 
-		UnicodeChar result=(*j++)&(mask-1);
+		UnicodeChar result = (*j++)&(mask-1);
 
 		unsigned k;
 		for(k=1; (k<bytes && j!=str.end() && (*j&0xC0)==0x80); ++k)
-			result=(result<<6) | ((*j++)&0x3F);
+			result = (result<<6) | ((*j++)&0x3F);
 
 		if(k<bytes)
-			result=error("Incomplete UTF-8 character");
+			result = error("Incomplete UTF-8 character");
 		else if(!(result>>(bytes*5-4)) || !(result>>7))
-			result=error("Denormalized UTF-8 multibyte sequence");
+			result = error("Denormalized UTF-8 multibyte sequence");
 		else if(result>0x10FFFF || (result>=0xD800 && result<=0xDFFF))
-			result=error("Invalid Unicode code point");
+			result = error("Invalid Unicode code point");
 
-		i=j;
+		i = j;
 		return result;
 	}
 	else