|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51450 - in sandbox/mirror: boost/mirror/detail boost/mirror/meta_classes/boost/fusion libs/mirror/test
From: chochlik_at_[hidden]
Date: 2009-02-26 05:44:02
Author: matus.chochlik
Date: 2009-02-26 05:44:00 EST (Thu, 26 Feb 2009)
New Revision: 51450
URL: http://svn.boost.org/trac/boost/changeset/51450
Log:
[mirror 0.3.x]
- updated the offset_of member function to work without initialization
on POD types
- Added a new example into the testsuite
Added:
sandbox/mirror/libs/mirror/test/other_ct_01.cpp (contents, props changed)
Text files modified:
sandbox/mirror/boost/mirror/detail/meta_attribs_base.hpp | 63 +++++++++++++++++++++++++++------------
sandbox/mirror/boost/mirror/meta_classes/boost/fusion/vector.hpp | 1
sandbox/mirror/libs/mirror/test/Jamfile.v2 | 1
3 files changed, 44 insertions(+), 21 deletions(-)
Modified: sandbox/mirror/boost/mirror/detail/meta_attribs_base.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/detail/meta_attribs_base.hpp (original)
+++ sandbox/mirror/boost/mirror/detail/meta_attribs_base.hpp 2009-02-26 05:44:00 EST (Thu, 26 Feb 2009)
@@ -22,6 +22,12 @@
//
// necessary type traits
#include <boost/call_traits.hpp>
+#include <boost/type_traits/is_pod.hpp>
+// enable if
+#include <boost/utility/enable_if.hpp>
+//
+// std::allocator
+//#include <memory>
namespace boost {
namespace mirror {
@@ -580,10 +586,35 @@
return traits::is_static::value;
}
+
+ template <class T, int I>
+ static inline ptrdiff_t get_offset_of(
+ mpl::int_<I> pos,
+ const T* _dummy_ptr,
+ typename enable_if<is_pod<T> >::type* _dummy = 0
+ )
+ {
+ // TODO: check whether dereferencing of null_ptr is safe
+ // this can be a problem with pod-types
+ // meta-types of which have custom implementation
+ // of address(...) expecting a valid instance
+ T* pointer(0);
+ //
+ // otherwise something like the following will
+ // be necessary:
+ //
+ //::std::allocator<T> alloc; // this needs #include <memory>
+ //T* pointer((T*)alloc.allocate(1));
+ // ...
+ // alloc.deallocate(pointer, 1);
+ return offset(*pointer, pos);
+ }
+
template <class T, int I>
static inline ptrdiff_t get_offset_of(
mpl::int_<I> pos,
- T* __dummy,
+ const T* _dummy_ptr,
+ typename disable_if<is_pod<T> >::type* _dummy = 0,
T instance = T()
)
{
@@ -602,16 +633,16 @@
template <int I>
static inline ptrdiff_t offset(Class& instance, mpl::int_<I> pos)
{
- if(attrib_is_static(pos)) return invalid_offset();
- ptrdiff_t& result = get_offset_storage(pos);
- if(result == invalid_offset())
- {
- result = calculate_offset(
- (byte_ptr)&instance,
- (byte_ptr)base_class::address(instance, pos)
- );
- }
- return result;
+ if(attrib_is_static(pos)) return invalid_offset();
+ ptrdiff_t& result = get_offset_storage(pos);
+ if(result == invalid_offset())
+ {
+ result = calculate_offset(
+ (byte_ptr)&instance,
+ (byte_ptr)base_class::address(instance, pos)
+ );
+ }
+ return result;
}
};
@@ -637,16 +668,8 @@
template <int I>
static inline ptrdiff_t offset_of(mpl::int_<I> pos)
{
- if(attrib_is_static(pos))
- return offs_calc::invalid_offset();
- //byte arena[sizeof(Class)*2];
- //::std::allocator<Class> alloc;
- //Class* ptr((Class*)alloc.allocate(1, arena));
Class* ptr(0);
- return calculate_offset(
- (byte_ptr)ptr,
- (byte_ptr)offs_calc::address(*ptr, pos)
- );
+ return get_offset_of(pos, ptr);
}
};
Modified: sandbox/mirror/boost/mirror/meta_classes/boost/fusion/vector.hpp
==============================================================================
--- sandbox/mirror/boost/mirror/meta_classes/boost/fusion/vector.hpp (original)
+++ sandbox/mirror/boost/mirror/meta_classes/boost/fusion/vector.hpp 2009-02-26 05:44:00 EST (Thu, 26 Feb 2009)
@@ -79,7 +79,6 @@
typename att_val_pass<I>::type
> get_traits(mpl::int_<I>);
-
// member attrib pointer
template <int I>
static typename att_val_pass<I>::pointer
Modified: sandbox/mirror/libs/mirror/test/Jamfile.v2
==============================================================================
--- sandbox/mirror/libs/mirror/test/Jamfile.v2 (original)
+++ sandbox/mirror/libs/mirror/test/Jamfile.v2 2009-02-26 05:44:00 EST (Thu, 26 Feb 2009)
@@ -48,6 +48,7 @@
[ compile concepts_ct_01.cpp ]
[ compile concepts_ct_02.cpp ]
[ compile concepts_ct_03.cpp ]
+ [ compile other_ct_01.cpp ]
[ run other_rt_01.cpp ]
[ run other_rt_02.cpp ]
;
Added: sandbox/mirror/libs/mirror/test/other_ct_01.cpp
==============================================================================
--- (empty file)
+++ sandbox/mirror/libs/mirror/test/other_ct_01.cpp 2009-02-26 05:44:00 EST (Thu, 26 Feb 2009)
@@ -0,0 +1,223 @@
+/**
+ * \file test/other_rt_01.cpp
+ *
+ * This file is part of the Mirror library testsuite.
+ *
+ * Tests the internal counter facility
+
+ *
+ * Copyright 2008 Matus Chochlik. Distributed under the Boost
+ * Software License, Version 1.0. (See accompanying file
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+
+#include <boost/char_type_switch/string.hpp>
+#include <boost/char_type_switch/iostream.hpp>
+
+#include <boost/mirror/meta_namespace.hpp>
+#include <boost/mirror/meta_type.hpp>
+#include <boost/mirror/meta_class.hpp>
+
+#include <boost/mirror/algorithms.hpp>
+#include <boost/mirror/intrinsic.hpp>
+#include <boost/mirror/iterators.hpp>
+#include <boost/mirror/functions.hpp>
+
+#include <boost/mirror/meta_types/boost/tuples/tuple.hpp>
+#include <boost/mirror/meta_classes/boost/tuples/tuple.hpp>
+
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/modulus.hpp>
+#include <boost/type_traits/is_integral.hpp>
+
+namespace boost {
+namespace mirror {
+
+template <class Modulus>
+struct is_even_attrib_templ
+{
+ template <class MetaAttribute>
+ struct apply : mpl::equal_to<
+ mpl::modulus<
+ typename MetaAttribute::position,
+ mpl::int_<2>
+ >,
+ Modulus
+ >::type { };
+};
+
+typedef is_even_attrib_templ<mpl::int_<0> > is_even_attrib;
+typedef is_even_attrib_templ<mpl::int_<1> > is_odd_attrib;
+
+struct is_integral_attrib
+{
+ template <class MetaAttribute>
+ struct apply : is_integral<
+ typename MetaAttribute::
+ type::
+ reflected_type
+ >::type { };
+};
+
+} // namespace mirror
+} // namespace boost
+
+int main(void)
+{
+ using namespace ::std;
+ using namespace ::boost;
+ using namespace ::boost::mirror;
+ //
+ typedef tuple<bool, unsigned char, char, wchar_t, short, int, long, float, double> T;
+ //
+ typedef BOOST_MIRRORED_CLASS(T) meta_T;
+ //
+ //
+ BOOST_MPL_ASSERT((iterator_not_equal<
+ begin<meta_T::all_attributes>::type,
+ end<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_less<
+ begin<meta_T::all_attributes>::type,
+ end<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_greater<
+ end<meta_T::all_attributes>::type,
+ begin<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_less_equal<
+ begin<meta_T::all_attributes>::type,
+ end<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_greater_equal<
+ end<meta_T::all_attributes>::type,
+ begin<meta_T::all_attributes>::type
+ >));
+ //
+ BOOST_MPL_ASSERT((iterator_not_equal<
+ rbegin<meta_T::all_attributes>::type,
+ rend<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_less<
+ rbegin<meta_T::all_attributes>::type,
+ rend<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_greater<
+ rend<meta_T::all_attributes>::type,
+ rbegin<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_less_equal<
+ rbegin<meta_T::all_attributes>::type,
+ rend<meta_T::all_attributes>::type
+ >));
+ BOOST_MPL_ASSERT((iterator_greater_equal<
+ rend<meta_T::all_attributes>::type,
+ rbegin<meta_T::all_attributes>::type
+ >));
+ //
+ //
+ typedef begin<meta_T::all_attributes>::type i_0;
+ typedef next<i_0>::type i_1;
+ typedef next<i_1>::type i_2;
+ typedef next<i_2>::type i_3;
+ typedef next<i_3>::type i_4;
+ typedef next<i_4>::type i_5;
+ typedef next<i_5>::type i_6;
+ typedef next<i_6>::type i_7;
+ typedef next<i_7>::type i_8;
+ typedef next<i_8>::type i_end;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ end<meta_T::all_attributes>::type, i_end
+ >));
+ //
+ typedef prior<i_end>::type j_8;
+ typedef prior<j_8>::type j_7;
+ typedef prior<j_7>::type j_6;
+ typedef prior<j_6>::type j_5;
+ typedef prior<j_5>::type j_4;
+ typedef prior<j_4>::type j_3;
+ typedef prior<j_3>::type j_2;
+ typedef prior<j_2>::type j_1;
+ typedef prior<j_1>::type j_0;
+ typedef j_0 j_begin;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ begin<meta_T::all_attributes>::type, j_begin
+ >));
+ //
+ typedef rbegin<meta_T::all_attributes>::type r_8;
+ typedef next<r_8>::type r_7;
+ typedef next<r_7>::type r_6;
+ typedef next<r_6>::type r_5;
+ typedef next<r_5>::type r_4;
+ typedef next<r_4>::type r_3;
+ typedef next<r_3>::type r_2;
+ typedef next<r_2>::type r_1;
+ typedef next<r_1>::type r_0;
+ typedef next<r_0>::type r_end;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ rend<meta_T::all_attributes>::type, r_end
+ >));
+ //
+ typedef prior<r_end>::type p_0;
+ typedef prior<p_0>::type p_1;
+ typedef prior<p_1>::type p_2;
+ typedef prior<p_2>::type p_3;
+ typedef prior<p_3>::type p_4;
+ typedef prior<p_4>::type p_5;
+ typedef prior<p_5>::type p_6;
+ typedef prior<p_6>::type p_7;
+ typedef prior<p_7>::type p_8;
+ typedef p_8 p_rbegin;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ rbegin<meta_T::all_attributes>::type, p_rbegin
+ >));
+ //
+ typedef mirror::find_if<meta_T::all_attributes, is_even_attrib>::type n_0;
+ typedef next<n_0>::type n_2;
+ typedef next<n_2>::type n_4;
+ typedef next<n_4>::type n_6;
+ typedef next<n_6>::type n_8;
+ typedef next<n_8>::type n_end;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ end<meta_T::all_attributes>::type, n_end
+ >));
+ //
+ //
+ typedef mirror::find_if<meta_T::all_attributes, is_odd_attrib >::type m_1;
+ typedef next<m_1>::type m_3;
+ typedef next<m_3>::type m_5;
+ typedef next<m_5>::type m_7;
+ typedef next<m_7>::type m_end;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ end<meta_T::all_attributes>::type, m_end
+ >));
+ //
+ //
+ typedef mirror::find_if<meta_T::all_attributes, is_integral_attrib >::type o_0;
+ typedef next<o_0>::type o_1;
+ typedef next<o_1>::type o_2;
+ typedef next<o_2>::type o_3;
+ typedef next<o_3>::type o_4;
+ typedef next<o_4>::type o_5;
+ typedef next<o_5>::type o_6;
+ typedef next<o_6>::type o_end;
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ end<meta_T::all_attributes>::type, o_end
+ >));
+ //
+ BOOST_MPL_ASSERT((iterator_equal<
+ begin<meta_T::base_classes>::type,
+ end<meta_T::base_classes>::type
+ >));
+ //
+ return 0;
+}
+
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk