[Swig-cvs] SWIG/Examples/test-suite director_extend.i, 1.1, 1.2 extend_placement.i, 1.6, 1.7 newobject2.i, 1.5, 1.6 operator_overload.i, 1.18, 1.19 overload_extend.i, 1.11, 1.12

[William F. <wsf...@us...>]

Update of /cvsroot/swig/SWIG/Examples/test-suite
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15826/Examples/test-suite

Modified Files:
	director_extend.i extend_placement.i newobject2.i 
	operator_overload.i overload_extend.i 
Log Message:
use $self special variable instead of self in %extend

Index: operator_overload.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/operator_overload.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** operator_overload.i	26 Oct 2006 18:49:11 -0000	1.18
--- operator_overload.i	8 Nov 2006 01:01:37 -0000	1.19
***************
*** 168,186 ****
  // to make the friends & non members part of the class
  %extend Op{
!         Op operator &&(const Op& b){return Op(self->i&&b.i);}
!         Op operator or(const Op& b){return Op(self->i||b.i);}
  
! 	Op operator+(const Op& b){return Op(self->i+b.i);}
! 	Op operator-(const Op& b){return Op(self->i-b.i);}
! 	Op operator*(const Op& b){return Op(self->i*b.i);}
! 	Op operator/(const Op& b){return Op(self->i/b.i);}
! 	Op operator%(const Op& b){return Op(self->i%b.i);}
  
! 	bool operator==(const Op& b){return self->i==b.i;}
! 	bool operator!=(const Op& b){return self->i!=b.i;}
! 	bool operator< (const Op& b){return self->i<b.i;}
! 	bool operator<=(const Op& b){return self->i<=b.i;}
! 	bool operator> (const Op& b){return self->i>b.i;}
! 	bool operator>=(const Op& b){return self->i>=b.i;}
  
  	// we also add the __str__() fn to the class
--- 168,186 ----
  // to make the friends & non members part of the class
  %extend Op{
!         Op operator &&(const Op& b){return Op($self->i&&b.i);}
!         Op operator or(const Op& b){return Op($self->i||b.i);}
  
! 	Op operator+(const Op& b){return Op($self->i+b.i);}
! 	Op operator-(const Op& b){return Op($self->i-b.i);}
! 	Op operator*(const Op& b){return Op($self->i*b.i);}
! 	Op operator/(const Op& b){return Op($self->i/b.i);}
! 	Op operator%(const Op& b){return Op($self->i%b.i);}
  
! 	bool operator==(const Op& b){return $self->i==b.i;}
! 	bool operator!=(const Op& b){return $self->i!=b.i;}
! 	bool operator< (const Op& b){return $self->i<b.i;}
! 	bool operator<=(const Op& b){return $self->i<=b.i;}
! 	bool operator> (const Op& b){return $self->i>b.i;}
! 	bool operator>=(const Op& b){return $self->i>=b.i;}
  
  	// we also add the __str__() fn to the class
***************
*** 189,193 ****
  	{
  		static char buffer[255];
! 		sprintf(buffer,"Op(%d)",self->i);
  		return buffer;
  	}
--- 189,193 ----
  	{
  		static char buffer[255];
! 		sprintf(buffer,"Op(%d)",$self->i);
  		return buffer;
  	}
***************
*** 195,201 ****
  	// __getitem__ & __setitem__
  	int __getitem__(unsigned i)
! 	{	return (*self)[i];	}
  	void __setitem__(unsigned i,int v)
! 	{	(*self)[i]=v;	}
  }
  
--- 195,201 ----
  	// __getitem__ & __setitem__
  	int __getitem__(unsigned i)
! 	{	return (*$self)[i];	}
  	void __setitem__(unsigned i,int v)
! 	{	(*$self)[i]=v;	}
  }
  

Index: overload_extend.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/overload_extend.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** overload_extend.i	31 Jan 2006 06:16:41 -0000	1.11
--- overload_extend.i	8 Nov 2006 01:01:37 -0000	1.12
***************
*** 41,45 ****
    }
    ~Bar() {
!     if (self) delete self;
    }
  #else
--- 41,45 ----
    }
    ~Bar() {
!     delete $self;
    }
  #else
***************
*** 48,52 ****
    }
    ~Bar() {
!     if (self) free(self);
    }
  #endif
--- 48,52 ----
    }
    ~Bar() {
!     free($self);
    }
  #endif

Index: newobject2.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/newobject2.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** newobject2.i	31 Jan 2006 06:16:41 -0000	1.5
--- newobject2.i	8 Nov 2006 01:01:37 -0000	1.6
***************
*** 42,46 ****
  %extend Foo {
      ~Foo() {
!         free((void *) self);
  	g_fooCount--;
      }
--- 42,46 ----
  %extend Foo {
      ~Foo() {
!         free((void *) $self);
  	g_fooCount--;
      }

Index: director_extend.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/director_extend.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** director_extend.i	25 Sep 2006 21:59:37 -0000	1.1
--- director_extend.i	8 Nov 2006 01:01:37 -0000	1.2
***************
*** 6,10 ****
     virtual int dummy()          // Had to remove virtual to work
     {
!       return self->getFooBar();
     }
  };
--- 6,10 ----
     virtual int dummy()          // Had to remove virtual to work
     {
!       return $self->getFooBar();
     }
  };

Index: extend_placement.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Examples/test-suite/extend_placement.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** extend_placement.i	16 Oct 2004 20:45:31 -0000	1.6
--- extend_placement.i	8 Nov 2006 01:01:37 -0000	1.7
***************
*** 7,11 ****
  %extend Foo {
    Foo(int a) { return new Foo(); }
!   ~Foo() { delete self;}
    int spam(int x) { return x; }
    int spam(int x, int y) { return x + y ; }
--- 7,11 ----
  %extend Foo {
    Foo(int a) { return new Foo(); }
!   ~Foo() { delete $self;}
    int spam(int x) { return x; }
    int spam(int x, int y) { return x + y ; }
***************
*** 42,46 ****
  %extend Bar {
    Bar(int a) { return new Bar(); }
!   ~Bar() { delete self;}
    int spam() { return 1}
    int spam(int x) { return x; }
--- 42,46 ----
  %extend Bar {
    Bar(int a) { return new Bar(); }
!   ~Bar() { delete $self;}
    int spam() { return 1}
    int spam(int x) { return x; }
***************
*** 57,61 ****
  %extend FooT {
    FooT(int a) { return new FooT<T>(); }
!   ~FooT() { delete self;}
    int spam(int x) { return x; }
    int spam(int x, int y) { return x + y ; }
--- 57,61 ----
  %extend FooT {
    FooT(int a) { return new FooT<T>(); }
!   ~FooT() { delete $self;}
    int spam(int x) { return x; }
    int spam(int x, int y) { return x + y ; }
***************
*** 97,101 ****
  %extend BarT {
    BarT(int a) { return new BarT<T>(); }
!   ~BarT() { delete self;}
    int spam() { return 1}
    int spam(int x) { return x; }
--- 97,101 ----
  %extend BarT {
    BarT(int a) { return new BarT<T>(); }
!   ~BarT() { delete $self;}
    int spam() { return 1}
    int spam(int x) { return x; }