Some fixes for eof handling in Memory

[libs/core.git] / source / io / memory.cpp

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index 4a6296b44a907321a5e04a585e229523ff7caf86..f64b4be9e52edcb6fcae3bb94c99d69595fd4e80 100644 (file)
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -8,14 +8,14 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Memory::Memory(char *d, unsigned s)
+Memory::Memory(char *d, unsigned s, Mode m)
 {
-       init(d, d+s, M_RDWR);
+       init(d, d+s, m);
 }
 
-Memory::Memory(char *b, char *e)
+Memory::Memory(char *b, char *e, Mode m)
 {
-       init(b, e, M_RDWR);
+       init(b, e, m);
 }
 
 Memory::Memory(const char *cd, unsigned s)
@@ -39,7 +39,7 @@ void Memory::init(char *b, char *e, Mode m)
 
 unsigned Memory::do_write(const char *buf, unsigned size)
 {
-       check_mode(M_WRITE);
+       check_access(M_WRITE);
 
        size = min<unsigned>(size, end-pos);
        memcpy(pos, buf, size);
@@ -49,9 +49,11 @@ unsigned Memory::do_write(const char *buf, unsigned size)
 
 unsigned Memory::do_read(char *buf, unsigned size)
 {
+       check_access(M_READ);
+
        if(pos==end)
        {
-               eof_flag = true;
+               set_eof();
                return 0;
        }
 
@@ -63,25 +65,38 @@ unsigned Memory::do_read(char *buf, unsigned size)
 
 unsigned Memory::put(char c)
 {
-       check_mode(M_WRITE);
+       check_access(M_WRITE);
+
+       if(pos==end)
+               return 0;
+
        *pos++ = c;
        return 1;
 }
 
 bool Memory::getline(string &line)
 {
+       check_access(M_READ);
+
+       if(pos==end)
+       {
+               set_eof();
+               return false;
+       }
+
        char *nl = find(pos, end, '\n');
        line.assign(pos, nl);
-       bool result = (nl!=pos);
-       pos = nl;
-       return result;
+       pos = (nl==end ? end : nl+1);
+       return true;
 }
 
 int Memory::get()
 {
+       check_access(M_READ);
+
        if(pos==end)
        {
-               eof_flag = true;
+               set_eof();
                return -1;
        }
 
@@ -104,14 +119,9 @@ SeekOffset Memory::seek(SeekOffset off, SeekType type)
                throw out_of_range("Memory::seek");
 
        pos = new_pos;
+       eof_flag = false;
        return pos-begin;
 }
 
-void Memory::check_mode(Mode m) const
-{
-       if(m==M_WRITE && !(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
-}
-
 } // namespace IO
 } // namespace Msp