Use an enum rather than plain integers to distinguish Console instances

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

diff --git a/source/io/console.cpp b/source/io/console.cpp
index a0e0c28f07cbbd506683cb92166f3def8b57b93a..447377b32ebe08d057c5e1f121601ffde893dd64 100644 (file)
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -12,7 +12,19 @@ using namespace std;
 
 namespace {
 
-#ifndef WIN32
+#ifdef WIN32
+DWORD stream_to_sys(Console::Stream stream)
+{
+       switch(stream)
+       {
+       case INPUT: return STD_INPUT_HANDLE;
+       case OUTPUT: return STD_OUTPUT_HANDLE;
+       case ERROR: return STD_ERROR_HANDLE;
+       default: throw invalid_argument("stream_to_sys");
+       }
+}
+
+#else
 termios orig_attr;
 #endif
 
@@ -21,35 +33,28 @@ termios orig_attr;
 namespace Msp {
 namespace IO {
 
-Console::Console(unsigned n)
+Console::Console(Stream s):
+       stream(s)
 {
-       if(n>2)
-               throw invalid_argument("Console::Console");
-
-       mode = (n==0 ? M_READ : M_WRITE);
+       mode = (stream==INPUT ? M_READ : M_WRITE);
 
 #ifdef WIN32
-       switch(n)
-       {
-       case 0: *handle = GetStdHandle(STD_INPUT_HANDLE); break;
-       case 1: *handle = GetStdHandle(STD_OUTPUT_HANDLE); break;
-       case 2: *handle = GetStdHandle(STD_ERROR_HANDLE); break;
-       }
+       *handle = GetStdHandle(stream_to_sys(stream));
 #else
-       *handle = n;
+       *handle = stream;
 
-       if(n==0)
+       if(stream==INPUT)
                tcgetattr(*handle, &orig_attr);
 #endif
 
-       if(n==0)
+       if(stream==INPUT)
                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32
-       if(handle==0)
+       if(stream==INPUT)
                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
@@ -68,8 +73,7 @@ void Console::set_block(bool b)
 
 void Console::set_local_echo(bool e)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
 #ifdef WIN32
        DWORD m;
@@ -85,8 +89,7 @@ void Console::set_local_echo(bool e)
 
 void Console::set_line_buffer(bool l)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
 #ifdef WIN32
        DWORD m;
@@ -103,8 +106,7 @@ void Console::set_line_buffer(bool l)
 
 void Console::get_size(unsigned &rows, unsigned &cols)
 {
-       if(!(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
+       check_access(M_WRITE);
 
 #ifdef WIN32
        // XXX Figure out how to do this
@@ -120,66 +122,41 @@ void Console::get_size(unsigned &rows, unsigned &cols)
 
 unsigned Console::do_write(const char *buf, unsigned len)
 {
-       if(!(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
+       check_access(M_WRITE);
 
-#ifdef WIN32
-       DWORD ret;
-       if(!WriteFile(*handle, buf, len, &ret, 0))
-               throw system_error("WriteFile");
-#else
-       int ret = ::write(*handle, buf, len);
-       if(ret==-1)
-               throw system_error("write");
-#endif
-
-       return ret;
+       return sys_write(handle, buf, len);
 }
 
 unsigned Console::do_read(char *buf, unsigned len)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
-#ifdef WIN32
-       DWORD ret;
-       if(!ReadFile(*handle, buf, len, &ret, 0))
-               throw system_error("ReadFile");
-#else
-       int ret = ::read(*handle, buf, len);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("read");
-       }
-       else if(ret==0)
-               eof_flag = true;
-#endif
+       unsigned ret = sys_read(handle, buf, len);
+       if(ret==0)
+               set_eof();
 
        return ret;
 }
 
-Console &Console::instance(unsigned n)
+Console &Console::instance(Stream s)
 {
-       static Console in(0);
-       static Console out(1);
-       static Console err(2);
+       static Console in(INPUT);
+       static Console out(OUTPUT);
+       static Console err(ERROR);
 
-       switch(n)
+       switch(s)
        {
-       case 0: return in;
-       case 1: return out;
-       case 2: return err;
+       case INPUT: return in;
+       case OUTPUT: return out;
+       case ERROR: return err;
        }
 
        throw invalid_argument("Console::instance");
 }
 
-Console &cin = Console::instance(0);
-Console &cout = Console::instance(1);
-Console &cerr = Console::instance(2);
+Console &cin = Console::instance(Console::INPUT);
+Console &cout = Console::instance(Console::OUTPUT);
+Console &cerr = Console::instance(Console::ERROR);
 
 } // namespace IO
 } // namespace Msp