5 files changed, 34 insertions, 8 deletions

diff --git a/src/array.h b/src/array.h
index 9233875..e8d8b30 100644
--- a/src/array.h
+++ b/src/array.h
@@ -157,6 +157,8 @@ namespace Bu
                                 src( src ),
                                 iPos( iPos )
                         {
+                                if( this->iPos >= src.getSize() )
+                                        this->iPos = -1;
                         }
 
                         MyType &src;
@@ -218,6 +220,8 @@ namespace Bu
                                 src( src ),
                                 iPos( iPos )
                         {
+                                if( this->iPos >= src.getSize() )
+                                        this->iPos = -1;
                         }
 
                         const MyType &src;
diff --git a/src/bzip2.cpp b/src/bzip2.cpp
index 9108bcf..c367cff 100644
--- a/src/bzip2.cpp
+++ b/src/bzip2.cpp
@@ -7,6 +7,8 @@
 
 #include "bu/bzip2.h"
 #include "bu/exceptions.h"
+#define BU_TRACE
+#include "bu/trace.h"
 
 using namespace Bu;
 
@@ -14,16 +16,19 @@ Bu::BZip2::BZip2( Bu::Stream &rNext, int nCompression ) :
         Bu::Filter( rNext ),
         nCompression( nCompression )
 {
+        TRACE( nCompression );
         start();
 }
 
 Bu::BZip2::~BZip2()
 {
+        TRACE();
         stop();
 }
 
 void Bu::BZip2::start()
 {
+        TRACE();
         bzState.state = NULL;
         bzState.bzalloc = NULL;
         bzState.bzfree = NULL;
@@ -35,6 +40,7 @@ void Bu::BZip2::start()
 
 size_t Bu::BZip2::stop()
 {
+        TRACE();
         if( bzState.state )
         {
                 if( bReading )
@@ -72,6 +78,7 @@ size_t Bu::BZip2::stop()
 
 void Bu::BZip2::bzError( int code )
 {
+        TRACE( code );
         switch( code )
         {
                 case BZ_OK:
@@ -115,10 +122,12 @@ void Bu::BZip2::bzError( int code )
 
 size_t Bu::BZip2::read( void *pData, size_t nBytes )
 {
+        TRACE( pData, nBytes );
+        printf("READ!!!\n");
         if( !bzState.state )
         {
                 bReading = true;
-                BZ2_bzDecompressInit( &bzState, 0, 0 );
+                BZ2_bzDecompressInit( &bzState, 7, 0 );
                 bzState.next_in = pBuf;
                 bzState.avail_in = 0;
         }
@@ -167,6 +176,7 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes )
 
 size_t Bu::BZip2::write( const void *pData, size_t nBytes )
 {
+        TRACE( pData, nBytes );
         if( !bzState.state )
         {
                 bReading = false;
@@ -198,6 +208,7 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes )
 
 bool Bu::BZip2::isOpen()
 {
+        TRACE();
         return (bzState.state != NULL);
 }
 
diff --git a/src/fstring.h b/src/fstring.h
index bc23e57..167c055 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -21,10 +21,6 @@
 #include "bu/hash.h"
 #include "bu/util.h"
 
-#ifndef min
-#define min( a, b )  ((a<b)?(a):(b))
-#endif
-
 namespace Bu
 {
         template< typename chr >
@@ -1070,6 +1066,7 @@ namespace Bu
         }
         
 #ifdef BU_TRACE
+        template<typename t> void __tracer_format( const t &v );
         template<> void __tracer_format<FString>( const FString &v );
 #endif
 }
diff --git a/src/trace.h b/src/trace.h
index 7a1f368..82399c2 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -45,6 +45,7 @@ namespace Bu
                 looper( v1 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2> void __tracer( const char *pf,
@@ -57,6 +58,7 @@ namespace Bu
                 looper( v2 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2, typename t3>
@@ -70,6 +72,7 @@ namespace Bu
                 looper( v3 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2, typename t3, typename t4>
@@ -84,6 +87,7 @@ namespace Bu
                 looper( v4 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2, typename t3, typename t4, typename t5>
@@ -99,6 +103,7 @@ namespace Bu
                 looper( v5 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2, typename t3, typename t4, typename t5,
@@ -117,6 +122,7 @@ namespace Bu
                 looper( v6 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
         
         template<typename t1, typename t2, typename t3, typename t4, typename t5,
@@ -136,6 +142,7 @@ namespace Bu
                 looper( v7 );
                 fwrite( s, (ptrdiff_t)n-(ptrdiff_t)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
+                fflush( stdout );
         }
 #undef looper
         
diff --git a/src/unit/array.cpp b/src/unit/array.cpp
index db29882..57d6c03 100644
--- a/src/unit/array.cpp
+++ b/src/unit/array.cpp
@@ -15,7 +15,8 @@ public:
         {
                 setName("Array");
                 addTest( Unit::general );
-                addTest( Unit::iterate );
+                addTest( Unit::iterate1 );
+                addTest( Unit::iterate2 );
         }
 
         virtual ~Unit()
@@ -34,7 +35,7 @@ public:
                 unitTest( ai[1] == 10 );
         }
 
-        void iterate()
+        void iterate1()
         {
                 Bu::Array<int> ai;
                 for( int j = 0; j < 10; j++ )
@@ -49,7 +50,13 @@ public:
                 for( Bu::Array<int>::const_iterator i = ci.begin(); i != ci.end(); i++ )
                         unitTest( (*i) == j++ );
         }
-        
+
+        void iterate2()
+        {
+                Bu::Array<int> ai;
+                for( Bu::Array<int>::iterator i = ai.begin(); i != ai.end(); i++ )
+                        unitFailed("Empty lists shouldn't be iterated through.");
+        }
 };
 
 int main( int argc, char *argv[] )