More sophisticated error handling

[libs/core.git] / source / utf8.h

diff --git a/source/utf8.h b/source/utf8.h
index 0475523cf52578216e9a63c4a4942ad1c18936e9..40b4fb88ea41eb54cd7ca12ac6c32171027b5a79 100644 (file)
--- a/source/utf8.h
+++ b/source/utf8.h
@@ -11,13 +11,16 @@ public:
        class Encoder: public StringCodec::Encoder
        {
        public:
+               Encoder(ErrorMode em=THROW_ON_ERROR): StringCodec::Encoder(em) { }
                void encode_char(wchar_t);
+       private:
+               void append_replacement() { append("\357\277\275"); }
        };
 
        class Decoder: public StringCodec::Decoder
        {
        public:
-               Decoder(): bytes(0), code(0) { }
+               Decoder(ErrorMode em=THROW_ON_ERROR): StringCodec::Decoder(em), bytes(0), code(0) { }
                void     decode_char(const std::string &, std::string::const_iterator &);
                void     sync();
                void     reset();
@@ -26,8 +29,8 @@ public:
                unsigned code;
        };
 
-       Encoder *create_encoder() const { return new Encoder; }
-       Decoder *create_decoder() const { return new Decoder; }
+       Encoder *create_encoder(ErrorMode em=THROW_ON_ERROR) const { return new Encoder(em); }
+       Decoder *create_decoder(ErrorMode em=THROW_ON_ERROR) const { return new Decoder(em); }
 };
 
 } // namespace Msp