New fpos class for the stream position.

7 files changed, 326 insertions, 0 deletions

diff --git a/include/ios_pos_types.h b/include/ios_pos_types.h
new file mode 100644
index 0000000..a096536
--- /dev/null
+++ b/include/ios_pos_types.h
@@ -0,0 +1,84 @@
+/* -*- c++ -*- */
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef ANDROID_ASTL_IOS_POS_TYPES__
+#define ANDROID_ASTL_IOS_POS_TYPES__
+
+#include <cstddef>  // ptrdiff_t
+namespace std {
+
+// Type use by fpos.
+typedef long long streamoff;
+
+// Signed type for I/O operation counts and buffer sizes.
+typedef ptrdiff_t  streamsize;
+
+// In the regular STL fpos is a template which gets specialized for
+// char and wchar and defines 2 types streampos and wstreampos. Since
+// we don't support wchar, we just provide the final char compliant
+// version.  The methods to get/set the mbstate in fpos are not
+// provided.
+
+class fpos {
+  public:
+    fpos() : mOffs(0) { }
+    fpos(streamoff offs) : mOffs(offs) { }
+
+    // Convert to streamoff.
+    operator streamoff() const { return mOffs; }
+
+    // Not supported:
+    // void state(mbstate_t);
+    // mbstate_t state() const;
+
+    fpos& operator+=(streamoff offs);
+    fpos& operator-=(streamoff offs) {
+        return operator+=(-offs);
+    }
+
+    fpos operator+(streamoff offs) const;
+    fpos operator-(streamoff offs) const;
+
+  private:
+    streamoff mOffs;
+};
+
+inline bool
+operator==(const fpos& lhs, const fpos& rhs)
+{ return streamoff(lhs) == streamoff(rhs); }
+
+inline bool
+operator!=(const fpos& lhs, const fpos& rhs)
+{ return streamoff(lhs) != streamoff(rhs); }
+
+typedef fpos streampos;
+
+}  // namespace std
+
+#endif
diff --git a/include/limits b/include/limits
index 74ef1e0..f097c23 100644
--- a/include/limits
+++ b/include/limits
@@ -30,6 +30,7 @@
 #ifndef ANDROID_ASTL_LIMITS__
 #define ANDROID_ASTL_LIMITS__
 
+#include <limits.h>
 // GNU C++ compiler?
 #ifndef __GNUG__
 #error "__GNUG__ is not defined"
@@ -42,6 +43,26 @@
 // This is very incomplete partial implementation of the standard
 // <limits>. Only partial support for float and double is provided.
 
+namespace {
+// Template to return the number of decimal digits in a number
+// representation based on the number of bits and sign.
+// e.g  digits10<int,64,true>::value == 19
+template<typename T, T bits, bool is_signed> struct digits10 {
+    static const int value = 0;
+};
+
+// Specialization that can be used to initialize static constant at
+// compile time.
+template<> struct digits10<int,  8, false> { static const int value = 3; };
+template<> struct digits10<int,  8, true>  { static const int value = 3; };
+template<> struct digits10<int, 16, false> { static const int value = 5; };
+template<> struct digits10<int, 16, true>  { static const int value = 5; };
+template<> struct digits10<int, 32, false> { static const int value = 10; };
+template<> struct digits10<int, 32, true>  { static const int value = 10; };
+template<> struct digits10<int, 64, false> { static const int value = 20; };
+template<> struct digits10<int, 64, true>  { static const int value = 19; };
+}
+
 namespace std {
 
 struct __numeric_limits_base
@@ -113,6 +134,38 @@ struct numeric_limits<double>
     static const int digits10 = __DBL_DIG__;
 };
 
+// numeric_limits<long>
+template<>
+struct numeric_limits<long>
+{
+    static const bool is_specialized = true;
+
+    static long min() { return LONG_MIN; }
+    static long max() { return LONG_MAX; }
+
+    static const bool is_signed = true;
+    static const bool is_integer = true;
+
+    static const int digits = LONG_BIT;
+    static const int digits10 = digits10<int, digits, is_signed>::value;
+};
+
+// numeric_limits<long long>
+template<>
+struct numeric_limits<long long>
+{
+    static const bool is_specialized = true;
+
+    static long long min() { return LLONG_MIN; }
+    static long long max() { return LLONG_MAX; }
+
+    static const bool is_signed = true;
+    static const bool is_integer = true;
+
+    static const int digits = ((int)(sizeof(long long) * CHAR_BIT));
+    static const int digits10 = digits10<int, digits, is_signed>::value;
+};
+
 }  // namespace std
 
 
diff --git a/src/Android.mk b/src/Android.mk
index a5c8221..e25dd8e 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -19,6 +19,7 @@
 LOCAL_PATH := $(call my-dir)
 
 astl_common_src_files := \
+    ios_pos_types.cpp \
     string.cpp
 
 # Build the target lib
diff --git a/src/ios_pos_types.cpp b/src/ios_pos_types.cpp
new file mode 100644
index 0000000..719f741
--- /dev/null
+++ b/src/ios_pos_types.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <ios_pos_types.h>
+
+namespace std {
+// Implementation of the fpos class for streams.
+
+fpos& fpos::operator+=(streamoff offs)  {
+    const streamoff new_offs = mOffs + offs;
+    if (offs > 0) {
+        if (new_offs > mOffs) {
+            mOffs = new_offs;
+        } // else overflow.
+    } else {
+        if (new_offs < mOffs) {
+            mOffs = new_offs;
+        } // else overflow or 0.
+    }
+    return *this;
+}
+
+fpos fpos::operator+(streamoff offs) const {
+    fpos pos(*this);
+    pos += offs;
+    return pos;
+}
+
+fpos fpos::operator-(streamoff offs) const {
+    fpos pos(*this);
+    pos -= offs;
+    return pos;
+}
+
+}  // namespace std
diff --git a/tests/Android.mk b/tests/Android.mk
index 586f778..11a76c6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -63,6 +63,7 @@ endef
 sources := \
     test_algorithm.cpp \
     test_functional.cpp \
+    test_ios_pos_types.cpp \
     test_limits.cpp \
     test_set.cpp \
     test_string.cpp \
diff --git a/tests/test_ios_pos_types.cpp b/tests/test_ios_pos_types.cpp
new file mode 100644
index 0000000..0e84e64
--- /dev/null
+++ b/tests/test_ios_pos_types.cpp
@@ -0,0 +1,108 @@
+/* -*- c++ -*- */
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "../include/ios_pos_types.h"
+#ifndef ANDROID_ASTL_IOS_POS_TYPES__
+#error "Wrong header included!!"
+#endif
+#include "common.h"
+
+#include <limits>
+
+namespace android {
+using std::fpos;
+using std::streamoff;
+
+bool testConstructor() {
+    {
+        fpos p;
+
+        EXPECT_TRUE(streamoff(p) == 0);
+    }
+    {
+        fpos p(1000);
+
+        EXPECT_TRUE(streamoff(p) == 1000);
+    }
+    return true;
+}
+
+bool testComparator() {
+    {
+        fpos p1(100);
+        fpos p2(100);
+
+        EXPECT_TRUE(p1 == p2);
+        EXPECT_FALSE(p1 != p2);
+    }
+    {
+        fpos p1(100);
+        fpos p2(200);
+
+        EXPECT_TRUE(p1 != p2);
+        EXPECT_FALSE(p1 == p2);
+    }
+    return true;
+}
+
+bool testIncrDecr() {
+    fpos p(100);
+
+    p += 0;
+    EXPECT_TRUE(streamoff(p) == 100);
+
+    p -= 0;
+    EXPECT_TRUE(streamoff(p) == 100);
+
+    p += 100;
+    EXPECT_TRUE(streamoff(p) == 200);
+
+    // overflow -> nop
+    p += std::numeric_limits<long long>::max();
+    EXPECT_TRUE(streamoff(p) == 200);
+
+    p -= 1000;
+    EXPECT_TRUE(streamoff(p) == -800);
+
+    // overflow -> nop
+    p -= std::numeric_limits<long long>::min();
+    EXPECT_TRUE(streamoff(p) == -800);
+
+    return true;
+}
+
+
+}  // namespace android
+
+int main(int argc, char **argv){
+    FAIL_UNLESS(testConstructor);
+    FAIL_UNLESS(testComparator);
+    FAIL_UNLESS(testIncrDecr);
+    return kPassed;
+}
diff --git a/tests/test_limits.cpp b/tests/test_limits.cpp
index ed77072..5a3aa80 100644
--- a/tests/test_limits.cpp
+++ b/tests/test_limits.cpp
@@ -39,6 +39,8 @@ bool testSpecialized()
 {
     EXPECT_TRUE(std::numeric_limits<float>::is_specialized);
     EXPECT_TRUE(std::numeric_limits<double>::is_specialized);
+    EXPECT_TRUE(std::numeric_limits<long>::is_specialized);
+    EXPECT_TRUE(std::numeric_limits<long long>::is_specialized);
     return true;
 }
 
@@ -46,6 +48,7 @@ bool testMin()
 {
     EXPECT_TRUE(std::numeric_limits<float>::min() == __FLT_MIN__);
     EXPECT_TRUE(std::numeric_limits<double>::min() == __DBL_MIN__);
+    EXPECT_TRUE(std::numeric_limits<long>::min() == LONG_MIN);
     return true;
 }
 
@@ -53,6 +56,8 @@ bool testMax()
 {
     EXPECT_TRUE(std::numeric_limits<float>::max() == __FLT_MAX__);
     EXPECT_TRUE(std::numeric_limits<double>::max() == __DBL_MAX__);
+    EXPECT_TRUE(std::numeric_limits<long>::max() == LONG_MAX);
+    EXPECT_TRUE(std::numeric_limits<long long>::max() == LLONG_MAX);
     return true;
 }
 
@@ -60,6 +65,8 @@ bool testSigned()
 {
     EXPECT_TRUE(std::numeric_limits<float>::is_signed);
     EXPECT_TRUE(std::numeric_limits<double>::is_signed);
+    EXPECT_TRUE(std::numeric_limits<long>::is_signed);
+    EXPECT_TRUE(std::numeric_limits<long long>::is_signed);
     return true;
 }
 
@@ -67,6 +74,17 @@ bool testIsInteger()
 {
     EXPECT_FALSE(std::numeric_limits<float>::is_integer);
     EXPECT_FALSE(std::numeric_limits<double>::is_integer);
+    EXPECT_TRUE(std::numeric_limits<long>::is_integer);
+    EXPECT_TRUE(std::numeric_limits<long long>::is_integer);
+    return true;
+}
+
+bool testDigits()
+{
+    EXPECT_TRUE(std::numeric_limits<long>::digits == 32);
+    EXPECT_TRUE(std::numeric_limits<long>::digits10 == 10);
+    EXPECT_TRUE(std::numeric_limits<long long>::digits == 64);
+    EXPECT_TRUE(std::numeric_limits<long long>::digits10 == 19);
     return true;
 }
 
@@ -79,5 +97,6 @@ int main(int argc, char **argv)
     FAIL_UNLESS(testMax);
     FAIL_UNLESS(testSigned);
     FAIL_UNLESS(testIsInteger);
+    FAIL_UNLESS(testDigits);
     return kPassed;
 }