Show
Ignore:
Timestamp:
08/05/09 14:40:03 (15 years ago)
Author:
mido
Message:

panove, vite, jak jsem peclivej na upravu kodu.. snad se vam bude libit:) konfigurace je v souboru /system/astylerc

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • library/tests/unittest-cpp/MemoryOutStream.cpp

    r418 r477  
    66namespace UnitTest { 
    77 
    8 char const* MemoryOutStream::GetText() const 
    9 { 
    10     m_text = this->str(); 
    11     return m_text.c_str(); 
     8char const* MemoryOutStream::GetText() const { 
     9        m_text = this->str(); 
     10        return m_text.c_str(); 
    1211} 
    1312 
    … …  
    2726 
    2827template<typename ValueType> 
    29 void FormatToStream(MemoryOutStream& stream, char const* format, ValueType const& value) 
    30 { 
     28void FormatToStream ( MemoryOutStream& stream, char const* format, ValueType const& value ) { 
    3129        using namespace std; 
    3230 
    33     char txt[32]; 
    34     sprintf(txt, format, value); 
    35     stream << txt; 
     31        char txt[32]; 
     32        sprintf ( txt, format, value ); 
     33        stream << txt; 
    3634} 
    3735 
    38 int RoundUpToMultipleOfPow2Number (int n, int pow2Number) 
    39 { 
    40     return (n + (pow2Number - 1)) & ~(pow2Number - 1); 
     36int RoundUpToMultipleOfPow2Number ( int n, int pow2Number ) { 
     37        return ( n + ( pow2Number - 1 ) ) & ~ ( pow2Number - 1 ); 
    4138} 
    4239 
    … …  
    4441 
    4542 
    46 MemoryOutStream::MemoryOutStream(int const size) 
    47     : m_capacity (0) 
    48     , m_buffer (0) 
     43MemoryOutStream::MemoryOutStream ( int const size ) 
     44                : m_capacity ( 0 ) 
     45                , m_buffer ( 0 ) 
    4946 
    5047{ 
    51     GrowBuffer(size); 
     48        GrowBuffer ( size ); 
    5249} 
    5350 
    54 MemoryOutStream::~MemoryOutStream() 
    55 { 
    56     delete [] m_buffer; 
     51MemoryOutStream::~MemoryOutStream() { 
     52        delete [] m_buffer; 
    5753} 
    5854 
    59 char const* MemoryOutStream::GetText() const 
    60 { 
    61     return m_buffer; 
     55char const* MemoryOutStream::GetText() const { 
     56        return m_buffer; 
    6257} 
    6358 
    64 MemoryOutStream& MemoryOutStream::operator << (char const* txt) 
    65 { 
     59MemoryOutStream& MemoryOutStream::operator << ( char const* txt ) { 
    6660        using namespace std; 
    6761 
    68     int const bytesLeft = m_capacity - (int)strlen(m_buffer); 
    69     int const bytesRequired = (int)strlen(txt) + 1; 
     62        int const bytesLeft = m_capacity - ( int ) strlen ( m_buffer ); 
     63        int const bytesRequired = ( int ) strlen ( txt ) + 1; 
    7064 
    71     if (bytesRequired > bytesLeft) 
    72     { 
    73         int const requiredCapacity = bytesRequired + m_capacity - bytesLeft; 
    74         GrowBuffer(requiredCapacity); 
    75     } 
     65        if ( bytesRequired > bytesLeft ) { 
     66                int const requiredCapacity = bytesRequired + m_capacity - bytesLeft; 
     67                GrowBuffer ( requiredCapacity ); 
     68        } 
    7669 
    77     strcat(m_buffer, txt); 
    78     return *this; 
    79 } 
    80  
    81 MemoryOutStream& MemoryOutStream::operator << (int const n) 
    82 { 
    83     FormatToStream(*this, "%i", n); 
    84     return *this; 
    85 } 
    86  
    87 MemoryOutStream& MemoryOutStream::operator << (long const n) 
    88 { 
    89     FormatToStream(*this, "%li", n); 
    90     return *this; 
    91 } 
    92  
    93 MemoryOutStream& MemoryOutStream::operator << (unsigned long const n) 
    94 { 
    95     FormatToStream(*this, "%lu", n); 
    96     return *this; 
    97 } 
    98  
    99 MemoryOutStream& MemoryOutStream::operator << (float const f) 
    100 { 
    101     FormatToStream(*this, "%ff", f); 
    102     return *this;     
    103 } 
    104  
    105 MemoryOutStream& MemoryOutStream::operator << (void const* p) 
    106 { 
    107     FormatToStream(*this, "%p", p); 
    108     return *this;     
    109 } 
    110  
    111 MemoryOutStream& MemoryOutStream::operator << (unsigned int const s) 
    112 { 
    113     FormatToStream(*this, "%u", s); 
    114     return *this;     
    115 } 
    116  
    117 MemoryOutStream& MemoryOutStream::operator <<(double const d) 
    118 { 
    119         FormatToStream(*this, "%f", d); 
     70        strcat ( m_buffer, txt ); 
    12071        return *this; 
    12172} 
    12273 
    123 int MemoryOutStream::GetCapacity() const 
    124 { 
    125     return m_capacity; 
     74MemoryOutStream& MemoryOutStream::operator << ( int const n ) { 
     75        FormatToStream ( *this, "%i", n ); 
     76        return *this; 
     77} 
     78 
     79MemoryOutStream& MemoryOutStream::operator << ( long const n ) { 
     80        FormatToStream ( *this, "%li", n ); 
     81        return *this; 
     82} 
     83 
     84MemoryOutStream& MemoryOutStream::operator << ( unsigned long const n ) { 
     85        FormatToStream ( *this, "%lu", n ); 
     86        return *this; 
     87} 
     88 
     89MemoryOutStream& MemoryOutStream::operator << ( float const f ) { 
     90        FormatToStream ( *this, "%ff", f ); 
     91        return *this; 
     92} 
     93 
     94MemoryOutStream& MemoryOutStream::operator << ( void const* p ) { 
     95        FormatToStream ( *this, "%p", p ); 
     96        return *this; 
     97} 
     98 
     99MemoryOutStream& MemoryOutStream::operator << ( unsigned int const s ) { 
     100        FormatToStream ( *this, "%u", s ); 
     101        return *this; 
     102} 
     103 
     104MemoryOutStream& MemoryOutStream::operator << ( double const d ) { 
     105        FormatToStream ( *this, "%f", d ); 
     106        return *this; 
     107} 
     108 
     109int MemoryOutStream::GetCapacity() const { 
     110        return m_capacity; 
    126111} 
    127112 
    128113 
    129 void MemoryOutStream::GrowBuffer(int const desiredCapacity) 
    130 { 
    131     int const newCapacity = RoundUpToMultipleOfPow2Number(desiredCapacity, GROW_CHUNK_SIZE); 
     114void MemoryOutStream::GrowBuffer ( int const desiredCapacity ) { 
     115        int const newCapacity = RoundUpToMultipleOfPow2Number ( desiredCapacity, GROW_CHUNK_SIZE ); 
    132116 
    133117        using namespace std; 
    134118 
    135     char* buffer = new char[newCapacity]; 
    136     if (m_buffer) 
    137         strcpy(buffer, m_buffer); 
    138     else 
    139         strcpy(buffer, ""); 
     119        char* buffer = new char[newCapacity]; 
     120        if ( m_buffer ) 
     121                strcpy ( buffer, m_buffer ); 
     122        else 
     123                strcpy ( buffer, "" ); 
    140124 
    141     delete [] m_buffer; 
    142     m_buffer = buffer; 
    143     m_capacity = newCapacity; 
     125        delete [] m_buffer; 
     126        m_buffer = buffer; 
     127        m_capacity = newCapacity; 
    144128} 
    145129