github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-04-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Rewritten expr
	* src/array_fun.h
	* test/array_funTest.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-04-25 17:04:32 +00:00
parent 8a1d530336
commit 1ea7fca02b
3 changed files with 62 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-04-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Rewritten expr
* src/array_fun.h
* test/array_funTest.cc
2009-04-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-04-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added forEachMemFunSH(). Use it in BitTorrent event dispatch. Added forEachMemFunSH(). Use it in BitTorrent event dispatch.

127
src/array_fun.h
View File

@ -118,114 +118,77 @@ public:
namespace expr { namespace expr {
template<typename T> template<typename L, typename OpTag, typename R>
struct Expr { struct BinExpr {
Expr(const T& expOp):_expOp(expOp) {} BinExpr(const L& l, const R& r):_l(l), _r(r) {}
typename T::returnType operator[](size_t index) const typedef typename OpTag::returnType returnType;
returnType operator[](size_t index) const
{ {
return _expOp(index); return OpTag::apply(_l[index], _r[index]);
} }
const T& _expOp; const L& _l;
const R& _r;
};
template<typename OpTag, typename A>
struct UnExpr {
UnExpr(const A& a):_a(a) {}
typedef typename OpTag::returnType returnType;
returnType operator[](size_t index) const
{
return OpTag::apply(_a[index]);
}
const A& _a;
}; };
template<typename T> template<typename T>
struct And struct And
{ {
typedef T returnType; typedef T returnType;
static inline T apply(T lhs, T rhs) { return lhs&rhs; } static inline returnType apply(T lhs, T rhs) { return lhs&rhs; }
};
template<typename T>
struct Noop
{
typedef T returnType;
static inline T apply(T arg) { return arg; }
}; };
template<typename T> template<typename T>
struct Negate struct Negate
{ {
typedef T returnType; typedef T returnType;
static inline T apply(T arg) { return ~arg; } static inline returnType apply(T a) { return ~a; }
}; };
template<typename T1, typename T2, typename BinOp>
struct ExpBinOp
{
typedef typename BinOp::returnType returnType;
ExpBinOp(const T1& lhs, const T2& rhs):_lhs(lhs), _rhs(rhs) {}
returnType operator()(size_t index) const
{
return BinOp::apply(_lhs[index], _rhs[index]);
}
const T1& _lhs;
const T2& _rhs;
};
template<typename T, typename UnOp>
struct ExpUnOp
{
typedef typename UnOp::returnType returnType;
ExpUnOp(const T& arg):_arg(arg) {}
returnType operator()(size_t index) const
{
return UnOp::apply(_arg[index]);
}
const T& _arg;
};
// Partial specialization for pointers
template<typename T, typename UnOp>
struct ExpUnOp<T*, UnOp>
{
typedef typename UnOp::returnType returnType;
ExpUnOp(const T* arg):_arg(arg) {}
returnType operator()(size_t index) const
{
return UnOp::apply(_arg[index]);
}
const T* _arg;
};
template<typename T, size_t N>
Expr<ExpUnOp<T(&)[N], Noop<T> > > arrayRef(T (&t)[N])
{
typedef ExpUnOp<T(&)[N], Noop<T> > ExpUnOpT;
return Expr<ExpUnOpT>(ExpUnOpT(t));
}
template<typename T> template<typename T>
Expr<ExpUnOp<T*, Noop<T> > > array(T* a) struct Array
{ {
typedef ExpUnOp<T*, Noop<T> > ExpUnOpT; typedef T returnType;
return Expr<ExpUnOpT>(ExpUnOpT(a));
} Array(const T* t):_t(t) {}
const T* _t;
returnType operator[](size_t index) const { return _t[index]; }
};
template<typename T> template<typename T>
Expr<ExpUnOp<Expr<T>, Negate<typename T::returnType> > > Array<T>
operator~(const Expr<T>& arg) array(const T* t) { return Array<T>(t); }
template<typename L, typename R>
BinExpr<L, And<typename L::returnType>, R>
operator&(const L& l, const R& r)
{ {
typedef ExpUnOp<Expr<T>, Negate<typename T::returnType> > ExpUnOpT; return BinExpr<L, And<typename L::returnType>, R>(l, r);
return Expr<ExpUnOpT>(ExpUnOpT(arg));
} }
template<typename T1, typename T2> template<typename A>
Expr<ExpBinOp<Expr<T1>, Expr<T2>, And<typename T1::returnType> > > UnExpr<Negate<typename A::returnType>, A>
operator&(const Expr<T1>& lhs, const Expr<T2>& rhs) operator~(const A& a)
{ {
typedef ExpBinOp<Expr<T1>, Expr<T2>, And<typename T1::returnType> > ExpBinOpT; return UnExpr<Negate<typename A::returnType>, A>(a);
return Expr<ExpBinOpT>(ExpBinOpT(lhs, rhs));
} }
} // namespace expr } // namespace expr

22
test/array_funTest.cc
View File

@ -36,28 +36,28 @@ CPPUNIT_TEST_SUITE_REGISTRATION(array_funTest);
void array_funTest::testArray_negate() void array_funTest::testArray_negate()
{ {
unsigned char a[] = { 0xaa, 0x55 }; unsigned char a[] = { 0xaa, 0x55 };
CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~arrayRef(a))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~array(a))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~array((unsigned char*)a))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~array((unsigned char*)a))[1]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~~arrayRef(a))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0xaa, (~~array(a))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~~arrayRef(a))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x55, (~~array(a))[1]);
} }
void array_funTest::testArray_and() void array_funTest::testArray_and()
{ {
unsigned char a1[] = { 0xaa, 0x55 }; unsigned char a1[] = { 0xaa, 0x55 };
unsigned char a2[] = { 0x1a, 0x25 }; unsigned char a2[] = { 0x1a, 0x25 };
CPPUNIT_ASSERT_EQUAL((unsigned char)0x0a, (arrayRef(a1)&arrayRef(a2))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x0a, (array(a1)&array(a2))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x05, (arrayRef(a1)&arrayRef(a2))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x05, (array(a1)&array(a2))[1]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (arrayRef(a1)&~arrayRef(a2))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (array(a1)&~array(a2))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (arrayRef(a1)&~arrayRef(a2))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (array(a1)&~array(a2))[1]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (~arrayRef(a2)&arrayRef(a1))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0xa0, (~array(a2)&array(a1))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (~arrayRef(a2)&arrayRef(a1))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x50, (~array(a2)&array(a1))[1]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x45, (~arrayRef(a1)&~arrayRef(a2))[0]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x45, (~array(a1)&~array(a2))[0]);
CPPUNIT_ASSERT_EQUAL((unsigned char)0x8a, (~arrayRef(a1)&~arrayRef(a2))[1]); CPPUNIT_ASSERT_EQUAL((unsigned char)0x8a, (~array(a1)&~array(a2))[1]);
} }
void array_funTest::testArrayLength() void array_funTest::testArrayLength()