ongoing work

Author: Marc-Oliver Gewaltig

base.mk

@@ -58,7 +58,9 @@ OBJS=	sli_array.o\
 	sli_stack.o\
 	sli_type_trie.o\
 	sli_typecheck.o\
-	sli_math.o
+	sli_math.o\
+	sli_io.o\
+	sli_fdstream.o
 
 SOURCES = ${OBJS:.o=.cpp}
 

makefile

@@ -1407,8 +1407,8 @@ void Sleep_dFunction::execute(SLIInterpreter *i) const
     i->require_stack_load(1);
     i->require_stack_type(0,sli3::doubletype);
   const long sec    = 0;
-  const long usec   = 
-      static_cast<long>(i->pick(0).data_.long_val*1000000.);
+  const int usec   = 
+      static_cast<int>(i->pick(0).data_.long_val*1000000.);
   struct timeval tv = { sec, usec };
 
   if (usec>0)

sli_control.cpp

@@ -20,21 +20,18 @@
  *
  */
 
-#include "config.h"
-#include "fdstream.h"
-
-#ifdef HAVE_ISTREAM
+#include "sli_config.h"
+#include "sli_fdstream.h"
 
 std::streamsize const fdbuf::s_bufsiz;
 
 fdbuf* fdbuf::open(const char* s, std::ios_base::openmode mode)
 {
   if (is_open())
     {
-      //      std::cerr<<"Is already open!"<<std::endl;
-      return NULL;
+      return 0;
     }
-  //  bool success=true;
+
 
   int oflag;
   std::ios_base::openmode open_mode = 
@@ -55,17 +52,16 @@ fdbuf* fdbuf::open(const char* s, std::ios_base::openmode mode)
     oflag = (O_RDWR | O_TRUNC | O_CREAT);
   else
     {
-      //std::cerr<<"bad flags!"<<std::endl;
-      return NULL;
+      return 0;
     }
 
   m_fd=::open(s, oflag, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); // these file permissions are required by POSIX.1 (see Stevens 5.5)
 
   if (m_fd==-1) 
     {
       // std::cerr<<"::open failed!"<<std::endl;
-      // perror(NULL);
-      return NULL;
+      // perror(0);
+      return 0;
     }
 
   // beware of operator precedence --- HEP
@@ -75,8 +71,8 @@ fdbuf* fdbuf::open(const char* s, std::ios_base::openmode mode)
 	{
 	  close();
 	  // std::cerr<<"seek failed!"<<std::endl;
-	  // perror(NULL);
-	  return NULL;
+	  // perror(0);
+	  return 0;
 	}
     };
 
@@ -89,7 +85,7 @@ fdbuf* fdbuf::close()
   if (!is_open())
     {
       // std::cerr<<"File was not open."<<std::endl;
-      return NULL;
+      return 0;
     }
 
   bool success=true;
@@ -101,18 +97,18 @@ fdbuf* fdbuf::close()
     }
   if (::close(m_fd)==-1)
     {
-      // std::cerr<<"::close failed: "<<std::endl;perror(NULL);
+      // std::cerr<<"::close failed: "<<std::endl;perror(0);
       success=false;
     }
 
   m_isopen=false;
 
-  return (success ? this : NULL);
+  return (success ? this : 0);
 }
 
 void ofdstream::close()
 {
-  if (rdbuf()->close() == NULL) 
+  if (rdbuf()->close() == 0) 
     {
       setstate(failbit);
     }
@@ -121,19 +117,17 @@ void ofdstream::close()
 
 void ifdstream::close()
 {
-  if (rdbuf()->close() == NULL) 
+  if (rdbuf()->close() == 0) 
     {
       setstate(failbit);
     }
 }
 
 void fdstream::close()
 {
-  if (rdbuf()->close() == NULL) 
+  if (rdbuf()->close() == 0) 
     {
       setstate(failbit);
     }
 }
 
-
-#endif

sli_fdstream.cpp

@@ -32,7 +32,7 @@
 #include <sstream>    
 #include <cstdio>
 
-#include "fdstream.h"
+#include "sli_fdstream.h"
 #include "sli_io.h"
 #include "sli_string.h"
 #include "sli_iostream.h"

sli_io.cpp

@@ -29,16 +29,11 @@
   filesystem.h
   *************************************/
 
-#include "sli_interpret.h"
+#include "sli_interpreter.h"
 
-void init_sli_io(SLIInterpreter *);
-
-class MathLinkPutStringFunction: public SLIFunction
+namespace sli3
 {
-public:
-  MathLinkPutStringFunction() {}
-    void execute(SLIInterpreter *) const;
-};
+void init_sli_io(SLIInterpreter *);
 
 class IfstreamFunction: public SLIFunction
 {
@@ -366,6 +361,7 @@ ReadWordFunction() {}
     void execute(SLIInterpreter *) const;
 };
 
+} // end of namespace
 #endif
 
 

sli_io.h

@@ -85,7 +85,7 @@ class lockPTR
     bool deletable;
     bool locked;
 
-// forbid this constructor!
+    //!< forbid this constructor!
     PointerObject(PointerObject const&){assert(false);} 
 
     public: