[Boost-commit] svn:boost r47452 - in trunk: boost libs/integer libs/integer/test

From: dwalker07_at_[hidden]
Date: 2008-07-15 14:56:59

Author: dlwalker
Date: 2008-07-15 14:56:59 EDT (Tue, 15 Jul 2008)
New Revision: 47452
URL: http://svn.boost.org/trac/boost/changeset/47452

Log:
Added MPL-compatible variant of the processor-optimized integer template
Text files modified: 
   trunk/boost/integer.hpp                  |    25 ++++++++++++++----                      
   trunk/boost/integer_fwd.hpp              |     3 ++                                      
   trunk/libs/integer/integer.htm           |    51 ++++++++++++++++++++++++--------------- 
   trunk/libs/integer/test/integer_test.cpp |    19 ++++++++++----                          
   4 files changed, 66 insertions(+), 32 deletions(-)

Modified: trunk/boost/integer.hpp
==============================================================================
--- trunk/boost/integer.hpp	(original)
+++ trunk/boost/integer.hpp	2008-07-15 14:56:59 EDT (Tue, 15 Jul 2008)
@@ -7,7 +7,8 @@
 //  See http://www.boost.org/libs/integer for documentation.
 
 //  Revision History
-//   15 Jul 08  Added exact-integer templates. (Daryle Walker)
+//   15 Jul 08  Added exact-integer templates; added MPL-compatible variant of
+//              processor-optimized integer template. (Daryle Walker)
 //   14 Jul 08  Added extended-integer support. (Daryle Walker)
 //   13 Jul 08  Redid implmentation. (Daryle Walker)
 //   22 Sep 01  Added value-based integer templates. (Daryle Walker)
@@ -20,10 +21,11 @@
 
 #include <boost/integer_fwd.hpp>  // self include
 
-#include <boost/config.hpp>          // for BOOST_STATIC_CONSTANT, etc.
-#include <boost/cstdint.hpp>         // for boost::uintmax_t, intmax_t
-#include <boost/integer_traits.hpp>  // for boost::integer_traits
-#include <boost/limits.hpp>          // for std::numeric_limits
+#include <boost/config.hpp>             // for BOOST_STATIC_CONSTANT, etc.
+#include <boost/cstdint.hpp>            // for boost::uintmax_t, intmax_t
+#include <boost/integer_traits.hpp>     // for boost::integer_traits
+#include <boost/limits.hpp>             // for std::numeric_limits
+#include <boost/utility/enable_if.hpp>  // for boost::enable_if_c
 
 #include <climits>  // for UCHAR_MAX, USHRT_MAX, UINT_MAX, ULONG_MAX, etc.
 
@@ -32,10 +34,21 @@
 
   //  integer template mapping a type to its processor-optimized analog  -----//
 
+  //  Some types can be handled better by the processor than others.  This
+  //  template metafunction should map various built-in integral types to
+  //  the processor's perferred type for the given type's value range
+  template < typename BaseInt >
+  struct fast_integral
+  {
+      typedef BaseInt  type;
+  };
+
+  // Platform-specific specializations should go here.
+
   //  fast integers from least integers
   //  int_fast_t<> works correctly for unsigned too, in spite of the name.
   template< typename LeastInt >
-  struct int_fast_t { typedef LeastInt fast; }; // imps may specialize
+  struct int_fast_t { typedef typename fast_integral<LeastInt>::type fast; };
 
 namespace detail
 {

Modified: trunk/boost/integer_fwd.hpp
==============================================================================
--- trunk/boost/integer_fwd.hpp	(original)
+++ trunk/boost/integer_fwd.hpp	2008-07-15 14:56:59 EDT (Tue, 15 Jul 2008)
@@ -84,6 +84,9 @@
 
 //  From <boost/integer.hpp>  ------------------------------------------------//
 
+template < typename BaseInt >
+    struct fast_integral;
+
 template < typename LeastInt >
     struct int_fast_t;
 

Modified: trunk/libs/integer/integer.htm
==============================================================================
--- trunk/libs/integer/integer.htm	(original)
+++ trunk/libs/integer/integer.htm	2008-07-15 14:56:59 EDT (Tue, 15 Jul 2008)
@@ -40,10 +40,27 @@
 namespace boost
 {
   //  fast integers from least integers
+  template&lt; typename BaseInt &gt;
+  struct fast_integral
+  {
+      typedef <em>implementation_supplied</em>  type;
+  };
+
   template&lt; typename LeastInt &gt;
   struct int_fast_t
   {
-      typedef <em>implementation_supplied</em>  fast;
+      typedef typename fast_integral&lt;LeastInt&gt;::type  fast;
+  };
+
+  //  MPL-compatible
+  template&lt; int Bits, typename Signedness &gt;
+  struct exact_integral
+  {
+      static  bool const  is_specialized = <em>implementation_supplied</em>;
+      static  bool const  is_signed = <em>implementation_supplied</em>;
+      static  int const   bit_count = Bits;
+
+      typedef <em>implementation_supplied</em>  type;
   };
 
   //  signed
@@ -57,7 +74,7 @@
   template&lt; int Bits &gt;
   struct int_exact_t
   {
-      typedef <em>implementation_supplied</em>  exact;
+      typedef typename exact_integral&lt;Bits, signed&gt;::type  exact;
   };
 
   //  unsigned
@@ -71,7 +88,7 @@
   template&lt; int Bits &gt;
   struct uint_exact_t
   {
-      typedef <em>implementation_supplied</em>  exact;
+      typedef typename exact_integral&lt;Bits, unsigned&gt;::type  exact;
   };
 
   //  signed
@@ -96,31 +113,25 @@
       typedef <em>implementation_supplied</em>  least;
       typedef int_fast_t&lt;least&gt;::fast  fast;
   };
-
-  //  MPL-compatible
-  template&lt; int Bits, typename Signedness &gt;
-  struct exact_integral
-  {
-      static  bool const  is_specialized = <em>implementation_supplied</em>;
-      static  bool const  is_signed = <em>implementation_supplied</em>;
-      static  int const   bit_count = Bits;
-
-      typedef <em>implementation_supplied</em>  type;
-  };
 } // namespace boost
 </pre></blockquote>
 
 <h2><a name="easy">Processor-Optimized Types</a></h2>
 
-<p>The <code>int_fast_t</code> class template maps its input type to the
+<p>The <code>fast_integral</code> class template maps its input type to the
 next-largest type that the processor can manipulate the easiest, or to
 itself if the input type is already an easy-to-manipulate type.  For
 instance, processing a bunch of <code>char</code> objects may go faster
 if they were converted to <code>int</code> objects before processing. 
-The input type, passed as the only template parameter, must be a
-built-in integral type, except <code>bool</code>.  Unsigned integral
-types can be used, as well as signed integral types, despite the name. 
-The output type is given as the class member <code>fast</code>.</p>
+The input type, passed as the only template parameter, can be any built-in
+integral type besides <code>bool</code>.  The output type is given as the class
+member <code>type</code>.</p>
+
+<p>The <code>int_fast_t</code> class template is the classic meta-function for
+this operation.  Despite the name, it works for unsigned integral types just
+like it works for the signed integral types.  The output type is given as the
+class member <code>fast</code>, defined to be the same as the corresponding
+result from the <code>fast_integral</code> meta-function.</p>
 
 <p><strong>Implementation Notes</strong><br>
 By default, the output type is identical to the input type.  Eventually,
@@ -282,7 +293,7 @@
                 <td><code>type</code></td>
                 <td><code>is_specialized == true</code></td>
                 <td>The meta-function's result.  It appears only if the input parameters
-			satisfy the template's requirements.  It's presence, or lack thereof,
+			satisfy the template's requirements.  Its presence, or lack thereof,
                         enables &quot;Substitution Failure Is Not An Error&quot; (SFINAE)
                         techniques, instead of a hard compiler diagnostic.</td>
         </tr>

Modified: trunk/libs/integer/test/integer_test.cpp
==============================================================================
--- trunk/libs/integer/test/integer_test.cpp	(original)
+++ trunk/libs/integer/test/integer_test.cpp	2008-07-15 14:56:59 EDT (Tue, 15 Jul 2008)
@@ -8,7 +8,8 @@
 //  See http://www.boost.org/libs/integer for documentation.
 
 //  Revision History
-//   15 Jul 08  Added exact-integer templates. (Daryle Walker)
+//   15 Jul 08  Added exact-integer templates; added MPL-compatible variant of
+//              processor-optimized integer template. (Daryle Walker)
 //   14 Jul 08  Improved testing of processor-optimized integer template; added
 //              extended-integer support. (Daryle Walker)
 //   13 Jul 08  Modernized tests w/ MPL instead of giant macros (Daryle Walker)
@@ -69,15 +70,15 @@
 
 
 // If specializations have not already been done, then we can confirm
-// the effects of the "fast" types by making a specialization.  If there
+// the effects of the fast types by making a specialization.  If there
 // is a specialization for "short," make sure that CONTROL_FAST_SHORT
 // is set to a type distinct from "short" and the default implementation.
 namespace boost
 {
     template < >
-    struct int_fast_t< short >
+    struct fast_integral< short >
     {
-        typedef CONTROL_FAST_SHORT  fast;
+        typedef CONTROL_FAST_SHORT  type;
     };
 }
 
@@ -273,8 +274,10 @@
 {
 #ifndef BOOST_NO_USING_TEMPLATE
     using std::numeric_limits;
+    using boost::is_same;
 #else
     using namespace std;
+    using namespace boost;
 #endif
 
     typedef short                               least_type;
@@ -282,8 +285,12 @@
     typedef numeric_limits<least_type>          least_limits;
     typedef numeric_limits<fast_type>            fast_limits;
 
-    BOOST_MPL_ASSERT_RELATION( (boost::is_same<least_type, fast_type>::value),
-     ==, false );
+    typedef boost::fast_integral<least_type>::type  real_fast_type;
+
+    BOOST_MPL_ASSERT_RELATION( (is_same<least_type, fast_type>::value), ==,
+     false );
+    BOOST_MPL_ASSERT_RELATION( (is_same<fast_type, real_fast_type>::value), ==,
+     true );
     BOOST_MPL_ASSERT_RELATION( fast_limits::is_specialized, ==, true );
     BOOST_MPL_ASSERT_RELATION( fast_limits::is_signed &&
      fast_limits::is_bounded, ==, true );