From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 23 Mar 2009 11:12:27 +0000 (+0000)
Subject: Add convenience functions to Encoder and Decoder to process a string and return the... 
X-Git-Tag: strings-1.1~4
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=0ac97daad8d24f6762e1b870fec782c7aace695a;p=libs%2Fcore.git

Add convenience functions to Encoder and Decoder to process a string and return the result
Fix UTF-8 detection in Codecs::detect_codec
---

diff --git a/source/codec.cpp b/source/codec.cpp
index 521dfea..42315e5 100644
--- a/source/codec.cpp
+++ b/source/codec.cpp
@@ -46,6 +46,14 @@ void Codec::Encoder::encode(const ustring &str, string &buf)
 		encode_char(*i, buf);
 }
 
+string Codec::Encoder::encode(const ustring &str)
+{
+	string buf;
+	encode(str, buf);
+	sync(buf);
+	return buf;
+}
+
 void Codec::Encoder::error(UnicodeChar ch, string &buf, const string &msg)
 {
 	switch(err_mode)
@@ -70,6 +78,13 @@ void Codec::Decoder::decode(const string &str, ustring &buf)
 	}
 }
 
+ustring Codec::Decoder::decode(const string &str)
+{
+	ustring buf;
+	decode(str, buf);
+	return buf;
+}
+
 UnicodeChar Codec::Decoder::error(const string &msg)
 {
 	switch(err_mode)
@@ -131,13 +146,21 @@ Codec *detect_codec(const string &str)
 			else if((c&0xC0)==0xC0)
 			{
 				if(utf8_mb)
+				{
 					is_utf8=false;
+					utf8_mb=0;
+				}
 				else
 				{
 					for(utf8_mb=1; (c>>(6-utf8_mb))&1; ++utf8_mb) ;
 				}
 			}
 		}
+		else if(utf8_mb)
+		{
+			is_utf8=false;
+			utf8_mb=0;
+		}
 	}
 
 	if(is_ascii)
diff --git a/source/codec.h b/source/codec.h
index d373740..e8b172e 100644
--- a/source/codec.h
+++ b/source/codec.h
@@ -79,6 +79,8 @@ public:
 		*/
 		virtual void encode(const ustring &str, std::string &buf);
 
+		std::string encode(const ustring &);
+
 		/**
 		Procuces a sequence of bytes that will bring the encoder back to the
 		initial state.
@@ -143,6 +145,8 @@ public:
 		*/
 		virtual void decode(const std::string &str, ustring &buf);
 
+		ustring decode(const std::string &);
+
 		/**
 		Resets the decoder to the initial state.
 		*/