Return -1 from decode_char if there is no input

[libs/core.git] / source / stringcodec / jisx0201.cpp

diff --git a/source/stringcodec/jisx0201.cpp b/source/stringcodec/jisx0201.cpp
index d5987e596b39f10cca85297f977fdbdd617afc40..4d9d6bdf5eaea9c257a13325643c574b1672761d 100644 (file)
--- a/source/stringcodec/jisx0201.cpp
+++ b/source/stringcodec/jisx0201.cpp
@@ -3,9 +3,9 @@
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-void JisX0201::Encoder::encode_char(UnicodeChar ch, string &buf)
+void JisX0201::Encoder::encode_char(unichar ch, string &buf)
 {
        if(ch>=0 && ch<=0x7F && ch!=0x5C && ch!=0x7E)
                buf += ch;
@@ -19,19 +19,19 @@ void JisX0201::Encoder::encode_char(UnicodeChar ch, string &buf)
                error(ch, buf, "Can't express character in JIS X 0201");
 }
 
-void JisX0201::Encoder::transliterate(UnicodeChar, string &buf)
+void JisX0201::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar JisX0201::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar JisX0201::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
-               return error("No input");
+               return -1;
 
        unsigned char ch = *i;
-       UnicodeChar result;
+       unichar result;
        if(ch==0x5C)
                result = 0xA5;
        else if(ch==0x7E)
@@ -47,5 +47,5 @@ UnicodeChar JisX0201::Decoder::decode_char(const string &str, string::const_iter
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp