adding template based list/sequence implementation, should replace LOKI_TYPELIST_, update some files
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@292 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp
parent
c343e24150
commit
98c07576c8
3 changed files with 213 additions and 0 deletions
|
|
@ -11,9 +11,15 @@
|
|||
|
||||
//#define CLASS_LEVEL_THERADING
|
||||
|
||||
#define USE_SEQUENCE
|
||||
|
||||
#include <iostream>
|
||||
#include "loki/Factory.h"
|
||||
#include "loki/Functor.h"
|
||||
#ifdef USE_SEQUENCE
|
||||
#include "loki/Sequence.h"
|
||||
using Loki::Seq;
|
||||
#endif
|
||||
|
||||
using Loki::Functor;
|
||||
using Loki::Factory;
|
||||
|
|
@ -52,7 +58,11 @@ PFactoryNull;
|
|||
|
||||
typedef SingletonHolder
|
||||
<
|
||||
#ifndef USE_SEQUENCE
|
||||
Factory< AbstractProduct, int, LOKI_TYPELIST_2( int, int ) >
|
||||
#else
|
||||
Factory< AbstractProduct, int, Seq< int, int >::Type >
|
||||
#endif
|
||||
>
|
||||
PFactory;
|
||||
|
||||
|
|
@ -136,12 +146,20 @@ public:
|
|||
// get creator functions on runntime
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef USE_SEQUENCE
|
||||
typedef Functor<Product*,LOKI_TYPELIST_2(int,int)> CreateFunctor;
|
||||
#else
|
||||
typedef Functor<Product*,Seq<int,int>::Type> CreateFunctor;
|
||||
#endif
|
||||
|
||||
typedef
|
||||
SingletonHolder
|
||||
<
|
||||
#ifndef USE_SEQUENCE
|
||||
Factory< AbstractProduct, int,LOKI_TYPELIST_3(CreateFunctor,int,int) >
|
||||
#else
|
||||
Factory< AbstractProduct, int,Seq<CreateFunctor,int,int>::Type >
|
||||
#endif
|
||||
>
|
||||
PFactoryFunctorParm;
|
||||
|
||||
|
|
@ -226,6 +244,9 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
// $Log$
|
||||
// Revision 1.3 2005/10/06 17:50:14 syntheticpp
|
||||
// adding template based list/sequence implementation, should replace LOKI_TYPELIST_, update some files
|
||||
//
|
||||
// Revision 1.2 2005/09/26 07:33:05 syntheticpp
|
||||
// move macros into LOKI_ namespace
|
||||
//
|
||||
|
|
|
|||
188
test/RegressionTest/SequenceTest.h
Executable file
188
test/RegressionTest/SequenceTest.h
Executable file
|
|
@ -0,0 +1,188 @@
|
|||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Unit Test for Loki
|
||||
//
|
||||
// Copyright Terje Slettebø and Pavel Vozenilek 2002.
|
||||
//
|
||||
// Permission to use, copy, modify, and distribute this software for any
|
||||
// purpose is hereby granted without fee, provided that this copyright and
|
||||
// permissions notice appear in all copies and derivatives.
|
||||
//
|
||||
// This software is provided "as is" without express or implied warranty.
|
||||
//
|
||||
// Last update: September 16, 2002
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef SEQUENCETEST_H
|
||||
#define SEQUENCETEST_H
|
||||
|
||||
#include <loki/Sequence.h>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// SequenceTest
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
class SequenceTest : public Test
|
||||
{
|
||||
public:
|
||||
SequenceTest() : Test("Sequence.h") {}
|
||||
|
||||
virtual void execute(TestResult &result)
|
||||
{
|
||||
printName(result);
|
||||
|
||||
using namespace Loki;
|
||||
using namespace Loki::TL;
|
||||
|
||||
typedef Seq<char>::Type CharList;
|
||||
typedef Seq<char,int,double>::Type CharIntDoubleList;
|
||||
typedef Seq<char,int,double,char>::Type CharIntDoubleCharList;
|
||||
typedef Seq<Base,Derived1,Derived2>::Type BaseDerived1Derived2List;
|
||||
typedef Seq<Derived2,Derived1,Base>::Type Derived2Derived1BaseList;
|
||||
typedef Seq<Base,Derived1,Base,Derived2>::Type BaseDerived1BaseDerived2List;
|
||||
typedef Seq<Derived1,Base,Derived1,Derived2>::Type Derived1BaseDerived1Derived2List;
|
||||
|
||||
bool r;
|
||||
|
||||
r=Length<NullType>::value==0 &&
|
||||
Length<CharList>::value==1 &&
|
||||
Length<CharIntDoubleList>::value==3;
|
||||
|
||||
testAssert("Length",r,result);
|
||||
|
||||
r=SameType<TypeAt<CharList,0>::Result,char>::value &&
|
||||
SameType<TypeAt<CharIntDoubleList,2>::Result,double>::value;
|
||||
|
||||
testAssert("TypeAt",r,result);
|
||||
|
||||
#if !(_MSC_VER && !__INTEL_COMPILER && !__MWERKS__ && _MSC_VER < 1300)
|
||||
|
||||
// TypeAtNonStrict works like TypeAt on MSVC 6.0
|
||||
|
||||
r=SameType<TypeAtNonStrict<NullType,0>::Result,NullType>::value &&
|
||||
SameType<TypeAtNonStrict<CharList,0>::Result,char>::value &&
|
||||
SameType<TypeAtNonStrict<CharIntDoubleList,2>::Result,double>::value &&
|
||||
SameType<TypeAtNonStrict<CharIntDoubleList,3>::Result,NullType>::value &&
|
||||
SameType<TypeAtNonStrict<CharList,1,long>::Result,long>::value;
|
||||
|
||||
testAssert("TypeAtNonStrict",r,result);
|
||||
|
||||
#else
|
||||
|
||||
testAssert("TypeAtNonStrict",false,result,false);
|
||||
|
||||
#endif
|
||||
|
||||
r=IndexOf<NullType,char>::value==-1 &&
|
||||
IndexOf<CharList,char>::value==0 &&
|
||||
IndexOf<CharIntDoubleList,double>::value==2 &&
|
||||
IndexOf<CharIntDoubleList,long>::value==-1;
|
||||
|
||||
testAssert("IndexOf",r,result);
|
||||
|
||||
#if !(_MSC_VER && !__INTEL_COMPILER && !__MWERKS__ && _MSC_VER < 1300)
|
||||
|
||||
// Append, Erase, EraseAll, NoDuplicates, Replace, ReplaceAll, Reverse,
|
||||
// MostDerived and DerivedToFront doesn't work on MSVC 6.0
|
||||
|
||||
r=SameType<Append<NullType,NullType>::Result,NullType>::value &&
|
||||
SameType<Append<NullType,char>::Result,Seq<char>::Type>::value &&
|
||||
SameType<Append<NullType,CharList>::Result,CharList>::value &&
|
||||
SameType<Append<CharList,NullType>::Result,CharList>::value &&
|
||||
SameType<Append<CharList,int>::Result,Seq<char,int>::Type>::value &&
|
||||
SameType<Append<CharList,CharIntDoubleList>::Result,Seq<char,char,int,double>::Type>::value;
|
||||
|
||||
testAssert("Append",r,result);
|
||||
|
||||
r=SameType<Erase<NullType,char>::Result,NullType>::value &&
|
||||
SameType<Erase<CharList,char>::Result,NullType>::value &&
|
||||
SameType<Erase<CharList,long>::Result,CharList>::value &&
|
||||
SameType<Erase<CharIntDoubleList,int>::Result,Seq<char,double>::Type>::value &&
|
||||
SameType<Erase<CharIntDoubleList,double>::Result,Seq<char,int>::Type>::value;
|
||||
|
||||
testAssert("Erase",r,result);
|
||||
|
||||
r=SameType<EraseAll<NullType,char>::Result,NullType>::value &&
|
||||
SameType<EraseAll<CharList,char>::Result,NullType>::value &&
|
||||
SameType<EraseAll<CharList,long>::Result,CharList>::value &&
|
||||
SameType<EraseAll<CharIntDoubleList,int>::Result,Seq<char,double>::Type>::value &&
|
||||
SameType<EraseAll<CharIntDoubleList,double>::Result,Seq<char,int>::Type>::value &&
|
||||
SameType<EraseAll<CharIntDoubleCharList,char>::Result,Seq<int,double>::Type>::value &&
|
||||
SameType<EraseAll<CharIntDoubleCharList,int>::Result,Seq<char,double,char>::Type>::value &&
|
||||
SameType<EraseAll<CharIntDoubleCharList,double>::Result,Seq<char,int,char>::Type>::value;
|
||||
|
||||
testAssert("EraseAll",r,result);
|
||||
|
||||
r=SameType<NoDuplicates<NullType>::Result,NullType>::value &&
|
||||
SameType<NoDuplicates<CharList>::Result,CharList>::value &&
|
||||
SameType<NoDuplicates<CharIntDoubleList>::Result,CharIntDoubleList>::value &&
|
||||
SameType<NoDuplicates<CharIntDoubleCharList>::Result,CharIntDoubleList>::value;
|
||||
|
||||
testAssert("NoDuplicates",r,result);
|
||||
|
||||
r=SameType<Replace<NullType,char,long>::Result,NullType>::value &&
|
||||
SameType<Replace<CharList,char,long>::Result,Seq<long>::Type>::value &&
|
||||
SameType<Replace<CharList,int,long>::Result,CharList>::value &&
|
||||
SameType<Replace<CharIntDoubleList,char,long>::Result,Seq<long,int,double>::Type>::value &&
|
||||
SameType<Replace<CharIntDoubleList,long,char[16]>::Result,CharIntDoubleList>::value &&
|
||||
SameType<Replace<CharIntDoubleCharList,char,long>::Result,Seq<long,int,double,char>::Type>::value;
|
||||
|
||||
testAssert("Replace",r,result);
|
||||
|
||||
r=SameType<ReplaceAll<NullType,char,long>::Result,NullType>::value &&
|
||||
SameType<ReplaceAll<CharList,char,long>::Result,Seq<long>::Type>::value &&
|
||||
SameType<ReplaceAll<CharList,int,long>::Result,CharList>::value &&
|
||||
SameType<ReplaceAll<CharIntDoubleList,char,long>::Result,Seq<long,int,double>::Type>::value &&
|
||||
SameType<ReplaceAll<CharIntDoubleList,long,char[16]>::Result,CharIntDoubleList>::value &&
|
||||
SameType<ReplaceAll<CharIntDoubleCharList,char,long>::Result,Seq<long,int,double,long>::Type>::value;
|
||||
|
||||
testAssert("ReplaceAll",r,result);
|
||||
|
||||
r=SameType<Reverse<NullType>::Result,NullType>::value &&
|
||||
SameType<Reverse<CharList>::Result,CharList>::value &&
|
||||
SameType<Reverse<CharIntDoubleList>::Result,Seq<double,int,char>::Type>::value;
|
||||
|
||||
testAssert("Reverse",r,result);
|
||||
|
||||
r=SameType<MostDerived<NullType,Base>::Result,Base>::value &&
|
||||
SameType<MostDerived<BaseDerived1Derived2List,Base>::Result,Derived2>::value &&
|
||||
SameType<MostDerived<BaseDerived1Derived2List,Derived1>::Result,Derived2>::value &&
|
||||
SameType<MostDerived<BaseDerived1Derived2List,Derived2>::Result,Derived2>::value &&
|
||||
SameType<MostDerived<Derived2Derived1BaseList,Base>::Result,Derived2>::value &&
|
||||
SameType<MostDerived<Derived2Derived1BaseList,Derived1>::Result,Derived2>::value &&
|
||||
SameType<MostDerived<Derived2Derived1BaseList,Derived2>::Result,Derived2>::value;
|
||||
|
||||
testAssert("MostDerived",r,result);
|
||||
|
||||
r=SameType<DerivedToFront<NullType>::Result,NullType>::value &&
|
||||
SameType<DerivedToFront<CharList>::Result,CharList>::value &&
|
||||
SameType<DerivedToFront<CharIntDoubleList>::Result,CharIntDoubleList>::value &&
|
||||
SameType<DerivedToFront<CharIntDoubleCharList>::Result,CharIntDoubleCharList>::value &&
|
||||
SameType<DerivedToFront<BaseDerived1Derived2List>::Result,Derived2Derived1BaseList>::value &&
|
||||
SameType<DerivedToFront<Derived2Derived1BaseList>::Result,Derived2Derived1BaseList>::value &&
|
||||
SameType<DerivedToFront<BaseDerived1BaseDerived2List>::Result,Seq<Derived2,Derived1,Base,Base>::Type>::value &&
|
||||
SameType<DerivedToFront<Derived1BaseDerived1Derived2List>::Result,Seq<Derived2,Derived1,Derived1,Base>::Type>::value;
|
||||
|
||||
testAssert("DerivedToFront",r,result);
|
||||
|
||||
#else
|
||||
|
||||
testAssert("Append",false,result,false);
|
||||
testAssert("Erase",false,result,false);
|
||||
testAssert("EraseAll",false,result,false);
|
||||
testAssert("NoDuplicates",false,result,false);
|
||||
testAssert("Replace",false,result,false);
|
||||
testAssert("Reverse",false,result,false);
|
||||
testAssert("MostDerived",false,result,false);
|
||||
testAssert("DerivedToFront",false,result,false);
|
||||
|
||||
#endif
|
||||
|
||||
std::cout << '\n';
|
||||
}
|
||||
|
||||
private:
|
||||
struct Base { char c; };
|
||||
struct Derived1 : Base { char c; };
|
||||
struct Derived2 : Derived1 { char c; };
|
||||
} sequenceTest;
|
||||
#endif
|
||||
|
|
@ -42,6 +42,7 @@ Test::tests_type Test::tests;
|
|||
// unit test.
|
||||
|
||||
#include "TypelistTest.h"
|
||||
#include "SequenceTest.h"
|
||||
#include "TypeManipTest.h"
|
||||
#include "TypeTraitsTest.h"
|
||||
#include "TypeTraitsTest2.h"
|
||||
|
|
@ -111,6 +112,9 @@ return result;
|
|||
|
||||
|
||||
// $Log$
|
||||
// Revision 1.8 2005/10/06 17:50:14 syntheticpp
|
||||
// adding template based list/sequence implementation, should replace LOKI_TYPELIST_, update some files
|
||||
//
|
||||
// Revision 1.7 2005/09/29 08:09:17 syntheticpp
|
||||
// update msvc build process
|
||||
//
|
||||
|
|
|
|||
Loading…
Reference in a new issue