Changeset 2050

Timestamp:

Sep 6, 2009, 3:54:05 AM (12 years ago)

Author:

Peter

Message:

refs #521. added constructor taking ostream and string. It does not take char* (as ofstream does) because I don't see the point with that. Needed to split member variable ios_ into a ostream* and istream* because the two cases need separate treatment (ostream needs to be flushed in destructor).

Location:

trunk

Files:

• test/stream_redirect_test.cc (modified) (3 diffs)
• yat/utility/StreamRedirect.h (modified) (8 diffs)

trunk/test/stream_redirect_test.cc

@@ -35 +35 @@
 void test3(test::Suite&);
 void test_cout(test::Suite&);
+void test_ofstream(test::Suite&);
 
 int main(int argc, char* argv[])
@@ -43 +44 @@
   test2(suite);
   test3(suite);
+  test_ofstream(suite);
 
   // keep this last in case it screws up cout
@@ -103 +105 @@
 
 
+void test_ofstream(test::Suite& suite)
+{
+  suite.out() << "testing redirect to ofstream\n";
+  std::ostringstream my_out;
+  std::string msg("some message");
+  std::string tmp_file("tmp.txt");
+  {
+    StreamRedirect sr(my_out, tmp_file.c_str());
+    my_out << msg;
+  }
+  if (my_out.str().size()) {
+    suite.err() << "my_out contains: '" << my_out.str()
+                << "'\n expected empty\n";
+    suite.add(false);
+  }
+  std::ifstream is(tmp_file.c_str());
+  std::string line;
+  getline(is, line);
+  if (line!=msg) {
+    suite.add(false);
+    suite.err() << "expected to find '" << msg << "' in file `"
+                << tmp_file << "'\nfound: '" << line << "'\n"; 
+  }
+  // cleaning up
+  unlink(tmp_file.c_str());
+}
+
+
 void test_cout(test::Suite& suite)
 {

trunk/yat/utility/StreamRedirect.h

@@ -25 +25 @@
 #include "yat_assert.h"
 
+#include <fstream>
 #include <istream>
 #include <ostream>
 #include <streambuf>
+#include <string>
 
 namespace theplu {
@@ -64 +66 @@
     
     /**
-       Constructor for istream
+       Constructor for ostream
 
        \a os1 is redirected to send its output to the buffer of \a os2
@@ -75 +77 @@
                         std::basic_ostream<charT, traits>& os2,
                         bool active=true);
+    
+    /**
+       Constructor for ostream
+
+       \a os1 is redirected to send its output to the buffer of \a os2
+       (rather than its own buffer). A reference to \a os1 and its
+       buffer is stored, so \a os1 can be restored in the destructor.
+
+       If \a active is false, the class does nothing.
+    */
+    BasicStreamRedirect(std::basic_ostream<charT, traits>& os1, 
+                        const std::string& file, bool active=true);
     
     /**
@@ -98 +112 @@
     
     void init(std::basic_ios<charT, traits>& ios1, 
-              std::basic_ios<charT, traits>& ios2,
-              bool active);
-    
-    std::basic_ios<charT, traits>* ios_;
+              std::basic_ios<charT, traits>& ios2);
+    
     std::basic_streambuf<charT, traits>* buf_;
+    std::basic_ifstream<charT, traits>* ifs_;
+    std::basic_istream<charT, traits>* is_;
+    std::basic_ofstream<charT, traits>* ofs_;
+    std::basic_ostream<charT, traits>* os_;
   };
   
@@ -122 +138 @@
   BasicStreamRedirect(std::basic_istream<charT, traits>& is1, 
                       std::basic_istream<charT, traits>& is2, bool active)
-  {
-    init(is1, is2, active);
+    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+  {
+    if (active) {
+      is_ = &is1;
+      init(is1, is2);
+    }
   }
   
@@ -131 +151 @@
   BasicStreamRedirect(std::basic_ostream<charT, traits>& os1, 
                       std::basic_ostream<charT, traits>& os2, bool active)
-  {
-    init(os1, os2, active);
+    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+  {
+    if (active) {
+      os_ = &os1;
+      init(os1, os2);
+    }
+  }
+  
+  
+  template<class charT, class traits>
+  BasicStreamRedirect<charT, traits>::
+  BasicStreamRedirect(std::basic_ostream<charT, traits>& os1, 
+                      const std::string& file, bool active)
+    : buf_(NULL), ifs_(NULL), is_(NULL), ofs_(NULL), os_(NULL) 
+  {
+    if (active) {
+      ofs_ = new std::basic_ofstream<charT, traits>(file.c_str());
+      os_ = &os1;
+      init(os1, *ofs_);
+    }
   }
   
@@ -140 +178 @@
   ~BasicStreamRedirect(void)
   {
+    YAT_ASSERT(os_==NULL || is_==NULL);
+
     // only restore stream if active is true
-    if (ios_) {
-      ios_->rdbuf(buf_);
-    }
+    if (os_) {
+      std::flush(*os_);
+      os_->rdbuf(buf_);
+    }
+    else if (is_) {
+      is_->rdbuf(buf_);
+    }
+    delete ifs_;
+    delete ofs_;
   }
   
@@ -150 +196 @@
   void 
   BasicStreamRedirect<charT, traits>::init(std::basic_ios<charT, traits>& s1, 
-                                           std::basic_ios<charT, traits>& s2,
-                                           bool active)
-  {
-    if (active) {
-      ios_ = &s1;
-      // save the buffer 
-      buf_ = ios_->rdbuf();
-      // redirect os1 to os2
-      ios_->rdbuf(s2.rdbuf());
-    }
-    else {
-      ios_ = NULL;
-      buf_ = NULL;
-    }
+                                           std::basic_ios<charT, traits>& s2)
+  {
+    // save the buffer 
+    buf_ = s1.rdbuf();
+    // redirect os1 to os2
+    s1.rdbuf(s2.rdbuf());
   }