1 files changed, 51 insertions, 45 deletions

diff --git a/src/trace.h b/src/trace.h
index 4f85c9b..fb54aaf 100644
--- a/src/trace.h
+++ b/src/trace.h
@@ -8,19 +8,21 @@
 #ifndef BU_TRACE_H
 #define BU_TRACE_H
 
-#ifdef BU_TRACE
-#include "bu/fstring.h"
+#include <stdio.h>
+#include <stdint.h>
 
-namespace Nango
+namespace Bu
 {
-        template<typename t> void __tracer_format( t &v );
-        
-        void __tracer( const char *pf )
+/*      template<typename t> void __tracer_format( t &v )
         {
-                printf("trace: %s\n", pf );
+                __tracer_format( *const_cast<const t *>(&v) );
         }
+*/
+        template<typename t> void __tracer_format( const t &v );
 
-#define looper( vv )                                                                    \
+        void __tracer( const char *pf );
+
+        #define looper( vv )                                                            \
                 for( ; *n; n++ )                                                                \
                 {                                                                                               \
                         if( *n == ',' || *n == ')' )                            \
@@ -33,6 +35,7 @@ namespace Nango
                                 break;                                                                  \
                         }                                                                                       \
                 }
+        
         template<typename t1> void __tracer( const char *pf, t1 &v1 )
         {
                 printf("trace: ");
@@ -42,9 +45,9 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2> void __tracer( const char *pf,
-                        t1 &v1, t2 &v2 )
+                t1 &v1, t2 &v2 )
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -54,9 +57,9 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2, typename t3>
-                void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3 )
+        void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3 )
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -67,9 +70,9 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2, typename t3, typename t4>
-                void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4 )
+        void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4 )
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -81,9 +84,9 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2, typename t3, typename t4, typename t5>
-                void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5 )
+        void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5 )
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -96,11 +99,11 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2, typename t3, typename t4, typename t5,
-                typename t6>
-                void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5,
-                                t6 &v6)
+        typename t6>
+        void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5,
+                t6 &v6)
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -114,11 +117,11 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
+        
         template<typename t1, typename t2, typename t3, typename t4, typename t5,
-                typename t6, typename t7>
-                void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5,
-                                t6 &v6, t7 &v7 )
+        typename t6, typename t7>
+        void __tracer( const char *pf, t1 &v1, t2 &v2, t3 &v3, t4 &v4, t5 &v5,
+                t6 &v6, t7 &v7 )
         {
                 printf("trace: ");
                 const char *s = pf;
@@ -133,29 +136,32 @@ namespace Nango
                 fwrite( s, (int)n-(int)s, 1, stdout );
                 fwrite( "\n", 1, 1, stdout );
         }
-
-        template<> void __tracer_format<const int>( const int &v )
-        {
-                printf("%d", v );
-        }
-
-        template<> void __tracer_format<int>( int &v )
-        {
-                printf("%d", v );
-        }
-
-        template<> void __tracer_format<void *>( void * &v )
-        {
-                printf("0x%08X", (unsigned int)v );
-        }
-
-        template<> void __tracer_format<const char *>( const char * &v )
-        {
-                printf("\"%s\"", v );
-        }
+#undef looper
+        
+        template<> void __tracer_format<int8_t>( const int8_t &v );
+        template<> void __tracer_format<uint8_t>( const uint8_t &v );
+        template<> void __tracer_format<int16_t>( const int16_t &v );
+        template<> void __tracer_format<uint16_t>( const uint16_t &v );
+        template<> void __tracer_format<int32_t>( const int32_t &v );
+        template<> void __tracer_format<uint32_t>( const uint32_t &v );
+        template<> void __tracer_format<int64_t>( const int64_t &v );
+        template<> void __tracer_format<uint64_t>( const uint64_t &v );
+        template<> void __tracer_format<bool>( const bool &v );
+        template<> void __tracer_format<char>( const char &v );
+        template<> void __tracer_format<long>( const long &v );
+        template<> void __tracer_format<unsigned long>( const unsigned long &v );
+        template<> void __tracer_format<float>( const float &v );
+        template<> void __tracer_format<double>( const double &v );
+        template<> void __tracer_format<void *>( void * const &v );
+        template<> void __tracer_format<char *>( char * const &v );
+        template<> void __tracer_format<char **>( char ** const &v );
+        template<> void __tracer_format<void const *>( void const * const &v );
+        template<> void __tracer_format<char const *>( char const * const &v );
+        template<> void __tracer_format<char const **>( char const ** const &v );
 }
 
-# define TRACE(args...) Nango::__tracer( __PRETTY_FUNCTION__, ##args )
+#ifdef BU_TRACE
+# define TRACE(args...) Bu::__tracer( __PRETTY_FUNCTION__, ##args )
 #else
 # define TRACE(args...) {}
 #endif