benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try to reorganise confusing API arrangement. leads to discovering Bug #641

Browse source
This commit is contained in:
Fischlurch 2010-06-17 04:28:32 +02:00
parent fab1c699ea
commit 8f0dd93308
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/proc/mobject/session/scope-query.hpp
View file

@ -69,26 +69,36 @@ namespace session {
: public Query<Placement<MO> >
, public Query<Placement<MO> >::iterator
{
/// Assignment explicitly disallowed (but copy ctor is ok)
DiscoveryQuery const& operator=(DiscoveryQuery const&);
protected:
typedef Query<Placement<MO> > _Query;
typedef typename _Query::iterator _QIter;
public:
typedef typename _Query::iterator iterator;
typedef function<bool(PlacementMO const&)> ContentFilter;
ContentFilter
contentFilter () const
{
return buildContentFilter();
}
protected:
/** yield additional filter to be applied to the result set. */
virtual ContentFilter buildContentFilter() const =0;
DiscoveryQuery ()
: _Query (_Query::defineQueryTypeID (Goal::DISCOVERY))
, _QIter ()
{ }
typedef PlacementMO const& Pla;
typedef function<bool(Pla)> ContentFilter;
/** yield an additional filter to be applied
* to the result set. */
virtual ContentFilter buildContentFilter() const =0;
private:
/// Assignment explicitly disallowed (but copy ctor is ok)
DiscoveryQuery const& operator=(DiscoveryQuery const&);
};
@ -129,8 +139,8 @@ namespace session {
class ScopeQuery
: public DiscoveryQuery<MO>
{
typedef DiscoveryQuery<MO> _Par;
typedef typename _Par::_Query _Query;
typedef DiscoveryQuery<MO> _Parent;
typedef Query<Placement<MO> > _Query;
QueryResolver const& index_;
@ -138,8 +148,8 @@ namespace session {
ScopeQueryKind to_discover_;
public:
typedef typename _Par::ContentFilter ContentFilter;
typedef typename _Query::iterator iterator;
typedef typename _Parent::iterator iterator;
typedef typename _Parent::ContentFilter ContentFilter;
ScopeQuery (QueryResolver const& resolver,
@ -149,7 +159,7 @@ namespace session {
, startPoint_(scope)
, to_discover_(direction)
{
resetResultIteration (_Query::resolveBy(index_));
resetResultIteration (_Query::resolveBy(index_)); ///////////////////////////////TICKET #642 this call causes the problem!!!
}
@ -172,11 +182,6 @@ namespace session {
return to_discover_;
}
ContentFilter
contentFilter () const
{
return buildContentFilter(); ////////////////////////FIXME why isn't this dispatched via VTABLE?????
}
private:
@ -186,7 +191,7 @@ namespace session {
* with our template parameter MO, we pick out only
* those elements of the scope being subclasses of MO
*/
virtual ContentFilter
ContentFilter
buildContentFilter() const
{
return bind (&PlacementMO::isCompatible<MO>, _1 );
@ -256,7 +261,7 @@ namespace session {
SpecialTest specialTest_;
virtual ContentFilter
ContentFilter
buildContentFilter() const
{
return specialTest_;