X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fjisx0208.cpp;h=d56ec33d22a2da43bc6ff8b8bc1d6af30e549706;hb=d3fc0bf0f20f100f2831188c1ce21461d21c2c7a;hp=b8d8e057ad52c1b36fde3a90146eef6c43771496;hpb=967785734be5c3fc6f75da122c2d93ebbb338271;p=libs%2Fcore.git

diff --git a/source/stringcodec/jisx0208.cpp b/source/stringcodec/jisx0208.cpp
index b8d8e05..d56ec33 100644
--- a/source/stringcodec/jisx0208.cpp
+++ b/source/stringcodec/jisx0208.cpp
@@ -5,9 +5,9 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
+void JisX0208::Encoder::encode_char(unichar ucs, string &buf)
 {
 	unsigned short jis = ucs_to_jisx0208(ucs);
 	if(jis)
@@ -16,33 +16,35 @@ void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
 		buf.append(jbuf, 2);
 	}
 	else
-		error(ucs, buf, "Can't express character in JIS X 0208");
+		error(ucs, buf, invalid_character(ucs, "JIS X 0208"));
 }
 
-void JisX0208::Encoder::transliterate(UnicodeChar, string &buf)
+void JisX0208::Encoder::transliterate(unichar, string &buf)
 {
 	buf.append("!)", 2);
 }
 
 
-UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar JisX0208::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
-		return error("No input");
+		return -1;
 
 	string::const_iterator j = i;
 	Kuten jis;
 	jis.ku = *j++-0x20;
 
-	UnicodeChar result;
+	unichar result;
 	if(j==str.end())
-		result = error("Incomplete JIS X 0208 character");
+		result = error(invalid_sequence(i, j, "incomplete JIS X 0208 character"));
 	else
 	{
 		jis.ten = *j++-0x20;
 		result = jisx0208_to_ucs(jis);
+		if(result==-1)
+			result = error(invalid_sequence(i, j, "invalid JIS X 0208 ku-ten"));
 		if(result==0)
-			result = error("Undefined JIS X 0208 character");
+			result = error(invalid_sequence(i, j, "undefined JIS X 0208 character"));
 	}
 
 	i = j;
@@ -50,15 +52,15 @@ UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iter
 }
 
 
-UnicodeChar jisx0208_to_ucs(Kuten jis)
+unichar jisx0208_to_ucs(Kuten jis)
 {
 	if(jis.ku==0 || jis.ku>0x5E || jis.ten==0 || jis.ten>0x5E)
-		return 0;
+		return -1;
 
 	return jisx0208_to_ucs_table[jis.ku*94 + jis.ten - 95];
 }
 
-Kuten ucs_to_jisx0208(UnicodeChar c)
+Kuten ucs_to_jisx0208(unichar c)
 {
 	if(c<0 || c>0xFFFF)
 		return Kuten();
@@ -82,5 +84,5 @@ Kuten ucs_to_jisx0208(UnicodeChar c)
 	return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp