X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fmemory.cpp;h=0b2d8f4c1b7f49ec7ccb93222d2bf48915abf3fd;hb=4ad05c650c55e3edccea887d15b26f41cdf60fb6;hp=274f6bae91c1a6a1d53f67be3872319bdae85bc2;hpb=bff25a255af05f1ddd6c956a97fa6b8c50c9b22d;p=libs%2Fcore.git

diff --git a/source/io/memory.cpp b/source/io/memory.cpp
index 274f6ba..0b2d8f4 100644
--- a/source/io/memory.cpp
+++ b/source/io/memory.cpp
@@ -8,68 +8,65 @@ using namespace std;
 namespace Msp {
 namespace IO {
 
-Memory::Memory(char *d, unsigned s)
+Memory::Memory(char *b, char *e, Mode m)
 {
-	init(d, d+s, M_RDWR);
-}
-
-Memory::Memory(char *b, char *e)
-{
-	init(b, e, M_RDWR);
-}
-
-Memory::Memory(const char *cd, unsigned s)
-{
-	char *d = const_cast<char *>(cd);
-	init(d, d+s, M_READ);
+	begin = b;
+	end = e;
+	pos = begin;
+	mode = m;
 }
 
-Memory::Memory(const char *b, const char *e)
+void Memory::set_block(bool)
 {
-	init(const_cast<char *>(b), const_cast<char *>(e), M_READ);
+	throw logic_error("Memory::set_block");
 }
 
-void Memory::init(char *b, char *e, Mode m)
+void Memory::set_inherit(bool)
 {
-	begin = b;
-	end = e;
-	pos = begin;
-	mode = m;
+	throw logic_error("Memory::set_inherit");
 }
 
-unsigned Memory::do_write(const char *buf, unsigned size)
+size_t Memory::do_write(const char *buf, size_t size)
 {
 	check_access(M_WRITE);
 
-	size = min<unsigned>(size, end-pos);
+	size = min<size_t>(size, end-pos);
 	memcpy(pos, buf, size);
 	pos += size;
 	return size;
 }
 
-unsigned Memory::do_read(char *buf, unsigned size)
+size_t Memory::do_read(char *buf, size_t size)
 {
+	check_access(M_READ);
+
 	if(pos==end)
 	{
 		set_eof();
 		return 0;
 	}
 
-	size = min<unsigned>(size, end-pos);
+	size = min<size_t>(size, end-pos);
 	memcpy(buf, pos, size);
 	pos += size;
 	return size;
 }
 
-unsigned Memory::put(char c)
+size_t Memory::put(char c)
 {
 	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();
@@ -84,6 +81,8 @@ bool Memory::getline(string &line)
 
 int Memory::get()
 {
+	check_access(M_READ);
+
 	if(pos==end)
 	{
 		set_eof();
@@ -93,6 +92,11 @@ int Memory::get()
 	return static_cast<unsigned char>(*pos++);
 }
 
+const Handle &Memory::get_handle(Mode)
+{
+	throw logic_error("Memory::get_handle");
+}
+
 SeekOffset Memory::seek(SeekOffset off, SeekType type)
 {
 	char *new_pos;
@@ -106,9 +110,10 @@ SeekOffset Memory::seek(SeekOffset off, SeekType type)
 		throw invalid_argument("Memory::seek");
 
 	if(new_pos<begin || new_pos>end)
-		throw out_of_range("Memory::seek");
+		throw bad_seek(off, type);
 
 	pos = new_pos;
+	eof_flag = false;
 	return pos-begin;
 }