Make certain functions pure virtual so I won't forget to implement them

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

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index 6ea130b54ae134478ab40851f4c49cf1d68ad439..c5aee1e0536e040e72187172b2c084269596cce9 100644 (file)
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstring>
-#include "except.h"
+#include "handle.h"
 #include "memory.h"
 
 using namespace std;
@@ -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)
@@ -37,9 +37,14 @@ void Memory::init(char *b, char *e, Mode m)
        mode = m;
 }
 
+void Memory::set_block(bool)
+{
+       throw logic_error("Memory::set_block");
+}
+
 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 +54,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,32 +70,50 @@ 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;
        }
 
        return static_cast<unsigned char>(*pos++);
 }
 
-unsigned Memory::seek(int off, SeekType type)
+const Handle &Memory::get_handle(Mode)
+{
+       throw logic_error("Memory::get_handle");
+}
+
+SeekOffset Memory::seek(SeekOffset off, SeekType type)
 {
        char *new_pos;
        if(type==S_BEG)
@@ -98,30 +123,15 @@ unsigned Memory::seek(int off, SeekType type)
        else if(type==S_END)
                new_pos = end+off;
        else
-               throw InvalidParameterValue("Invalid seek type");
+               throw invalid_argument("Memory::seek");
 
        if(new_pos<begin || new_pos>end)
-               throw InvalidParameterValue("Invalid seek offset");
+               throw bad_seek(off, type);
 
        pos = new_pos;
+       eof_flag = false;
        return pos-begin;
 }
 
-Handle Memory::get_event_handle()
-{
-       throw Exception("Memory doesn't support events");
-}
-
-void Memory::check_mode(Mode m) const
-{
-       if(m==M_WRITE)
-       {
-               if(!(mode&M_WRITE))
-                       throw InvalidState("Memory is not writable");
-               if(pos==end)
-                       throw InvalidState("Attempt to write past end of Memory");
-       }
-}
-
 } // namespace IO
 } // namespace Msp