Fix unused variable warnings in test-suite

This commit is contained in:
William S Fulton 2016-05-27 08:37:05 +01:00
commit 6725b2fdf6
4 changed files with 52 additions and 49 deletions

View file

@ -34,5 +34,5 @@ int inserted_wrapper(int i) { return inserted_header3(i); }
%init %{ %init %{
// %inserted code %init // %inserted code %init
int inserted_init_value = inserted_wrapper(0); int SWIGUNUSED inserted_init_value = inserted_wrapper(0);
%} %}

View file

@ -98,5 +98,9 @@ typedef struct {
static struct { static struct {
int i; int i;
} THING; } THING;
int useThing() {
return THING.i;
}
%} %}

View file

@ -93,8 +93,6 @@ see bottom for a set of possible tests
#include <iso646.h> /* for named logical operator, eg 'operator or' */ #include <iso646.h> /* for named logical operator, eg 'operator or' */
#endif #endif
#include <assert.h>
class Op { class Op {
public: public:
int i; int i;
@ -249,8 +247,8 @@ public:
%{ %{
#include <stdexcept>
#include <assert.h> #define ASSERT(X) { if (!(X)) { throw std::runtime_error(#X); } }
void Op::sanity_check() void Op::sanity_check()
{ {
@ -262,66 +260,66 @@ void Op::sanity_check()
Op dd=d; // assignment operator Op dd=d; // assignment operator
// test equality // test equality
assert(a!=b); ASSERT(a!=b);
assert(b==c); ASSERT(b==c);
assert(a!=d); ASSERT(a!=d);
assert(d==dd); ASSERT(d==dd);
// test < // test <
assert(a<b); ASSERT(a<b);
assert(a<=b); ASSERT(a<=b);
assert(b<=c); ASSERT(b<=c);
assert(b>=c); ASSERT(b>=c);
assert(b>d); ASSERT(b>d);
assert(b>=d); ASSERT(b>=d);
// test += // test +=
Op e=3; Op e=3;
e+=d; e+=d;
assert(e==b); ASSERT(e==b);
e-=c; e-=c;
assert(e==a); ASSERT(e==a);
e=Op(1); e=Op(1);
e*=b; e*=b;
assert(e==c); ASSERT(e==c);
e/=d; e/=d;
assert(e==d); ASSERT(e==d);
e%=c; e%=c;
assert(e==d); ASSERT(e==d);
// test + // test +
Op f(1),g(1); Op f(1),g(1);
assert(f+g==Op(2)); ASSERT(f+g==Op(2));
assert(f-g==Op(0)); ASSERT(f-g==Op(0));
assert(f*g==Op(1)); ASSERT(f*g==Op(1));
assert(f/g==Op(1)); ASSERT(f/g==Op(1));
assert(f%g==Op(0)); ASSERT(f%g==Op(0));
// test unary operators // test unary operators
assert(!a==true); ASSERT(!a==true);
assert(!b==false); ASSERT(!b==false);
assert(-a==a); ASSERT(-a==a);
assert(-b==Op(-5)); ASSERT(-b==Op(-5));
// test [] // test []
Op h=3; Op h=3;
assert(h[0]==3); ASSERT(h[0]==3);
assert(h[1]==0); ASSERT(h[1]==0);
h[0]=2; // set h[0]=2; // set
assert(h[0]==2); ASSERT(h[0]==2);
h[1]=2; // ignored h[1]=2; // ignored
assert(h[0]==2); ASSERT(h[0]==2);
assert(h[1]==0); ASSERT(h[1]==0);
// test () // test ()
Op i=3; Op i=3;
assert(i()==3); ASSERT(i()==3);
assert(i(1)==4); ASSERT(i(1)==4);
assert(i(1,2)==6); ASSERT(i(1,2)==6);
// plus add some code to check the __str__ fn // plus add some code to check the __str__ fn
//assert(str(Op(1))=="Op(1)"); //ASSERT(str(Op(1))=="Op(1)");
//assert(str(Op(-3))=="Op(-3)"); //ASSERT(str(Op(-3))=="Op(-3)");
// test ++ and -- // test ++ and --
Op j(100); Op j(100);
@ -329,36 +327,36 @@ void Op::sanity_check()
{ {
Op newOp = j++; Op newOp = j++;
int newInt = original++; int newInt = original++;
assert(j.i == original); ASSERT(j.i == original);
assert(newOp.i == newInt); ASSERT(newOp.i == newInt);
} }
{ {
Op newOp = j--; Op newOp = j--;
int newInt = original--; int newInt = original--;
assert(j.i == original); ASSERT(j.i == original);
assert(newOp.i == newInt); ASSERT(newOp.i == newInt);
} }
{ {
Op newOp = ++j; Op newOp = ++j;
int newInt = ++original; int newInt = ++original;
assert(j.i == original); ASSERT(j.i == original);
assert(newOp.i == newInt); ASSERT(newOp.i == newInt);
} }
{ {
Op newOp = --j; Op newOp = --j;
int newInt = --original; int newInt = --original;
assert(j.i == original); ASSERT(j.i == original);
assert(newOp.i == newInt); ASSERT(newOp.i == newInt);
} }
// cast operators // cast operators
Op k=3; Op k=3;
int check_k = k; int check_k = k;
assert (check_k == 3); ASSERT (check_k == 3);
Op l=4; Op l=4;
double check_l = l; double check_l = l;
assert (check_l == 4); ASSERT (check_l == 4);
} }
%} %}

View file

@ -13,6 +13,7 @@
$9 = &temp9; $9 = &temp9;
$10 = &temp10; // the code generated for this was arg20 = &temp10; and arg20 does not exist. $10 = &temp10; // the code generated for this was arg20 = &temp10; and arg20 does not exist.
int $10_ptr = 0; // Was arg20_ptr int $10_ptr = 0; // Was arg20_ptr
(void)$10_ptr;
} }
%inline %{ %inline %{