From d11b03ad1ed0431046adce18ca0af89c2c86dbbd Mon Sep 17 00:00:00 2001
From: Edward Diener <eldiener@tropicsoft.com>
Date: Thu, 5 Dec 2013 14:43:02 -0500
Subject: [PATCH] Updated tests to cover more areas of the implementation.

---
 test/list.cxx    | 19 +++++++++++++++++++
 test/logical.cxx | 23 +++++++++++++++++++++++
 test/seq.cxx     | 17 +++++++++++++++++
 test/slot.cxx    | 26 ++++++++++++++++++++++++++
 4 files changed, 85 insertions(+)

diff --git a/test/list.cxx b/test/list.cxx
index 3e83a04..db6c432 100644
--- a/test/list.cxx
+++ b/test/list.cxx
@@ -13,17 +13,33 @@
 #
 # include <boost/preprocessor/arithmetic/add.hpp>
 # include <boost/preprocessor/arithmetic/sub.hpp>
+# include <boost/preprocessor/comparison/equal.hpp>
 # include <boost/preprocessor/comparison/less.hpp>
+# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/list.hpp>
 # include <boost/preprocessor/tuple/elem.hpp>
 # include <boost/preprocessor/array/elem.hpp>
 # include <boost/preprocessor/seq/elem.hpp>
+# include <boost/preprocessor/variadic/elem.hpp>
 # include <libs/preprocessor/test/test.h>
 
+# define LISTNIL BOOST_PP_NIL
 # define LIST (4, (1, (5, (2, BOOST_PP_NIL))))
 
 # define REVERSAL(d, x, y) BOOST_PP_SUB_D(d, y, x)
 
+BEGIN BOOST_PP_LIST_FIRST(LIST) == 4 END
+BEGIN BOOST_PP_LIST_IS_CONS(LIST) == 1 END
+BEGIN BOOST_PP_LIST_IS_CONS(LISTNIL) == 0 END
+BEGIN BOOST_PP_LIST_IS_NIL(LIST) == 0 END
+BEGIN BOOST_PP_LIST_IS_NIL(LISTNIL) == 1 END
+
+#if BOOST_PP_VARIADICS
+
+BEGIN BOOST_PP_VARIADIC_ELEM(2,BOOST_PP_LIST_ENUM(LIST)) == 5 END
+
+#endif
+
 BEGIN BOOST_PP_LIST_FOLD_LEFT(BOOST_PP_SUB_D, 22, LIST) == 10 END
 BEGIN BOOST_PP_LIST_FOLD_RIGHT(BOOST_PP_ADD_D, 0, LIST) == 12 END
 BEGIN BOOST_PP_LIST_FOLD_RIGHT(REVERSAL, 0, LIST) == 4 END
@@ -40,7 +56,10 @@ BEGIN BOOST_PP_LIST_CAT(BOOST_PP_LIST_TRANSFORM(BOOST_PP_ADD_D, 2, LIST)) == 637
 BEGIN BOOST_PP_LIST_CAT(BOOST_PP_LIST_APPEND(BOOST_PP_LIST_REST(LIST), LIST)) == 1524152 END
 
 # define F1(r, state, x) + x + state
+# define FI2(r, state, i, x) BOOST_PP_IIF(BOOST_PP_EQUAL(i,1),+ x + x + state,+ x + state)
+
 BEGIN BOOST_PP_LIST_FOR_EACH(F1, 1, LIST) == 16 END
+BEGIN BOOST_PP_LIST_FOR_EACH_I(FI2, 1, LIST) == 17 END
 
 BEGIN BOOST_PP_TUPLE_ELEM(4, 3, BOOST_PP_LIST_TO_TUPLE(LIST)) == 2 END
 
diff --git a/test/logical.cxx b/test/logical.cxx
index ec770a5..30bde7b 100644
--- a/test/logical.cxx
+++ b/test/logical.cxx
@@ -34,3 +34,26 @@ BEGIN BOOST_PP_NOR(0, 0) == 1 END
 BEGIN BOOST_PP_NOR(0, 6) == 0 END
 BEGIN BOOST_PP_NOR(7, 0) == 0 END
 BEGIN BOOST_PP_NOR(8, 9) == 0 END
+
+BEGIN BOOST_PP_BOOL(22) == 1 END
+BEGIN BOOST_PP_BOOL(0) == 0 END
+
+BEGIN BOOST_PP_BITAND(0, 0) == 0 END
+BEGIN BOOST_PP_BITAND(0, 1) == 0 END
+BEGIN BOOST_PP_BITAND(1, 0) == 0 END
+BEGIN BOOST_PP_BITAND(1, 1) == 1 END
+
+BEGIN BOOST_PP_BITNOR(0, 0) == 1 END
+BEGIN BOOST_PP_BITNOR(0, 1) == 0 END
+BEGIN BOOST_PP_BITNOR(1, 0) == 0 END
+BEGIN BOOST_PP_BITNOR(1, 1) == 0 END
+
+BEGIN BOOST_PP_BITOR(0, 0) == 0 END
+BEGIN BOOST_PP_BITOR(0, 1) == 1 END
+BEGIN BOOST_PP_BITOR(1, 0) == 1 END
+BEGIN BOOST_PP_BITOR(1, 1) == 1 END
+
+BEGIN BOOST_PP_BITXOR(0, 0) == 0 END
+BEGIN BOOST_PP_BITXOR(0, 1) == 1 END
+BEGIN BOOST_PP_BITXOR(1, 0) == 1 END
+BEGIN BOOST_PP_BITXOR(1, 1) == 0 END
diff --git a/test/seq.cxx b/test/seq.cxx
index 819ccb2..c64085d 100644
--- a/test/seq.cxx
+++ b/test/seq.cxx
@@ -13,18 +13,25 @@
 #
 # include <boost/preprocessor/arithmetic/add.hpp>
 # include <boost/preprocessor/arithmetic/sub.hpp>
+# include <boost/preprocessor/comparison/equal.hpp>
 # include <boost/preprocessor/comparison/less.hpp>
+# include <boost/preprocessor/control/iif.hpp>
 # include <boost/preprocessor/seq.hpp>
+# include <boost/preprocessor/array/elem.hpp>
 # include <boost/preprocessor/tuple/elem.hpp>
 # include <boost/preprocessor/list/at.hpp>
+# include <boost/preprocessor/variadic/elem.hpp>
 # include <libs/preprocessor/test/test.h>
 
 # define SEQ (4)(1)(5)(2)
+# define SEQVAR (4,5,8,3,61)(1,0)(5,22,43)(2)(17,45,33)
 
 # define REVERSAL(s, x, y) BOOST_PP_SUB(y, x)
 # define SUB_S(s, x, y) BOOST_PP_SUB(x, y)
 # define ADD_S(s, x, y) BOOST_PP_ADD(x, y)
 
+BEGIN BOOST_PP_SEQ_HEAD(SEQ) == 4 END
+
 BEGIN BOOST_PP_SEQ_FOLD_LEFT(SUB_S, 22, SEQ) == 10 END
 BEGIN BOOST_PP_SEQ_FOLD_RIGHT(ADD_S, 0, SEQ) == 12 END
 BEGIN BOOST_PP_SEQ_FOLD_RIGHT(REVERSAL, 0, SEQ) == 4 END
@@ -41,9 +48,12 @@ BEGIN BOOST_PP_SEQ_CAT(BOOST_PP_SEQ_TRANSFORM(ADD_S, 2, SEQ)) == 6374 END
 BEGIN BOOST_PP_SEQ_CAT(BOOST_PP_SEQ_TAIL(SEQ) SEQ) == 1524152 END
 
 # define F1(r, state, x) + x + state
+# define FI2(r, state, i, x) BOOST_PP_IIF(BOOST_PP_EQUAL(i,2),+ x + x + state,+ x + state)
 BEGIN BOOST_PP_SEQ_FOR_EACH(F1, 1, SEQ) == 16 END
+BEGIN BOOST_PP_SEQ_FOR_EACH_I(FI2, 1, SEQ) == 21 END
 
 BEGIN BOOST_PP_TUPLE_ELEM(4, 3, BOOST_PP_SEQ_TO_TUPLE(SEQ)) == 2 END
+BEGIN BOOST_PP_ARRAY_ELEM(3, BOOST_PP_SEQ_TO_ARRAY(SEQ)) == 2 END
 
 # define LESS_S(s, x, y) BOOST_PP_LESS(x, y)
 BEGIN BOOST_PP_SEQ_CAT(BOOST_PP_SEQ_FILTER(LESS_S, 3, SEQ)) == 45 END
@@ -88,3 +98,10 @@ BEGIN BOOST_PP_SEQ_CAT(BOOST_PP_SEQ_TAIL(BOOST_PP_SEQ_FOLD_LEFT(SEQ_APPEND, (~),
 BEGIN BOOST_PP_SEQ_SIZE(BOOST_PP_SEQ_TAIL(BOOST_PP_SEQ_FOLD_LEFT(SEQ_APPEND, (~), LL))) == 9 END
 
 BEGIN BOOST_PP_LIST_AT(BOOST_PP_SEQ_TO_LIST(SEQ), 2) == 5 END
+
+#if BOOST_PP_VARIADICS
+
+BEGIN BOOST_PP_VARIADIC_ELEM(0,BOOST_PP_SEQ_ENUM(SEQ)) == 4 END
+BEGIN BOOST_PP_TUPLE_ELEM(2,BOOST_PP_SEQ_ELEM(0,BOOST_PP_VARIADIC_SEQ_TO_SEQ(SEQVAR))) == 8 END
+
+#endif
diff --git a/test/slot.cxx b/test/slot.cxx
index d4aee49..2b5b3f8 100644
--- a/test/slot.cxx
+++ b/test/slot.cxx
@@ -11,6 +11,7 @@
 #
 # include <boost/preprocessor/slot.hpp>
 # include <libs/preprocessor/test/test.h>
+# include <boost/preprocessor/slot/counter.hpp>
 
 # define X() 4
 
@@ -25,3 +26,28 @@ BEGIN BOOST_PP_SLOT(1) == 10 END
 # include BOOST_PP_ASSIGN_SLOT(1)
 
 BEGIN BOOST_PP_SLOT(1) == 100 END
+
+BEGIN BOOST_PP_COUNTER == 0 END
+
+#include BOOST_PP_UPDATE_COUNTER()
+
+BEGIN BOOST_PP_COUNTER == 1 END
+
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+
+BEGIN BOOST_PP_COUNTER == 3 END
+
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+
+BEGIN BOOST_PP_COUNTER == 6 END
+
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+#include BOOST_PP_UPDATE_COUNTER()
+
+BEGIN BOOST_PP_COUNTER == 11 END