|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78421 - in sandbox/variadic_templates/boost/composite_storage: layout pack pack/multiple_dispatch
From: cppljevans_at_[hidden]
Date: 2012-05-11 11:24:28
Author: cppljevans
Date: 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
New Revision: 78421
URL: http://svn.boost.org/trac/boost/changeset/78421
Log:
* operators_all_of_aligned.hpp
rm'ed unused #include
* layout_composite.hpp
WHAT:
Changed template arg type to result_type.
WHY:
Simplify result_type in container_one_of_maybe.hpp
* container_one_of_maybe.hpp
WHAT:
Added templated proj_base.
WHY:
Make it easier to avoid compile errors when using
reifier_{indexed,virtfun}
* reifier_visitor.hpp
WHAT:
renamed to reifier_virtfun.
WHY:
The _visitor suffix seemed too general. The _virtfun
suffix is meant to suggest the method of implementing
the reification.
Removed:
sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_visitor.hpp
Text files modified:
sandbox/variadic_templates/boost/composite_storage/layout/operators_all_of_aligned.hpp | 1
sandbox/variadic_templates/boost/composite_storage/pack/container_one_of_maybe.hpp | 48 +++++++++++++++++++++++++--------------
sandbox/variadic_templates/boost/composite_storage/pack/layout_composite.hpp | 2
sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_indexed.hpp | 4 +-
4 files changed, 34 insertions(+), 21 deletions(-)
Modified: sandbox/variadic_templates/boost/composite_storage/layout/operators_all_of_aligned.hpp
==============================================================================
--- sandbox/variadic_templates/boost/composite_storage/layout/operators_all_of_aligned.hpp (original)
+++ sandbox/variadic_templates/boost/composite_storage/layout/operators_all_of_aligned.hpp 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
@@ -14,7 +14,6 @@
#include <boost/composite_storage/buffers/rval_ref_buf.hpp>
#include <boost/composite_storage/alignment/compose.hpp>
#include <boost/composite_storage/alignment/aligned_offset.hpp>
-#include <boost/composite_storage/special_components.hpp>
#include <boost/mpl/next.hpp>
#include <memory>
Modified: sandbox/variadic_templates/boost/composite_storage/pack/container_one_of_maybe.hpp
==============================================================================
--- sandbox/variadic_templates/boost/composite_storage/pack/container_one_of_maybe.hpp (original)
+++ sandbox/variadic_templates/boost/composite_storage/pack/container_one_of_maybe.hpp 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
@@ -385,15 +385,19 @@
{
destroy();
}
+
+ template
+ < index_base IndexValu
+ >
+ struct result_base_type
+ : layout_comp::template result_type<IndexValu>
+ {
+ };
template
< index_type IndexValu
>
struct result_type
- : mpl::if_c
- < index_base(IndexValu)==index_undefined::value
- , special_components::nothing
- , typename layout_comp::template result_type<IndexValu>::type
- >
+ : result_base_type<index_base(IndexValu)>
{
};
@@ -425,37 +429,47 @@
which_put(IndexValu);
}
template
- < index_type IndexValu
+ < index_base IndexValu
>
- typename result_type<IndexValu>::type const&
- project(void)const
+ typename result_base_type<IndexValu>::type const&
+ proj_base(void)const
/**@brief
* Requires:
* IndexValue == which()
*/
{
mpl::integral_c<index_base,IndexValu> index;
-#ifdef MULTIPLE_DISPATCH_DEBUG
- std::cout<<__FILE__<<":"<<__LINE__<<":project-yes-const<"<<IndexValu<<">()\n";
-#endif
return scanned::project(index,buffer.address());
}
template
- < index_type IndexValu
+ < index_base IndexValu
>
- typename result_type<IndexValu>::type&
- project(void)
+ typename result_base_type<IndexValu>::type&
+ proj_base(void)
/**@brief
* Requires:
* IndexValue == which()
*/
{
mpl::integral_c<index_base,IndexValu> index;
-#ifdef MULTIPLE_DISPATCH_DEBUG
- std::cout<<__FILE__<<":"<<__LINE__<<":project-not-const<"<<IndexValu<<">()\n";
-#endif
return scanned::project(index,buffer.address());
}
+ template
+ < index_type IndexValu
+ >
+ typename result_type<IndexValu>::type const&
+ project(void)const
+ {
+ return proj_base<index_base(IndexValu)>();
+ }
+ template
+ < index_type IndexValu
+ >
+ typename result_type<IndexValu>::type&
+ project(void)
+ {
+ return proj_base<index_base(IndexValu)>();
+ }
bool
operator==( container const& from)const
{
Modified: sandbox/variadic_templates/boost/composite_storage/pack/layout_composite.hpp
==============================================================================
--- sandbox/variadic_templates/boost/composite_storage/pack/layout_composite.hpp (original)
+++ sandbox/variadic_templates/boost/composite_storage/pack/layout_composite.hpp 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
@@ -61,7 +61,7 @@
index_end
;
template
- < index_type IndexValu
+ < index_base IndexValu
>
struct result_type
{
Modified: sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_indexed.hpp
==============================================================================
--- sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_indexed.hpp (original)
+++ sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_indexed.hpp 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
@@ -88,9 +88,9 @@
typename super_t::head_abstract_t&
my_head_abstract=this->head_abstract();
typedef
- decltype(my_head_abstract.template project<index_concrete>())
+ decltype(my_head_abstract.template proj_base<index_concrete>())
tail_type;
- tail_type& a_tail_concrete=my_head_abstract.template project<index_concrete>();
+ tail_type& a_tail_concrete=my_head_abstract.template proj_base<index_concrete>();
return this->push_back_concrete(a_tail_concrete);
}
Deleted: sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_visitor.hpp
==============================================================================
--- sandbox/variadic_templates/boost/composite_storage/pack/multiple_dispatch/reifier_visitor.hpp 2012-05-11 11:24:25 EDT (Fri, 11 May 2012)
+++ (empty file)
@@ -1,315 +0,0 @@
-//
-#ifndef BOOST_COMPOSITE_STORAGE_PACK_MULTIPLE_DISPATCH_REIFIER_VISITOR_HPP_INCLUDED
-#define BOOST_COMPOSITE_STORAGE_PACK_MULTIPLE_DISPATCH_REIFIER_VISITOR_HPP_INCLUDED
-// (C) Copyright Larry Evans 2010.
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-#include <boost/composite_storage/pack/multiple_dispatch/reifier_base.hpp>
-#include <boost/mpl/pair.hpp>
-#include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/has_xxx.hpp>
-BOOST_MPL_HAS_XXX_TRAIT_DEF(type)
-
-namespace boost
-{
-namespace composite_storage
-{
-namespace pack
-{
-namespace multiple_dispatch
-{
- template
- < typename ResultType
- , typename... ConcreteHosts
- >
-struct reifier_visit_abstract_pack
-;
- template
- < typename ResultType
- >
-struct reifier_visit_abstract_pack
- < ResultType
- >
-{
- void visit(void)
- //only declared to enable use of
- // using super_type::visit;
- //in subclasses.
- //Should never be called.
- ;
-};
- template
- < typename ResultType
- , typename ConcreteHead
- , typename... ConcreteTail
- >
-struct reifier_visit_abstract_pack
- < ResultType
- , ConcreteHead
- , ConcreteTail...
- >
-: reifier_visit_abstract_pack
- < ResultType
- , ConcreteTail...
- >
-{
- typedef
- reifier_visit_abstract_pack
- < ResultType
- , ConcreteTail...
- >
- super_type;
-
- using super_type::visit;
-
- virtual
- ResultType
- visit(ConcreteHead const&)const=0;
-};
- template
- < typename ResultType
- , typename ConcreteHosts
- >
-struct reifier_visit_abstract_seq
-;
- template
- < typename ResultType
- , typename... ConcreteHosts
- >
-struct reifier_visit_abstract_seq
- < ResultType
- , mpl::package
- < ConcreteHosts...
- >
- >
- /**@brief
- * Abstract Visitor class
- * for abstract Host class whose
- * concrete subclasses
- * are ConcreteHosts...
- */
-: reifier_visit_abstract_pack
- < ResultType
- , ConcreteHosts...
- >
-{
-};
- template
- < typename ReifierVisitor
- , typename ConcretePkg
- , typename... ConcreteHosts
- >
-struct reifier_visit_concrete_pack
-;
- template
- < typename ReifierVisitor
- , typename... ConcreteHosts
- >
-struct reifier_visit_concrete_pack
- < ReifierVisitor
- , mpl::package
- < ConcreteHosts...
- >
- >
-: reifier_visit_abstract_seq
- < typename ReifierVisitor::first
- , mpl::package
- < ConcreteHosts...
- >
- >
-{
-};
- template
- < typename ReifierVisitor
- , typename ConcretePkg
- , typename ConcreteHead
- , typename... ConcreteTail
- >
-struct reifier_visit_concrete_pack
- < ReifierVisitor
- , ConcretePkg
- , ConcreteHead
- , ConcreteTail...
- >
- /**@brief
- * Define concrete visit method for ConcreteHead
- * and then repeat for each ConcreteTail...
- */
-: reifier_visit_concrete_pack
- < ReifierVisitor
- , ConcretePkg
- , ConcreteTail...
- >
-{
- typename ReifierVisitor::first
- visit(ConcreteHead const&a_host)const
- {
- typedef
- typename ReifierVisitor::second
- self_derived;
- self_derived const&
- self_value=static_cast<self_derived const&>(*this);
- return self_value.push_back_concrete(a_host);
- }
-};
- template
- < typename ReifierVisitor
- , typename ConcreteHead
- >
-struct reifier_visit_concrete_seq
- ;
- template
- < typename ReifierVisitor
- , typename... ConcreteHosts
- >
-struct reifier_visit_concrete_seq
- < ReifierVisitor
- , mpl::package
- < ConcreteHosts...
- >
- >
- /**@brief
- * Concrete Visitor class
- * for abstract Host class whose
- * concrete subclasses
- * are ConcreteHosts...
- */
-: reifier_visit_concrete_pack
- < ReifierVisitor
- , mpl::package //store ConcreteHosts... for use in defining abstract visit methods.
- < ConcreteHosts...
- >
- , ConcreteHosts... //used for defining concrete visit methods.
- >
-{
-};
- template
- < typename HostAbstract
- >
-struct hosts_concrete
- /**@brief
- * Metafunction returning mpl::package
- * of Concrete classes corresponding
- * to the HostAbstract abstract class.
- */
-;
-
- template
- < typename ReifyApply
- , typename ArgsConcreteAbstract
- >
-struct reifier_visitor
-;
- template
- < typename ReifyApply
- , typename... HeadConcrete
- , typename HeadAbstract
- , typename... TailAbstract
- >
-struct reifier_visitor
- < ReifyApply
- , ptrs_target_source //container of pointers.
- < mpl::package
- < HeadConcrete...
- >
- , HeadAbstract
- , TailAbstract...
- >
- >
-: reifier_base
- < ReifyApply
- , ptrs_target_source //container of pointers.
- < mpl::package
- < HeadConcrete...
- >
- , HeadAbstract
- , TailAbstract...
- >
- >
- /**@brief
- * Uses visitor design pattern (in superclass)
- * to convert HeadAbstract* to its concrete
- * subclass pointer, store pointer in a
- * ptrs_target_source, and then call
- * a ReifyApply with the modified ptrs_target_source.
- */
-, reifier_visit_concrete_seq
- //Uses CRTP:
- // http://www.informit.com/articles/article.aspx?p=31473&seqNum=3
- //to implement concrete visitor in the visitor design pattern:
- // http://www.tml.tkk.fi/~pnr/Tik-76.278/gof/html/Visitor.html
- //However, instead of the Element term used in Visitor.html,
- //the term, Host, is used here
- //( because Visitor::visit(Host) seems more meaningful).
- //
- < mpl::pair
- < typename ReifyApply::result_type
- , reifier_visitor
- < ReifyApply
- , ptrs_target_source
- < mpl::package
- < HeadConcrete...
- >
- , HeadAbstract
- , TailAbstract...
- >
- >
- >
- , typename hosts_concrete
- < typename remove_cv
- < HeadAbstract
- >::type
- >::type
- >
-{
- typedef
- ptrs_target_source
- < mpl::package
- < HeadConcrete...
- >
- , HeadAbstract
- , TailAbstract...
- >
- now_tar_src_type
- ;
- typedef
- reifier_base
- < ReifyApply
- , now_tar_src_type
- >
- super_t
- ;
- reifier_visitor
- ( ReifyApply const& a_reify
- , now_tar_src_type* a_ptrs_tar_src
- )
- : super_t
- ( a_reify
- , a_ptrs_tar_src
- )
- {
- }
- typedef
- typename ReifyApply::result_type
- result_type
- ;
- result_type
- reify_rest
- ( void
- )const
- {
- return this->head_abstract().accept(*this);
- }
-};
-
-}//exit namespace multiple_dispatch
-}//exit namespace pack
-
-}//exit composite_storage namespace
-}//exit boost namespace
-#endif
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