Added reset function for StringCodec::Decoder

diff --git a/source/codec.h b/source/codec.h
index d5ba595b3b3ee765caa574479c766c92f27281c8..5fb29db29b305577582e6ed56c58f3bda61d823c 100644 (file)
--- a/source/codec.h
+++ b/source/codec.h
@@ -91,11 +91,17 @@ public:
                { for(std::string::const_iterator i=s.begin(); i!=s.end(); ) decode_char(s, i); }
 
                /**
                { for(std::string::const_iterator i=s.begin(); i!=s.end(); ) decode_char(s, i); }
 
                /**

-               Ensures that all input has been processed.  An exception is thrown if
-               this is not the case.
+               Ensures that all input has been processed.  If this is not the case any
+               buffers are cleared and an exception is thrown,

                */
                virtual void sync() { }
 
                */
                virtual void sync() { }
 

+               /**
+               Resets the decoder, clearing a possibly erroneus state.  Does not flush
+               the internal buffer.
+               */
+               virtual void reset() { }
+

                const std::wstring &get() const { return buffer_; }
                unsigned size() const { return buffer_.size(); }
                void flush() { buffer_.clear(); }
                const std::wstring &get() const { return buffer_; }
                unsigned size() const { return buffer_.size(); }
                void flush() { buffer_.clear(); }

diff --git a/source/iso2022jp.cpp b/source/iso2022jp.cpp
index 806dca1d2e672958b1ebfdf62091a009c7ceaa54..ab31456245b449c861a4c69b98dab62af77d4f40 100644 (file)
--- a/source/iso2022jp.cpp
+++ b/source/iso2022jp.cpp
@@ -110,6 +110,12 @@ void Iso2022Jp::Decoder::sync()
        dec->flush();
 }
 
        dec->flush();
 }
 

+void Iso2022Jp::Decoder::reset()
+{
+       switch_mode(ASCII);
+       escape=0;
+}
+

 void Iso2022Jp::Decoder::switch_mode(Mode m)
 {
        append(dec->get());
 void Iso2022Jp::Decoder::switch_mode(Mode m)
 {
        append(dec->get());

diff --git a/source/iso2022jp.h b/source/iso2022jp.h
index ea5209e56c19d7e4157a5632685226343507aa56..8ded0d845d2c87200577351acb57ded2466c9f2d 100644 (file)
--- a/source/iso2022jp.h
+++ b/source/iso2022jp.h
@@ -33,6 +33,7 @@ public:
                Decoder();
                void decode_char(const std::string &, std::string::const_iterator &);
                void sync();
                Decoder();
                void decode_char(const std::string &, std::string::const_iterator &);
                void sync();

+               void reset();

        private:
                Mode mode;
                StringCodec::Decoder *dec;
        private:
                Mode mode;
                StringCodec::Decoder *dec;

diff --git a/source/jisx0208.cpp b/source/jisx0208.cpp
index 477ccd082c4d1516fa45dde8ccdbac6d474ab85e..4d46f709f89df5f739aa7c11a6a298505f41ed45 100644 (file)
--- a/source/jisx0208.cpp
+++ b/source/jisx0208.cpp
@@ -42,6 +42,10 @@ void JisX0208::Decoder::sync()
                throw CodecError("Sync in middle of JIS X 0208 character");
 }
 
                throw CodecError("Sync in middle of JIS X 0208 character");
 }
 

+void JisX0208::Decoder::reset()
+{
+       high=0;
+}

 
 wchar_t jisx0208_to_ucs(unsigned short jis)
 {
 
 wchar_t jisx0208_to_ucs(unsigned short jis)
 {

diff --git a/source/jisx0208.h b/source/jisx0208.h
index a81f578108c9f933f3fdbf3ac91b16cd7e6b6baf..16f82027247c4517d32097d74bca300af1d897ca 100644 (file)
--- a/source/jisx0208.h
+++ b/source/jisx0208.h
@@ -19,6 +19,7 @@ public:
        public:
                void decode_char(const std::string &, std::string::const_iterator &);
                void sync();
        public:
                void decode_char(const std::string &, std::string::const_iterator &);
                void sync();

+               void reset();

        private:
                char high;
        };
        private:
                char high;
        };

diff --git a/source/utf8.cpp b/source/utf8.cpp
index 0217790277a2a1b14112668552cc1675125028d6..f95ad9c27a9ea1b76b86d273432f3c74b21b7fea 100644 (file)
--- a/source/utf8.cpp
+++ b/source/utf8.cpp
@@ -89,4 +89,9 @@ void Utf8::Decoder::sync()
                throw CodecError("Sync in the middle of multibyte UTF-8 sequence");
 }
 
                throw CodecError("Sync in the middle of multibyte UTF-8 sequence");
 }
 

+void Utf8::Decoder::reset()
+{
+       bytes=0;
+}
+

 } // namespace Msp
 } // namespace Msp

diff --git a/source/utf8.h b/source/utf8.h
index 18f9ae58f93fa42421887422986e038c276e3abe..0475523cf52578216e9a63c4a4942ad1c18936e9 100644 (file)
--- a/source/utf8.h
+++ b/source/utf8.h
@@ -20,6 +20,7 @@ public:
                Decoder(): bytes(0), code(0) { }
                void     decode_char(const std::string &, std::string::const_iterator &);
                void     sync();
                Decoder(): bytes(0), code(0) { }
                void     decode_char(const std::string &, std::string::const_iterator &);
                void     sync();

+               void     reset();

        private:
                unsigned bytes;
                unsigned code;
        private:
                unsigned bytes;
                unsigned code;