]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/longlong.cpp
bump subrelease number
[wxWidgets.git] / src / common / longlong.cpp
index 9334dcc3f478e2c0c80987423337e63326d5847b..e951865bffa0ab6edeaf6e97370ec7d5bff81576 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/longlong.cpp
+// Name:        src/common/longlong.cpp
 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
 // headers
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "longlong.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 #if wxUSE_LONGLONG
+
 #include "wx/longlong.h"
-#include "wx/math.h"       // for fabs()
 
-#if defined(__MWERKS__) && defined(__WXMSW__)
-#include <string.h>     // for memset()
-#else
-#include <memory.h>     // for memset()
+#ifndef WX_PRECOMP
+    #include "wx/math.h"       // for fabs()
 #endif
 
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"
+#endif
+
+#include <string.h>            // for memset()
+
 #include "wx/ioswrap.h"
 
 // ============================================================================
@@ -51,14 +51,14 @@ void *wxLongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
-    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
-    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
-    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
-    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
-    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
-    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
-    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
-    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
 
     return temp;
 }
@@ -67,14 +67,14 @@ void *wxULongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
-    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
-    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
-    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
-    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
-    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
-    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
-    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
-    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
 
     return temp;
 }
@@ -96,6 +96,41 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
     m_ll |= ll.GetLo();
     return *this;
 }
+
+wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+
+wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+}
+
+wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
+
+wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
 #endif
 
 #endif // wxUSE_LONGLONG_NATIVE
@@ -106,6 +141,14 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
 
 #if wxUSE_LONGLONG_WX
 
+// Set value from unsigned wxULongLongWx
+wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll)
+{
+    m_hi = (unsigned long) ll.GetHi();
+    m_lo = ll.GetLo();
+    return *this;
+}
+
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {
@@ -134,6 +177,32 @@ wxLongLongWx& wxLongLongWx::Assign(double d)
     return *this;
 }
 
+double wxLongLongWx::ToDouble() const
+{
+    double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+
+double wxULongLongWx::ToDouble() const
+{
+    unsigned double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+
 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
     wxLongLongWx ll(*this);
@@ -779,9 +848,11 @@ wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
 
 // division
 
+#define IS_MSB_SET(ll)  ((ll.GetHi()) & (1 << (8*sizeof(long) - 1)))
+
 void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
                           wxLongLongWx& quotient,
-                          wxLongLongWx& remainder) const
+                          wxLongLongWx& remainderIO) const
 {
     if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
     {
@@ -805,8 +876,7 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //     all responsibility for using this code.
 
     // init everything
-    wxLongLongWx dividend = *this,
-                 divisor = divisorIn;
+    wxULongLongWx dividend, divisor, remainder;
 
     quotient = 0l;
     remainder = 0l;
@@ -819,17 +889,21 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //      dividend = quotient*divisor + remainder
     //
     // with 0 <= abs(remainder) < abs(divisor)
-    bool negRemainder = dividend.m_hi < 0;
+    bool negRemainder = GetHi() < 0;
     bool negQuotient = false;   // assume positive
-    if ( dividend.m_hi < 0 )
+    if ( GetHi() < 0 )
     {
         negQuotient = !negQuotient;
-        dividend = -dividend;
+        dividend = -*this;
+    } else {
+        dividend = *this;
     }
-    if ( divisor.m_hi < 0 )
+    if ( divisorIn.GetHi() < 0 )
     {
         negQuotient = !negQuotient;
-        divisor = -divisor;
+        divisor = -divisorIn;
+    } else {
+        divisor = divisorIn;
     }
 
     // check for some particular cases
@@ -847,8 +921,6 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
         size_t nBits = 64u;
         wxLongLongWx d;
 
-        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
-
         while ( remainder < divisor )
         {
             remainder <<= 1;
@@ -888,10 +960,12 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
         }
     }
 
+    remainderIO = remainder;
+
     // adjust signs
     if ( negRemainder )
     {
-        remainder = -remainder;
+        remainderIO = -remainderIO;
     }
 
     if ( negQuotient )
@@ -947,8 +1021,6 @@ void wxULongLongWx::Divide(const wxULongLongWx& divisorIn,
         size_t nBits = 64u;
         wxULongLongWx d;
 
-        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
-
         while ( remainder < divisor )
         {
             remainder <<= 1;
@@ -1179,4 +1251,113 @@ WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
     return s << ll.ToString();
 }
 
+#if wxUSE_STREAMS
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+#define READ_STRING_CHAR(s, idx, len) ((wxChar) ((idx!=len) ? s[idx++] : 0))
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxULongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Read number
+    wxULongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxULongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxLongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Ask for sign
+    int iSign = 1;
+    if (ch==wxT('-') || ch==wxT('+')) {
+        iSign = ((ch==wxT('-')) ? -1 : 1);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    // Read number
+    wxLongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxLongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    ll = ll * wxLongLong((wxLongLong_t) iSign);
+#else
+    ll = ll * wxLongLong((long) iSign);
+#endif
+
+    return o;
+}
+
+#if wxUSE_LONGLONG_NATIVE
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)
+{
+    return o << wxULongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)
+{
+    return o << wxLongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value)
+{
+    wxULongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value)
+{
+    wxLongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+#endif // wxUSE_STREAMS
+
 #endif // wxUSE_LONGLONG