Move class members and comments around

[libs/core.git] / source / buffered.cpp

diff --git a/source/buffered.cpp b/source/buffered.cpp
index e36aef460dd8e163cadb6aec006b235e3fd0f8c9..f53d2fc23fa49e38ede87da0188b40d3cfeadb50 100644 (file)
--- a/source/buffered.cpp
+++ b/source/buffered.cpp
@@ -19,17 +19,16 @@ Buffered::Buffered(Base &b, unsigned s):
        below.signal_flush_required.connect(sigc::mem_fun(this, &Buffered::flush));
 }
 
-unsigned Buffered::put(char c)
+Buffered::~Buffered()
 {
-       set_op(M_WRITE);
-
-       if(end<buf+buf_size)
+       try
        {
-               *end++ = c;
-               return 1;
+               flush();
        }
-       else
-               return do_write(&c, 1);
+       catch(...)
+       { }
+
+       delete[] buf;
 }
 
 void Buffered::flush()
@@ -51,63 +50,6 @@ void Buffered::flush()
                begin=end = buf;
 }
 
-bool Buffered::getline(std::string &line)
-{
-       set_op(M_READ);
-
-       for(char *i=begin; i!=end; ++i)
-               if(*i=='\n')
-               {
-                       line.assign(begin, i-begin);
-                       begin = i+1;
-                       return true;
-               }
-
-       return Base::getline(line);
-}
-
-int Buffered::get()
-{
-       set_op(M_READ);
-
-       if(begin<end)
-               return static_cast<unsigned char>(*begin++);
-
-       char c;
-       if(do_read(&c, 1)==0)
-               return -1;
-       return static_cast<unsigned char>(c);
-}
-
-Handle Buffered::get_event_handle()
-{
-       throw Exception("Buffered doesn't support events");
-}
-
-unsigned Buffered::get_current_size() const
-{
-       return end-begin;
-}
-
-Buffered::~Buffered()
-{
-       try
-       {
-               flush();
-       }
-       catch(...)
-       { }
-
-       delete[] buf;
-}
-
-void Buffered::set_op(Mode op)
-{
-       if(op!=cur_op)
-               flush();
-       cur_op = op;
-}
-
 unsigned Buffered::do_write(const char *data, unsigned size)
 {
        set_op(M_WRITE);
@@ -184,5 +126,63 @@ unsigned Buffered::do_read(char *data, unsigned size)
        }
 }
 
+unsigned Buffered::put(char c)
+{
+       set_op(M_WRITE);
+
+       if(end<buf+buf_size)
+       {
+               *end++ = c;
+               return 1;
+       }
+       else
+               return do_write(&c, 1);
+}
+
+bool Buffered::getline(std::string &line)
+{
+       set_op(M_READ);
+
+       for(char *i=begin; i!=end; ++i)
+               if(*i=='\n')
+               {
+                       line.assign(begin, i-begin);
+                       begin = i+1;
+                       return true;
+               }
+
+       return Base::getline(line);
+}
+
+int Buffered::get()
+{
+       set_op(M_READ);
+
+       if(begin<end)
+               return static_cast<unsigned char>(*begin++);
+
+       char c;
+       if(do_read(&c, 1)==0)
+               return -1;
+       return static_cast<unsigned char>(c);
+}
+
+void Buffered::set_op(Mode op)
+{
+       if(op!=cur_op)
+               flush();
+       cur_op = op;
+}
+
+unsigned Buffered::get_current_size() const
+{
+       return end-begin;
+}
+
+Handle Buffered::get_event_handle()
+{
+       throw Exception("Buffered doesn't support events");
+}
+
 } // namespace IO
 } // namespace Msp