SWIG

Revision: 10954
          http://swig.svn.sourceforge.net/swig/?rev=10954&view=rev
Author:   wsfulton
Date:     2008-11-26 23:04:18 +0000 (Wed, 26 Nov 2008)

Log Message:
-----------
modifying build system not to rely on the -I path to find the input files avoiding warning 125: merge .i files that are common between python and the main version

Modified Paths:
--------------
    trunk/Examples/test-suite/li_std_map.i
    trunk/Examples/test-suite/li_std_set.i

Added Paths:
-----------
    trunk/Examples/test-suite/li_std_vector_extra.i
    trunk/Examples/test-suite/python/li_std_vector_extra_runme.py

Removed Paths:
-------------
    trunk/Examples/test-suite/python/li_std_map.i
    trunk/Examples/test-suite/python/li_std_set.i
    trunk/Examples/test-suite/python/li_std_stream.i
    trunk/Examples/test-suite/python/li_std_vector.i
    trunk/Examples/test-suite/python/li_std_vector_runme.py
    trunk/Examples/test-suite/python/li_std_wstring.i
    trunk/Examples/test-suite/python/std_containers.i

Modified: trunk/Examples/test-suite/li_std_map.i
===================================================================
--- trunk/Examples/test-suite/li_std_map.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/li_std_map.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -47,8 +47,15 @@
   %template(pairiiAc) pair<int,const pair<int, A*> >;
 
 
+#ifdef SWIGRUBY
   %template() pair< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >;
   %template(LanguageMap) map< swig::LANGUAGE_OBJ, swig::LANGUAGE_OBJ >;
+#endif
+
+#ifdef SWIGPYTHON
+  %template() pair<swig::PyObject_ptr, swig::PyObject_ptr>;
+  %template(pymap) map<swig::PyObject_ptr, swig::PyObject_ptr>;
+#endif
   
 }
 

Modified: trunk/Examples/test-suite/li_std_set.i
===================================================================
--- trunk/Examples/test-suite/li_std_set.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/li_std_set.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -31,4 +31,10 @@
 
 
 
+#if defined(SWIGRUBY)
 %template(LanguageSet) std::set<swig::LANGUAGE_OBJ>; 
+#endif
+
+#if defined(SWIGPYTHON)
+%template(pyset) std::set<swig::PyObject_ptr>; 
+#endif

Copied: trunk/Examples/test-suite/li_std_vector_extra.i (from rev 10949, trunk/Examples/test-suite/python/li_std_vector.i)
===================================================================
--- trunk/Examples/test-suite/li_std_vector_extra.i	                        (rev 0)
+++ trunk/Examples/test-suite/li_std_vector_extra.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -0,0 +1,141 @@
+%module li_std_vector_extra
+
+%warnfilter(509) overloaded1;
+%warnfilter(509) overloaded2;
+
+%include "std_string.i"
+%include "std_vector.i"
+%include "cpointer.i"
+%include "carrays.i"
+
+%{
+#include <algorithm>
+#include <functional>
+#include <numeric>
+%}
+
+namespace std {
+    %template() vector<short>;
+    %template(IntVector) vector<int>;
+    %template(BoolVector) vector<bool>;
+    %template() vector<string>;
+}
+
+%template(DoubleVector) std::vector<double>;
+
+
+%template(sizeVector) std::vector<size_t>;
+%{
+  template <class T>
+  struct Param
+  {
+    T val;
+
+    Param(T v = 0): val(v) {
+    }
+    
+    operator T() const { return val; }
+  };
+%}
+specialize_std_vector(Param<int>,PyInt_Check,PyInt_AsLong,PyInt_FromLong);
+%template(PIntVector) std::vector<Param<int> >;
+
+%inline %{
+typedef float Real;
+%}
+
+namespace std {
+    %template(RealVector) vector<Real>;
+}
+
+%inline %{
+
+double average(std::vector<int> v) {
+    return std::accumulate(v.begin(),v.end(),0.0)/v.size();
+}
+
+std::vector<Real> half(const std::vector<Real>& v) {
+    std::vector<Real> w(v);
+    for (std::vector<Real>::size_type i=0; i<w.size(); i++)
+        w[i] /= 2.0;
+    return w;
+}
+
+void halve_in_place(std::vector<double>& v) {
+    std::transform(v.begin(),v.end(),v.begin(),
+                   std::bind2nd(std::divides<double>(),2.0));
+}
+
+%}
+
+%template(IntPtrVector) std::vector<int *>;
+
+
+
+//
+//
+%{
+#include <iostream>
+%}
+
+%inline %{
+  
+namespace Test {
+struct A {
+    virtual ~A() {}    
+    virtual int f(const int i) const = 0;
+};
+
+struct B : public A {
+  int val;
+  
+  B(int i = 0) : val(i)
+  {
+  }
+  
+  int f(const int i) const { return i + val; }
+};
+
+
+int vecAptr(const std::vector<A*>& v) {
+    return v[0]->f(1);
+}
+
+} 
+
+std::vector<short> halfs(const std::vector<short>& v) {
+    std::vector<short> w(v);
+    for (std::vector<short>::size_type i=0; i<w.size(); i++)
+        w[i] /= 2;
+    return w;
+}
+
+
+std::vector<std::string>  vecStr(std::vector<std::string> v) {
+  v[0] += v[1];
+  return v;
+}
+
+%}
+%template(VecB) std::vector<Test::B>; 
+%template(VecA) std::vector<Test::A*>; 
+
+%pointer_class(int,PtrInt)
+%array_functions(int,ArrInt)
+
+
+%template(pyvector) std::vector<swig::PyObject_ptr>; 
+
+namespace std {
+   %template(ConstIntVector) vector<const int *>;
+}
+
+%inline %{
+std::string overloaded1(std::vector<double> vi) { return "vector<double>"; }
+std::string overloaded1(std::vector<int> vi) { return "vector<int>"; }
+std::string overloaded2(std::vector<int> vi) { return "vector<int>"; }
+std::string overloaded2(std::vector<double> vi) { return "vector<double>"; }
+std::string overloaded3(std::vector<int> *vi) { return "vector<int> *"; }
+std::string overloaded3(int i) { return "int"; }
+%}
+

Deleted: trunk/Examples/test-suite/python/li_std_map.i
===================================================================
--- trunk/Examples/test-suite/python/li_std_map.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_map.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,58 +0,0 @@
-%module("templatereduce") li_std_map
-
-%include std_pair.i
-%include std_map.i
-%include std_multimap.i
-
-%inline %{
-struct A{
-    int val;
-    
-    A(int v = 0): val(v)
-    {
-    }
-
-};
-%}
-
-namespace std
-{
-  %template(pairii) pair<int, int>;
-  %template(pairAA) pair<int, A>;
-  %template(pairA) pair<int, A*>;
-  %template(mapA) map<int, A*>;
-  %template(mmapA) multimap<int, A*>;
-
-  %template(paircA1) pair<const int, A*>;
-  %template(paircA2) pair<const int, const A*>;
-  %template(pairiiA) pair<int,pair<int, A*> >;
-  %template(pairiiAc) pair<int,const pair<int, A*> >;
-
-
-  %template() pair<swig::PyObject_ptr, swig::PyObject_ptr>;
-  %template(pymap) map<swig::PyObject_ptr, swig::PyObject_ptr>;
-  
-}
-
-
-
-%inline 
-{
-std::pair<int, A*> 
-p_identa(std::pair<int, A*> p) {
-  return p;
-}
-
-std::map<int,A*> m_identa(const std::map<int,A*>& v)
-{
-  return v;
-}
-
-}
-
-
-
-namespace std
-{
-%template(mapii) map<int,int>;
-}

Deleted: trunk/Examples/test-suite/python/li_std_set.i
===================================================================
--- trunk/Examples/test-suite/python/li_std_set.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_set.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,17 +0,0 @@
-%module li_std_set
-
-%include <std_string.i>
-%include <std_set.i>
-%include <std_multiset.i>
-%include <std_vector.i>
-
-%template(set_string) std::set<std::string>;
-%template(set_int) std::multiset<int>;
-
-
-%template(v_int) std::vector<int>;
-
-
-
-
-%template(pyset) std::set<swig::PyObject_ptr>; 

Deleted: trunk/Examples/test-suite/python/li_std_stream.i
===================================================================
--- trunk/Examples/test-suite/python/li_std_stream.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_stream.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,59 +0,0 @@
-%module li_std_stream
-
-%inline %{
-  struct A;  
-%}
-
-%include <std_iostream.i>
-%include <std_sstream.i>
-
-
-
-%callback(1) A::bar;
-
-%inline %{
-
-  struct B {
-    virtual ~B()
-    {
-    }
-    
-  };
-  
-  struct A : B
-  {
-    void __add__(int a)
-    {
-    }
-
-    void __add__(double a)
-    {
-    }
-
-    static int bar(int a){
-      return a;
-    }
-
-    static int foo(int a, int (*pf)(int a))
-    {
-      return pf(a);
-    }
-
-
-    std::ostream& __rlshift__(std::ostream& out)
-    {
-      out << "A class";
-      return out;
-    }    
-  };
-%}
-
-%extend std::basic_ostream<char>{
-  std::basic_ostream<char>& 
-    operator<<(const A& a)
-    {
-      *self << "A class";
-      return *self;
-    }
-}
-

Deleted: trunk/Examples/test-suite/python/li_std_vector.i
===================================================================
--- trunk/Examples/test-suite/python/li_std_vector.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_vector.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,141 +0,0 @@
-%module li_std_vector
-
-%warnfilter(509) overloaded1;
-%warnfilter(509) overloaded2;
-
-%include "std_string.i"
-%include "std_vector.i"
-%include "cpointer.i"
-%include "carrays.i"
-
-%{
-#include <algorithm>
-#include <functional>
-#include <numeric>
-%}
-
-namespace std {
-    %template() vector<short>;
-    %template(IntVector) vector<int>;
-    %template(BoolVector) vector<bool>;
-    %template() vector<string>;
-}
-
-%template(DoubleVector) std::vector<double>;
-
-
-%template(sizeVector) std::vector<size_t>;
-%{
-  template <class T>
-  struct Param
-  {
-    T val;
-
-    Param(T v = 0): val(v) {
-    }
-    
-    operator T() const { return val; }
-  };
-%}
-specialize_std_vector(Param<int>,PyInt_Check,PyInt_AsLong,PyInt_FromLong);
-%template(PIntVector) std::vector<Param<int> >;
-
-%inline %{
-typedef float Real;
-%}
-
-namespace std {
-    %template(RealVector) vector<Real>;
-}
-
-%inline %{
-
-double average(std::vector<int> v) {
-    return std::accumulate(v.begin(),v.end(),0.0)/v.size();
-}
-
-std::vector<Real> half(const std::vector<Real>& v) {
-    std::vector<Real> w(v);
-    for (std::vector<Real>::size_type i=0; i<w.size(); i++)
-        w[i] /= 2.0;
-    return w;
-}
-
-void halve_in_place(std::vector<double>& v) {
-    std::transform(v.begin(),v.end(),v.begin(),
-                   std::bind2nd(std::divides<double>(),2.0));
-}
-
-%}
-
-%template(IntPtrVector) std::vector<int *>;
-
-
-
-//
-//
-%{
-#include <iostream>
-%}
-
-%inline %{
-  
-namespace Test {
-struct A {
-    virtual ~A() {}    
-    virtual int f(const int i) const = 0;
-};
-
-struct B : public A {
-  int val;
-  
-  B(int i = 0) : val(i)
-  {
-  }
-  
-  int f(const int i) const { return i + val; }
-};
-
-
-int vecAptr(const std::vector<A*>& v) {
-    return v[0]->f(1);
-}
-
-} 
-
-std::vector<short> halfs(const std::vector<short>& v) {
-    std::vector<short> w(v);
-    for (std::vector<short>::size_type i=0; i<w.size(); i++)
-        w[i] /= 2;
-    return w;
-}
-
-
-std::vector<std::string>  vecStr(std::vector<std::string> v) {
-  v[0] += v[1];
-  return v;
-}
-
-%}
-%template(VecB) std::vector<Test::B>; 
-%template(VecA) std::vector<Test::A*>; 
-
-%pointer_class(int,PtrInt)
-%array_functions(int,ArrInt)
-
-
-%template(pyvector) std::vector<swig::PyObject_ptr>; 
-
-namespace std {
-   %template(ConstIntVector) vector<const int *>;
-}
-
-%inline %{
-std::string overloaded1(std::vector<double> vi) { return "vector<double>"; }
-std::string overloaded1(std::vector<int> vi) { return "vector<int>"; }
-std::string overloaded2(std::vector<int> vi) { return "vector<int>"; }
-std::string overloaded2(std::vector<double> vi) { return "vector<double>"; }
-std::string overloaded3(std::vector<int> *vi) { return "vector<int> *"; }
-std::string overloaded3(int i) { return "int"; }
-%}
-

Copied: trunk/Examples/test-suite/python/li_std_vector_extra_runme.py (from rev 10949, trunk/Examples/test-suite/python/li_std_vector_runme.py)
===================================================================
--- trunk/Examples/test-suite/python/li_std_vector_extra_runme.py	                        (rev 0)
+++ trunk/Examples/test-suite/python/li_std_vector_extra_runme.py	2008-11-26 23:04:18 UTC (rev 10954)
@@ -0,0 +1,135 @@
+from li_std_vector_extra import *
+
+iv = IntVector(4)
+for i in range(0,4):
+    iv[i] = i
+
+x = average(iv)
+y = average([1,2,3,4])
+
+a = half([10,10.5,11,11.5])
+
+dv = DoubleVector(10)
+for i in range(0,10):
+    dv[i] = i/2.0
+
+halve_in_place(dv)
+
+
+bv = BoolVector(4)
+bv[0]= 1
+bv[1]= 0
+bv[2]= 4
+bv[3]= 0
+
+if bv[0] != bv[2]:
+    raise RuntimeError,"bad std::vector<bool> mapping"
+
+b = B(5)
+va = VecA([b,None,b,b])
+
+if va[0].f(1) != 6:
+    raise RuntimeError,"bad std::vector<A*> mapping"
+
+if vecAptr(va) != 6:
+    raise RuntimeError,"bad std::vector<A*> mapping"
+
+b.val = 7
+if va[3].f(1) != 8:
+    raise RuntimeError,"bad std::vector<A*> mapping"
+
+
+ip = PtrInt()
+ap = new_ArrInt(10)
+
+ArrInt_setitem(ip,0,123)
+ArrInt_setitem(ap,2,123)
+
+vi = IntPtrVector((ip,ap,None))
+if ArrInt_getitem(vi[0],0) != ArrInt_getitem(vi[1],2):
+    raise RuntimeError,"bad std::vector<int*> mapping"
+
+delete_ArrInt(ap)    
+
+
+a = halfs([10,8,4,3])
+
+v = IntVector()
+v[0:2] = [1,2]
+if v[0] != 1 or v[1] != 2:
+    raise RuntimeError,"bad setslice"
+
+if v[0:-1][0] != 1:
+    raise RuntimeError,"bad getslice"
+
+if v[0:-2].size() != 0:
+    raise RuntimeError,"bad getslice"
+
+v[0:1] = [2]
+if v[0] != 2:
+    raise RuntimeError,"bad setslice"
+
+v[1:] = [3]
+if v[1] != 3:
+    raise RuntimeError,"bad setslice"
+
+v[2:] = [3]
+if v[2] != 3:
+    raise RuntimeError,"bad setslice"
+
+if v[0:][0] != v[0]:
+    raise RuntimeError,"bad getslice"
+
+
+del v[:]
+if v.size() != 0:
+    raise RuntimeError,"bad getslice"    
+
+del v[:]
+if v.size() != 0:
+    raise RuntimeError,"bad getslice"    
+
+
+
+v = vecStr(["hello ", "world"])
+if v[0] != 'hello world':
+    raise RuntimeError,"bad std::string+std::vector"
+    
+
+
+pv = pyvector([1, "hello", (1,2)])
+
+if pv[1] != "hello":
+    raise RuntimeError
+
+
+iv = IntVector(5)
+for i in range(0,5):
+    iv[i] = i
+
+iv[1:3] = []
+if iv[1] != 3:
+    raise RuntimeError
+
+# Overloading checks
+if overloaded1(iv) != "vector<int>":
+  raise RuntimeError
+
+if overloaded1(dv) != "vector<double>":
+  raise RuntimeError
+
+if overloaded2(iv) != "vector<int>":
+  raise RuntimeError
+
+if overloaded2(dv) != "vector<double>":
+  raise RuntimeError
+
+if overloaded3(iv) != "vector<int> *":
+  raise RuntimeError
+
+if overloaded3(None) != "vector<int> *":
+  raise RuntimeError
+
+if overloaded3(100) != "int":
+  raise RuntimeError
+

Deleted: trunk/Examples/test-suite/python/li_std_vector_runme.py
===================================================================
--- trunk/Examples/test-suite/python/li_std_vector_runme.py	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_vector_runme.py	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,135 +0,0 @@
-from li_std_vector import *
-
-iv = IntVector(4)
-for i in range(0,4):
-    iv[i] = i
-
-x = average(iv)
-y = average([1,2,3,4])
-
-a = half([10,10.5,11,11.5])
-
-dv = DoubleVector(10)
-for i in range(0,10):
-    dv[i] = i/2.0
-
-halve_in_place(dv)
-
-
-bv = BoolVector(4)
-bv[0]= 1
-bv[1]= 0
-bv[2]= 4
-bv[3]= 0
-
-if bv[0] != bv[2]:
-    raise RuntimeError,"bad std::vector<bool> mapping"
-
-b = B(5)
-va = VecA([b,None,b,b])
-
-if va[0].f(1) != 6:
-    raise RuntimeError,"bad std::vector<A*> mapping"
-
-if vecAptr(va) != 6:
-    raise RuntimeError,"bad std::vector<A*> mapping"
-
-b.val = 7
-if va[3].f(1) != 8:
-    raise RuntimeError,"bad std::vector<A*> mapping"
-
-
-ip = PtrInt()
-ap = new_ArrInt(10)
-
-ArrInt_setitem(ip,0,123)
-ArrInt_setitem(ap,2,123)
-
-vi = IntPtrVector((ip,ap,None))
-if ArrInt_getitem(vi[0],0) != ArrInt_getitem(vi[1],2):
-    raise RuntimeError,"bad std::vector<int*> mapping"
-
-delete_ArrInt(ap)    
-
-
-a = halfs([10,8,4,3])
-
-v = IntVector()
-v[0:2] = [1,2]
-if v[0] != 1 or v[1] != 2:
-    raise RuntimeError,"bad setslice"
-
-if v[0:-1][0] != 1:
-    raise RuntimeError,"bad getslice"
-
-if v[0:-2].size() != 0:
-    raise RuntimeError,"bad getslice"
-
-v[0:1] = [2]
-if v[0] != 2:
-    raise RuntimeError,"bad setslice"
-
-v[1:] = [3]
-if v[1] != 3:
-    raise RuntimeError,"bad setslice"
-
-v[2:] = [3]
-if v[2] != 3:
-    raise RuntimeError,"bad setslice"
-
-if v[0:][0] != v[0]:
-    raise RuntimeError,"bad getslice"
-
-
-del v[:]
-if v.size() != 0:
-    raise RuntimeError,"bad getslice"    
-
-del v[:]
-if v.size() != 0:
-    raise RuntimeError,"bad getslice"    
-
-
-
-v = vecStr(["hello ", "world"])
-if v[0] != 'hello world':
-    raise RuntimeError,"bad std::string+std::vector"
-    
-
-
-pv = pyvector([1, "hello", (1,2)])
-
-if pv[1] != "hello":
-    raise RuntimeError
-
-
-iv = IntVector(5)
-for i in range(0,5):
-    iv[i] = i
-
-iv[1:3] = []
-if iv[1] != 3:
-    raise RuntimeError
-
-# Overloading checks
-if overloaded1(iv) != "vector<int>":
-  raise RuntimeError
-
-if overloaded1(dv) != "vector<double>":
-  raise RuntimeError
-
-if overloaded2(iv) != "vector<int>":
-  raise RuntimeError
-
-if overloaded2(dv) != "vector<double>":
-  raise RuntimeError
-
-if overloaded3(iv) != "vector<int> *":
-  raise RuntimeError
-
-if overloaded3(None) != "vector<int> *":
-  raise RuntimeError
-
-if overloaded3(100) != "int":
-  raise RuntimeError
-

Deleted: trunk/Examples/test-suite/python/li_std_wstring.i
===================================================================
--- trunk/Examples/test-suite/python/li_std_wstring.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/li_std_wstring.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,89 +0,0 @@
-%module li_std_wstring
-%include <std_basic_string.i>
-%include <std_wstring.i>
-
-
-%inline %{
-
-struct A : std::wstring 
-{
-  A(const std::wstring& s) : std::wstring(s)
-  {
-  }
-};
-
-struct B 
-{
-  B(const std::wstring& s) : cname(0), name(s), a(s)
-  {
-  }
-  
-  char *cname;
-  std::wstring name;
-  A a;
-
-};
- 
-
-wchar_t test_wcvalue(wchar_t x) {
-   return x;
-}
-
-const wchar_t* test_ccvalue(const wchar_t* x) {
-   return x;
-}
-
-wchar_t* test_cvalue(wchar_t* x) {
-   return x;
-}
-  
-
-std::wstring test_value(std::wstring x) {
-   return x;
-}
-
-const std::wstring& test_const_reference(const std::wstring &x) {
-   return x;
-}
-
-void test_pointer(std::wstring *x) {
-}
-
-std::wstring *test_pointer_out() {
-   static std::wstring x = L"x";
-   return &x;
-}
-
-void test_const_pointer(const std::wstring *x) {
-}
-
-const std::wstring *test_const_pointer_out() {
-   static std::wstring x = L"x";
-   return &x;
-}
-
-void test_reference(std::wstring &x) {
-}
-
-std::wstring& test_reference_out() {
-   static std::wstring x = L"x";
-   return x;
-}
-
-#if defined(_MSC_VER)
-  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
-void test_throw() throw(std::wstring){
-  static std::wstring x = L"x";
-  
-  throw x;
-}
-
-#if defined(_MSC_VER)
-  #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
-%}
-
-

Deleted: trunk/Examples/test-suite/python/std_containers.i
===================================================================
--- trunk/Examples/test-suite/python/std_containers.i	2008-11-26 22:50:35 UTC (rev 10953)
+++ trunk/Examples/test-suite/python/std_containers.i	2008-11-26 23:04:18 UTC (rev 10954)
@@ -1,199 +0,0 @@
-%module std_containers
-
-%{
-#include <set>
-%}
-%include std_vector.i
-%include std_string.i
-%include std_deque.i
-%include std_list.i
-%include std_set.i
-%include std_multiset.i
-%include std_pair.i
-%include std_map.i
-%include std_multimap.i
-%include std_complex.i
-
-%template() std::vector<double>;
-%template() std::pair<std::string, int>;
-%template() std::pair<int,double>;
-
-%template() std::vector< std::vector<double > > ;
-%template(ccube) std::vector< std::vector< std::vector<double > > >;
-
-%inline 
-{ 
-  typedef
-    std::vector<std::vector<std::vector<double > > >
-    ccube;
- 
-  ccube cident(const ccube& c)
-  {
-    return c;
-  }
-
-  struct C
-  {
-  };
-}
-
-
-%template(map_si)  std::map<std::string, int>;
-%template(pair_iC)  std::pair<int, C*>;
-%template(map_iC)  std::map<int, C*>;
-%template(mmap_si)  std::multimap<std::string, int>;
-%template(set_i) std::set<int>;
-%template(multiset_i) std::multiset<int>;
-%template(list_i) std::list<int>;
-%template(deque_i) std::deque<int>;
-
-%template(vector_b) std::vector<bool>;
-%template(vector_i) std::vector<int>;
-%template(vector_c) std::vector<std::complex<double> >;
-%template(vector_ui) std::vector<unsigned int>;
-
-%template(bmatrix) std::vector<std::vector<bool> >;
-%template(imatrix) std::vector<std::vector<int> >;
-%template(cmatrix) std::vector<std::vector<std::complex<double> > >;
-
-%apply std::vector<int> *INOUT {std::vector<int> *INOUT2};
-
-%inline 
-{
-  typedef std::vector<std::vector<int> >  imatrix;
-  imatrix midenti(const imatrix& v)
-  {
-    return v;
-  }
-
-  typedef std::vector<std::vector<bool> >  bmatrix;
-  bmatrix midentb(const bmatrix& v)
-  {
-    return v;
-  }
-
-  std::map<int,C*> mapidentc(const std::map<int,C*>& v)
-  {
-    return v;
-  }
-
-  std::map<int,int> mapidenti(const std::map<int,int>& v)
-  {
-    return v;
-  }
-
-  std::map<std::string,int> mapident(const std::map<std::string,int>& v)
-  {
-    return v;
-  }
-
-  std::multimap<std::string,int> mapident(const std::multimap<std::string,int>& v)
-  {
-    return v;
-  }
-
-  std::vector<int> vident(const std::vector<int>& v)
-  {
-    return v;
-  }
-
-  std::set<int> sident(const std::set<int>& v)
-  {
-    return v;
-  }
-
-  std::vector<unsigned int> videntu(const std::vector<unsigned int>& v)
-  {
-    return v;
-  }
-
-
-  int get_elem(const std::vector<int>& v, int index)
-  {
-    return v[index];
-  }
-
-  std::pair<int,double> pident(const std::pair<int,double>& p) 
-  {
-    return p;
-  }
-
-  void
-  v_inout(std::vector<int> *INOUT) {
-    *INOUT = *INOUT;
-  }  
-
-  void
-  v_inout2(std::vector<int> *INOUT, std::vector<int> *INOUT2) {
-    std::swap(*INOUT, *INOUT2);
-  } 
-
-}
-
-
-%{
-  
-  template <class C> struct Param 
-  {
-  };	    
-%}
-
-
-template <class C> struct Param 
-{
-};
-
-
-%template(Param_c) Param<std::complex<double> >;
-%inline 
-{
-  int hello(Param<std::complex<double> > c)
-  {
-    return 0;
-  }
-}
-
-%inline 
-{
-  struct A 
-  {
-    A(int aa = 0) : a(aa)
-    {
-    }
-    int a;
-  };  
-}
-
-%template() std::pair<A,int>;
-%template(pair_iA) std::pair<int,A>;
-%template(vector_piA) std::vector<std::pair<int,A> >;
-
-
-%inline {
-  std::pair<A,int> ident(std::pair<int,A> a, const std::pair<int,int>& b)
-  {
-    return std::pair<A,int>();
-  }  
-
-
-  std::vector<std::pair<int,A> > pia_vident(std::vector<std::pair<int,A> > a )
-  {
-    return a;
-  }  
-
-  struct Foo
-  {
-    Foo(int i) {
-    }
-  };
-  
-}
-
-
-%std_nodefconst_type(Foo);
-
-%template(vector_Foo) std::vector<Foo>;
-%template(deque_Foo) std::deque<Foo>;
-%template(list_Foo) std::list<Foo>;
-
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10957
          http://swig.svn.sourceforge.net/swig/?rev=10957&view=rev
Author:   wsfulton
Date:     2008-11-28 23:33:37 +0000 (Fri, 28 Nov 2008)

Log Message:
-----------
move iadd.h contents into iadd.i

Modified Paths:
--------------
    trunk/Examples/test-suite/iadd.i

Removed Paths:
-------------
    trunk/Examples/test-suite/python/iadd.h

Modified: trunk/Examples/test-suite/iadd.i
===================================================================
--- trunk/Examples/test-suite/iadd.i	2008-11-28 23:30:45 UTC (rev 10956)
+++ trunk/Examples/test-suite/iadd.i	2008-11-28 23:33:37 UTC (rev 10957)
@@ -1,12 +1,58 @@
 %module iadd
 
 %include attribute.i
-%{
-#include "iadd.h"
-%} 
 class Foo; 
 %attribute_ref(test::Foo, test::A& , AsA);
 %attribute_ref(test::Foo, long, AsLong);
 
 
-%include "iadd.h"
+%inline %{
+struct B {
+	int x;
+	B(const int x) : x(x) {}
+	
+        B& get_me() 
+        {
+		return *this;
+        }
+  
+	B& operator+=(const B& a) {
+		x += a.x;
+		return *this;
+	}
+};
+
+
+
+namespace test { 
+
+struct A {
+	int x;
+	A(const int x) : x(x) {}
+	
+        A& get_me() 
+        {
+		return *this;
+        }
+  
+	A operator+=(const A& a) {
+		x += a.x;
+		return *this;
+	}
+};
+
+
+class Foo {
+public: 
+	Foo(): _a(new A(5)), _n(new long) {}
+	~Foo() { delete _a; delete _n; _a = NULL; _n = NULL; }
+
+	A & AsA() const { return *_a; }
+	long& AsLong() const { return *_n; }
+private: 
+	A *_a;
+	long *_n;
+};
+}
+
+%}

Deleted: trunk/Examples/test-suite/python/iadd.h
===================================================================
--- trunk/Examples/test-suite/python/iadd.h	2008-11-28 23:30:45 UTC (rev 10956)
+++ trunk/Examples/test-suite/python/iadd.h	2008-11-28 23:33:37 UTC (rev 10957)
@@ -1,47 +0,0 @@
-struct B {
-	int x;
-	B(const int x) : x(x) {}
-	
-        B& get_me() 
-        {
-		return *this;
-        }
-  
-	B& operator+=(const B& a) {
-		x += a.x;
-		return *this;
-	}
-};
-
-
-
-namespace test { 
-
-struct A {
-	int x;
-	A(const int x) : x(x) {}
-	
-        A& get_me() 
-        {
-		return *this;
-        }
-  
-	A operator+=(const A& a) {
-		x += a.x;
-		return *this;
-	}
-};
-
-
-class Foo {
-public: 
-	Foo(): _a(new A(5)), _n(new long) {}
-	~Foo() { delete _a; delete _n; _a = NULL; _n = NULL; }
-
-	A & AsA() const { return *_a; }
-	long& AsLong() const { return *_n; }
-private: 
-	A *_a;
-	long *_n;
-};
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 10964
          http://swig.svn.sourceforge.net/swig/?rev=10964&view=rev
Author:   wsfulton
Date:     2008-12-06 17:10:53 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
add test for inheritance of 3 classes deep which exposes a problem in the python shared_ptr wrappers. Manually added the %types for now.

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs
    trunk/Examples/test-suite/java/li_boost_shared_ptr_runme.java
    trunk/Examples/test-suite/li_boost_shared_ptr.i
    trunk/Examples/test-suite/python/li_boost_shared_ptr_runme.py

Modified: trunk/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs	2008-12-03 21:36:53 UTC (rev 10963)
+++ trunk/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs	2008-12-06 17:10:53 UTC (rev 10964)
@@ -345,6 +345,16 @@
       verifyCount(1, kret);
     }
 
+    // 3rd derived class
+    {
+      Klass k = new Klass3rdDerived("me oh my");
+      String val = k.getValue();
+      verifyValue("me oh my-3rdDerived", val);
+      verifyCount(3, k); // 3 classes in inheritance chain == 3 swigCPtr values
+      val = li_boost_shared_ptr.test3rdupcast(k);
+      verifyValue("me oh my-3rdDerived", val);
+      verifyCount(3, k);
+    }
 
     ////////////////////////////////// Member variables ////////////////////////////////////////
     // smart pointer by value

Modified: trunk/Examples/test-suite/java/li_boost_shared_ptr_runme.java
===================================================================
--- trunk/Examples/test-suite/java/li_boost_shared_ptr_runme.java	2008-12-03 21:36:53 UTC (rev 10963)
+++ trunk/Examples/test-suite/java/li_boost_shared_ptr_runme.java	2008-12-06 17:10:53 UTC (rev 10964)
@@ -357,6 +357,16 @@
       verifyCount(1, kret);
     }
 
+    // 3rd derived class
+    {
+      Klass k = new Klass3rdDerived("me oh my");
+      String val = k.getValue();
+      verifyValue("me oh my-3rdDerived", val);
+      verifyCount(3, k); // 3 classes in inheritance chain == 3 swigCPtr values
+      val = li_boost_shared_ptr.test3rdupcast(k);
+      verifyValue("me oh my-3rdDerived", val);
+      verifyCount(3, k);
+    }
 
     ////////////////////////////////// Member variables ////////////////////////////////////////
     // smart pointer by value

Modified: trunk/Examples/test-suite/li_boost_shared_ptr.i
===================================================================
--- trunk/Examples/test-suite/li_boost_shared_ptr.i	2008-12-03 21:36:53 UTC (rev 10963)
+++ trunk/Examples/test-suite/li_boost_shared_ptr.i	2008-12-06 17:10:53 UTC (rev 10964)
@@ -43,7 +43,15 @@
 %include <boost_shared_ptr.i>
 SWIG_SHARED_PTR(Klass, Space::Klass)
 SWIG_SHARED_PTR_DERIVED(KlassDerived, Space::Klass, Space::KlassDerived)
+SWIG_SHARED_PTR_DERIVED(Klass2ndDerived, Space::Klass, Space::Klass2ndDerived)
+SWIG_SHARED_PTR_DERIVED(Klass3rdDerived, Space::Klass2ndDerived, Space::Klass3rdDerived)
 
+// TEMP for python
+%types(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > = SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >) {
+  *newmemory = SWIG_CAST_NEW_MEMORY;
+  return (void *) new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass >(*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< Space::Klass3rdDerived > *)$from);
+}
+
 #endif
 
 // TODO:
@@ -101,7 +109,13 @@
 };
 SwigExamples::CriticalSection Space::Klass::critical_section;
 
-struct IgnoredMultipleInheritBase { virtual ~IgnoredMultipleInheritBase() {} double d; double e;};
+struct IgnoredMultipleInheritBase { 
+  IgnoredMultipleInheritBase() : d(0.0), e(0.0) {}
+  virtual ~IgnoredMultipleInheritBase() {} 
+  double d; 
+  double e;
+  virtual void AVirtualMethod() {} 
+};
 
 // For most compilers, this use of multiple inheritance results in different derived and base class 
 // pointer values ... for some more challenging tests :)
@@ -142,7 +156,21 @@
   return kd;
 }
 
+// 3 classes in inheritance chain test
+struct Klass2ndDerived : Klass {
+  Klass2ndDerived() : Klass() {}
+  Klass2ndDerived(const std::string &val) : Klass(val) {}
+};
+struct Klass3rdDerived : IgnoredMultipleInheritBase, Klass2ndDerived {
+  Klass3rdDerived() : Klass2ndDerived() {}
+  Klass3rdDerived(const std::string &val) : Klass2ndDerived(val) {}
+  virtual ~Klass3rdDerived() {}
+  virtual std::string getValue() const { return Klass2ndDerived::getValue() + "-3rdDerived"; }
+};
 
+std::string test3rdupcast( SwigBoost::shared_ptr< Klass > k) {
+  return k->getValue();
+}
 
 
 
@@ -217,8 +245,14 @@
   return new SwigBoost::shared_ptr<Klass>(new Klass("smartpointerpointerownertest"));
 }
 
-// Provide overloads for Klass and KlassDerived as some language modules, eg Python, create an extra reference in
+// Provide overloads for Klass and derived classes as some language modules, eg Python, create an extra reference in
 // the marshalling if an upcast to a base class is required.
+long use_count(const SwigBoost::shared_ptr<Klass3rdDerived>& sptr) {
+  return sptr.use_count();
+}
+long use_count(const SwigBoost::shared_ptr<Klass2ndDerived>& sptr) {
+  return sptr.use_count();
+}
 long use_count(const SwigBoost::shared_ptr<KlassDerived>& sptr) {
   return sptr.use_count();
 }

Modified: trunk/Examples/test-suite/python/li_boost_shared_ptr_runme.py
===================================================================
--- trunk/Examples/test-suite/python/li_boost_shared_ptr_runme.py	2008-12-03 21:36:53 UTC (rev 10963)
+++ trunk/Examples/test-suite/python/li_boost_shared_ptr_runme.py	2008-12-06 17:10:53 UTC (rev 10964)
@@ -304,6 +304,15 @@
     self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
     self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
 
+    # 3rd derived class
+    k = li_boost_shared_ptr.Klass3rdDerived("me oh my")
+    val = k.getValue()
+    self.verifyValue("me oh my-3rdDerived", val)
+    self.verifyCount(1, k)
+    val = li_boost_shared_ptr.test3rdupcast(k)
+    self.verifyValue("me oh my-3rdDerived", val)
+    self.verifyCount(1, k)
+
     # //////////////////////////////// Member variables ////////////////////////////////////////
     # smart pointer by value
     m = li_boost_shared_ptr.MemberVariables()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11057
          http://swig.svn.sourceforge.net/swig/?rev=11057&view=rev
Author:   drjoe
Date:     2009-01-12 07:41:38 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
Add regression tests for R

Modified Paths:
--------------
    trunk/Examples/test-suite/li_std_vector.i
    trunk/Examples/test-suite/template_typedef_funcptr.i
    trunk/Examples/test-suite/types_directive.i

Added Paths:
-----------
    trunk/Examples/test-suite/r/arrays_dimensionless_runme.R

Modified: trunk/Examples/test-suite/li_std_vector.i
===================================================================
--- trunk/Examples/test-suite/li_std_vector.i	2009-01-11 21:37:54 UTC (rev 11056)
+++ trunk/Examples/test-suite/li_std_vector.i	2009-01-12 07:41:38 UTC (rev 11057)
@@ -85,8 +85,10 @@
 %template(StructureConstPtrVector) std::vector<const Structure *>;
 #endif
 
+#if !defined(SWIGR)
 %template(IntPtrVector) std::vector<int *>;
 %template(IntConstPtrVector) std::vector<const int *>;
+#endif
 %template(StructVector) std::vector<Struct>;
 %template(StructPtrVector) std::vector<Struct *>;
 %template(StructConstPtrVector) std::vector<const Struct *>;

Added: trunk/Examples/test-suite/r/arrays_dimensionless_runme.R
===================================================================
--- trunk/Examples/test-suite/r/arrays_dimensionless_runme.R	                        (rev 0)
+++ trunk/Examples/test-suite/r/arrays_dimensionless_runme.R	2009-01-12 07:41:38 UTC (rev 11057)
@@ -0,0 +1,20 @@
+source("unittest.R")
+dyn.load(paste("arrays_dimensionless", .Platform$dynlib.ext, sep=""))
+source("arrays_dimensionless.R")
+cacheMetaData(1)
+
+unittest(arr_short(1:4, 3), 6)
+unittest(arr_ushort(1:4, 3), 6)
+unittest(arr_int(1:4, 3), 6)
+unittest(arr_uint(1:4, 3), 6)
+unittest(arr_long(1:4, 3), 6)
+unittest(arr_ulong(1:4, 3), 6)
+unittest(arr_ll(1:4, 3), 6)
+unittest(arr_ull(1:4, 3), 6)
+unittest(arr_float(as.numeric(1:4), 3), 6)
+unittest(arr_double(as.numeric(1:4), 3), 6)
+
+q(save="no")
+
+
+

Modified: trunk/Examples/test-suite/template_typedef_funcptr.i
===================================================================
--- trunk/Examples/test-suite/template_typedef_funcptr.i	2009-01-11 21:37:54 UTC (rev 11056)
+++ trunk/Examples/test-suite/template_typedef_funcptr.i	2009-01-12 07:41:38 UTC (rev 11057)
@@ -2,6 +2,10 @@
 
 //Bug #1832613
 
+#if !defined(SWIGR)
+// R Swig fails on this test.  Because it tries to return a nil SEXP in
+// an error
+
 %include <std_string.i>
 
 %inline %{
@@ -46,3 +50,4 @@
 // Plain pointers were also causing problems...
 %template(MCContractFactory2) ContractFactory<MCContract, std::string, ContractPtrPtr>;
 
+#endif

Modified: trunk/Examples/test-suite/types_directive.i
===================================================================
--- trunk/Examples/test-suite/types_directive.i	2009-01-11 21:37:54 UTC (rev 11056)
+++ trunk/Examples/test-suite/types_directive.i	2009-01-12 07:41:38 UTC (rev 11057)
@@ -1,5 +1,13 @@
 %module types_directive
 
+#if defined(SWIGR)
+// Avoid conflict with Date class in R
+#define Date DateSwig
+%inline %{
+#define Date DateSwig
+%}
+#endif
+
 %ignore Time2::operator Date *;
 
 %inline %{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11060
          http://swig.svn.sourceforge.net/swig/?rev=11060&view=rev
Author:   wsfulton
Date:     2009-01-12 11:42:27 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
Fix union.i module name and rename to union_parameter.i

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/tcl/union_parameter_runme.tcl
    trunk/Examples/test-suite/union_parameter.i

Removed Paths:
-------------
    trunk/Examples/test-suite/tcl/union_runme.tcl
    trunk/Examples/test-suite/union.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-01-12 08:57:16 UTC (rev 11059)
+++ trunk/Examples/test-suite/common.mk	2009-01-12 11:42:27 UTC (rev 11060)
@@ -451,7 +451,7 @@
 	struct_rename \
 	typedef_struct \
 	typemap_subst \
-	union \
+	union_parameter \
 	unions
 
 

Copied: trunk/Examples/test-suite/tcl/union_parameter_runme.tcl (from rev 11059, trunk/Examples/test-suite/tcl/union_runme.tcl)
===================================================================
--- trunk/Examples/test-suite/tcl/union_parameter_runme.tcl	                        (rev 0)
+++ trunk/Examples/test-suite/tcl/union_parameter_runme.tcl	2009-01-12 11:42:27 UTC (rev 11060)
@@ -0,0 +1,36 @@
+if [ catch { load ./union_parameter[info sharedlibextension] union_parameter} err_msg ] {
+        puts stderr "Could not load shared object:\n$err_msg"
+}
+
+set event [SDL_Event]
+
+for { set i 0 } { $i < 2 } { incr i } {
+#    puts -nonewline "Loop $i: "
+    set evAvailable [SDL_PollEvent $event]
+    set evType [$event cget -type]
+#    puts "evType = $evType"
+
+    if { $evType == 1 } {
+        set specEvent [$event cget -active]
+#        puts "specEvent = $specEvent"
+        set type [$specEvent cget -type]
+        if { $type != $evType } {
+            error "Type $type should be $evType"
+        }
+        set gain   [$specEvent cget -gain]
+        set state  [$specEvent cget -state]
+#        puts "gain=$gain state=$state"
+    }
+    if { $evType == 2 } {
+        set specEvent [$event cget -key]
+#        puts "specEvent = $specEvent"
+        set type [$specEvent cget -type]
+        if { $type != $evType } {
+            error "Type $type should be $evType"
+        }
+        set which  [$specEvent cget -which]
+        set state  [$specEvent cget -state]
+#        puts "which=$which state=$state"
+    }
+#    puts ""
+}

Deleted: trunk/Examples/test-suite/tcl/union_runme.tcl
===================================================================
--- trunk/Examples/test-suite/tcl/union_runme.tcl	2009-01-12 08:57:16 UTC (rev 11059)
+++ trunk/Examples/test-suite/tcl/union_runme.tcl	2009-01-12 11:42:27 UTC (rev 11060)
@@ -1,36 +0,0 @@
-if [ catch { load ./union[info sharedlibextension] unions} err_msg ] {
-        puts stderr "Could not load shared object:\n$err_msg"
-}
-
-set event [SDL_Event]
-
-for { set i 0 } { $i < 2 } { incr i } {
-#    puts -nonewline "Loop $i: "
-    set evAvailable [SDL_PollEvent $event]
-    set evType [$event cget -type]
-#    puts "evType = $evType"
-
-    if { $evType == 1 } {
-        set specEvent [$event cget -active]
-#        puts "specEvent = $specEvent"
-        set type [$specEvent cget -type]
-        if { $type != $evType } {
-            error "Type $type should be $evType"
-        }
-        set gain   [$specEvent cget -gain]
-        set state  [$specEvent cget -state]
-#        puts "gain=$gain state=$state"
-    }
-    if { $evType == 2 } {
-        set specEvent [$event cget -key]
-#        puts "specEvent = $specEvent"
-        set type [$specEvent cget -type]
-        if { $type != $evType } {
-            error "Type $type should be $evType"
-        }
-        set which  [$specEvent cget -which]
-        set state  [$specEvent cget -state]
-#        puts "which=$which state=$state"
-    }
-#    puts ""
-}

Deleted: trunk/Examples/test-suite/union.i
===================================================================
--- trunk/Examples/test-suite/union.i	2009-01-12 08:57:16 UTC (rev 11059)
+++ trunk/Examples/test-suite/union.i	2009-01-12 11:42:27 UTC (rev 11060)
@@ -1,41 +0,0 @@
-%module unions
-
-%inline %{
-
-typedef unsigned char Uint8;
-
-typedef struct SDL_ActiveEvent {
-        Uint8 type;     /* SDL_ACTIVEEVENT */
-        Uint8 gain;     /* Whether given states were gained or lost (1/0) */
-        Uint8 state;    /* A mask of the focus states */
-} SDL_ActiveEvent;
-
-/* Keyboard event structure */
-typedef struct SDL_KeyboardEvent {
-        Uint8 type;     /* SDL_KEYDOWN or SDL_KEYUP */
-        int which;    /* The keyboard device index */
-        int state;    /* SDL_PRESSED or SDL_RELEASED */
-} SDL_KeyboardEvent;
-
-typedef union {
-        Uint8 type;
-        SDL_ActiveEvent active;
-        SDL_KeyboardEvent key;
-} SDL_Event;
-
-int SDL_PollEvent (SDL_Event *ev) {
-    static int toggle = 0;
-    if (toggle == 0) {
-        ev->type = 1;
-        ev->active.gain = 20;
-        ev->active.state = 30;
-    } else {
-        ev->type = 2;
-        ev->key.which = 2000;
-        ev->key.state = 3000;
-    }
-    toggle = 1 - toggle;
-    return 1;
-}
-
-%}

Copied: trunk/Examples/test-suite/union_parameter.i (from rev 11059, trunk/Examples/test-suite/union.i)
===================================================================
--- trunk/Examples/test-suite/union_parameter.i	                        (rev 0)
+++ trunk/Examples/test-suite/union_parameter.i	2009-01-12 11:42:27 UTC (rev 11060)
@@ -0,0 +1,41 @@
+%module union_parameter
+
+%inline %{
+
+typedef unsigned char Uint8;
+
+typedef struct SDL_ActiveEvent {
+        Uint8 type;     /* SDL_ACTIVEEVENT */
+        Uint8 gain;     /* Whether given states were gained or lost (1/0) */
+        Uint8 state;    /* A mask of the focus states */
+} SDL_ActiveEvent;
+
+/* Keyboard event structure */
+typedef struct SDL_KeyboardEvent {
+        Uint8 type;     /* SDL_KEYDOWN or SDL_KEYUP */
+        int which;    /* The keyboard device index */
+        int state;    /* SDL_PRESSED or SDL_RELEASED */
+} SDL_KeyboardEvent;
+
+typedef union {
+        Uint8 type;
+        SDL_ActiveEvent active;
+        SDL_KeyboardEvent key;
+} SDL_Event;
+
+int SDL_PollEvent (SDL_Event *ev) {
+    static int toggle = 0;
+    if (toggle == 0) {
+        ev->type = 1;
+        ev->active.gain = 20;
+        ev->active.state = 30;
+    } else {
+        ev->type = 2;
+        ev->key.which = 2000;
+        ev->key.state = 3000;
+    }
+    toggle = 1 - toggle;
+    return 1;
+}
+
+%}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11161
          http://swig.svn.sourceforge.net/swig/?rev=11161&view=rev
Author:   bhy
Date:     2009-03-19 16:56:01 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Fix problem caused by thread not properly terminated in director_thread test. This was cause crash in Python 3

Modified Paths:
--------------
    trunk/Examples/test-suite/director_thread.i
    trunk/Examples/test-suite/python/director_thread_runme.py

Modified: trunk/Examples/test-suite/director_thread.i
===================================================================
--- trunk/Examples/test-suite/director_thread.i	2009-03-19 15:26:57 UTC (rev 11160)
+++ trunk/Examples/test-suite/director_thread.i	2009-03-19 16:56:01 UTC (rev 11161)
@@ -13,6 +13,7 @@
 #include <process.h>
 #else
 #include <pthread.h>
+#include <signal.h>
 #include <unistd.h>
 #endif
 
@@ -27,6 +28,8 @@
   void* working(void* t);
   pthread_t thread;
 #endif
+  static int thread_terminate = 0;
+  
 }
 %}
 
@@ -51,6 +54,15 @@
     virtual ~Foo()  {
     }
 
+    void stop() {
+      thread_terminate = 1;
+    %#ifdef _WIN32
+      /*TODO(bhy) what to do for win32? */
+    %#else  
+      pthread_join(thread, NULL);
+    %#endif
+    }
+
     void run() {
 %#ifdef _WIN32
       _beginthreadex(NULL,0,working,this,0,&thread_id);
@@ -75,10 +87,15 @@
 #endif
   {
     Foo* f = static_cast<Foo*>(t);
-    while (1) {
+    while ( ! thread_terminate ) {
       MilliSecondSleep(50);
       f->do_foo();
     }
+#ifdef _WIN32
+    /* TODO(bhy) what's the corresponding of pthread_exit in win32? */
+#else
+    pthread_exit(0);
+#endif
     return 0;
   }
 }

Modified: trunk/Examples/test-suite/python/director_thread_runme.py
===================================================================
--- trunk/Examples/test-suite/python/director_thread_runme.py	2009-03-19 15:26:57 UTC (rev 11160)
+++ trunk/Examples/test-suite/python/director_thread_runme.py	2009-03-19 16:56:01 UTC (rev 11161)
@@ -14,3 +14,5 @@
 if d.val >= 0:
     print d.val
     raise RuntimeError
+
+d.stop()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11199
          http://swig.svn.sourceforge.net/swig/?rev=11199&view=rev
Author:   wsfulton
Date:     2009-04-30 06:12:32 +0000 (Thu, 30 Apr 2009)

Log Message:
-----------
add test for optimal attribute in out typemap

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/csharp/typemap_out_optimal_runme.cs
    trunk/Examples/test-suite/java/typemap_out_optimal_runme.java
    trunk/Examples/test-suite/python/typemap_out_optimal_runme.py
    trunk/Examples/test-suite/typemap_out_optimal.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-04-30 00:13:14 UTC (rev 11198)
+++ trunk/Examples/test-suite/common.mk	2009-04-30 06:12:32 UTC (rev 11199)
@@ -371,6 +371,7 @@
 	typemap_namespace \
 	typemap_ns_using \
 	typemap_numinputs \
+	typemap_out_optimal \
 	typemap_variables \
 	typemap_various \
 	typename \

Added: trunk/Examples/test-suite/csharp/typemap_out_optimal_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/typemap_out_optimal_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/typemap_out_optimal_runme.cs	2009-04-30 06:12:32 UTC (rev 11199)
@@ -0,0 +1,13 @@
+using System;
+using typemap_out_optimalNamespace;
+
+public class typemap_out_optimal_runme {
+
+  public static XX x = null;
+  public static void Main() {
+    XX.debug = false;
+    x = XX.create();
+  }
+
+}
+


Property changes on: trunk/Examples/test-suite/csharp/typemap_out_optimal_runme.cs
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/Examples/test-suite/java/typemap_out_optimal_runme.java
===================================================================
--- trunk/Examples/test-suite/java/typemap_out_optimal_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/typemap_out_optimal_runme.java	2009-04-30 06:12:32 UTC (rev 11199)
@@ -0,0 +1,21 @@
+
+import typemap_out_optimal.*;
+
+public class typemap_out_optimal_runme {
+
+  static {
+    try {
+	System.loadLibrary("typemap_out_optimal");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static XX x = null;
+  public static void main(String argv[]) {
+    XX.setDebug(false);
+    x = XX.create();
+  }
+}
+

Added: trunk/Examples/test-suite/python/typemap_out_optimal_runme.py
===================================================================
--- trunk/Examples/test-suite/python/typemap_out_optimal_runme.py	                        (rev 0)
+++ trunk/Examples/test-suite/python/typemap_out_optimal_runme.py	2009-04-30 06:12:32 UTC (rev 11199)
@@ -0,0 +1,5 @@
+from typemap_out_optimal import *
+
+cvar.XX_debug = False
+x = XX.create()
+

Added: trunk/Examples/test-suite/typemap_out_optimal.i
===================================================================
--- trunk/Examples/test-suite/typemap_out_optimal.i	                        (rev 0)
+++ trunk/Examples/test-suite/typemap_out_optimal.i	2009-04-30 06:12:32 UTC (rev 11199)
@@ -0,0 +1,38 @@
+// Test the optimal attribute in the out typemap
+%module typemap_out_optimal
+
+// Just the following languages tested
+#if defined (SWIGCSHARP)
+%typemap(out, optimal="1") SWIGTYPE %{
+  $result = new $1_ltype((const $1_ltype &)$1);
+%}
+#elif defined (SWIGJAVA)
+%typemap(out, optimal="1") SWIGTYPE %{ 
+  *($&1_ltype*)&$result = new $1_ltype((const $1_ltype &)$1);
+%}
+#elif defined (SWIGUTL)
+%typemap(out,noblock="1", optimal="1") SWIGTYPE {
+  %set_output(SWIG_NewPointerObj(%new_copy($1, $ltype), $&descriptor, SWIG_POINTER_OWN | %newpointer_flags));
+}
+#endif
+
+%ignore XX::operator=;
+
+%inline %{
+#include <iostream>
+using namespace std;
+
+struct XX {
+  XX() { cout << "XX()" << endl; }
+  XX(int i) { if (debug) cout << "XX(" << i << ")" << endl; }
+  XX(const XX &other) { cout << "XX(const XX &)" << endl; }
+  XX& operator =(const XX &other) { cout << "operator=(const XX &)" << endl; return *this; }
+  ~XX() { if (debug) cout << "~XX()" << endl; }
+  static XX create() { 
+    return XX(123);
+  }
+  static bool debug;
+};
+bool XX::debug = true;
+%}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11201
          http://swig.svn.sourceforge.net/swig/?rev=11201&view=rev
Author:   wsfulton
Date:     2009-05-01 06:26:42 +0000 (Fri, 01 May 2009)

Log Message:
-----------
Add test for notderived attribute in csbase/javabase typemap

Modified Paths:
--------------
    trunk/Examples/test-suite/inherit_target_language.i
    trunk/Examples/test-suite/java/inherit_target_language_runme.java

Added Paths:
-----------
    trunk/Examples/test-suite/csharp/inherit_target_language_runme.cs

Added: trunk/Examples/test-suite/csharp/inherit_target_language_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/inherit_target_language_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/inherit_target_language_runme.cs	2009-05-01 06:26:42 UTC (rev 11201)
@@ -0,0 +1,24 @@
+using System;
+using inherit_target_languageNamespace;
+
+public class inherit_target_language_runme {
+  public static void Main() {
+    new Derived1().targetLanguageBaseMethod();
+    new Derived2().targetLanguageBaseMethod();
+
+    new MultipleDerived1().targetLanguageBaseMethod();
+    new MultipleDerived2().targetLanguageBaseMethod();
+    new MultipleDerived3().f();
+    new MultipleDerived4().g();
+
+    BaseX baseX = new BaseX();
+    baseX.basex();
+    baseX.targetLanguageBase2Method();
+
+    DerivedX derivedX = new DerivedX();
+    derivedX.basex();
+    derivedX.derivedx();
+    derivedX.targetLanguageBase2Method();
+  }
+}
+

Modified: trunk/Examples/test-suite/inherit_target_language.i
===================================================================
--- trunk/Examples/test-suite/inherit_target_language.i	2009-05-01 06:21:56 UTC (rev 11200)
+++ trunk/Examples/test-suite/inherit_target_language.i	2009-05-01 06:26:42 UTC (rev 11201)
@@ -12,10 +12,12 @@
 using System;
 using System.Runtime.InteropServices;
 public class TargetLanguageBase { public virtual void targetLanguageBaseMethod() {} };
+public class TargetLanguageBase2 { public virtual void targetLanguageBase2Method() {} };
 %}
 
 %pragma(java) moduleimports=%{
 class TargetLanguageBase { public void targetLanguageBaseMethod() {} };
+class TargetLanguageBase2 { public void targetLanguageBase2Method() {} };
 %}
 
 
@@ -61,3 +63,11 @@
 struct MultipleDerived4 : MBase4a, MBase4b {};
 %}
 
+// Replace a C++ base, but only classes that do not have a C++ base
+%typemap(csbase, notderived="1") SWIGTYPE "TargetLanguageBase2"
+
+%inline %{
+struct BaseX            { virtual ~BaseX() {}; void basex() {} };
+struct DerivedX : BaseX { void derivedx() {} };
+%}
+

Modified: trunk/Examples/test-suite/java/inherit_target_language_runme.java
===================================================================
--- trunk/Examples/test-suite/java/inherit_target_language_runme.java	2009-05-01 06:21:56 UTC (rev 11200)
+++ trunk/Examples/test-suite/java/inherit_target_language_runme.java	2009-05-01 06:26:42 UTC (rev 11201)
@@ -21,6 +21,15 @@
     new MultipleDerived2().targetLanguageBaseMethod();
     new MultipleDerived3().f();
     new MultipleDerived4().g();
+
+    BaseX baseX = new BaseX();
+    baseX.basex();
+    baseX.targetLanguageBase2Method();
+
+    DerivedX derivedX = new DerivedX();
+    derivedX.basex();
+    derivedX.derivedx();
+    derivedX.targetLanguageBase2Method();
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11210
          http://swig.svn.sourceforge.net/swig/?rev=11210&view=rev
Author:   wsfulton
Date:     2009-05-12 17:24:01 +0000 (Tue, 12 May 2009)

Log Message:
-----------
move std::multimap tests from li_std_map.i into new li_std_multimap.i

Modified Paths:
--------------
    trunk/Examples/test-suite/li_std_map.i
    trunk/Examples/test-suite/python/Makefile.in
    trunk/Examples/test-suite/ruby/Makefile.in
    trunk/Examples/test-suite/ruby/li_std_map_runme.rb

Added Paths:
-----------
    trunk/Examples/test-suite/ruby/li_std_multimap_runme.rb

Modified: trunk/Examples/test-suite/li_std_map.i
===================================================================
--- trunk/Examples/test-suite/li_std_map.i	2009-05-11 17:46:51 UTC (rev 11209)
+++ trunk/Examples/test-suite/li_std_map.i	2009-05-12 17:24:01 UTC (rev 11210)
@@ -16,11 +16,11 @@
  */
 
 %module("templatereduce") li_std_map
+
 %feature("trackobjects");
 
 %include std_pair.i
 %include std_map.i
-%include std_multimap.i
 
 %inline %{
 struct A{
@@ -39,7 +39,6 @@
   %template(pairAA) pair<int, A>;
   %template(pairA) pair<int, A*>;
   %template(mapA) map<int, A*>;
-  %template(mmapA) multimap<int, A*>;
 
   %template(paircA1) pair<const int, A*>;
   %template(paircA2) pair<const int, const A*>;

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2009-05-11 17:46:51 UTC (rev 11209)
+++ trunk/Examples/test-suite/python/Makefile.in	2009-05-12 17:24:01 UTC (rev 11210)
@@ -50,6 +50,7 @@
 	li_std_vectora \
 	li_std_vector_extra \
 	li_std_map \
+	li_std_multimap \
 	li_std_pair_extra \
 	li_std_set \
 	li_std_stream \

Modified: trunk/Examples/test-suite/ruby/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ruby/Makefile.in	2009-05-11 17:46:51 UTC (rev 11209)
+++ trunk/Examples/test-suite/ruby/Makefile.in	2009-05-12 17:24:01 UTC (rev 11210)
@@ -15,6 +15,7 @@
 	li_factory \
 	li_std_functors \
 	li_std_map \
+	li_std_multimap \
 	li_std_pair_lang_object \
 	li_std_queue \
 	li_std_set \

Modified: trunk/Examples/test-suite/ruby/li_std_map_runme.rb
===================================================================
--- trunk/Examples/test-suite/ruby/li_std_map_runme.rb	2009-05-11 17:46:51 UTC (rev 11209)
+++ trunk/Examples/test-suite/ruby/li_std_map_runme.rb	2009-05-12 17:24:01 UTC (rev 11210)
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Tests for std::map and std::multimap
+# Tests for std::map
 #
 # 
 # 
@@ -41,15 +41,6 @@
 pm = Li_std_map::LanguageMap.new
 m.each_key { |k| pm[k] = m[k] }
 m.each_key { |k| swig_assert_equal("pm[#{k.inspect}]", "m[#{k.inspect}]", binding) }
-
-m = Li_std_map::MmapA.new
-m[0] = a1
-m[0] = a2
-m[0].size == 2
-m.respond_to?(:each) == true
-m.respond_to?(:each_key) == true
-m.respond_to?(:each_value) == true
-m.values_at(0)[0] == m[0]
 EOF
 
 mii = Li_std_map::Mapii.new

Added: trunk/Examples/test-suite/ruby/li_std_multimap_runme.rb
===================================================================
--- trunk/Examples/test-suite/ruby/li_std_multimap_runme.rb	                        (rev 0)
+++ trunk/Examples/test-suite/ruby/li_std_multimap_runme.rb	2009-05-12 17:24:01 UTC (rev 11210)
@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+#
+# Tests for std::multimap
+#
+# 
+# 
+# 
+#
+
+require 'swig_assert'
+require 'li_std_multimap'
+
+swig_assert_each_line(<<'EOF', binding)
+
+a1 = Li_std_multimap::A.new(3)
+a2 = Li_std_multimap::A.new(7)
+
+m = Li_std_multimap::MultimapA.new
+m[0] = a1
+m[0] = a2
+m[0].size == 2
+m.respond_to?(:each) == true
+m.respond_to?(:each_key) == true
+m.respond_to?(:each_value) == true
+m.values_at(0)[0] == m[0]
+EOF
+


Property changes on: trunk/Examples/test-suite/ruby/li_std_multimap_runme.rb
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11232
          http://swig.svn.sourceforge.net/swig/?rev=11232&view=rev
Author:   wsfulton
Date:     2009-05-22 06:53:20 +0000 (Fri, 22 May 2009)

Log Message:
-----------
Improve C# std::map tests to do the bulk of the testing on a map where the key and value types are different

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/li_std_map_runme.cs
    trunk/Examples/test-suite/li_std_map.i

Modified: trunk/Examples/test-suite/csharp/li_std_map_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/li_std_map_runme.cs	2009-05-22 06:11:45 UTC (rev 11231)
+++ trunk/Examples/test-suite/csharp/li_std_map_runme.cs	2009-05-22 06:53:20 UTC (rev 11232)
@@ -24,55 +24,55 @@
     public static void Main()
     {
         // Set up an int int map
-        IntIntMap iimap = new IntIntMap();
+        StringIntMap simap = new StringIntMap();
         for (int i = 0; i < collectionSize; i++)
         {
             int val = i * 18;
-            iimap.Add(i, val);
+            simap.Add(i.ToString(), val);
         }
 
         // Count property test
-        if (iimap.Count != collectionSize)
+        if (simap.Count != collectionSize)
             throw new Exception("Count test failed");
 
         // IsReadOnly property test
-        if (iimap.IsReadOnly)
+        if (simap.IsReadOnly)
             throw new Exception("IsReadOnly test failed");
 
         // Item indexing test
-        iimap[0] = 200;
-        if (iimap[0] != 200)
+        simap["0"] = 200;
+        if (simap["0"] != 200)
             throw new Exception("Item property test failed");
-        iimap[0] = 0 * 18;
+        simap["0"] = 0 * 18;
 
         // ContainsKey() test
         for (int i = 0; i < collectionSize; i++)
         {
-            if (!iimap.ContainsKey(i))
+            if (!simap.ContainsKey(i.ToString()))
                 throw new Exception("ContainsKey test " + i + " failed");
         }
 
         // ContainsKey() test
         for (int i = 0; i < collectionSize; i++)
         {
-            if (!iimap.Contains(new KeyValuePair<int, int>(i, i * 18)))
+            if (!simap.Contains(new KeyValuePair<string, int>(i.ToString(), i * 18)))
                 throw new Exception("Contains test " + i + " failed");
         }
 
         // TryGetValue() test
         int value;
-        bool rc = iimap.TryGetValue(3, out value);
+        bool rc = simap.TryGetValue("3", out value);
         if (rc != true || value != (3 * 18))
             throw new Exception("TryGetValue test 1 failed");
 
-        rc = iimap.TryGetValue(-1, out value);
+        rc = simap.TryGetValue("-1", out value);
         if (rc != false)
             throw new Exception("TryGetValue test 2 failed");
 
         // Keys and Values test
         {
-            IList<int> keys = new List<int>(iimap.Keys);
-            IList<int> values = new List<int>(iimap.Values);
+            IList<string> keys = new List<string>(simap.Keys);
+            IList<int> values = new List<int>(simap.Values);
             if (keys.Count != collectionSize)
                 throw new Exception("Keys count test failed");
 
@@ -81,7 +81,7 @@
 
             for (int i = 0; i < keys.Count; i++)
             {
-                if (iimap[keys[i]] != values[i])
+                if (simap[keys[i]] != values[i])
                     throw new Exception("Keys and values test failed for index " + i);
             }
         }
@@ -89,30 +89,30 @@
         // Add and Remove test
         for (int i = 100; i < 103; i++)
         {
-            iimap.Add(i, i * 18);
-            if (!iimap.ContainsKey(i) || iimap[i] != (i * 18))
+            simap.Add(i.ToString(), i * 18);
+            if (!simap.ContainsKey(i.ToString()) || simap[i.ToString()] != (i * 18))
                 throw new Exception("Add test failed for index " + i);
 
-            iimap.Remove(i);
-            if (iimap.ContainsKey(i))
+            simap.Remove(i.ToString());
+            if (simap.ContainsKey(i.ToString()))
                 throw new Exception("Remove test failed for index " + i);
         }
 
         for (int i = 200; i < 203; i++)
         {
-            iimap.Add(new KeyValuePair<int, int>(i, i * 18));
-            if (!iimap.ContainsKey(i) || iimap[i] != (i * 18))
+            simap.Add(new KeyValuePair<string, int>(i.ToString(), i * 18));
+            if (!simap.ContainsKey(i.ToString()) || simap[i.ToString()] != (i * 18))
                 throw new Exception("Add explicit test failed for index " + i);
 
-            iimap.Remove(new KeyValuePair<int, int>(i, i * 18));
-            if (iimap.ContainsKey(i))
+            simap.Remove(new KeyValuePair<string, int>(i.ToString(), i * 18));
+            if (simap.ContainsKey(i.ToString()))
                 throw new Exception("Remove explicit test failed for index " + i);
         }
 
         // Duplicate key test
         try
         {
-            iimap.Add(3, 0);
+            simap.Add("3", 0);
             throw new Exception("Adding duplicate key test failed");
         }
         catch (ArgumentException)
@@ -121,29 +121,29 @@
 
         // CopyTo() test
         {
-            KeyValuePair<int, int>[] outputarray = new KeyValuePair<int, int>[collectionSize];
-            iimap.CopyTo(outputarray);
-            foreach (KeyValuePair<int, int> val in outputarray)
+            KeyValuePair<string, int>[] outputarray = new KeyValuePair<string, int>[collectionSize];
+            simap.CopyTo(outputarray);
+            foreach (KeyValuePair<string, int> val in outputarray)
             {
-                if (iimap[val.Key] != val.Value)
+                if (simap[val.Key] != val.Value)
                     throw new Exception("CopyTo (1) test failed, index:" + val.Key);
             }
         }
         {
-            KeyValuePair<int, int>[] outputarray = new KeyValuePair<int, int>[midCollection + collectionSize];
-            iimap.CopyTo(outputarray, midCollection);
+            KeyValuePair<string, int>[] outputarray = new KeyValuePair<string, int>[midCollection + collectionSize];
+            simap.CopyTo(outputarray, midCollection);
             for (int i = midCollection; i < midCollection + collectionSize; i++)
             {
-                KeyValuePair<int, int> val = outputarray[i];
-                if (iimap[val.Key] != val.Value)
+                KeyValuePair<string, int> val = outputarray[i];
+                if (simap[val.Key] != val.Value)
                     throw new Exception("CopyTo (2) test failed, index:" + val.Key);
             }
         }
         {
-            KeyValuePair<int, int>[] outputarray = new KeyValuePair<int, int>[collectionSize - 1];
+            KeyValuePair<string, int>[] outputarray = new KeyValuePair<string, int>[collectionSize - 1];
             try
             {
-                iimap.CopyTo(outputarray);
+                simap.CopyTo(outputarray);
                 throw new Exception("CopyTo (4) test failed");
             }
             catch (ArgumentException)
@@ -152,19 +152,23 @@
         }
 
         // Clear test
-        iimap.Clear();
-        if (iimap.Count != 0)
+        simap.Clear();
+        if (simap.Count != 0)
             throw new Exception("Clear test failed");
 
         // Test wrapped methods
         for (int i = 1; i <= 5; i++)
         {
-            iimap[i] = i;
+            simap[i.ToString()] = i;
         }
-        double avg = li_std_map.keyAverage(iimap);
+        double avg = li_std_map.valueAverage(simap);
         if (avg != 3.0)
-            throw new Exception("Wrapped method keyAverage test failed. Got " + avg);
+            throw new Exception("Wrapped method valueAverage test failed. Got " + avg);
 
+        string keyStringified = li_std_map.stringifyKeys(simap);
+        if (keyStringified != " 1 2 3 4 5")
+            throw new Exception("Wrapped method stringifyKeys test failed. Got " + keyStringified);
+
         // Test a map with a new specialized type (Struct)
         {
             IntStructMap ismap = new IntStructMap();

Modified: trunk/Examples/test-suite/li_std_map.i
===================================================================
--- trunk/Examples/test-suite/li_std_map.i	2009-05-22 06:11:45 UTC (rev 11231)
+++ trunk/Examples/test-suite/li_std_map.i	2009-05-22 06:53:20 UTC (rev 11232)
@@ -15,19 +15,27 @@
 // Add an inline function to test
 %inline %{
 
-double keyAverage(std::map<int, int> m) {
+double valueAverage(std::map<std::string, int> m) {
   if (m.size() == 0) {
     return 0.0;
   }
     
   double a = 0.0;
-  for (std::map<int, int>::iterator i = m.begin(); i != m.end(); i++) {
-    a += i->first;
+  for (std::map<std::string, int>::iterator i = m.begin(); i != m.end(); i++) {
+    a += i->second;
   }
     
   return a / m.size();
 }
     
+std::string stringifyKeys(std::map<std::string, int> m) {
+  std::string a;
+  for (std::map<std::string, int>::iterator i = m.begin(); i != m.end(); i++) {
+    a += " " + i->first;
+  }
+  return a;
+}
+
 struct Struct {
   double num;
   Struct() : num(0.0) {}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11280
          http://swig.svn.sourceforge.net/swig/?rev=11280&view=rev
Author:   wsfulton
Date:     2009-06-16 20:26:28 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
remove perl specific modifications to the enum_thorough test

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/enum_thorough_runme.cs
    trunk/Examples/test-suite/csharp/enum_thorough_simple_runme.cs
    trunk/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs
    trunk/Examples/test-suite/enum_thorough.i
    trunk/Examples/test-suite/java/enum_thorough_proper_runme.java
    trunk/Examples/test-suite/java/enum_thorough_runme.java
    trunk/Examples/test-suite/java/enum_thorough_simple_runme.java
    trunk/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java
    trunk/Examples/test-suite/perl5/enum_thorough_runme.pl

Modified: trunk/Examples/test-suite/csharp/enum_thorough_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/enum_thorough_runme.cs	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/csharp/enum_thorough_runme.cs	2009-06-16 20:26:28 UTC (rev 11280)
@@ -402,7 +402,7 @@
       if ((int)enum_thorough.repeatTest(repeat.initial) != 1) throw new Exception("repeatTest 2 failed");
       if ((int)enum_thorough.repeatTest(repeat.two) != 2) throw new Exception("repeatTest 3 failed");
       if ((int)enum_thorough.repeatTest(repeat.three) != 3) throw new Exception("repeatTest 4 failed");
-      if ((int)enum_thorough.repeatTest(repeat.last) != 3) throw new Exception("repeatTest 5 failed");
+      if ((int)enum_thorough.repeatTest(repeat.llast) != 3) throw new Exception("repeatTest 5 failed");
       if ((int)enum_thorough.repeatTest(repeat.end) != 3) throw new Exception("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/csharp/enum_thorough_simple_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/enum_thorough_simple_runme.cs	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/csharp/enum_thorough_simple_runme.cs	2009-06-16 20:26:28 UTC (rev 11280)
@@ -402,7 +402,7 @@
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.initial) != 1) throw new Exception("repeatTest 2 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.two) != 2) throw new Exception("repeatTest 3 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.three) != 3) throw new Exception("repeatTest 4 failed");
-      if (enum_thorough_simple.repeatTest(enum_thorough_simple.last) != 3) throw new Exception("repeatTest 5 failed");
+      if (enum_thorough_simple.repeatTest(enum_thorough_simple.llast) != 3) throw new Exception("repeatTest 5 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.end) != 3) throw new Exception("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs	2009-06-16 20:26:28 UTC (rev 11280)
@@ -402,7 +402,7 @@
       if (enum_thorough_typesafe.repeatTest(repeat.initial).swigValue != 1) throw new Exception("repeatTest 2 failed");
       if (enum_thorough_typesafe.repeatTest(repeat.two).swigValue != 2) throw new Exception("repeatTest 3 failed");
       if (enum_thorough_typesafe.repeatTest(repeat.three).swigValue != 3) throw new Exception("repeatTest 4 failed");
-      if (enum_thorough_typesafe.repeatTest(repeat.last).swigValue != 3) throw new Exception("repeatTest 5 failed");
+      if (enum_thorough_typesafe.repeatTest(repeat.llast).swigValue != 3) throw new Exception("repeatTest 5 failed");
       if (enum_thorough_typesafe.repeatTest(repeat.end).swigValue != 3) throw new Exception("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/enum_thorough.i
===================================================================
--- trunk/Examples/test-suite/enum_thorough.i	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/enum_thorough.i	2009-06-16 20:26:28 UTC (rev 11280)
@@ -534,9 +534,6 @@
 IgnoreTest::IgnoreE ignoreETest(IgnoreTest::IgnoreE n) { return n; }
 %}
 
-#warning TODO: remove SWIGPERL code - replace with portable symbols
-
-#if defined(SWIGPERL)
 %inline %{
 
 namespace RepeatSpace {
@@ -554,24 +551,3 @@
 
 %}
 
-#else
-%inline %{
-
-namespace RepeatSpace {
-typedef enum
-{
-   one = 1,
-   initial = one,
-   two,
-   three,
-   last = three,
-   end = last
-} repeat;
-repeat repeatTest(repeat e) { return e; }
-}
-
-%}
-
-
-#endif
-

Modified: trunk/Examples/test-suite/java/enum_thorough_proper_runme.java
===================================================================
--- trunk/Examples/test-suite/java/enum_thorough_proper_runme.java	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/java/enum_thorough_proper_runme.java	2009-06-16 20:26:28 UTC (rev 11280)
@@ -413,7 +413,7 @@
       if (enum_thorough_proper.repeatTest(repeat.initial).swigValue() != 1) throw new RuntimeException("repeatTest 2 failed");
       if (enum_thorough_proper.repeatTest(repeat.two).swigValue() != 2) throw new RuntimeException("repeatTest 3 failed");
       if (enum_thorough_proper.repeatTest(repeat.three).swigValue() != 3) throw new RuntimeException("repeatTest 4 failed");
-      if (enum_thorough_proper.repeatTest(repeat.last).swigValue() != 3) throw new RuntimeException("repeatTest 5 failed");
+      if (enum_thorough_proper.repeatTest(repeat.llast).swigValue() != 3) throw new RuntimeException("repeatTest 5 failed");
       if (enum_thorough_proper.repeatTest(repeat.end).swigValue() != 3) throw new RuntimeException("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/java/enum_thorough_runme.java
===================================================================
--- trunk/Examples/test-suite/java/enum_thorough_runme.java	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/java/enum_thorough_runme.java	2009-06-16 20:26:28 UTC (rev 11280)
@@ -413,7 +413,7 @@
       if (enum_thorough.repeatTest(repeat.initial).swigValue() != 1) throw new RuntimeException("repeatTest 2 failed");
       if (enum_thorough.repeatTest(repeat.two).swigValue() != 2) throw new RuntimeException("repeatTest 3 failed");
       if (enum_thorough.repeatTest(repeat.three).swigValue() != 3) throw new RuntimeException("repeatTest 4 failed");
-      if (enum_thorough.repeatTest(repeat.last).swigValue() != 3) throw new RuntimeException("repeatTest 5 failed");
+      if (enum_thorough.repeatTest(repeat.llast).swigValue() != 3) throw new RuntimeException("repeatTest 5 failed");
       if (enum_thorough.repeatTest(repeat.end).swigValue() != 3) throw new RuntimeException("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/java/enum_thorough_simple_runme.java
===================================================================
--- trunk/Examples/test-suite/java/enum_thorough_simple_runme.java	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/java/enum_thorough_simple_runme.java	2009-06-16 20:26:28 UTC (rev 11280)
@@ -413,7 +413,7 @@
       if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.initial) != 1) throw new RuntimeException("repeatTest 2 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.two) != 2) throw new RuntimeException("repeatTest 3 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.three) != 3) throw new RuntimeException("repeatTest 4 failed");
-      if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.last) != 3) throw new RuntimeException("repeatTest 5 failed");
+      if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.llast) != 3) throw new RuntimeException("repeatTest 5 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simpleConstants.end) != 3) throw new RuntimeException("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java
===================================================================
--- trunk/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/java/enum_thorough_typeunsafe_runme.java	2009-06-16 20:26:28 UTC (rev 11280)
@@ -413,7 +413,7 @@
       if (enum_thorough_typeunsafe.repeatTest(repeat.initial) != 1) throw new RuntimeException("repeatTest 2 failed");
       if (enum_thorough_typeunsafe.repeatTest(repeat.two) != 2) throw new RuntimeException("repeatTest 3 failed");
       if (enum_thorough_typeunsafe.repeatTest(repeat.three) != 3) throw new RuntimeException("repeatTest 4 failed");
-      if (enum_thorough_typeunsafe.repeatTest(repeat.last) != 3) throw new RuntimeException("repeatTest 5 failed");
+      if (enum_thorough_typeunsafe.repeatTest(repeat.llast) != 3) throw new RuntimeException("repeatTest 5 failed");
       if (enum_thorough_typeunsafe.repeatTest(repeat.end) != 3) throw new RuntimeException("repeatTest 6 failed");
     }
   }

Modified: trunk/Examples/test-suite/perl5/enum_thorough_runme.pl
===================================================================
--- trunk/Examples/test-suite/perl5/enum_thorough_runme.pl	2009-06-16 19:29:08 UTC (rev 11279)
+++ trunk/Examples/test-suite/perl5/enum_thorough_runme.pl	2009-06-16 20:26:28 UTC (rev 11280)
@@ -1,7 +1,7 @@
 # an adaptation of ../java/enum_thorough_runme.java
 use strict;
 use warnings;
-use Test::More tests => 299;
+use Test::More tests => 298;
 BEGIN { use_ok('enum_thorough') }
 require_ok('enum_thorough');
 
@@ -392,12 +392,7 @@
 	is(enum_thorough::repeatTest($enum_thorough::initial), 1, "repeatTest 2");
 	is(enum_thorough::repeatTest($enum_thorough::two), 2, "repeatTest 3");
 	is(enum_thorough::repeatTest($enum_thorough::three), 3, "repeatTest 4");
-{ local $TODO = "overzealous keyword guarding";
-	ok(defined($enum_thorough::last), "found enum value");
-SKIP: {
-	skip "enum value not in expected package", 1 unless defined $enum_thorough::last;
-	is(enum_thorough::repeatTest($enum_thorough::last), 3, "repeatTest 5");
-}}
+	is(enum_thorough::repeatTest($enum_thorough::llast), 3, "repeatTest 5");
 	is(enum_thorough::repeatTest($enum_thorough::end), 3, "repeatTest 6");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11346
          http://swig.svn.sourceforge.net/swig/?rev=11346&view=rev
Author:   wsfulton
Date:     2009-07-02 20:32:51 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
rename byreference testcase to li_reference to follow normal test naming conventions of library files. Remove ability to add testcases into subdirectories (again) - not wanted

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/perl5/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/li_reference.i
    trunk/Examples/test-suite/perl5/li_reference_runme.pl

Removed Paths:
-------------
    trunk/Examples/test-suite/perl5/byreference.i
    trunk/Examples/test-suite/perl5/byreference_runme.pl

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-02 18:28:50 UTC (rev 11345)
+++ trunk/Examples/test-suite/common.mk	2009-07-02 20:32:51 UTC (rev 11346)
@@ -64,7 +64,7 @@
 LIBS       = -L.
 LIBPREFIX  = lib
 ACTION     = check
-INTERFACEDIR = $(if $(wildcard $*.i), ./, ../)
+INTERFACEDIR = ../
 
 #
 # Please keep test cases in alphabetical order.

Copied: trunk/Examples/test-suite/li_reference.i (from rev 11345, trunk/Examples/test-suite/perl5/byreference.i)
===================================================================
--- trunk/Examples/test-suite/li_reference.i	                        (rev 0)
+++ trunk/Examples/test-suite/li_reference.i	2009-07-02 20:32:51 UTC (rev 11346)
@@ -0,0 +1,52 @@
+%module li_reference
+
+%include "reference.i"
+
+%inline %{
+  double FrVal;
+  double ToVal;
+  void PDouble(double *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RDouble(double &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PFloat(float *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RFloat(float &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PInt(int *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RInt(int &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PShort(short *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RShort(short &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PLong(long *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RLong(long &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PUInt(unsigned int *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RUInt(unsigned int &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PUShort(unsigned short *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RUShort(unsigned short &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PULong(unsigned long *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RULong(unsigned long &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PUChar(unsigned char *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RUChar(unsigned char &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PChar(signed char *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RChar(signed char &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+  void PBool(bool *REFERENCE, int t = 0)
+    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
+  void RBool(bool &REFERENCE, int t = 0)
+    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
+%}


Property changes on: trunk/Examples/test-suite/li_reference.i
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/swig-2.0/Examples/test-suite/perl5/byreference.i:11085-11086,11088-11089

Modified: trunk/Examples/test-suite/perl5/Makefile.in
===================================================================
--- trunk/Examples/test-suite/perl5/Makefile.in	2009-07-02 18:28:50 UTC (rev 11345)
+++ trunk/Examples/test-suite/perl5/Makefile.in	2009-07-02 20:32:51 UTC (rev 11346)
@@ -15,7 +15,7 @@
 	li_cdata \
 	li_cstring \
 	li_cdata_carrays \
-	byreference \
+	li_reference \
 
 C_TEST_CASES += \
 	li_cdata \

Deleted: trunk/Examples/test-suite/perl5/byreference.i
===================================================================
--- trunk/Examples/test-suite/perl5/byreference.i	2009-07-02 18:28:50 UTC (rev 11345)
+++ trunk/Examples/test-suite/perl5/byreference.i	2009-07-02 20:32:51 UTC (rev 11346)
@@ -1,52 +0,0 @@
-%module byreference
-
-%include "reference.i"
-
-%inline %{
-  double FrVal;
-  double ToVal;
-  void PDouble(double *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RDouble(double &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PFloat(float *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RFloat(float &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PInt(int *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RInt(int &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PShort(short *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RShort(short &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PLong(long *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RLong(long &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PUInt(unsigned int *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RUInt(unsigned int &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PUShort(unsigned short *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RUShort(unsigned short &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PULong(unsigned long *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RULong(unsigned long &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PUChar(unsigned char *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RUChar(unsigned char &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PChar(signed char *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RChar(signed char &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-  void PBool(bool *REFERENCE, int t = 0)
-    { ToVal = *REFERENCE; *REFERENCE = FrVal + t; }
-  void RBool(bool &REFERENCE, int t = 0)
-    { ToVal =  REFERENCE;  REFERENCE = FrVal + t; }
-%}

Deleted: trunk/Examples/test-suite/perl5/byreference_runme.pl
===================================================================
--- trunk/Examples/test-suite/perl5/byreference_runme.pl	2009-07-02 18:28:50 UTC (rev 11345)
+++ trunk/Examples/test-suite/perl5/byreference_runme.pl	2009-07-02 20:32:51 UTC (rev 11346)
@@ -1,36 +0,0 @@
-use strict;
-use warnings;
-use Test::More tests => 68;
-BEGIN { use_ok('byreference') }
-require_ok('byreference');
-
-sub chk { my($type, $call, $v1, $v2) = @_;
-    $byreference::FrVal = $v1;
-    my $v = $v2;
-    eval { $call->(\$v) };
-    is($@, '', "$type check");
-    is($byreference::ToVal, $v2, "$type out");
-    is($v, $v1, "$type in");
-}
-chk("double*", \&byreference::PDouble, 12.2, 18.6);
-chk("double&", \&byreference::RDouble, 32.5, 64.8);
-chk("float*",  \&byreference::PFloat,  64.5, 96.0);
-chk("float&",  \&byreference::RFloat,  98.5, 6.25);
-chk("int*",    \&byreference::PInt,    1887, 3356);
-chk("int&",    \&byreference::RInt,    2622, 9867);
-chk("short*",  \&byreference::PShort,  4752, 3254);
-chk("short&",  \&byreference::RShort,  1898, 5757);
-chk("long*",   \&byreference::PLong,   6687, 7132);
-chk("long&",   \&byreference::RLong,   8346, 4398);
-chk("uint*",   \&byreference::PUInt,   6853, 5529);
-chk("uint&",   \&byreference::RUInt,   5483, 7135);
-chk("ushort*", \&byreference::PUShort, 9960, 9930);
-chk("ushort&", \&byreference::RUShort, 1193, 4178);
-chk("ulong*",  \&byreference::PULong,  7960, 4788);
-chk("ulong&",  \&byreference::RULong,  8829, 1603);
-chk("uchar*",  \&byreference::PUChar,  110,  239);
-chk("uchar&",  \&byreference::RUChar,  15,   97);
-chk("char*",   \&byreference::PChar,   -7,   118);
-chk("char&",   \&byreference::RChar,   -3,  -107);
-chk("bool*",   \&byreference::PBool,   0,    1);
-chk("bool&",   \&byreference::RBool,   1,    0);

Copied: trunk/Examples/test-suite/perl5/li_reference_runme.pl (from rev 11345, trunk/Examples/test-suite/perl5/byreference_runme.pl)
===================================================================
--- trunk/Examples/test-suite/perl5/li_reference_runme.pl	                        (rev 0)
+++ trunk/Examples/test-suite/perl5/li_reference_runme.pl	2009-07-02 20:32:51 UTC (rev 11346)
@@ -0,0 +1,36 @@
+use strict;
+use warnings;
+use Test::More tests => 68;
+BEGIN { use_ok('li_reference') }
+require_ok('li_reference');
+
+sub chk { my($type, $call, $v1, $v2) = @_;
+    $li_reference::FrVal = $v1;
+    my $v = $v2;
+    eval { $call->(\$v) };
+    is($@, '', "$type check");
+    is($li_reference::ToVal, $v2, "$type out");
+    is($v, $v1, "$type in");
+}
+chk("double*", \&li_reference::PDouble, 12.2, 18.6);
+chk("double&", \&li_reference::RDouble, 32.5, 64.8);
+chk("float*",  \&li_reference::PFloat,  64.5, 96.0);
+chk("float&",  \&li_reference::RFloat,  98.5, 6.25);
+chk("int*",    \&li_reference::PInt,    1887, 3356);
+chk("int&",    \&li_reference::RInt,    2622, 9867);
+chk("short*",  \&li_reference::PShort,  4752, 3254);
+chk("short&",  \&li_reference::RShort,  1898, 5757);
+chk("long*",   \&li_reference::PLong,   6687, 7132);
+chk("long&",   \&li_reference::RLong,   8346, 4398);
+chk("uint*",   \&li_reference::PUInt,   6853, 5529);
+chk("uint&",   \&li_reference::RUInt,   5483, 7135);
+chk("ushort*", \&li_reference::PUShort, 9960, 9930);
+chk("ushort&", \&li_reference::RUShort, 1193, 4178);
+chk("ulong*",  \&li_reference::PULong,  7960, 4788);
+chk("ulong&",  \&li_reference::RULong,  8829, 1603);
+chk("uchar*",  \&li_reference::PUChar,  110,  239);
+chk("uchar&",  \&li_reference::RUChar,  15,   97);
+chk("char*",   \&li_reference::PChar,   -7,   118);
+chk("char&",   \&li_reference::RChar,   -3,  -107);
+chk("bool*",   \&li_reference::PBool,   0,    1);
+chk("bool&",   \&li_reference::RBool,   1,    0);


Property changes on: trunk/Examples/test-suite/perl5/li_reference_runme.pl
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/swig-2.0/Examples/test-suite/perl5/byreference_runme.pl:11085-11086,11088-11089


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11347
          http://swig.svn.sourceforge.net/swig/?rev=11347&view=rev
Author:   wsfulton
Date:     2009-07-02 21:35:41 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
Add a test for the -Wallkw commandline option. Also refine general framework for using custom commandline options for individual test cases

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/csharp/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/java/custom_wallkw_runme.java

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-02 20:32:51 UTC (rev 11346)
+++ trunk/Examples/test-suite/common.mk	2009-07-02 21:35:41 UTC (rev 11347)
@@ -60,6 +60,7 @@
 TARGETPREFIX = 
 TARGETSUFFIX = 
 SWIGOPT    = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
+SWIGOPTCUSTOM =
 INCLUDES   = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
 LIBS       = -L.
 LIBPREFIX  = lib
@@ -468,6 +469,16 @@
 	template_typedef_import \
 	multi_import
 
+# Non standard testcases, usually using custom commandline options
+# Testcase names are prefixed with custom_ and can be run individually using make testcase.customtest
+CUSTOM_TEST_CASES = \
+	custom_allkw \
+
+# individual custom tests - any kind of customisation allowed here
+# Note: $(basename $@) strips everything after and including the . in the target name
+custom_wallkw.customtest: 
+	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-Wallkw"
+
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
 			$(C_TEST_CASES:=.ctest) \
 			$(MULTI_CPP_TEST_CASES:=.multicpptest) \
@@ -500,14 +511,14 @@
 swig_and_compile_cpp =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 
 swig_and_compile_c =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)
 
@@ -515,7 +526,7 @@
 	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
 	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
-	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
 	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
 	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
@@ -527,7 +538,7 @@
 	$(LANGUAGE)$(VARIANT)_externalhdr; \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2009-07-02 20:32:51 UTC (rev 11346)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2009-07-02 21:35:41 UTC (rev 11347)
@@ -28,7 +28,7 @@
 include $(srcdir)/../common.mk
 
 # Overridden variables here
-SWIGOPT += -namespace $*Namespace $(SWIGOPTSPECIAL)
+SWIGOPT += -namespace $*Namespace
 INTERFACEDIR = ../../
 
 CSHARPFLAGSSPECIAL =
@@ -51,9 +51,9 @@
 
 # Rules for custom tests
 intermediary_classname.customtest: 
-	$(MAKE) intermediary_classname.cpptest SWIGOPTSPECIAL="-dllimport intermediary_classname"
+	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-dllimport intermediary_classname"
 csharp_lib_arrays.customtest: 
-	$(MAKE) csharp_lib_arrays.cpptest CSHARPFLAGSSPECIAL="-unsafe"
+	$(MAKE) $(basename $@).cpptest CSHARPFLAGSSPECIAL="-unsafe"
 
 # Makes a directory for the testcase if it does not exist
 setup = \

Added: trunk/Examples/test-suite/java/custom_wallkw_runme.java
===================================================================
--- trunk/Examples/test-suite/java/custom_wallkw_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/custom_wallkw_runme.java	2009-07-02 21:35:41 UTC (rev 11347)
@@ -0,0 +1,25 @@
+
+import custom_wallkw.*;
+
+public class custom_wallkw_runme {
+
+  static {
+    try {
+	System.loadLibrary("custom_wallkw");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    if (!custom_wallkw.c_clone().equals("clone"))
+      throw new RuntimeException("clone_c keyword fail");
+    if (!custom_wallkw._delegate().equals("delegate"))
+      throw new RuntimeException("delegate keyword fail");
+    if (!custom_wallkw._pass().equals("pass"))
+      throw new RuntimeException("pass keyword fail");
+    if (!custom_wallkw.C_alias().equals("alias"))
+      throw new RuntimeException("alias keyword fail");
+  }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11348
          http://swig.svn.sourceforge.net/swig/?rev=11348&view=rev
Author:   wsfulton
Date:     2009-07-02 21:59:29 +0000 (Thu, 02 Jul 2009)

Log Message:
-----------
rename custom testcases with a custom_ prefix (intermediary_classname.i and lib_arrays.i). Also some typo fixes for custom testcases

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/csharp/custom_csharp_lib_arrays_runme.cs
    trunk/Examples/test-suite/csharp/custom_intermediary_classname_runme.cs
    trunk/Examples/test-suite/custom_csharp_lib_arrays.i
    trunk/Examples/test-suite/custom_intermediary_classname.i
    trunk/Examples/test-suite/java/custom_intermediary_classname_runme.java

Removed Paths:
-------------
    trunk/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs
    trunk/Examples/test-suite/csharp/intermediary_classname_runme.cs
    trunk/Examples/test-suite/csharp_lib_arrays.i
    trunk/Examples/test-suite/intermediary_classname.i
    trunk/Examples/test-suite/java/intermediary_classname_runme.java

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/common.mk	2009-07-02 21:59:29 UTC (rev 11348)
@@ -9,7 +9,8 @@
 # then builds the object code for use by the language.
 # To complete a test in a language follow these guidelines: 
 # 1) Add testcases to CPP_TEST_CASES (c++) or C_TEST_CASES (c) or
-#    MULTI_CPP_TEST_CASES (multi-module c++ tests)
+#    MULTI_CPP_TEST_CASES (multi-module c++ tests) or 
+#    CUSTOM_TEST_CASES (mainly for customised SWIG comandline options)
 # 2) If not already done, create a makefile which:
 #    a) Defines LANGUAGE matching a language rule in Examples/Makefile, 
 #       for example LANGUAGE = java
@@ -471,8 +472,8 @@
 
 # Non standard testcases, usually using custom commandline options
 # Testcase names are prefixed with custom_ and can be run individually using make testcase.customtest
-CUSTOM_TEST_CASES = \
-	custom_allkw \
+CUSTOM_TEST_CASES += \
+	custom_wallkw \
 
 # individual custom tests - any kind of customisation allowed here
 # Note: $(basename $@) strips everything after and including the . in the target name

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2009-07-02 21:59:29 UTC (rev 11348)
@@ -22,8 +22,8 @@
 	exception_partial_info
 
 CUSTOM_TEST_CASES = \
-	csharp_lib_arrays \
-	intermediary_classname
+	custom_csharp_lib_arrays \
+	custom_intermediary_classname
 
 include $(srcdir)/../common.mk
 
@@ -50,9 +50,9 @@
 	+$(run_testcase)
 
 # Rules for custom tests
-intermediary_classname.customtest: 
-	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-dllimport intermediary_classname"
-csharp_lib_arrays.customtest: 
+custom_intermediary_classname.customtest: 
+	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-dllimport custom_intermediary_classname"
+custom_csharp_lib_arrays.customtest: 
 	$(MAKE) $(basename $@).cpptest CSHARPFLAGSSPECIAL="-unsafe"
 
 # Makes a directory for the testcase if it does not exist

Deleted: trunk/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs	2009-07-02 21:59:29 UTC (rev 11348)
@@ -1,70 +0,0 @@
-using System;
-using csharp_lib_arraysNamespace;
-
-public class runme
-{
-  static void Main() 
-  {
-    {
-      int[] source = { 1, 2, 3, 4, 5 };
-      int[] target = new int[ source.Length ];
-
-      csharp_lib_arrays.myArrayCopy( source, target, target.Length );
-      CompareArrays(source, target);
-    }
-
-    {
-      int[] source = { 1, 2, 3, 4, 5 };
-      int[] target = new int[ source.Length ];
-
-      csharp_lib_arrays.myArrayCopyUsingFixedArrays( source, target, target.Length );
-      CompareArrays(source, target);
-    }
-
-    {
-      int[] source = { 1, 2, 3, 4, 5 };
-      int[] target = new int[] { 6, 7, 8, 9, 10 };
-
-      csharp_lib_arrays.myArraySwap( source, target, target.Length );
-
-      for (int i=0; i<target.Length; ++i)
-        target[i] += 5;
-      CompareArrays(source, target);
-    }
-
-    {
-      int[] source = { 1, 2, 3, 4, 5 };
-      int[] target = new int[] { 6, 7, 8, 9, 10 };
-
-      csharp_lib_arrays.myArraySwapUsingFixedArrays( source, target, target.Length );
-
-      for (int i=0; i<target.Length; ++i)
-        target[i] += 5;
-      CompareArrays(source, target);
-    }
-  }
-  
-  static void CompareArrays( int[] a, int[] b ) 
-  {
-    if (a.Length != b.Length)
-      throw new Exception("size mismatch");
-
-    for(int i=0; i<a.Length; ++i) {
-      if (a[i] != b[i]) {
-        Console.Error.WriteLine("a:");
-        PrintArray(a);
-        Console.Error.WriteLine("b:");
-        PrintArray(b);
-        throw new Exception("element mismatch");
-      }
-    }
-  }
-
-  static void PrintArray( int[] a ) 
-  {
-    foreach ( int i in a ) 
-      Console.Error.Write( "{0} ", i );
-    Console.Error.WriteLine();
-  }
-}
-

Copied: trunk/Examples/test-suite/csharp/custom_csharp_lib_arrays_runme.cs (from rev 11346, trunk/Examples/test-suite/csharp/csharp_lib_arrays_runme.cs)
===================================================================
--- trunk/Examples/test-suite/csharp/custom_csharp_lib_arrays_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/custom_csharp_lib_arrays_runme.cs	2009-07-02 21:59:29 UTC (rev 11348)
@@ -0,0 +1,70 @@
+using System;
+using custom_csharp_lib_arraysNamespace;
+
+public class runme
+{
+  static void Main() 
+  {
+    {
+      int[] source = { 1, 2, 3, 4, 5 };
+      int[] target = new int[ source.Length ];
+
+      custom_csharp_lib_arrays.myArrayCopy( source, target, target.Length );
+      CompareArrays(source, target);
+    }
+
+    {
+      int[] source = { 1, 2, 3, 4, 5 };
+      int[] target = new int[ source.Length ];
+
+      custom_csharp_lib_arrays.myArrayCopyUsingFixedArrays( source, target, target.Length );
+      CompareArrays(source, target);
+    }
+
+    {
+      int[] source = { 1, 2, 3, 4, 5 };
+      int[] target = new int[] { 6, 7, 8, 9, 10 };
+
+      custom_csharp_lib_arrays.myArraySwap( source, target, target.Length );
+
+      for (int i=0; i<target.Length; ++i)
+        target[i] += 5;
+      CompareArrays(source, target);
+    }
+
+    {
+      int[] source = { 1, 2, 3, 4, 5 };
+      int[] target = new int[] { 6, 7, 8, 9, 10 };
+
+      custom_csharp_lib_arrays.myArraySwapUsingFixedArrays( source, target, target.Length );
+
+      for (int i=0; i<target.Length; ++i)
+        target[i] += 5;
+      CompareArrays(source, target);
+    }
+  }
+  
+  static void CompareArrays( int[] a, int[] b ) 
+  {
+    if (a.Length != b.Length)
+      throw new Exception("size mismatch");
+
+    for(int i=0; i<a.Length; ++i) {
+      if (a[i] != b[i]) {
+        Console.Error.WriteLine("a:");
+        PrintArray(a);
+        Console.Error.WriteLine("b:");
+        PrintArray(b);
+        throw new Exception("element mismatch");
+      }
+    }
+  }
+
+  static void PrintArray( int[] a ) 
+  {
+    foreach ( int i in a ) 
+      Console.Error.Write( "{0} ", i );
+    Console.Error.WriteLine();
+  }
+}
+

Copied: trunk/Examples/test-suite/csharp/custom_intermediary_classname_runme.cs (from rev 11346, trunk/Examples/test-suite/csharp/intermediary_classname_runme.cs)
===================================================================
--- trunk/Examples/test-suite/csharp/custom_intermediary_classname_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/custom_intermediary_classname_runme.cs	2009-07-02 21:59:29 UTC (rev 11348)
@@ -0,0 +1,21 @@
+
+/***********************************************************************************************
+   NOTE: This is a custom testcase and should be run using make custom_intermediary_classname.customtest
+ ***********************************************************************************************/
+
+using System;
+using custom_intermediary_classnameNamespace;
+
+public class runme
+{
+    static void Main() 
+    {
+      // test the renamed module class is correctly named
+      double d = custom_intermediary_classnameModule.maxdouble(10.0, 20.0);
+      if (d!=20.0) throw new Exception("Test failed");
+
+      // test the renamed intermediary class is correctly named
+      IntPtr ptr = custom_intermediary_classname.new_vecdouble(10);
+      custom_intermediary_classname.delete_vecdouble(new System.Runtime.InteropServices.HandleRef(null,ptr));
+    }
+}

Deleted: trunk/Examples/test-suite/csharp/intermediary_classname_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/intermediary_classname_runme.cs	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/csharp/intermediary_classname_runme.cs	2009-07-02 21:59:29 UTC (rev 11348)
@@ -1,21 +0,0 @@
-
-/***********************************************************************************************
-   NOTE: This is a custom testcase and should be run using make intermediary_classname.customtest
- ***********************************************************************************************/
-
-using System;
-using intermediary_classnameNamespace;
-
-public class runme
-{
-    static void Main() 
-    {
-      // test the renamed module class is correctly named
-      double d = intermediary_classnameModule.maxdouble(10.0, 20.0);
-      if (d!=20.0) throw new Exception("Test failed");
-
-      // test the renamed intermediary class is correctly named
-      IntPtr ptr = intermediary_classname.new_vecdouble(10);
-      intermediary_classname.delete_vecdouble(new System.Runtime.InteropServices.HandleRef(null,ptr));
-    }
-}

Deleted: trunk/Examples/test-suite/csharp_lib_arrays.i
===================================================================
--- trunk/Examples/test-suite/csharp_lib_arrays.i	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/csharp_lib_arrays.i	2009-07-02 21:59:29 UTC (rev 11348)
@@ -1,61 +0,0 @@
-%module csharp_lib_arrays
-
-%include "arrays_csharp.i"
-
-%apply int INPUT[]  { int* sourceArray }
-%apply int OUTPUT[] { int* targetArray }
-
-%apply int INOUT[] { int* array1 }
-%apply int INOUT[] { int* array2 }
-
-%inline %{
-/* copy the contents of the first array to the second */
-void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) {
-  int i;
-  for ( i = 0; i < nitems; i++ ) {
-    targetArray[ i ] = sourceArray[ i ];
-  }
-}
-
-/* swap the contents of the two arrays */
-void myArraySwap( int* array1, int* array2, int nitems ) {
-  int i, temp;
-  for ( i = 0; i < nitems; i++ ) {
-    temp = array1[ i ];
-    array1[ i ] = array2[ i ];
-    array2[ i ] = temp;
-  }
-}
-%}
-
-
-%clear int* sourceArray;
-%clear int* targetArray;
-
-%clear int* array1;
-%clear int* array2;
-
-
-// Below replicates the above array handling but this time using the pinned (fixed) array typemaps
-%csmethodmodifiers myArrayCopyUsingFixedArrays "public unsafe";
-%csmethodmodifiers myArraySwapUsingFixedArrays "public unsafe";
-
-%apply int FIXED[] { int* sourceArray }
-%apply int FIXED[] { int* targetArray }
-
-%inline %{
-void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) {
-  myArrayCopy(sourceArray, targetArray, nitems);
-}
-%}
-
-%apply int FIXED[] { int* array1 }
-%apply int FIXED[] { int* array2 }
-
-%inline %{
-void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) {
-  myArraySwap(array1, array2, nitems);
-}
-%}
-
-  

Copied: trunk/Examples/test-suite/custom_csharp_lib_arrays.i (from rev 11346, trunk/Examples/test-suite/csharp_lib_arrays.i)
===================================================================
--- trunk/Examples/test-suite/custom_csharp_lib_arrays.i	                        (rev 0)
+++ trunk/Examples/test-suite/custom_csharp_lib_arrays.i	2009-07-02 21:59:29 UTC (rev 11348)
@@ -0,0 +1,61 @@
+%module custom_csharp_lib_arrays
+
+%include "arrays_csharp.i"
+
+%apply int INPUT[]  { int* sourceArray }
+%apply int OUTPUT[] { int* targetArray }
+
+%apply int INOUT[] { int* array1 }
+%apply int INOUT[] { int* array2 }
+
+%inline %{
+/* copy the contents of the first array to the second */
+void myArrayCopy( int* sourceArray, int* targetArray, int nitems ) {
+  int i;
+  for ( i = 0; i < nitems; i++ ) {
+    targetArray[ i ] = sourceArray[ i ];
+  }
+}
+
+/* swap the contents of the two arrays */
+void myArraySwap( int* array1, int* array2, int nitems ) {
+  int i, temp;
+  for ( i = 0; i < nitems; i++ ) {
+    temp = array1[ i ];
+    array1[ i ] = array2[ i ];
+    array2[ i ] = temp;
+  }
+}
+%}
+
+
+%clear int* sourceArray;
+%clear int* targetArray;
+
+%clear int* array1;
+%clear int* array2;
+
+
+// Below replicates the above array handling but this time using the pinned (fixed) array typemaps
+%csmethodmodifiers myArrayCopyUsingFixedArrays "public unsafe";
+%csmethodmodifiers myArraySwapUsingFixedArrays "public unsafe";
+
+%apply int FIXED[] { int* sourceArray }
+%apply int FIXED[] { int* targetArray }
+
+%inline %{
+void myArrayCopyUsingFixedArrays( int *sourceArray, int* targetArray, int nitems ) {
+  myArrayCopy(sourceArray, targetArray, nitems);
+}
+%}
+
+%apply int FIXED[] { int* array1 }
+%apply int FIXED[] { int* array2 }
+
+%inline %{
+void myArraySwapUsingFixedArrays( int* array1, int* array2, int nitems ) {
+  myArraySwap(array1, array2, nitems);
+}
+%}
+
+  

Copied: trunk/Examples/test-suite/custom_intermediary_classname.i (from rev 11346, trunk/Examples/test-suite/intermediary_classname.i)
===================================================================
--- trunk/Examples/test-suite/custom_intermediary_classname.i	                        (rev 0)
+++ trunk/Examples/test-suite/custom_intermediary_classname.i	2009-07-02 21:59:29 UTC (rev 11348)
@@ -0,0 +1,82 @@
+
+// This test is to check the intermediary class name can be changed (C# and Java only use intermediary classes at time of writing)
+%module(directors="1", jniclassname="custom_intermediary_classname", imclassname="custom_intermediary_classname") "custom_intermediary_classname"
+
+%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR);
+
+// change the access to the intermediary class for testing purposes
+%pragma(java) jniclassclassmodifiers="public class";
+%pragma(csharp) imclassclassmodifiers="public class";
+
+%feature("director") Base;
+%feature("director") Derived;
+
+// Test the throws attribute in these typemaps
+%typemap(javadirectorout, throws="InstantiationException/*javadirectorout Base&*/") Base& 
+  "$javaclassname.getCPtr($javacall)/* XYZ& typemap directorout*/"
+%typemap(javadirectorin, throws="ClassNotFoundException/*javadirectorin Base&*/") Base&
+  "new $javaclassname($jniinput, false)/*javadirectorin*/"
+%typemap(out, throws="IllegalAccessException/*out Base&*/") Base& {
+  // XYZ& typemap out
+  $result = 0; // remove unused variable warning
+}
+%inline %{
+
+template<class T> T maximum(const T a, const T b) { return  a>b ? a : b; }
+
+template<class T> class vector {
+  T *v;
+  int sz;
+ public:
+  vector(int _sz) {
+    v = new T[_sz];
+    sz = _sz;
+  }
+  T &get(int index) {
+    return v[index];
+  }
+  void set(int index, T &val) {
+    v[index] = val;
+  }
+  void testconst(const T x) { }
+};
+
+#if defined(_MSC_VER)
+  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+
+class Base {
+public:
+  Base() : mVectInt(0) {}
+  Base(Base *b) : mVectInt(0) {}
+  virtual ~Base() {}
+  virtual Base& m1(Base &b) { return b; }
+  virtual Base& m1out() { static Base b; return b; }
+  virtual Base* m2(Base *b) { return b; }
+//  virtual Base m3(Base b) { return b; }
+  vector<int> mVectInt;
+  int mInt;
+  enum en { en1, en2 };
+  en enummethod(en e) { return e; }
+};
+class Derived : public Base {
+public:
+  Derived(Base *b) : Base(b) {}
+  virtual Base& m1(Base &b) { return b; }
+  virtual Base* m2(Base *b) { return b; }
+//  virtual Base m3(Base b) { return b; }
+  void throwspec() throw (int, Base) {}
+};
+#if defined(_MSC_VER)
+  #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#endif
+%}
+
+%template(maxint) maximum<int>;
+%template(maxdouble) maximum<double>;
+%template(vecint) vector<int>;
+%template(vecdouble) vector<double>;
+%template(maxintp) maximum<int (*)[10]>;
+%template(vecintp) vector<int (*)[10]>;
+
+

Deleted: trunk/Examples/test-suite/intermediary_classname.i
===================================================================
--- trunk/Examples/test-suite/intermediary_classname.i	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/intermediary_classname.i	2009-07-02 21:59:29 UTC (rev 11348)
@@ -1,82 +0,0 @@
-
-// This test is to check the intermediary class name can be changed (C# and Java only use intermediary classes at time of writing)
-%module(directors="1", jniclassname="intermediary_classname", imclassname="intermediary_classname") "intermediary_classname"
-
-%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR);
-
-// change the access to the intermediary class for testing purposes
-%pragma(java) jniclassclassmodifiers="public class";
-%pragma(csharp) imclassclassmodifiers="public class";
-
-%feature("director") Base;
-%feature("director") Derived;
-
-// Test the throws attribute in these typemaps
-%typemap(javadirectorout, throws="InstantiationException/*javadirectorout Base&*/") Base& 
-  "$javaclassname.getCPtr($javacall)/* XYZ& typemap directorout*/"
-%typemap(javadirectorin, throws="ClassNotFoundException/*javadirectorin Base&*/") Base&
-  "new $javaclassname($jniinput, false)/*javadirectorin*/"
-%typemap(out, throws="IllegalAccessException/*out Base&*/") Base& {
-  // XYZ& typemap out
-  $result = 0; // remove unused variable warning
-}
-%inline %{
-
-template<class T> T maximum(const T a, const T b) { return  a>b ? a : b; }
-
-template<class T> class vector {
-  T *v;
-  int sz;
- public:
-  vector(int _sz) {
-    v = new T[_sz];
-    sz = _sz;
-  }
-  T &get(int index) {
-    return v[index];
-  }
-  void set(int index, T &val) {
-    v[index] = val;
-  }
-  void testconst(const T x) { }
-};
-
-#if defined(_MSC_VER)
-  #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-
-class Base {
-public:
-  Base() : mVectInt(0) {}
-  Base(Base *b) : mVectInt(0) {}
-  virtual ~Base() {}
-  virtual Base& m1(Base &b) { return b; }
-  virtual Base& m1out() { static Base b; return b; }
-  virtual Base* m2(Base *b) { return b; }
-//  virtual Base m3(Base b) { return b; }
-  vector<int> mVectInt;
-  int mInt;
-  enum en { en1, en2 };
-  en enummethod(en e) { return e; }
-};
-class Derived : public Base {
-public:
-  Derived(Base *b) : Base(b) {}
-  virtual Base& m1(Base &b) { return b; }
-  virtual Base* m2(Base *b) { return b; }
-//  virtual Base m3(Base b) { return b; }
-  void throwspec() throw (int, Base) {}
-};
-#if defined(_MSC_VER)
-  #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-#endif
-%}
-
-%template(maxint) maximum<int>;
-%template(maxdouble) maximum<double>;
-%template(vecint) vector<int>;
-%template(vecdouble) vector<double>;
-%template(maxintp) maximum<int (*)[10]>;
-%template(vecintp) vector<int (*)[10]>;
-
-

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/java/Makefile.in	2009-07-02 21:59:29 UTC (rev 11348)
@@ -19,7 +19,7 @@
 	enum_thorough_simple \
 	enum_thorough_typeunsafe \
 	exception_partial_info \
-	intermediary_classname \
+	custom_intermediary_classname \
 	java_constants \
 	java_director \
 	java_enums \

Copied: trunk/Examples/test-suite/java/custom_intermediary_classname_runme.java (from rev 11346, trunk/Examples/test-suite/java/intermediary_classname_runme.java)
===================================================================
--- trunk/Examples/test-suite/java/custom_intermediary_classname_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/custom_intermediary_classname_runme.java	2009-07-02 21:59:29 UTC (rev 11348)
@@ -0,0 +1,24 @@
+
+import custom_intermediary_classname.*;
+
+public class custom_intermediary_classname_runme {
+  static {
+    try {
+        System.loadLibrary("custom_intermediary_classname");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+      // test the renamed module class is correctly named
+      double d = custom_intermediary_classnameModule.maxdouble(10.0, 20.0);
+      if (d!=20.0) throw new RuntimeException("Test failed");
+
+      // test the renamed intermediary class is correctly named
+      long ptr = custom_intermediary_classname.new_vecdouble(10);
+      custom_intermediary_classname.delete_vecdouble(ptr);
+  }
+}

Deleted: trunk/Examples/test-suite/java/intermediary_classname_runme.java
===================================================================
--- trunk/Examples/test-suite/java/intermediary_classname_runme.java	2009-07-02 21:35:41 UTC (rev 11347)
+++ trunk/Examples/test-suite/java/intermediary_classname_runme.java	2009-07-02 21:59:29 UTC (rev 11348)
@@ -1,24 +0,0 @@
-
-import intermediary_classname.*;
-
-public class intermediary_classname_runme {
-  static {
-    try {
-        System.loadLibrary("intermediary_classname");
-    } catch (UnsatisfiedLinkError e) {
-      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
-      System.exit(1);
-    }
-  }
-
-  public static void main(String argv[]) 
-  {
-      // test the renamed module class is correctly named
-      double d = intermediary_classnameModule.maxdouble(10.0, 20.0);
-      if (d!=20.0) throw new RuntimeException("Test failed");
-
-      // test the renamed intermediary class is correctly named
-      long ptr = intermediary_classname.new_vecdouble(10);
-      intermediary_classname.delete_vecdouble(ptr);
-  }
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11356
          http://swig.svn.sourceforge.net/swig/?rev=11356&view=rev
Author:   wsfulton
Date:     2009-07-03 22:23:43 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
better way to provide custom commandline options for individual tests

Modified Paths:
--------------
    trunk/Examples/test-suite/allegrocl/Makefile.in
    trunk/Examples/test-suite/cffi/Makefile.in
    trunk/Examples/test-suite/chicken/Makefile.in
    trunk/Examples/test-suite/clisp/Makefile.in
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/guile/Makefile.in
    trunk/Examples/test-suite/guilescm/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in
    trunk/Examples/test-suite/lua/Makefile.in
    trunk/Examples/test-suite/mzscheme/Makefile.in
    trunk/Examples/test-suite/ocaml/Makefile.in
    trunk/Examples/test-suite/octave/Makefile.in
    trunk/Examples/test-suite/perl5/Makefile.in
    trunk/Examples/test-suite/php/Makefile.in
    trunk/Examples/test-suite/pike/Makefile.in
    trunk/Examples/test-suite/python/Makefile.in
    trunk/Examples/test-suite/r/Makefile.in
    trunk/Examples/test-suite/ruby/Makefile.in
    trunk/Examples/test-suite/tcl/Makefile.in
    trunk/Examples/test-suite/uffi/Makefile.in

Modified: trunk/Examples/test-suite/allegrocl/Makefile.in
===================================================================
--- trunk/Examples/test-suite/allegrocl/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/allegrocl/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -89,8 +89,12 @@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # SWIGOPT += -debug-module 4
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/cffi/Makefile.in
===================================================================
--- trunk/Examples/test-suite/cffi/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/cffi/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -11,10 +11,14 @@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/chicken/Makefile.in
===================================================================
--- trunk/Examples/test-suite/chicken/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/chicken/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -23,10 +23,12 @@
 
 include $(srcdir)/../common.mk
 
-
 # Overridden variables here
 SWIGOPT += -nounit
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/clisp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/clisp/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/clisp/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -11,10 +11,14 @@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/common.mk	2009-07-03 22:23:43 UTC (rev 11356)
@@ -16,8 +16,8 @@
 #    b) Define rules for %.ctest, %.cpptest, %.multicpptest and %.clean.
 #    c) Define srcdir, top_srcdir and top_builddir (these are the
 #       equivalent to configure's variables of the same name).
-# 3) One off special commandline options can be achieved by adding a
-#    test case to CUSTOM_TEST_CASES and defining rules to run and test.
+# 3) One off special commandline options for a testcase can be added.
+#    See custom tests below.
 #
 # The 'check' target runs the testcases including SWIG invocation,
 # C/C++ compilation, target language compilation (if any) and runtime
@@ -60,7 +60,6 @@
 TARGETPREFIX = 
 TARGETSUFFIX = 
 SWIGOPT    = -outcurrentdir -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
-SWIGOPTCUSTOM =
 INCLUDES   = -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
 LIBS       = -L.
 LIBPREFIX  = lib
@@ -72,7 +71,7 @@
 # Note that any whitespace after the last entry in each list will break make
 #
 
-# Broken C++ test cases. (Can be run individually using make testcase.cpptest.)
+# Broken C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_BROKEN += \
 	constants \
 	cpp_broken \
@@ -86,12 +85,12 @@
 	template_expr
 
 
-# Broken C test cases. (Can be run individually using make testcase.ctest.)
+# Broken C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_BROKEN += \
 	tag_no_clash_with_variable
 
 
-# C++ test cases. (Can be run individually using make testcase.cpptest.)
+# C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_CASES += \
 	abstract_access \
 	abstract_inherit \
@@ -143,6 +142,7 @@
 	cpp_nodefault \
 	cpp_static \
 	cpp_typedef \
+	custom_wallkw \
 	default_args \
 	default_constructor \
 	defvalue_constructor \
@@ -421,7 +421,7 @@
 endif
 
 
-# C test cases. (Can be run individually using make testcase.ctest.)
+# C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_CASES += \
 	arrays \
 	char_constant \
@@ -460,7 +460,7 @@
 	unions
 
 
-# Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest.)
+# Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest)
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
 	imports \
@@ -469,20 +469,13 @@
 	template_typedef_import \
 	multi_import
 
-# Non standard testcases, usually using custom commandline options
-# Testcase names are prefixed with custom_ and can be run individually using make testcase.customtest
-CUSTOM_TEST_CASES = \
-	custom_wallkw \
+# Custom tests - tests with additional commandline options
+custom_wallkw.cpptest: SWIGOPT += -Wallkw
 
-# individual custom tests - any kind of customisation allowed here
-# Note: $(basename $@) strips everything after and including the . in the target name
-custom_wallkw.customtest: 
-	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-Wallkw"
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
 			$(C_TEST_CASES:=.ctest) \
 			$(MULTI_CPP_TEST_CASES:=.multicpptest) \
-			$(CUSTOM_TEST_CASES:=.customtest) \
 			$(EXTRA_TEST_CASES)
 
 BROKEN_TEST_CASES = 	$(CPP_TEST_BROKEN:=.cpptest) \
@@ -491,7 +484,6 @@
 ALL_CLEAN = 		$(CPP_TEST_CASES:=.clean) \
 			$(C_TEST_CASES:=.clean) \
 			$(MULTI_CPP_TEST_CASES:=.clean) \
-			$(CUSTOM_TEST_CASES:=.clean) \
 			$(CPP_TEST_BROKEN:=.clean) \
 			$(C_TEST_BROKEN:=.clean)
 
@@ -511,14 +503,14 @@
 swig_and_compile_cpp =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 
 swig_and_compile_c =  \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CSRCS="$(CSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)
 
@@ -526,7 +518,7 @@
 	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS)" \
 	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
-	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
 	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
@@ -538,7 +530,7 @@
 	$(LANGUAGE)$(VARIANT)_externalhdr; \
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile CXXSRCS="$(CXXSRCS) $*_external.cxx" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
-	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) $(SWIGOPTCUSTOM)" NOLINK=true \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
 	TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
 	$(LANGUAGE)$(VARIANT)_cpp
 

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -15,14 +15,12 @@
 	csharp_attributes \
 	csharp_exceptions \
 	csharp_features \
+	csharp_lib_arrays \
 	csharp_prepost \
 	csharp_typemaps \
 	enum_thorough_simple \
 	enum_thorough_typesafe \
-	exception_partial_info
-
-CUSTOM_TEST_CASES = \
-	csharp_lib_arrays \
+	exception_partial_info \
 	intermediary_classname
 
 include $(srcdir)/../common.mk
@@ -33,6 +31,10 @@
 
 CSHARPFLAGSSPECIAL =
 
+# Custom tests - tests with additional commandline options
+intermediary_classname.cpptest: SWIGOPT += -dllimport intermediary_classname
+csharp_lib_arrays.cpptest: CSHARPFLAGSSPECIAL = -unsafe
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)
@@ -49,12 +51,6 @@
 	+(cd $* && $(swig_and_compile_multi_cpp))
 	+$(run_testcase)
 
-# Rules for custom tests
-intermediary_classname.customtest: 
-	$(MAKE) $(basename $@).cpptest SWIGOPTCUSTOM="-dllimport intermediary_classname"
-csharp_lib_arrays.customtest: 
-	$(MAKE) $(basename $@).cpptest CSHARPFLAGSSPECIAL="-unsafe"
-
 # Makes a directory for the testcase if it does not exist
 setup = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \

Modified: trunk/Examples/test-suite/guile/Makefile.in
===================================================================
--- trunk/Examples/test-suite/guile/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/guile/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -17,6 +17,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/guilescm/Makefile.in
===================================================================
--- trunk/Examples/test-suite/guilescm/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/guilescm/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -6,12 +6,15 @@
 
 include ../guile/Makefile
 
+# Overridden variables here
 INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guilescm
-
 VARIANT      =
 # Refer to the guile directory for the run scripts
 SCRIPTPREFIX = ../guile/
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.scm appended after the testcase name.
 run_testcase = \

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/java/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -40,6 +40,9 @@
 SWIGOPT += -package $*
 INTERFACEDIR = ../../
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/lua/Makefile.in
===================================================================
--- trunk/Examples/test-suite/lua/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/lua/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -24,6 +24,9 @@
 # Overridden variables here
 LIBS       = -L.
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/mzscheme/Makefile.in
===================================================================
--- trunk/Examples/test-suite/mzscheme/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/mzscheme/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -14,6 +14,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/ocaml/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ocaml/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/ocaml/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -44,6 +44,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest:
 	echo $@ >> testing

Modified: trunk/Examples/test-suite/octave/Makefile.in
===================================================================
--- trunk/Examples/test-suite/octave/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/octave/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -34,6 +34,9 @@
 # Overridden variables here
 LIBS       = -L.
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/perl5/Makefile.in
===================================================================
--- trunk/Examples/test-suite/perl5/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/perl5/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -27,6 +27,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/php/Makefile.in
===================================================================
--- trunk/Examples/test-suite/php/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/php/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -16,6 +16,9 @@
 # Overridden variables here
 TARGETPREFIX =# Should be php_ for Windows, empty otherwise
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # write out tests without a _runme.php
 missingcpptests:
 	for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done

Modified: trunk/Examples/test-suite/pike/Makefile.in
===================================================================
--- trunk/Examples/test-suite/pike/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/pike/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -14,6 +14,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/python/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -89,6 +89,9 @@
 LIBS       = -L.
 VALGRIND_OPT += --suppressions=pythonswig.supp
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/r/Makefile.in
===================================================================
--- trunk/Examples/test-suite/r/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/r/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -16,7 +16,11 @@
 include $(srcdir)/../common.mk
 
 # Overridden variables here
+# none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/ruby/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ruby/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/ruby/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -38,12 +38,10 @@
 # Overridden variables here
 SWIGOPT += -w801 -noautorename -features autodoc=4
 
-
-# Rules for the different types of tests
-
-# make sure -autorename is true for the naming test
+# Custom tests - tests with additional commandline options
 ruby_naming.cpptest: SWIGOPT += -autorename
 
+# Rules for the different types of tests
 %.cpptest: 
 	$(setup)
 	+$(swig_and_compile_cpp)

Modified: trunk/Examples/test-suite/tcl/Makefile.in
===================================================================
--- trunk/Examples/test-suite/tcl/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/tcl/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -23,6 +23,9 @@
 # Overridden variables here
 # none!
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)

Modified: trunk/Examples/test-suite/uffi/Makefile.in
===================================================================
--- trunk/Examples/test-suite/uffi/Makefile.in	2009-07-03 21:23:34 UTC (rev 11355)
+++ trunk/Examples/test-suite/uffi/Makefile.in	2009-07-03 22:23:43 UTC (rev 11356)
@@ -11,10 +11,14 @@
 
 include $(srcdir)/../common.mk
 
+# Overridden variables here
 # no C++ tests for now
 CPP_TEST_CASES =
 #C_TEST_CASES += 
 
+# Custom tests - tests with additional commandline options
+# none!
+
 # Rules for the different types of tests
 %.cpptest: 
 	$(setup)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11357
          http://swig.svn.sourceforge.net/swig/?rev=11357&view=rev
Author:   wsfulton
Date:     2009-07-03 22:28:07 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
rename custom_wallkw to wallkw - custom commandline tests needn't start with custom_

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/java/wallkw_runme.java
    trunk/Examples/test-suite/wallkw.i

Removed Paths:
-------------
    trunk/Examples/test-suite/custom_wallkw.i
    trunk/Examples/test-suite/java/custom_wallkw_runme.java

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-03 22:23:43 UTC (rev 11356)
+++ trunk/Examples/test-suite/common.mk	2009-07-03 22:28:07 UTC (rev 11357)
@@ -142,7 +142,6 @@
 	cpp_nodefault \
 	cpp_static \
 	cpp_typedef \
-	custom_wallkw \
 	default_args \
 	default_constructor \
 	defvalue_constructor \
@@ -395,6 +394,7 @@
 	virtual_destructor \
 	virtual_poly \
 	voidtest \
+	wallkw \
 	wrapmacro
 
 #
@@ -470,7 +470,7 @@
 	multi_import
 
 # Custom tests - tests with additional commandline options
-custom_wallkw.cpptest: SWIGOPT += -Wallkw
+wallkw.cpptest: SWIGOPT += -Wallkw
 
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \

Deleted: trunk/Examples/test-suite/custom_wallkw.i
===================================================================
--- trunk/Examples/test-suite/custom_wallkw.i	2009-07-03 22:23:43 UTC (rev 11356)
+++ trunk/Examples/test-suite/custom_wallkw.i	2009-07-03 22:28:07 UTC (rev 11357)
@@ -1,16 +0,0 @@
-%module custom_wallkw
-
-// test the -Wallkw option
-
-%warnfilter(SWIGWARN_PARSE_KEYWORD) clone; // 'clone' is a php keyword, renamed as 'c_clone'
-%warnfilter(SWIGWARN_PARSE_KEYWORD) delegate; // 'delegate' is a C# keyword, renaming to '_delegate'
-%warnfilter(SWIGWARN_PARSE_KEYWORD) pass; // 'pass' is a python keyword, renaming to '_pass'
-%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a ruby keyword, renaming to 'C_alias'
-
-%inline %{
-const char * clone() { return "clone"; }
-const char * delegate() { return "delegate"; }
-const char * pass() { return "pass"; }
-const char * alias() { return "alias"; }
-%}
-

Deleted: trunk/Examples/test-suite/java/custom_wallkw_runme.java
===================================================================
--- trunk/Examples/test-suite/java/custom_wallkw_runme.java	2009-07-03 22:23:43 UTC (rev 11356)
+++ trunk/Examples/test-suite/java/custom_wallkw_runme.java	2009-07-03 22:28:07 UTC (rev 11357)
@@ -1,25 +0,0 @@
-
-import custom_wallkw.*;
-
-public class custom_wallkw_runme {
-
-  static {
-    try {
-	System.loadLibrary("custom_wallkw");
-    } catch (UnsatisfiedLinkError e) {
-      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
-      System.exit(1);
-    }
-  }
-
-  public static void main(String argv[]) {
-    if (!custom_wallkw.c_clone().equals("clone"))
-      throw new RuntimeException("clone_c keyword fail");
-    if (!custom_wallkw._delegate().equals("delegate"))
-      throw new RuntimeException("delegate keyword fail");
-    if (!custom_wallkw._pass().equals("pass"))
-      throw new RuntimeException("pass keyword fail");
-    if (!custom_wallkw.C_alias().equals("alias"))
-      throw new RuntimeException("alias keyword fail");
-  }
-}

Copied: trunk/Examples/test-suite/java/wallkw_runme.java (from rev 11349, trunk/Examples/test-suite/java/custom_wallkw_runme.java)
===================================================================
--- trunk/Examples/test-suite/java/wallkw_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/wallkw_runme.java	2009-07-03 22:28:07 UTC (rev 11357)
@@ -0,0 +1,25 @@
+
+import wallkw.*;
+
+public class wallkw_runme {
+
+  static {
+    try {
+	System.loadLibrary("wallkw");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    if (!wallkw.c_clone().equals("clone"))
+      throw new RuntimeException("clone_c keyword fail");
+    if (!wallkw._delegate().equals("delegate"))
+      throw new RuntimeException("delegate keyword fail");
+    if (!wallkw._pass().equals("pass"))
+      throw new RuntimeException("pass keyword fail");
+    if (!wallkw.C_alias().equals("alias"))
+      throw new RuntimeException("alias keyword fail");
+  }
+}

Copied: trunk/Examples/test-suite/wallkw.i (from rev 11355, trunk/Examples/test-suite/custom_wallkw.i)
===================================================================
--- trunk/Examples/test-suite/wallkw.i	                        (rev 0)
+++ trunk/Examples/test-suite/wallkw.i	2009-07-03 22:28:07 UTC (rev 11357)
@@ -0,0 +1,16 @@
+%module wallkw
+
+// test the -Wallkw option
+
+%warnfilter(SWIGWARN_PARSE_KEYWORD) clone; // 'clone' is a php keyword, renamed as 'c_clone'
+%warnfilter(SWIGWARN_PARSE_KEYWORD) delegate; // 'delegate' is a C# keyword, renaming to '_delegate'
+%warnfilter(SWIGWARN_PARSE_KEYWORD) pass; // 'pass' is a python keyword, renaming to '_pass'
+%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a ruby keyword, renaming to 'C_alias'
+
+%inline %{
+const char * clone() { return "clone"; }
+const char * delegate() { return "delegate"; }
+const char * pass() { return "pass"; }
+const char * alias() { return "alias"; }
+%}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11382
          http://swig.svn.sourceforge.net/swig/?rev=11382&view=rev
Author:   wsfulton
Date:     2009-07-09 19:56:47 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
add test for %extend on member variable

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/java/memberin_extend_runme.java
    trunk/Examples/test-suite/memberin_extend.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-08 23:54:15 UTC (rev 11381)
+++ trunk/Examples/test-suite/common.mk	2009-07-09 19:56:47 UTC (rev 11382)
@@ -79,7 +79,7 @@
 	extend_variable \
 	li_std_vector_ptr \
 	namespace_union \
-	nested_struct \
+	nested_structs \
 	overload_complicated \
 	template_default_pointer \
 	template_expr
@@ -220,6 +220,7 @@
 	li_typemaps \
 	li_windows \
 	long_long_apply \
+	memberin_extend \
 	member_pointer \
 	member_template \
 	minherit \

Added: trunk/Examples/test-suite/java/memberin_extend_runme.java
===================================================================
--- trunk/Examples/test-suite/java/memberin_extend_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/memberin_extend_runme.java	2009-07-09 19:56:47 UTC (rev 11382)
@@ -0,0 +1,26 @@
+
+import memberin_extend.*;
+
+public class memberin_extend_runme {
+  static {
+    try {
+        System.loadLibrary("memberin_extend");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+     ExtendMe em1 = new ExtendMe();
+     ExtendMe em2 = new ExtendMe();
+     em1.setThing("em1thing");
+     em2.setThing("em2thing");
+     if (!em1.getThing().equals("em1thing")) 
+       throw new RuntimeException("wrong: " + em1.getThing());
+     if (!em2.getThing().equals("em2thing")) 
+       throw new RuntimeException("wrong: " + em2.getThing());
+  }
+}
+

Added: trunk/Examples/test-suite/memberin_extend.i
===================================================================
--- trunk/Examples/test-suite/memberin_extend.i	                        (rev 0)
+++ trunk/Examples/test-suite/memberin_extend.i	2009-07-09 19:56:47 UTC (rev 11382)
@@ -0,0 +1,22 @@
+%module memberin_extend
+
+// Tests memberin typemap. The default char * memberin typemap will be used.
+// The test extends the struct with a pseudo member variable
+
+%inline %{
+#include <string>
+struct ExtendMe {
+};
+%}
+
+%{
+#include <map>
+std::map<ExtendMe*, char *> ExtendMeStringMap;
+#define ExtendMe_thing_set(self_, val_) ExtendMeStringMap[self_]
+#define ExtendMe_thing_get(self_) ExtendMeStringMap[self_]
+%}
+
+%extend ExtendMe {
+  char *thing;
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11475
          http://swig.svn.sourceforge.net/swig/?rev=11475&view=rev
Author:   wsfulton
Date:     2009-07-30 06:15:50 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
rename special_variable_functions testcase to special_variable_macros

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/csharp/special_variable_macros_runme.cs
    trunk/Examples/test-suite/java/special_variable_macros_runme.java
    trunk/Examples/test-suite/python/special_variable_macros_runme.py
    trunk/Examples/test-suite/special_variable_macros.i

Removed Paths:
-------------
    trunk/Examples/test-suite/csharp/special_variable_functions_runme.cs
    trunk/Examples/test-suite/java/special_variable_functions_runme.java
    trunk/Examples/test-suite/python/special_variable_functions_runme.py
    trunk/Examples/test-suite/special_variable_functions.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-07-30 06:08:36 UTC (rev 11474)
+++ trunk/Examples/test-suite/common.mk	2009-07-30 06:15:50 UTC (rev 11475)
@@ -292,7 +292,7 @@
 	smart_pointer_templatevariables \
 	smart_pointer_typedef \
 	special_variables \
-	special_variable_functions \
+	special_variable_macros \
 	static_array_member \
 	static_const_member \
 	static_const_member_2 \

Deleted: trunk/Examples/test-suite/csharp/special_variable_functions_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/special_variable_functions_runme.cs	2009-07-30 06:08:36 UTC (rev 11474)
+++ trunk/Examples/test-suite/csharp/special_variable_functions_runme.cs	2009-07-30 06:15:50 UTC (rev 11475)
@@ -1,18 +0,0 @@
-using System;
-using special_variable_functionsNamespace;
-
-public class runme {
-  static void Main() {
-    Name name = new Name();
-    if (special_variable_functions.testFred(name) != "none")
-      throw new Exception("test failed");
-    if (special_variable_functions.testJack(name) != "$specialname")
-      throw new Exception("test failed");
-    if (special_variable_functions.testJill(name) != "jilly")
-      throw new Exception("test failed");
-    if (special_variable_functions.testMary(name) != "SWIGTYPE_p_NameWrap")
-      throw new Exception("test failed");
-    NewName newName = NewName.factory("factoryname");
-    name = newName.getStoredName();
-  }
-}

Copied: trunk/Examples/test-suite/csharp/special_variable_macros_runme.cs (from rev 11470, trunk/Examples/test-suite/csharp/special_variable_functions_runme.cs)
===================================================================
--- trunk/Examples/test-suite/csharp/special_variable_macros_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/special_variable_macros_runme.cs	2009-07-30 06:15:50 UTC (rev 11475)
@@ -0,0 +1,18 @@
+using System;
+using special_variable_macrosNamespace;
+
+public class runme {
+  static void Main() {
+    Name name = new Name();
+    if (special_variable_macros.testFred(name) != "none")
+      throw new Exception("test failed");
+    if (special_variable_macros.testJack(name) != "$specialname")
+      throw new Exception("test failed");
+    if (special_variable_macros.testJill(name) != "jilly")
+      throw new Exception("test failed");
+    if (special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap")
+      throw new Exception("test failed");
+    NewName newName = NewName.factory("factoryname");
+    name = newName.getStoredName();
+  }
+}


Property changes on: trunk/Examples/test-suite/csharp/special_variable_macros_runme.cs
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/Examples/test-suite/java/special_variable_functions_runme.java
===================================================================
--- trunk/Examples/test-suite/java/special_variable_functions_runme.java	2009-07-30 06:08:36 UTC (rev 11474)
+++ trunk/Examples/test-suite/java/special_variable_functions_runme.java	2009-07-30 06:15:50 UTC (rev 11475)
@@ -1,28 +0,0 @@
-
-import special_variable_functions.*;
-
-public class special_variable_functions_runme {
-
-  static {
-    try {
-	System.loadLibrary("special_variable_functions");
-    } catch (UnsatisfiedLinkError e) {
-      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
-      System.exit(1);
-    }
-  }
-
-  public static void main(String argv[]) {
-    Name name = new Name();
-    if (!special_variable_functions.testFred(name).equals("none"))
-      throw new RuntimeException("test failed");
-    if (!special_variable_functions.testJack(name).equals("$specialname"))
-      throw new RuntimeException("test failed");
-    if (!special_variable_functions.testJill(name).equals("jilly"))
-      throw new RuntimeException("test failed");
-    if (!special_variable_functions.testMary(name).equals("SWIGTYPE_p_NameWrap"))
-      throw new RuntimeException("test failed");
-    NewName newName = NewName.factory("factoryname");
-    name = newName.getStoredName();
-  }
-}

Copied: trunk/Examples/test-suite/java/special_variable_macros_runme.java (from rev 11470, trunk/Examples/test-suite/java/special_variable_functions_runme.java)
===================================================================
--- trunk/Examples/test-suite/java/special_variable_macros_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/special_variable_macros_runme.java	2009-07-30 06:15:50 UTC (rev 11475)
@@ -0,0 +1,28 @@
+
+import special_variable_macros.*;
+
+public class special_variable_macros_runme {
+
+  static {
+    try {
+	System.loadLibrary("special_variable_macros");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Name name = new Name();
+    if (!special_variable_macros.testFred(name).equals("none"))
+      throw new RuntimeException("test failed");
+    if (!special_variable_macros.testJack(name).equals("$specialname"))
+      throw new RuntimeException("test failed");
+    if (!special_variable_macros.testJill(name).equals("jilly"))
+      throw new RuntimeException("test failed");
+    if (!special_variable_macros.testMary(name).equals("SWIGTYPE_p_NameWrap"))
+      throw new RuntimeException("test failed");
+    NewName newName = NewName.factory("factoryname");
+    name = newName.getStoredName();
+  }
+}


Property changes on: trunk/Examples/test-suite/java/special_variable_macros_runme.java
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/Examples/test-suite/python/special_variable_functions_runme.py
===================================================================
--- trunk/Examples/test-suite/python/special_variable_functions_runme.py	2009-07-30 06:08:36 UTC (rev 11474)
+++ trunk/Examples/test-suite/python/special_variable_functions_runme.py	2009-07-30 06:15:50 UTC (rev 11475)
@@ -1,12 +0,0 @@
-import special_variable_functions
-
-name = special_variable_functions.Name()
-if special_variable_functions.testFred(name) != "none":
-  raise "test failed"
-if special_variable_functions.testJack(name) != "$specialname":
-  raise "test failed"
-if special_variable_functions.testJill(name) != "jilly":
-  raise "test failed"
-if special_variable_functions.testMary(name) != "SWIGTYPE_p_NameWrap":
-  raise "test failed"
-

Copied: trunk/Examples/test-suite/python/special_variable_macros_runme.py (from rev 11470, trunk/Examples/test-suite/python/special_variable_functions_runme.py)
===================================================================
--- trunk/Examples/test-suite/python/special_variable_macros_runme.py	                        (rev 0)
+++ trunk/Examples/test-suite/python/special_variable_macros_runme.py	2009-07-30 06:15:50 UTC (rev 11475)
@@ -0,0 +1,12 @@
+import special_variable_macros
+
+name = special_variable_macros.Name()
+if special_variable_macros.testFred(name) != "none":
+  raise "test failed"
+if special_variable_macros.testJack(name) != "$specialname":
+  raise "test failed"
+if special_variable_macros.testJill(name) != "jilly":
+  raise "test failed"
+if special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap":
+  raise "test failed"
+


Property changes on: trunk/Examples/test-suite/python/special_variable_macros_runme.py
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/Examples/test-suite/special_variable_functions.i
===================================================================
--- trunk/Examples/test-suite/special_variable_functions.i	2009-07-30 06:08:36 UTC (rev 11474)
+++ trunk/Examples/test-suite/special_variable_functions.i	2009-07-30 06:15:50 UTC (rev 11475)
@@ -1,121 +0,0 @@
-%module special_variable_functions
-
-// test $typemap() special variable function
-// these tests are not typical of how $typemap() should be used, but it checks that it is mostly working
-
-%inline %{
-struct Name {
-  Name(const char *n="none") : name(n) {}
-  const char *getName() const { return name; };
-  Name *getNamePtr() { return this; };
-private:
-  const char *name;
-};
-struct NameWrap {
-  NameWrap(const char *n="casternone") : name(n) {}
-  Name *getNamePtr() { return &name; };
-private:
-  Name name;
-};
-%}
-
-// check $1 and $input get expanded properly when used from $typemap()
-%typemap(in) Name *GENERIC ($*1_type temp)
-%{
-  /*%typemap(in) Name *GENERIC start */
-  temp = Name("$specialname");
-  (void)$input;
-  $1 = ($1_ltype) &temp;
-  /*%typemap(in) Name *GENERIC end */
-%}
-
-// This would never be done in real code, it is just a test of what madness can be done.
-// Note that the special variable substitutions $*1_type, $descriptor etc are for NameWrap 
-// even when used within the Name typemap via $typemap. I can't think of any useful use cases
-// for this behaviour in the C/C++ typemaps, but it is possible.
-%typemap(in) NameWrap *NAMEWRAP ($*1_type temp)
-%{
-  /*%typemap(in) NameWrap *NAMEWRAP start */
-  temp = $*1_ltype("$descriptor");
-  (void)$input;
-  $1 = temp.getNamePtr();
-  /*%typemap(in) NameWrap *NAMEWRAP end */
-%}
-
-
-//////////////////////////////////////////////////////////////////////////////////////
-
-// This should use Name *GENERIC typemap which ignores passed in Name * and instead uses a newly a newly constructed Name
-// held in a typemap variable with name="$specialname"
-%typemap(in) Name *jack {
-// %typemap(in) Name *jack start
-$typemap(in, Name *GENERIC)
-// %typemap(in) Name *jack end
-}
-
-// as above, but also perform variable substitution
-%typemap(in) Name *jill {
-// %typemap(in) Name *jill start
-$typemap(in, Name *GENERIC, specialname=jilly)
-// %typemap(in) Name *jill end
-}
-
-%typemap(in) Name *mary {
-// %typemap(in) Name *mary start
-$typemap(in, NameWrap *NAMEWRAP)
-// %typemap(in) Name *mary end
-}
-
-%inline %{
-const char * testFred(Name *fred) {
-  return fred->getName();
-}
-const char * testJack(Name *jack) {
-  return jack->getName();
-}
-const char * testJill(Name *jill) {
-  return jill->getName();
-}
-const char * testMary(Name *mary) {
-  return mary->getName();
-}
-%}
-
-//////////////////////////////////////////////////////////////////////////////////////
-// Multi-arg typemap lookup
-#warning TODO!!!
-
-
-//////////////////////////////////////////////////////////////////////////////////////
-// A real use case for $typemap
-
-#if defined(SWIGCSHARP)
-%typemap(cscode) Space::RenameMe %{
-  public static NewName factory(String s) {
-  //below should expand to:
-  //return new NewName( new Name(s) );
-    return new $typemap(cstype, Space::RenameMe)( new $typemap(cstype, Name)(s) ); 
-  }
-%}
-#elif defined(SWIGJAVA)
-%typemap(javacode) Space::RenameMe %{
-  public static NewName factory(String s) {
-  //below should expand to:
-  //return new NewName( new Name(s) );
-    return new $typemap(jstype, Space::RenameMe)( new $typemap(jstype, Name)(s) ); 
-  }
-%}
-#endif
-
-%rename(NewName) Space::RenameMe;
-%inline %{
-namespace Space {
-  struct RenameMe {
-    RenameMe(Name n) : storedName(n) {}
-    Name getStoredName() { return storedName; }
-  private:
-    Name storedName;
-  };
-}
-%}
-

Copied: trunk/Examples/test-suite/special_variable_macros.i (from rev 11470, trunk/Examples/test-suite/special_variable_functions.i)
===================================================================
--- trunk/Examples/test-suite/special_variable_macros.i	                        (rev 0)
+++ trunk/Examples/test-suite/special_variable_macros.i	2009-07-30 06:15:50 UTC (rev 11475)
@@ -0,0 +1,121 @@
+%module special_variable_macros
+
+// test $typemap() special variable function
+// these tests are not typical of how $typemap() should be used, but it checks that it is mostly working
+
+%inline %{
+struct Name {
+  Name(const char *n="none") : name(n) {}
+  const char *getName() const { return name; };
+  Name *getNamePtr() { return this; };
+private:
+  const char *name;
+};
+struct NameWrap {
+  NameWrap(const char *n="casternone") : name(n) {}
+  Name *getNamePtr() { return &name; };
+private:
+  Name name;
+};
+%}
+
+// check $1 and $input get expanded properly when used from $typemap()
+%typemap(in) Name *GENERIC ($*1_type temp)
+%{
+  /*%typemap(in) Name *GENERIC start */
+  temp = Name("$specialname");
+  (void)$input;
+  $1 = ($1_ltype) &temp;
+  /*%typemap(in) Name *GENERIC end */
+%}
+
+// This would never be done in real code, it is just a test of what madness can be done.
+// Note that the special variable substitutions $*1_type, $descriptor etc are for NameWrap 
+// even when used within the Name typemap via $typemap. I can't think of any useful use cases
+// for this behaviour in the C/C++ typemaps, but it is possible.
+%typemap(in) NameWrap *NAMEWRAP ($*1_type temp)
+%{
+  /*%typemap(in) NameWrap *NAMEWRAP start */
+  temp = $*1_ltype("$descriptor");
+  (void)$input;
+  $1 = temp.getNamePtr();
+  /*%typemap(in) NameWrap *NAMEWRAP end */
+%}
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+
+// This should use Name *GENERIC typemap which ignores passed in Name * and instead uses a newly a newly constructed Name
+// held in a typemap variable with name="$specialname"
+%typemap(in) Name *jack {
+// %typemap(in) Name *jack start
+$typemap(in, Name *GENERIC)
+// %typemap(in) Name *jack end
+}
+
+// as above, but also perform variable substitution
+%typemap(in) Name *jill {
+// %typemap(in) Name *jill start
+$typemap(in, Name *GENERIC, specialname=jilly)
+// %typemap(in) Name *jill end
+}
+
+%typemap(in) Name *mary {
+// %typemap(in) Name *mary start
+$typemap(in, NameWrap *NAMEWRAP)
+// %typemap(in) Name *mary end
+}
+
+%inline %{
+const char * testFred(Name *fred) {
+  return fred->getName();
+}
+const char * testJack(Name *jack) {
+  return jack->getName();
+}
+const char * testJill(Name *jill) {
+  return jill->getName();
+}
+const char * testMary(Name *mary) {
+  return mary->getName();
+}
+%}
+
+//////////////////////////////////////////////////////////////////////////////////////
+// Multi-arg typemap lookup
+#warning TODO!!!
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+// A real use case for $typemap
+
+#if defined(SWIGCSHARP)
+%typemap(cscode) Space::RenameMe %{
+  public static NewName factory(String s) {
+  //below should expand to:
+  //return new NewName( new Name(s) );
+    return new $typemap(cstype, Space::RenameMe)( new $typemap(cstype, Name)(s) ); 
+  }
+%}
+#elif defined(SWIGJAVA)
+%typemap(javacode) Space::RenameMe %{
+  public static NewName factory(String s) {
+  //below should expand to:
+  //return new NewName( new Name(s) );
+    return new $typemap(jstype, Space::RenameMe)( new $typemap(jstype, Name)(s) ); 
+  }
+%}
+#endif
+
+%rename(NewName) Space::RenameMe;
+%inline %{
+namespace Space {
+  struct RenameMe {
+    RenameMe(Name n) : storedName(n) {}
+    Name getStoredName() { return storedName; }
+  private:
+    Name storedName;
+  };
+}
+%}
+


Property changes on: trunk/Examples/test-suite/special_variable_macros.i
___________________________________________________________________
Added: svn:mergeinfo
   + 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11495
          http://swig.svn.sourceforge.net/swig/?rev=11495&view=rev
Author:   vmiklos
Date:     2009-08-04 09:32:12 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
PHP: fix for the wrapmacro testcase

'max' is a built-in function in PHP, so let's rename it to 'maximum'
instead.

Modified Paths:
--------------
    trunk/Examples/test-suite/octave/wrapmacro_runme.m
    trunk/Examples/test-suite/perl5/wrapmacro_runme.pl
    trunk/Examples/test-suite/python/wrapmacro_runme.py
    trunk/Examples/test-suite/wrapmacro.i

Modified: trunk/Examples/test-suite/octave/wrapmacro_runme.m
===================================================================
--- trunk/Examples/test-suite/octave/wrapmacro_runme.m	2009-08-04 00:51:21 UTC (rev 11494)
+++ trunk/Examples/test-suite/octave/wrapmacro_runme.m	2009-08-04 09:32:12 UTC (rev 11495)
@@ -2,7 +2,7 @@
 
 a = 2;
 b = -1;
-wrapmacro.max(a,b);
-wrapmacro.max(a/7.0, -b*256);
+wrapmacro.maximum(a,b);
+wrapmacro.maximum(a/7.0, -b*256);
 wrapmacro.GUINT16_SWAP_LE_BE_CONSTANT(1);
 

Modified: trunk/Examples/test-suite/perl5/wrapmacro_runme.pl
===================================================================
--- trunk/Examples/test-suite/perl5/wrapmacro_runme.pl	2009-08-04 00:51:21 UTC (rev 11494)
+++ trunk/Examples/test-suite/perl5/wrapmacro_runme.pl	2009-08-04 09:32:12 UTC (rev 11495)
@@ -9,6 +9,6 @@
 
 my $a = 2;
 my $b = -1;
-is(wrapmacro::max($a,$b), 2);
-is(wrapmacro::max($a/7.0, -$b*256), 256);
+is(wrapmacro::maximum($a,$b), 2);
+is(wrapmacro::maximum($a/7.0, -$b*256), 256);
 is(wrapmacro::GUINT16_SWAP_LE_BE_CONSTANT(1), 256);

Modified: trunk/Examples/test-suite/python/wrapmacro_runme.py
===================================================================
--- trunk/Examples/test-suite/python/wrapmacro_runme.py	2009-08-04 00:51:21 UTC (rev 11494)
+++ trunk/Examples/test-suite/python/wrapmacro_runme.py	2009-08-04 09:32:12 UTC (rev 11495)
@@ -2,6 +2,6 @@
 
 a = 2
 b = -1
-wrapmacro.max(a,b)
-wrapmacro.max(a/7.0, -b*256)
+wrapmacro.maximum(a,b)
+wrapmacro.maximum(a/7.0, -b*256)
 wrapmacro.GUINT16_SWAP_LE_BE_CONSTANT(1)

Modified: trunk/Examples/test-suite/wrapmacro.i
===================================================================
--- trunk/Examples/test-suite/wrapmacro.i	2009-08-04 00:51:21 UTC (rev 11494)
+++ trunk/Examples/test-suite/wrapmacro.i	2009-08-04 09:32:12 UTC (rev 11495)
@@ -21,7 +21,8 @@
     (guint16) ((guint16) (val) >> 8) |  \
     (guint16) ((guint16) (val) << 8)))
 
-#define max(a,b) ((a) > (b) ? (a) : (b))
+/* Don't use max(), it's a builtin function for PHP. */
+#define maximum(a,b) ((a) > (b) ? (a) : (b))
   
 %}
 
@@ -41,8 +42,8 @@
 
 /* Here, wrapping the macros */
 %wrapmacro(guint16, GUINT16_SWAP_LE_BE_CONSTANT, guint16 val, val);
-%wrapmacro(size_t, max, PLIST(size_t a, const size_t& b), PLIST(a, b));
-%wrapmacro(double, max, PLIST(double a, double b), PLIST(a, b));
+%wrapmacro(size_t, maximum, PLIST(size_t a, const size_t& b), PLIST(a, b));
+%wrapmacro(double, maximum, PLIST(double a, double b), PLIST(a, b));
 
 
 /* Maybe in the future, a swig directive will make this easier:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11509
          http://swig.svn.sourceforge.net/swig/?rev=11509&view=rev
Author:   wsfulton
Date:     2009-08-05 22:19:04 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
add a new testcase testing combinations of STL types... just vector and pair at the moment

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/li_std_combinations.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-08-05 22:17:06 UTC (rev 11508)
+++ trunk/Examples/test-suite/common.mk	2009-08-05 22:19:04 UTC (rev 11509)
@@ -405,6 +405,7 @@
 CPP_STD_TEST_CASES += \
 	director_string \
 	ignore_template_constructor \
+	li_std_combinations \
 	li_std_deque \
 	li_std_except \
         li_std_pair \

Added: trunk/Examples/test-suite/li_std_combinations.i
===================================================================
--- trunk/Examples/test-suite/li_std_combinations.i	                        (rev 0)
+++ trunk/Examples/test-suite/li_std_combinations.i	2009-08-05 22:19:04 UTC (rev 11509)
@@ -0,0 +1,15 @@
+%module li_std_combinations
+
+%include <std_vector.i>
+%include <std_string.i>
+%include <std_pair.i>
+
+%template(VectorInt) std::vector<int>;
+%template(VectorString) std::vector<std::string>;
+%template(PairIntString) std::pair<int, std::string>;
+
+%template(VectorPairIntString) std::vector< std::pair<int, std::string> >;
+%template(PairIntVectorString) std::pair< int, std::vector<std::string> >;
+
+%template(VectorVectorString) std::vector< std::vector<std::string> >;
+%template(PairIntPairIntString) std::pair< int, std::pair<int, std::string> >;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11545
          http://swig.svn.sourceforge.net/swig/?rev=11545&view=rev
Author:   olly
Date:     2009-08-13 03:58:09 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Change class names in test code which clash with PHP reserved words
(Interface, Class, and Function - these are case insensitive reserved
words in PHP).

Fix lists of expected methods in rename_scope_runme.php to match those
which we expect with PHP5.  With this and the change above, this testcase
now passes.

Modified Paths:
--------------
    trunk/Examples/test-suite/php/rename_scope_runme.php
    trunk/Examples/test-suite/rename_scope.i
    trunk/Examples/test-suite/template_default_qualify.i
    trunk/Examples/test-suite/template_enum_ns_inherit.i
    trunk/Examples/test-suite/template_enum_typedef.i
    trunk/Examples/test-suite/template_ns4.i
    trunk/Examples/test-suite/valuewrapper_base.i

Modified: trunk/Examples/test-suite/php/rename_scope_runme.php
===================================================================
--- trunk/Examples/test-suite/php/rename_scope_runme.php	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/php/rename_scope_runme.php	2009-08-13 03:58:09 UTC (rev 11545)
@@ -6,10 +6,10 @@
 
 check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
 
-check::classmethods("Interface_UP",array("__construct"));
-check::classmethods("Interface_BP",array("__construct"));
-check::classmethods("Natural_UP",array("__construct","rtest"));
-check::classmethods("Natural_BP",array("__construct","rtest"));
+check::classmethods("Interface_UP",array("__construct","__set","__isset","__get"));
+check::classmethods("Interface_BP",array("__construct","__set","__isset","__get"));
+check::classmethods("Natural_UP",array("__construct","__set","__isset","__get","rtest"));
+check::classmethods("Natural_BP",array("__construct","__set","__isset","__get","rtest"));
 check::classparent("Natural_UP","Interface_UP");
 check::classparent("Natural_BP","Interface_BP");
 

Modified: trunk/Examples/test-suite/rename_scope.i
===================================================================
--- trunk/Examples/test-suite/rename_scope.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/rename_scope.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -7,7 +7,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization }; 
  
     template <Polarization P> 
-    struct Interface 
+    struct Interface_
     { 
     };    
   } 
@@ -15,9 +15,9 @@
  
 namespace oss 
 { 
-  // Interface 
-  %template(Interface_UP) Interface<UnaryPolarization>; 
-  %template(Interface_BP) Interface<BinaryPolarization>; 
+  // Interface_ 
+  %template(Interface_UP) Interface_<UnaryPolarization>; 
+  %template(Interface_BP) Interface_<BinaryPolarization>; 
  
 } 
 %inline 
@@ -27,7 +27,7 @@
     namespace interfaces 
     { 
       template <Polarization P> 
-      struct Natural : Interface<P> 
+      struct Natural : Interface_<P> 
       { 
            int test(void) { return 1; }
       };      

Modified: trunk/Examples/test-suite/template_default_qualify.i
===================================================================
--- trunk/Examples/test-suite/template_default_qualify.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/template_default_qualify.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -12,14 +12,14 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
 
     namespace modules
     {
  
-      template <class traits, class base = Interface<traits::pmode> >
+      template <class traits, class base = Interface_<traits::pmode> >
  // *** problem here ****
       struct Module : base
       {
@@ -35,7 +35,7 @@
  
 namespace oss
 {	
-  %template(Interface_UP) Interface<UnaryPolarization>;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
   namespace modules
   {
     %template(Module_etraits) Module<etraits>;

Modified: trunk/Examples/test-suite/template_enum_ns_inherit.i
===================================================================
--- trunk/Examples/test-suite/template_enum_ns_inherit.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/template_enum_ns_inherit.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -6,7 +6,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
 
@@ -21,8 +21,8 @@
  
 namespace oss
 {
-  %template(Interface_UP) Interface<UnaryPolarization>;
-  %template(Module_UPIUP) Module<UnaryPolarization,Interface<UnaryPolarization> >;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
+  %template(Module_UPIUP) Module<UnaryPolarization,Interface_<UnaryPolarization> >;
 }
  
 %inline %{
@@ -31,18 +31,18 @@
     namespace hello
     {
       struct HInterface1 :
-           Interface<oss::UnaryPolarization>  // this works (with fullns qualification)
+           Interface_<oss::UnaryPolarization>  // this works (with fullns qualification)
       {
       };
  
       struct HInterface2 :
-          Interface<UnaryPolarization>       // this doesn't work
+          Interface_<UnaryPolarization>       // this doesn't work
       {
       };
  
-     struct HModule1 : Module<UnaryPolarization, Interface<UnaryPolarization> > {
+     struct HModule1 : Module<UnaryPolarization, Interface_<UnaryPolarization> > {
  };
 
     }
   }
-%}                                   
\ No newline at end of file
+%}                                   

Modified: trunk/Examples/test-suite/template_enum_typedef.i
===================================================================
--- trunk/Examples/test-suite/template_enum_typedef.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/template_enum_typedef.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -9,7 +9,7 @@
     enum Polarization { UnaryPolarization, BinaryPolarization };
  
     template <Polarization P>
-    struct Interface
+    struct Interface_
     {
     };
  
@@ -25,7 +25,7 @@
       typedef Traits traits;
       static const Polarization P = traits::pmode;
  
-      void get(Interface<P> arg) { };   // Here P is only replace by traits::pmode
+      void get(Interface_<P> arg) { };   // Here P is only replace by traits::pmode
  
     };
   }
@@ -34,6 +34,6 @@
  
 namespace oss
 {
-  %template(Interface_UP) Interface<UnaryPolarization>;
+  %template(Interface_UP) Interface_<UnaryPolarization>;
   %template(Module_UP) Module<etraits>;
 }                                                                 

Modified: trunk/Examples/test-suite/template_ns4.i
===================================================================
--- trunk/Examples/test-suite/template_ns4.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/template_ns4.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -8,13 +8,13 @@
     };
    
     template <class ArgType, class ResType>
-    struct Function
+    struct Function_
     {     
 	char *test() { return (char *) "test"; }
     };
    
     template <class AF, class RF>
-    struct ArithFunction : Function<AF, RF>
+    struct ArithFunction : Function_<AF, RF>
     {
     };
    
@@ -40,7 +40,7 @@
     };   
 
     template <class AF, class RF>
-    class Class : public ArithFunction< typename traits<AF, RF>::arg_type,
+    class Class_ : public ArithFunction< typename traits<AF, RF>::arg_type,
                     typename traits<AF, RF>::res_type >
     {
     };
@@ -49,7 +49,7 @@
     typename traits<AF, RF>::base
     make_Class()
     {
-      return Class<AF, RF>();
+      return Class_<AF, RF>();
     }
 
 
@@ -58,9 +58,9 @@
 
 %{  
   namespace hello {
-    template struct Function <Double, Double>;
+    template struct Function_ <Double, Double>;
     template struct ArithFunction <Double, Double>;
-    template class Class <Double, Double>;   
+    template class Class_ <Double, Double>;   
   }  
 %}
 
@@ -69,9 +69,9 @@
   // This complains only when using a namespace
   //
   %template() traits<Double,Double>;
-  %template(Function_DD) Function <Double, Double>;
+  %template(Function_DD) Function_ <Double, Double>;
   %template(ArithFunction_DD) ArithFunction <Double, Double>;
-  %template(Class_DD) Class <Double, Double>;
+  %template(Class_DD) Class_ <Double, Double>;
   %template(make_Class_DD) make_Class <Double, Double>;
  }
 

Modified: trunk/Examples/test-suite/valuewrapper_base.i
===================================================================
--- trunk/Examples/test-suite/valuewrapper_base.i	2009-08-13 03:35:48 UTC (rev 11544)
+++ trunk/Examples/test-suite/valuewrapper_base.i	2009-08-13 03:58:09 UTC (rev 11545)
@@ -10,9 +10,9 @@
     };    
  
     template <Polarization P> 
-    struct Interface : Base 
+    struct Interface_ : Base 
     { 
-      Interface(const Base& b) { }; 
+      Interface_(const Base& b) { }; 
     }; 
     
     template <class Result> 
@@ -23,6 +23,6 @@
 namespace oss 
 { 
   // Interface 
-  %template(Interface_BP) Interface<BinaryPolarization>; 
-  %template(make_Interface_BP) make<Interface<BinaryPolarization> >; 
+  %template(Interface_BP) Interface_<BinaryPolarization>; 
+  %template(make_Interface_BP) make<Interface_<BinaryPolarization> >; 
 } 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11553
          http://swig.svn.sourceforge.net/swig/?rev=11553&view=rev
Author:   wsfulton
Date:     2009-08-13 23:37:05 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Add non-const char *& runtime tests

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/char_strings_runme.cs
    trunk/Examples/test-suite/java/char_strings_runme.java

Modified: trunk/Examples/test-suite/csharp/char_strings_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/char_strings_runme.cs	2009-08-13 23:31:19 UTC (rev 11552)
+++ trunk/Examples/test-suite/csharp/char_strings_runme.cs	2009-08-13 23:37:05 UTC (rev 11553)
@@ -120,15 +120,26 @@
 
     // char *& tests
     for (i=0; i<count; i++) {
-      String str = char_strings.GetConstCharPointerRef();
+      String str = char_strings.GetCharPointerRef();
       if (str != CPLUSPLUS_MSG)
         throw new Exception("Test char pointer ref get failed, iteration " + i);
     }
 
     for (i=0; i<count; i++) {
-      if (!char_strings.SetConstCharPointerRef(OTHERLAND_MSG + i, i))
+      if (!char_strings.SetCharPointerRef(OTHERLAND_MSG + i, i))
         throw new Exception("Test char pointer ref set failed, iteration " + i);
     }
+
+    for (i=0; i<count; i++) {
+      String str = char_strings.GetConstCharPointerRef();
+      if (str != CPLUSPLUS_MSG)
+        throw new Exception("Test const char pointer ref get failed, iteration " + i);
+    }
+
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetConstCharPointerRef(OTHERLAND_MSG + i, i))
+        throw new Exception("Test const char pointer ref set failed, iteration " + i);
+    }
   }
 }
 

Modified: trunk/Examples/test-suite/java/char_strings_runme.java
===================================================================
--- trunk/Examples/test-suite/java/char_strings_runme.java	2009-08-13 23:31:19 UTC (rev 11552)
+++ trunk/Examples/test-suite/java/char_strings_runme.java	2009-08-13 23:37:05 UTC (rev 11553)
@@ -127,15 +127,26 @@
 
     // char *& tests
     for (i=0; i<count; i++) {
-      String str = char_strings.GetConstCharPointerRef();
+      String str = char_strings.GetCharPointerRef();
       if (!str.equals(CPLUSPLUS_MSG))
         throw new RuntimeException("Test char pointer ref get failed, iteration " + i);
     }
 
     for (i=0; i<count; i++) {
-      if (!char_strings.SetConstCharPointerRef(OTHERLAND_MSG + i, i))
+      if (!char_strings.SetCharPointerRef(OTHERLAND_MSG + i, i))
         throw new RuntimeException("Test char pointer ref set failed, iteration " + i);
     }
+
+    for (i=0; i<count; i++) {
+      String str = char_strings.GetConstCharPointerRef();
+      if (!str.equals(CPLUSPLUS_MSG))
+        throw new RuntimeException("Test const char pointer ref get failed, iteration " + i);
+    }
+
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetConstCharPointerRef(OTHERLAND_MSG + i, i))
+        throw new RuntimeException("Test const char pointer ref set failed, iteration " + i);
+    }
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11557
          http://swig.svn.sourceforge.net/swig/?rev=11557&view=rev
Author:   olly
Date:     2009-08-14 01:33:23 +0000 (Fri, 14 Aug 2009)

Log Message:
-----------
Rename max() to maximum() as max() is a built-in function in PHP.
Testcases overload_template and overload_template_fast now pass for PHP.

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/overload_template_runme.cs
    trunk/Examples/test-suite/java/overload_template_runme.java
    trunk/Examples/test-suite/lua/overload_template_runme.lua
    trunk/Examples/test-suite/octave/overload_template_runme.m
    trunk/Examples/test-suite/overload_template.i
    trunk/Examples/test-suite/python/overload_template_runme.py
    trunk/Examples/test-suite/ruby/overload_template_runme.rb

Modified: trunk/Examples/test-suite/csharp/overload_template_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/overload_template_runme.cs	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/csharp/overload_template_runme.cs	2009-08-14 01:33:23 UTC (rev 11557)
@@ -7,8 +7,8 @@
     {
       int f = overload_template.foo();
 
-      f += overload_template.max(3,4);
-      double b = overload_template.max(3.4,5.2);
+      f += overload_template.maximum(3,4);
+      double b = overload_template.maximum(3.4,5.2);
       b++; // warning suppression
 
       // mix 1

Modified: trunk/Examples/test-suite/java/overload_template_runme.java
===================================================================
--- trunk/Examples/test-suite/java/overload_template_runme.java	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/java/overload_template_runme.java	2009-08-14 01:33:23 UTC (rev 11557)
@@ -16,8 +16,8 @@
   public static void main(String argv[]) {
     int f = overload_template.foo();
 
-    int a = overload_template.max(3,4);
-    double b = overload_template.max(3.4,5.2);
+    int a = overload_template.maximum(3,4);
+    double b = overload_template.maximum(3.4,5.2);
 
     // mix 1
     if (overload_template.mix1("hi") != 101)

Modified: trunk/Examples/test-suite/lua/overload_template_runme.lua
===================================================================
--- trunk/Examples/test-suite/lua/overload_template_runme.lua	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/lua/overload_template_runme.lua	2009-08-14 01:33:23 UTC (rev 11557)
@@ -2,12 +2,12 @@
 import("overload_template")	-- import code
 for k,v in pairs(overload_template) do _G[k]=v end -- move to global
 
--- lua has only one numeric type, so max(int,int) and max(double,double) are the same
+-- lua has only one numeric type, so maximum(int,int) and maximum(double,double) are the same
 -- whichever one was wrapper first will be used (which is int)
 
 f = foo()
 
-a = max(3,4)
+a = maximum(3,4)
 
 -- mix 1
 assert(mix1("hi") == 101)

Modified: trunk/Examples/test-suite/octave/overload_template_runme.m
===================================================================
--- trunk/Examples/test-suite/octave/overload_template_runme.m	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/octave/overload_template_runme.m	2009-08-14 01:33:23 UTC (rev 11557)
@@ -1,8 +1,8 @@
 overload_template
 f = foo();
 
-a = max(3,4);
-b = max(3.4,5.2);
+a = maximum(3,4);
+b = maximum(3.4,5.2);
 
 # mix 1
 if (mix1("hi") != 101)

Modified: trunk/Examples/test-suite/overload_template.i
===================================================================
--- trunk/Examples/test-suite/overload_template.i	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/overload_template.i	2009-08-14 01:33:23 UTC (rev 11557)
@@ -3,7 +3,7 @@
 #ifdef SWIGLUA
 // lua only has one numeric type, so most of the overloads shadow each other creating warnings
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) foo;
-%warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) max;
+%warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) maximum;
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) specialization;
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) overload;
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) space::nsoverload;
@@ -11,12 +11,6 @@
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) barT;
 #endif
 
-%{
-#ifdef max
-#undef max
-#endif
-%}
-
 %inline %{
 
 int foo() {
@@ -29,15 +23,15 @@
   }
 
 template<class T>
-  T max(T a, T b) { return  (a > b) ? a : b; }
+  T maximum(T a, T b) { return  (a > b) ? a : b; }
 %}                                     
 
 
 %template(foo) foo<int>;
 %template(foo) foo<double>;
 
-%template(max) max<int>;
-%template(max) max<double>;
+%template(maximum) maximum<int>;
+%template(maximum) maximum<double>;
 
 // Mix template overloading with plain function overload
 // Mix 1

Modified: trunk/Examples/test-suite/python/overload_template_runme.py
===================================================================
--- trunk/Examples/test-suite/python/overload_template_runme.py	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/python/overload_template_runme.py	2009-08-14 01:33:23 UTC (rev 11557)
@@ -1,8 +1,8 @@
 from overload_template import *
 f = foo()
 
-a = max(3,4)
-b = max(3.4,5.2)
+a = maximum(3,4)
+b = maximum(3.4,5.2)
 
 # mix 1
 if (mix1("hi") != 101):

Modified: trunk/Examples/test-suite/ruby/overload_template_runme.rb
===================================================================
--- trunk/Examples/test-suite/ruby/overload_template_runme.rb	2009-08-14 01:14:49 UTC (rev 11556)
+++ trunk/Examples/test-suite/ruby/overload_template_runme.rb	2009-08-14 01:33:23 UTC (rev 11557)
@@ -13,5 +13,5 @@
 
 f = Overload_template.foo()
 
-a = Overload_template.max(3,4)
-b = Overload_template.max(3.4,5.2)
+a = Overload_template.maximum(3,4)
+b = Overload_template.maximum(3.4,5.2)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11628
          http://swig.svn.sourceforge.net/swig/?rev=11628&view=rev
Author:   wsfulton
Date:     2009-08-17 23:07:16 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
Fix for r11557 rename of max to maximum

Modified Paths:
--------------
    trunk/Examples/test-suite/lua/overload_template_fast_runme.lua
    trunk/Examples/test-suite/octave/overload_template_fast_runme.m
    trunk/Examples/test-suite/python/overload_template_fast_runme.py

Modified: trunk/Examples/test-suite/lua/overload_template_fast_runme.lua
===================================================================
--- trunk/Examples/test-suite/lua/overload_template_fast_runme.lua	2009-08-17 16:29:31 UTC (rev 11627)
+++ trunk/Examples/test-suite/lua/overload_template_fast_runme.lua	2009-08-17 23:07:16 UTC (rev 11628)
@@ -2,12 +2,12 @@
 import("overload_template_fast")	-- import code
 for k,v in pairs(overload_template_fast) do _G[k]=v end -- move to global
 
--- lua has only one numeric type, so max(int,int) and max(double,double) are the same
+-- lua has only one numeric type, so maximum(int,int) and maximum(double,double) are the same
 -- whichever one was wrapper first will be used (which is int)
 
 f = foo()
 
-a = max(3,4)
+a = maximum(3,4)
 
 -- mix 1
 assert(mix1("hi") == 101)

Modified: trunk/Examples/test-suite/octave/overload_template_fast_runme.m
===================================================================
--- trunk/Examples/test-suite/octave/overload_template_fast_runme.m	2009-08-17 16:29:31 UTC (rev 11627)
+++ trunk/Examples/test-suite/octave/overload_template_fast_runme.m	2009-08-17 23:07:16 UTC (rev 11628)
@@ -5,8 +5,8 @@
 
 f = foo();
 
-a = max(3,4);
-b = max(3.4,5.2);
+a = maximum(3,4);
+b = maximum(3.4,5.2);
 
 # mix 1
 if (mix1("hi") != 101)

Modified: trunk/Examples/test-suite/python/overload_template_fast_runme.py
===================================================================
--- trunk/Examples/test-suite/python/overload_template_fast_runme.py	2009-08-17 16:29:31 UTC (rev 11627)
+++ trunk/Examples/test-suite/python/overload_template_fast_runme.py	2009-08-17 23:07:16 UTC (rev 11628)
@@ -1,8 +1,8 @@
 from overload_template_fast import *
 f = foo()
 
-a = max(3,4)
-b = max(3.4,5.2)
+a = maximum(3,4)
+b = maximum(3.4,5.2)
 
 # mix 1
 if (mix1("hi") != 101):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11658
          http://swig.svn.sourceforge.net/swig/?rev=11658&view=rev
Author:   wsfulton
Date:     2009-08-20 23:21:07 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Test std::map in all languages

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/octave/Makefile.in
    trunk/Examples/test-suite/python/Makefile.in
    trunk/Examples/test-suite/ruby/Makefile.in

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-08-20 22:53:17 UTC (rev 11657)
+++ trunk/Examples/test-suite/common.mk	2009-08-20 23:21:07 UTC (rev 11658)
@@ -409,6 +409,7 @@
 	li_std_combinations \
 	li_std_deque \
 	li_std_except \
+	li_std_map \
         li_std_pair \
 	li_std_string \
 	li_std_vector \

Modified: trunk/Examples/test-suite/octave/Makefile.in
===================================================================
--- trunk/Examples/test-suite/octave/Makefile.in	2009-08-20 22:53:17 UTC (rev 11657)
+++ trunk/Examples/test-suite/octave/Makefile.in	2009-08-20 23:21:07 UTC (rev 11658)
@@ -17,7 +17,6 @@
 CPP_TEST_BROKEN += \
 	implicittest \
 	li_implicit \
-	li_std_map \
 	li_std_set \
 	li_std_stream
 

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2009-08-20 22:53:17 UTC (rev 11657)
+++ trunk/Examples/test-suite/python/Makefile.in	2009-08-20 23:21:07 UTC (rev 11658)
@@ -49,7 +49,6 @@
 	li_implicit \
 	li_std_vectora \
 	li_std_vector_extra \
-	li_std_map \
 	li_std_multimap \
 	li_std_pair_extra \
 	li_std_set \

Modified: trunk/Examples/test-suite/ruby/Makefile.in
===================================================================
--- trunk/Examples/test-suite/ruby/Makefile.in	2009-08-20 22:53:17 UTC (rev 11657)
+++ trunk/Examples/test-suite/ruby/Makefile.in	2009-08-20 23:21:07 UTC (rev 11658)
@@ -14,7 +14,6 @@
 	li_cstring \
 	li_factory \
 	li_std_functors \
-	li_std_map \
 	li_std_multimap \
 	li_std_pair_lang_object \
 	li_std_queue \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11676
          http://swig.svn.sourceforge.net/swig/?rev=11676&view=rev
Author:   wsfulton
Date:     2009-09-02 20:49:55 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
fix overloading of jboolean  with other JNI types at the c++ level for some platforms (64bit Linux)

Modified Paths:
--------------
    trunk/Examples/test-suite/java/java_jnitypes_runme.java
    trunk/Examples/test-suite/java_jnitypes.i

Modified: trunk/Examples/test-suite/java/java_jnitypes_runme.java
===================================================================
--- trunk/Examples/test-suite/java/java_jnitypes_runme.java	2009-09-01 17:30:17 UTC (rev 11675)
+++ trunk/Examples/test-suite/java/java_jnitypes_runme.java	2009-09-02 20:49:55 UTC (rev 11676)
@@ -28,7 +28,7 @@
     double doubleArray[] = new double[] {10.0, 20.0};
     Test objectArray[] = new Test[] {new Test(), test};
 
-    if (java_jnitypes.jnifunc(true) != true)                testFailed("jboolean");
+    if (java_jnitypes.jnifunc_bool(true) != true)           testFailed("jboolean");
     if (java_jnitypes.jnifunc('A') != 'A')                  testFailed("jchar");
     if (java_jnitypes.jnifunc((byte)100) != (byte)100)      testFailed("jbyte");
     if (java_jnitypes.jnifunc((short)100) != (short)100)    testFailed("jshort");

Modified: trunk/Examples/test-suite/java_jnitypes.i
===================================================================
--- trunk/Examples/test-suite/java_jnitypes.i	2009-09-01 17:30:17 UTC (rev 11675)
+++ trunk/Examples/test-suite/java_jnitypes.i	2009-09-02 20:49:55 UTC (rev 11676)
@@ -5,7 +5,7 @@
 
 %inline %{
 
-jboolean      jnifunc(jboolean in) { return in; }
+jboolean      jnifunc_bool(jboolean in) { return in; } /* some JVM implementations won't allow overloading of the jboolean type with some of the others on the c++ level */
 jchar         jnifunc(jchar in) { return in; }
 jbyte         jnifunc(jbyte in) { return in; }
 jshort        jnifunc(jshort in) { return in; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11715
          http://swig.svn.sourceforge.net/swig/?rev=11715&view=rev
Author:   wsfulton
Date:     2009-10-24 21:58:06 +0000 (Sat, 24 Oct 2009)

Log Message:
-----------
minor improvement to testcase

Modified Paths:
--------------
    trunk/Examples/test-suite/java/template_nested_typemaps_runme.java
    trunk/Examples/test-suite/template_nested_typemaps.i

Modified: trunk/Examples/test-suite/java/template_nested_typemaps_runme.java
===================================================================
--- trunk/Examples/test-suite/java/template_nested_typemaps_runme.java	2009-10-24 06:27:02 UTC (rev 11714)
+++ trunk/Examples/test-suite/java/template_nested_typemaps_runme.java	2009-10-24 21:58:06 UTC (rev 11715)
@@ -21,6 +21,7 @@
 
       if (template_nested_typemaps.globalInt1(v) != v) throw new RuntimeException("failed");
       if (template_nested_typemaps.globalInt2(v) != v) throw new RuntimeException("failed");
+      if (template_nested_typemaps.globalInt3(v) != vTypemap) throw new RuntimeException("failed");
     }
 
     {
@@ -31,6 +32,7 @@
 
       if (template_nested_typemaps.globalShort1(v) != v) throw new RuntimeException("failed");
       if (template_nested_typemaps.globalShort2(v) != v) throw new RuntimeException("failed");
+      if (template_nested_typemaps.globalShort3(v) != vTypemap) throw new RuntimeException("failed");
     }
   }
 }

Modified: trunk/Examples/test-suite/template_nested_typemaps.i
===================================================================
--- trunk/Examples/test-suite/template_nested_typemaps.i	2009-10-24 06:27:02 UTC (rev 11714)
+++ trunk/Examples/test-suite/template_nested_typemaps.i	2009-10-24 21:58:06 UTC (rev 11715)
@@ -2,12 +2,14 @@
 
 %module template_nested_typemaps
 
+// Testing that the typemaps invoked within a class via %template are picked up by appropriate methods
+
 template <typename T> struct Typemap {
   %typemap(in) T {
     $1 = -99;
   }
 };
-template <> struct Typemap<short> {
+template <> struct Typemap<short> { // Note explicit specialization
   %typemap(in) short {
     $1 = -77;
   }
@@ -22,14 +24,14 @@
 #if defined(SWIG)
   %template() Typemap<int>;
 #endif
-  int methodInt2(int s) { return s; } // only this method should pick up the typemap within Typemap<int>
+  int methodInt2(int s) { return s; } // should pick up the typemap within Typemap<int>
   void takeIt(T t) {}
 
   short methodShort1(short s) { return s; }
 #if defined(SWIG)
   %template(TypemapShort) Typemap<short>; // should issue warning SWIGWARN_PARSE_NESTED_TEMPLATE
 #endif
-  short methodShort2(short s) { return s; } // only this method should pick up the typemap within Typemap<short> - note specialization
+  short methodShort2(short s) { return s; } // should pick up the typemap within Typemap<short>
 };
 
 int globalInt2(int s) { return s; }
@@ -37,3 +39,9 @@
 %}
 
 %template(BreezeString) Breeze<const char *>;
+
+%inline %{
+int globalInt3(int s) { return s; } // should pick up the typemap within Typemap<int>
+short globalShort3(short s) { return s; } // should pick up the typemap within Typemap<short>
+%}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11746
          http://swig.svn.sourceforge.net/swig/?rev=11746&view=rev
Author:   wsfulton
Date:     2009-11-14 23:51:12 +0000 (Sat, 14 Nov 2009)

Log Message:
-----------
namespace_union.i now works given recent nested class improvements. Closes bug #811906

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/namespace_union.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2009-11-14 22:07:51 UTC (rev 11745)
+++ trunk/Examples/test-suite/common.mk	2009-11-14 23:51:12 UTC (rev 11746)
@@ -80,7 +80,6 @@
 	exception_partial_info \
 	extend_variable \
 	li_std_vector_ptr \
-	namespace_union \
 	nested_structs \
 	overload_complicated \
 	template_default_pointer \
@@ -241,6 +240,7 @@
 	namespace_template \
 	namespace_typedef_class \
 	namespace_typemap \
+	namespace_union \
 	namespace_virtual_method \
 	naturalvar \
 	nested_class \

Modified: trunk/Examples/test-suite/namespace_union.i
===================================================================
--- trunk/Examples/test-suite/namespace_union.i	2009-11-14 22:07:51 UTC (rev 11745)
+++ trunk/Examples/test-suite/namespace_union.i	2009-11-14 23:51:12 UTC (rev 11746)
@@ -1,4 +1,7 @@
 %module namespace_union
+
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) SpatialIndex::Variant::val;
+
 %inline %{
 namespace SpatialIndex 
 { 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11860
          http://swig.svn.sourceforge.net/swig/?rev=11860&view=rev
Author:   wsfulton
Date:     2010-02-13 15:37:53 +0000 (Sat, 13 Feb 2010)

Log Message:
-----------
Add in some testcases that should have been checked in a while ago

Added Paths:
-----------
    trunk/Examples/test-suite/global_scope_types.i
    trunk/Examples/test-suite/typemap_template.i

Added: trunk/Examples/test-suite/global_scope_types.i
===================================================================
--- trunk/Examples/test-suite/global_scope_types.i	                        (rev 0)
+++ trunk/Examples/test-suite/global_scope_types.i	2010-02-13 15:37:53 UTC (rev 11860)
@@ -0,0 +1,44 @@
+%module global_scope_types
+
+// no constructor/destructor wrappers as they do not use global scope operator which we are trying to test here
+%nodefaultctor Dingaling;
+%nodefaultdtor Dingaling;
+
+%inline %{
+struct Dingaling {};
+typedef Dingaling DINGALING;
+template <typename T> struct MyTemplate {
+  T tt(T t) { return t; }
+  T& ttr(T& t) { return t; }
+};
+
+#ifndef SWIG
+// This is added so that the code will not compile, if the global scope operator on Dingaling is omitted in the generated code
+namespace Spac {
+  class Dingaling {
+    Dingaling();
+    Dingaling(const Dingaling& t);
+    Dingaling& operator=(const Dingaling t);
+  };
+}
+using namespace Spac;
+#endif
+
+namespace Spac {
+
+  struct Ting {};
+  typedef Ting TING;
+
+  class Test {
+  public:
+  void something(::Dingaling t, ::Dingaling* pt, ::Dingaling& rt, const ::Dingaling& crt) {}
+  void tsomething(MyTemplate< ::Dingaling > t1, MyTemplate< const ::Dingaling& > t2) {}
+//  void usomething(::MyTemplate< ::DINGALING > t3, ::MyTemplate< ::DINGALING *> t4) {} // needs fixing
+  void nothing(::Spac::Ting*, ::Spac::TING&) {}
+  };
+
+}
+
+void funcptrtest( void (*)(::Dingaling) ) {}
+%}
+

Added: trunk/Examples/test-suite/typemap_template.i
===================================================================
--- trunk/Examples/test-suite/typemap_template.i	                        (rev 0)
+++ trunk/Examples/test-suite/typemap_template.i	2010-02-13 15:37:53 UTC (rev 11860)
@@ -0,0 +1,34 @@
+%module typemap_template
+
+/* Test bug in 1.3.40 where the presence of a generic/unspecialized typemap caused the incorrect specialized typemap to be used */
+
+%typemap(in) SWIGTYPE "/*_this_will_not_compile_SWIGTYPE_ \"$type\" */ "
+%typemap(in) const SWIGTYPE & "/*_this_will_not_compile_const_SWIGTYPE_REF_\"$type\" */ "
+
+%typemap(in) const TemplateTest1 & {$1 = (TemplateTest1<YY> *)0; /* in typemap generic for $type */}
+%typemap(in) const TemplateTest1< ZZ > & {$1 = (TemplateTest1<ZZ> *)0; /* in typemap ZZ for $type */}
+%typemap(in) const TemplateTest1< int > & {$1 = (TemplateTest1<int> *)0; /* in typemap int for $type */}
+
+%inline %{
+template<typename T> struct TemplateTest1 {
+  void setT(const TemplateTest1& t) {}
+};
+%}
+
+%inline %{
+  struct YY {};
+  struct ZZ {};
+%}
+
+
+%template(TTYY) TemplateTest1< YY >;
+%template(TTZZ) TemplateTest1< ZZ >;
+%template(TTint) TemplateTest1< int >;
+
+%inline %{
+  void extratest(const TemplateTest1< YY > &t, 
+                 const TemplateTest1< ZZ > &tt,
+                 const TemplateTest1< int > &ttt)
+  {}
+%}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11899
          http://swig.svn.sourceforge.net/swig/?rev=11899&view=rev
Author:   wsfulton
Date:     2010-03-05 18:37:05 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
Add java run test for nspace test and extend the test a bit

Modified Paths:
--------------
    trunk/Examples/test-suite/nspace.i

Added Paths:
-----------
    trunk/Examples/test-suite/java/nspace_runme.java

Added: trunk/Examples/test-suite/java/nspace_runme.java
===================================================================
--- trunk/Examples/test-suite/java/nspace_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/nspace_runme.java	2010-03-05 18:37:05 UTC (rev 11899)
@@ -0,0 +1,64 @@
+// This tests changes the package name from nspace to nspacePackage as javac can't seem to resolve classes and packages having the same name
+public class nspace_runme {
+
+  static {
+    try {
+	System.loadLibrary("nspace");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    // constructors and destructors
+    nspacePackage.Outer.Inner1.Color color1 = new nspacePackage.Outer.Inner1.Color();
+    nspacePackage.Outer.Inner1.Color color = new nspacePackage.Outer.Inner1.Color(color1);
+    color1.delete();
+    color1 = null;
+
+    // class methods
+    color.colorInstanceMethod(20.0);
+    nspacePackage.Outer.Inner1.Color.colorStaticMethod(20.0);
+    nspacePackage.Outer.Inner1.Color created = nspacePackage.Outer.Inner1.Color.create();
+
+    // class enums
+    nspacePackage.Outer.SomeClass someClass = new nspacePackage.Outer.SomeClass();
+    nspacePackage.Outer.Inner1.Color.Channel channel = someClass.GetInner1ColorChannel();
+    if (channel != nspacePackage.Outer.Inner1.Color.Channel.Transmission)
+      throw new RuntimeException("Transmission wrong");
+
+    // static member variables
+    nspacePackage.Outer.Inner1.Color.setStaticMemberVariable(789);
+    if (nspacePackage.Outer.Inner1.Color.getStaticMemberVariable() != 789)
+      throw new RuntimeException("static member variable failed");
+
+    // instance member variables
+    color.setInstanceMemberVariable(123);
+    if (color.getInstanceMemberVariable() != 123)
+      throw new RuntimeException("instance member variable failed");
+
+    // Same class different namespaces
+    nspacePackage.Outer.Inner1.Color col1 = new nspacePackage.Outer.Inner1.Color();
+    nspacePackage.Outer.Inner2.Color col2 = nspacePackage.Outer.Inner2.Color.create();
+    col2.colors(col1, col1, col2, col2, col2);
+
+    // check globals in a namespace don't get mangled with the nspacePackage option
+    nspacePackage.nspace.namespaceFunction(color);
+    nspacePackage.nspace.setNamespaceVar(111);
+    if (nspacePackage.nspace.getNamespaceVar() != 111)
+      throw new RuntimeException("global var failed");
+
+    // global enums
+    nspacePackage.Outer.Inner1.Channel outerChannel1 = someClass.GetInner1Channel();
+    if (outerChannel1 != nspacePackage.Outer.Inner1.Channel.Transmission1)
+      throw new RuntimeException("Transmission1 wrong");
+    nspacePackage.Outer.Inner2.Channel outerChannel2 = someClass.GetInner2Channel();
+    if (outerChannel2 != nspacePackage.Outer.Inner2.Channel.Transmission2)
+      throw new RuntimeException("Transmission2 wrong");
+
+    // turn feature off / ignoring
+    nspacePackage.Outer.nspace ns = new nspacePackage.Outer.nspace();
+    nspacePackage.NoNSpacePlease nons = new nspacePackage.NoNSpacePlease();
+  }
+}

Modified: trunk/Examples/test-suite/nspace.i
===================================================================
--- trunk/Examples/test-suite/nspace.i	2010-03-05 03:43:41 UTC (rev 11898)
+++ trunk/Examples/test-suite/nspace.i	2010-03-05 18:37:05 UTC (rev 11899)
@@ -4,10 +4,14 @@
 #if defined(SWIGJAVA)
 SWIG_JAVABODY_METHODS(public, public, SWIGTYPE) 
 %pragma(java) jniclassclassmodifiers = "public class"
+#endif
 
-%feature("nspace");
-%feature("nspace", "0") Outer::Inner2::NoNSpacePlease;
+// nspace feature only supported by these languages
+#if defined(SWIGJAVA) || defined(SWIGCSHARP)
 
+%nspace;
+%nonspace Outer::Inner2::NoNSpacePlease;
+
 %copyctor;
 %ignore Outer::Inner2::Color::Color();
 
@@ -64,6 +68,11 @@
       static int staticMemberVariable;
       void colorInstanceMethod(double d) {}
       static void colorStaticMethod(double d) {}
+      void colors(const Inner1::Color& col1a, 
+                  const Outer::Inner1::Color& col1b, 
+                  const Color &col2a, 
+                  const Inner2::Color& col2b, 
+                  const Outer::Inner2::Color& col2c) {}
     }; // Color 
     int Color::staticMemberVariable = 0;
     class NoNSpacePlease {};
@@ -91,3 +100,4 @@
 %}
 
 #endif
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11929
          http://swig.svn.sourceforge.net/swig/?rev=11929&view=rev
Author:   wsfulton
Date:     2010-03-08 23:02:53 +0000 (Mon, 08 Mar 2010)

Log Message:
-----------
Test %extend and nspace feature

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/java/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/csharp/nspace_extend_runme.cs
    trunk/Examples/test-suite/java/nspace_extend_runme.java
    trunk/Examples/test-suite/nspace_extend.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-03-08 22:26:17 UTC (rev 11928)
+++ trunk/Examples/test-suite/common.mk	2010-03-08 23:02:53 UTC (rev 11929)
@@ -243,6 +243,7 @@
 	namespace_union \
 	namespace_virtual_method \
 	nspace \
+	nspace_extend \
 	naturalvar \
 	nested_class \
 	nested_comment \

Added: trunk/Examples/test-suite/csharp/nspace_extend_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/nspace_extend_runme.cs	                        (rev 0)
+++ trunk/Examples/test-suite/csharp/nspace_extend_runme.cs	2010-03-08 23:02:53 UTC (rev 11929)
@@ -0,0 +1,39 @@
+using System;
+
+public class runme
+{
+  static void Main() 
+  {
+    {
+      // constructors and destructors
+      nspace_extendNamespace.Outer.Inner1.Color color1 = new nspace_extendNamespace.Outer.Inner1.Color();
+      nspace_extendNamespace.Outer.Inner1.Color color = new nspace_extendNamespace.Outer.Inner1.Color(color1);
+      color1.Dispose();
+      color1 = null;
+
+      // class methods
+      color.colorInstanceMethod(20.0);
+      nspace_extendNamespace.Outer.Inner1.Color.colorStaticMethod(20.0);
+      nspace_extendNamespace.Outer.Inner1.Color created = nspace_extendNamespace.Outer.Inner1.Color.create();
+      created.Dispose();
+    }
+    {
+      // constructors and destructors
+      nspace_extendNamespace.Outer.Inner2.Color color2 = new nspace_extendNamespace.Outer.Inner2.Color();
+      nspace_extendNamespace.Outer.Inner2.Color color = new nspace_extendNamespace.Outer.Inner2.Color(color2);
+      color2.Dispose();
+      color2 = null;
+
+      // class methods
+      color.colorInstanceMethod(20.0);
+      nspace_extendNamespace.Outer.Inner2.Color.colorStaticMethod(20.0);
+      nspace_extendNamespace.Outer.Inner2.Color created = nspace_extendNamespace.Outer.Inner2.Color.create();
+      created.Dispose();
+
+      // Same class different namespaces
+      nspace_extendNamespace.Outer.Inner1.Color col1 = new nspace_extendNamespace.Outer.Inner1.Color();
+      nspace_extendNamespace.Outer.Inner2.Color col2 = nspace_extendNamespace.Outer.Inner2.Color.create();
+      col2.colors(col1, col1, col2, col2, col2);
+    }
+  }
+}

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2010-03-08 22:26:17 UTC (rev 11928)
+++ trunk/Examples/test-suite/java/Makefile.in	2010-03-08 23:02:53 UTC (rev 11929)
@@ -43,6 +43,7 @@
 
 # Custom tests - tests with additional commandline options
 nspace.%: JAVA_PACKAGE = $*Package
+nspace_extend.%: JAVA_PACKAGE = $*Package
 
 # Rules for the different types of tests
 %.cpptest: 

Added: trunk/Examples/test-suite/java/nspace_extend_runme.java
===================================================================
--- trunk/Examples/test-suite/java/nspace_extend_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/nspace_extend_runme.java	2010-03-08 23:02:53 UTC (rev 11929)
@@ -0,0 +1,44 @@
+// This tests changes the package name from nspace to nspacePackage as javac can't seem to resolve classes and packages having the same name
+public class nspace_extend_runme {
+
+  static {
+    try {
+	System.loadLibrary("nspace_extend");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    {
+      // constructors and destructors
+      nspace_extendPackage.Outer.Inner1.Color color1 = new nspace_extendPackage.Outer.Inner1.Color();
+      nspace_extendPackage.Outer.Inner1.Color color = new nspace_extendPackage.Outer.Inner1.Color(color1);
+      color1.delete();
+      color1 = null;
+
+      // class methods
+      color.colorInstanceMethod(20.0);
+      nspace_extendPackage.Outer.Inner1.Color.colorStaticMethod(20.0);
+      nspace_extendPackage.Outer.Inner1.Color created = nspace_extendPackage.Outer.Inner1.Color.create();
+    }
+    {
+      // constructors and destructors
+      nspace_extendPackage.Outer.Inner2.Color color2 = new nspace_extendPackage.Outer.Inner2.Color();
+      nspace_extendPackage.Outer.Inner2.Color color = new nspace_extendPackage.Outer.Inner2.Color(color2);
+      color2.delete();
+      color2 = null;
+
+      // class methods
+      color.colorInstanceMethod(20.0);
+      nspace_extendPackage.Outer.Inner2.Color.colorStaticMethod(20.0);
+      nspace_extendPackage.Outer.Inner2.Color created = nspace_extendPackage.Outer.Inner2.Color.create();
+
+      // Same class different namespaces
+      nspace_extendPackage.Outer.Inner1.Color col1 = new nspace_extendPackage.Outer.Inner1.Color();
+      nspace_extendPackage.Outer.Inner2.Color col2 = nspace_extendPackage.Outer.Inner2.Color.create();
+      col2.colors(col1, col1, col2, col2, col2);
+    }
+  }
+}

Added: trunk/Examples/test-suite/nspace_extend.i
===================================================================
--- trunk/Examples/test-suite/nspace_extend.i	                        (rev 0)
+++ trunk/Examples/test-suite/nspace_extend.i	2010-03-08 23:02:53 UTC (rev 11929)
@@ -0,0 +1,50 @@
+// Test the nspace feature and %extend
+%module nspace_extend
+
+// nspace feature only supported by these languages
+#if defined(SWIGJAVA) || defined(SWIGCSHARP)
+
+%nspace;
+
+%extend Outer::Inner1::Color {
+      Color() { return new Outer::Inner1::Color(); }
+      virtual ~Color() { delete $self; }
+      static Color* create() { return new Outer::Inner1::Color(); }
+      Color(const Color& other) { return new Outer::Inner1::Color(other); }
+
+      void colorInstanceMethod(double d) {}
+      static void colorStaticMethod(double d) {}
+}
+
+%inline %{
+
+namespace Outer {
+  namespace Inner1 {
+    struct Color {
+    };
+  }
+
+  namespace Inner2 {
+    struct Color {
+    };
+  }
+}
+%}
+
+#endif
+
+%extend Outer::Inner2::Color {
+      Color() { return new Outer::Inner2::Color(); }
+      ~Color() { delete $self; }
+      static Color* create() { return new Outer::Inner2::Color(); }
+      Color(const Color& other) { return new Outer::Inner2::Color(other); }
+
+      void colorInstanceMethod(double d) {}
+      static void colorStaticMethod(double d) {}
+      void colors(const Inner1::Color& col1a, 
+                  const Outer::Inner1::Color& col1b, 
+                  const Color &col2a, 
+                  const Inner2::Color& col2b, 
+                  const Outer::Inner2::Color& col2c) {}
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12005
          http://swig.svn.sourceforge.net/swig/?rev=12005&view=rev
Author:   wsfulton
Date:     2010-05-01 10:01:26 +0000 (Sat, 01 May 2010)

Log Message:
-----------
More string tests: char const*const

Modified Paths:
--------------
    trunk/Examples/test-suite/char_strings.i
    trunk/Examples/test-suite/csharp/char_strings_runme.cs
    trunk/Examples/test-suite/java/char_strings_runme.java

Modified: trunk/Examples/test-suite/char_strings.i
===================================================================
--- trunk/Examples/test-suite/char_strings.i	2010-04-30 07:31:55 UTC (rev 12004)
+++ trunk/Examples/test-suite/char_strings.i	2010-05-01 10:01:26 UTC (rev 12005)
@@ -21,7 +21,7 @@
 static char *global_str = NULL;
 const int UINT_DIGITS = 10; // max unsigned int is 4294967295
 
-bool check(const char *str, unsigned int number) {
+bool check(const char *const str, unsigned int number) {
   static char expected[256];
   sprintf(expected, "%s%d", OTHERLAND_MSG, number);
   bool matches = (strcmp(str, expected) == 0);
@@ -105,6 +105,18 @@
   return check(static_str, number);
 }
 
+bool SetCharConstStaticString(char *const str, unsigned int number) {
+  static char static_str[] = CPLUSPLUS_MSG;
+  strcpy(static_str, str);
+  return check(static_str, number);
+}
+
+bool SetConstCharConstStaticString(const char *const str, unsigned int number) {
+  static char static_str[] = CPLUSPLUS_MSG;
+  strcpy(static_str, str);
+  return check(static_str, number);
+}
+
 // get set function
 char *CharPingPong(char *str) {
   return str;

Modified: trunk/Examples/test-suite/csharp/char_strings_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/char_strings_runme.cs	2010-04-30 07:31:55 UTC (rev 12004)
+++ trunk/Examples/test-suite/csharp/char_strings_runme.cs	2010-05-01 10:01:26 UTC (rev 12005)
@@ -76,6 +76,16 @@
         throw new Exception("Test char set 6 failed, iteration " + i);
     }
 
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetCharConstStaticString(OTHERLAND_MSG + i, i))
+        throw new Exception("Test char set 7 failed, iteration " + i);
+    }
+
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetConstCharConstStaticString(OTHERLAND_MSG + i, i))
+        throw new Exception("Test char set 8 failed, iteration " + i);
+    }
+
     // get set function
     for (i=0; i<count*10; i++) {
       string ping = OTHERLAND_MSG + i;

Modified: trunk/Examples/test-suite/java/char_strings_runme.java
===================================================================
--- trunk/Examples/test-suite/java/char_strings_runme.java	2010-04-30 07:31:55 UTC (rev 12004)
+++ trunk/Examples/test-suite/java/char_strings_runme.java	2010-05-01 10:01:26 UTC (rev 12005)
@@ -83,6 +83,16 @@
         throw new RuntimeException("Test char set 6 failed, iteration " + i);
     }
 
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetCharConstStaticString(OTHERLAND_MSG + i, i))
+        throw new RuntimeException("Test char set 7 failed, iteration " + i);
+    }
+
+    for (i=0; i<count; i++) {
+      if (!char_strings.SetConstCharConstStaticString(OTHERLAND_MSG + i, i))
+        throw new RuntimeException("Test char set 8 failed, iteration " + i);
+    }
+
     // get set function
     for (i=0; i<count; i++) {
       String ping = OTHERLAND_MSG + i;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12012
          http://swig.svn.sourceforge.net/swig/?rev=12012&view=rev
Author:   wsfulton
Date:     2010-05-07 18:13:15 +0000 (Fri, 07 May 2010)

Log Message:
-----------
fix my perl keyword warning

Modified Paths:
--------------
    trunk/Examples/test-suite/enums.i
    trunk/Examples/test-suite/octave/enums_runme.m
    trunk/Examples/test-suite/python/enums_runme.py

Modified: trunk/Examples/test-suite/enums.i
===================================================================
--- trunk/Examples/test-suite/enums.i	2010-05-06 07:08:16 UTC (rev 12011)
+++ trunk/Examples/test-suite/enums.i	2010-05-07 18:13:15 UTC (rev 12012)
@@ -90,8 +90,8 @@
 
 enum ContainYourself {
   slap = 10,
-  my,
+  mine,
   thigh
-} Slap = slap, My = my, Thigh = thigh, *pThigh = &Thigh, arrayContainYourself[3] = {slap, my, thigh};
+} Slap = slap, Mine = mine, Thigh = thigh, *pThigh = &Thigh, arrayContainYourself[3] = {slap, mine, thigh};
 %}
 

Modified: trunk/Examples/test-suite/octave/enums_runme.m
===================================================================
--- trunk/Examples/test-suite/octave/enums_runme.m	2010-05-06 07:08:16 UTC (rev 12011)
+++ trunk/Examples/test-suite/octave/enums_runme.m	2010-05-07 18:13:15 UTC (rev 12012)
@@ -13,7 +13,7 @@
   error
 endif
 
-if (enums.cvar.My != 11)
+if (enums.cvar.Mine != 11)
   error
 endif
 

Modified: trunk/Examples/test-suite/python/enums_runme.py
===================================================================
--- trunk/Examples/test-suite/python/enums_runme.py	2010-05-06 07:08:16 UTC (rev 12011)
+++ trunk/Examples/test-suite/python/enums_runme.py	2010-05-07 18:13:15 UTC (rev 12012)
@@ -11,7 +11,7 @@
 if _enums.cvar.Slap != 10:
   raise RuntimeError
 
-if _enums.cvar.My != 11:
+if _enums.cvar.Mine != 11:
   raise RuntimeError
 
 if _enums.cvar.Thigh != 12:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12061
          http://swig.svn.sourceforge.net/swig/?rev=12061&view=rev
Author:   wsfulton
Date:     2010-05-27 20:12:58 +0000 (Thu, 27 May 2010)

Log Message:
-----------
some warning fixes on solaris

Modified Paths:
--------------
    trunk/Examples/test-suite/global_scope_types.i
    trunk/Examples/test-suite/typemap_global_scope.i

Modified: trunk/Examples/test-suite/global_scope_types.i
===================================================================
--- trunk/Examples/test-suite/global_scope_types.i	2010-05-27 07:14:20 UTC (rev 12060)
+++ trunk/Examples/test-suite/global_scope_types.i	2010-05-27 20:12:58 UTC (rev 12061)
@@ -39,6 +39,6 @@
 
 }
 
-void funcptrtest( void (*)(::Dingaling) ) {}
+extern "C" void funcptrtest( void (*)(::Dingaling) ) {}
 %}
 

Modified: trunk/Examples/test-suite/typemap_global_scope.i
===================================================================
--- trunk/Examples/test-suite/typemap_global_scope.i	2010-05-27 07:14:20 UTC (rev 12060)
+++ trunk/Examples/test-suite/typemap_global_scope.i	2010-05-27 20:12:58 UTC (rev 12061)
@@ -12,7 +12,7 @@
 // Structs
 /////////////////////////////////////////////////////////////////////
 
-%typemap(in) Test1, ::Test2, Space::Test3, ::Space::Test4 "/*in typemap for $type*/"
+%typemap(in) Test1, ::Test2, Space::Test3, ::Space::Test4 "$1 = $type(); /*in typemap for $type*/"
 %typemap(in) const Test1 &, const ::Test2 &, const Space::Test3 &, const ::Space::Test4 & "/*in typemap for $type*/"
 %inline %{
 struct Test1 {};
@@ -55,7 +55,7 @@
 struct XX {};
 %}
 
-%typemap(in) TemplateTest1< ::XX >, ::TemplateTest2< ::XX >, Space::TemplateTest3< ::XX >, ::Space::TemplateTest4< ::XX > "/* in typemap for $type */"
+%typemap(in) TemplateTest1< ::XX >, ::TemplateTest2< ::XX >, Space::TemplateTest3< ::XX >, ::Space::TemplateTest4< ::XX > "$1 = $type(); /* in typemap for $type */"
 %typemap(in) const TemplateTest1< XX > &, const ::TemplateTest2< XX > &, const Space::TemplateTest3< XX > &, const ::Space::TemplateTest4< XX > & "/* in typemap for $type */"
 %inline %{
 template<typename T> struct TemplateTest1 { T m_t; };
@@ -99,7 +99,7 @@
 // Enums
 /////////////////////////////////////////////////////////////////////
 
-%typemap(in) Enum1, ::Enum2, Space::Enum3, ::Space::Enum4 "/*in typemap for $type*/"
+%typemap(in) Enum1, ::Enum2, Space::Enum3, ::Space::Enum4 "$1 = $1_type(); /*in typemap for $type*/"
 %typemap(in) const Enum1 &, const ::Enum2 &, const Space::Enum3 &, const ::Space::Enum4 & "/*in typemap for $type*/"
 %inline %{
 enum Enum1 { enum_1 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12159
          http://swig.svn.sourceforge.net/swig/?rev=12159&view=rev
Author:   wsfulton
Date:     2010-07-18 00:06:40 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
Fix out of source builds for the test-suite which broke in 1.3.37

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-07-17 14:48:13 UTC (rev 12158)
+++ trunk/Examples/test-suite/common.mk	2010-07-18 00:06:40 UTC (rev 12159)
@@ -69,7 +69,7 @@
 LIBS       = -L.
 LIBPREFIX  = lib
 ACTION     = check
-INTERFACEDIR = ../
+INTERFACEDIR = $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/
 
 #
 # Please keep test cases in alphabetical order.

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2010-07-17 14:48:13 UTC (rev 12158)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2010-07-18 00:06:40 UTC (rev 12159)
@@ -27,7 +27,6 @@
 
 # Overridden variables here
 SWIGOPT += -namespace $*Namespace
-INTERFACEDIR = ../../
 
 CSHARPFLAGSSPECIAL =
 

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2010-07-17 14:48:13 UTC (rev 12158)
+++ trunk/Examples/test-suite/java/Makefile.in	2010-07-18 00:06:40 UTC (rev 12159)
@@ -39,7 +39,6 @@
 # Overridden variables here
 JAVA_PACKAGE = $*
 SWIGOPT += -package $(JAVA_PACKAGE)
-INTERFACEDIR = ../../
 
 # Custom tests - tests with additional commandline options
 nspace.%: JAVA_PACKAGE = $*Package


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12171
          http://swig.svn.sourceforge.net/swig/?rev=12171&view=rev
Author:   vadz
Date:     2010-07-22 17:00:59 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
Add a test case for the regex encoder inside %rename.

Simple unit test checking that %rename("%(regex:...)") works as expected.

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py
    trunk/Examples/test-suite/rename_pcre_encoder.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-07-22 17:00:37 UTC (rev 12170)
+++ trunk/Examples/test-suite/common.mk	2010-07-22 17:00:59 UTC (rev 12171)
@@ -284,6 +284,7 @@
 	rename4 \
 	rename_scope \
 	rename_strip_encoder \
+	rename_pcre_encoder \
 	restrict_cplusplus \
 	return_const_value \
 	return_value_scope \

Added: trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py
===================================================================
--- trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py	                        (rev 0)
+++ trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py	2010-07-22 17:00:59 UTC (rev 12171)
@@ -0,0 +1,8 @@
+from rename_pcre_encoder import *
+
+s = SomeWidget()
+a = AnotherWidget()
+a.DoSomething()
+
+evt = wxEVTSomeEvent()
+t   = xUnchangedName()


Property changes on: trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/Examples/test-suite/rename_pcre_encoder.i
===================================================================
--- trunk/Examples/test-suite/rename_pcre_encoder.i	                        (rev 0)
+++ trunk/Examples/test-suite/rename_pcre_encoder.i	2010-07-22 17:00:59 UTC (rev 12171)
@@ -0,0 +1,21 @@
+%module rename_pcre_encoder
+
+// strip the wx prefix from all identifiers except those starting with wxEVT
+%rename("%(regex:/wx(?!EVT)(.*)/\\1/)s") "";
+
+%inline %{
+
+class wxSomeWidget {
+};
+
+struct wxAnotherWidget {
+    void wxDoSomething() {}
+};
+
+class wxEVTSomeEvent {
+};
+
+class xUnchangedName {
+};
+
+%}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12173
          http://swig.svn.sourceforge.net/swig/?rev=12173&view=rev
Author:   vadz
Date:     2010-07-22 17:01:36 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
Correct top_{src,build}dir definitions in csharp and java test suite.

The ".." artificially appended to these variables was enough to make the build
work in the source directory but broke down when the build directory was
different from the source one. Remove this hack and use absolute path to the
build directory instead to ensure that it's still valid even when csharp/java
makefiles invoke swig_and_compile_{c,cpp} macros from a subdirectory.

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2010-07-22 17:01:16 UTC (rev 12172)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2010-07-22 17:01:36 UTC (rev 12173)
@@ -8,8 +8,8 @@
 CSHARPPATHSEPARATOR = "@CSHARPPATHSEPARATOR@"
 CSHARPCYGPATH_W     = @CSHARPCYGPATH_W@
 srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@/..
+top_srcdir   = @top_srcdir@
+top_builddir = $(abspath @top_builddir@)
 
 CPP_TEST_CASES = \
 	csharp_attributes \
@@ -66,7 +66,7 @@
 # Note C# uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows and SHLIB_PATH on HPUX.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
-	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
 	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \
 	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; \

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2010-07-22 17:01:16 UTC (rev 12172)
+++ trunk/Examples/test-suite/java/Makefile.in	2010-07-22 17:01:36 UTC (rev 12173)
@@ -7,8 +7,8 @@
 JAVAC        = javac
 SCRIPTSUFFIX = _runme.java
 srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@/..
+top_srcdir   = @top_srcdir@
+top_builddir = $(abspath @top_builddir@)
 
 C_TEST_CASES = \
 	java_lib_arrays \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12212
          http://swig.svn.sourceforge.net/swig/?rev=12212&view=rev
Author:   wsfulton
Date:     2010-09-10 06:40:42 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Remove java specifics from testcase

Modified Paths:
--------------
    trunk/Examples/test-suite/java/preproc_line_file_runme.java
    trunk/Examples/test-suite/preproc_line_file.i

Modified: trunk/Examples/test-suite/java/preproc_line_file_runme.java
===================================================================
--- trunk/Examples/test-suite/java/preproc_line_file_runme.java	2010-09-10 06:08:45 UTC (rev 12211)
+++ trunk/Examples/test-suite/java/preproc_line_file_runme.java	2010-09-10 06:40:42 UTC (rev 12212)
@@ -45,16 +45,16 @@
     if (preproc_line_file.MYLINE2 != 30)
       throw new RuntimeException("preproc failure");
 
-    if (SillyStruct.LINE_NUMBER != 41)
+    if (SillyStruct.LINE_NUMBER != 52)
       throw new RuntimeException("preproc failure");
 
-    if (SillyMacroClass.LINE_NUM != 45)
+    if (SillyMacroClass.LINE_NUM != 56)
       throw new RuntimeException("preproc failure");
 
-    if (SillyMultipleMacroStruct.LINE_NUM != 70)
+    if (SillyMultipleMacroStruct.LINE_NUM != 81)
       throw new RuntimeException("preproc failure");
 
-    if (preproc_line_file.INLINE_LINE != 76)
+    if (preproc_line_file.INLINE_LINE != 87)
       throw new RuntimeException("preproc failure");
 
     String inlineFile = preproc_line_file.INLINE_FILE;

Modified: trunk/Examples/test-suite/preproc_line_file.i
===================================================================
--- trunk/Examples/test-suite/preproc_line_file.i	2010-09-10 06:08:45 UTC (rev 12211)
+++ trunk/Examples/test-suite/preproc_line_file.i	2010-09-10 06:40:42 UTC (rev 12212)
@@ -29,7 +29,18 @@
 
 #define MYLINE2 __LINE__
 
+#if defined (SWIGJAVA)
 %javaconst(1);
+#elif defined(SWIGCSHARP)
+%csconst(1);
+#else
+%ignore LINE_NUMBER;
+%ignore LINE_NUM;
+/* spare space */
+
+
+#endif
+
 %{
 struct SillyStruct {
   int num;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12217
          http://swig.svn.sourceforge.net/swig/?rev=12217&view=rev
Author:   vadz
Date:     2010-09-11 11:44:26 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
Fix the rename_pcre_encoder unit test for Python.

Due to a bug in the way %rename() directives without a name currently work,
the second %rename in rename_pcre_encoder.i overrides the first one and the
function wxDoSomething() is not renamed to DoSomething() any more. Remove the
test for this renaming that doesn't work to at least let the rest of the test
to pass.

Also test that SetXXX() functions from the .i file really are renamed to
putXXX() as expected.

Modified Paths:
--------------
    trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py
    trunk/Examples/test-suite/rename_pcre_encoder.i

Modified: trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py
===================================================================
--- trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py	2010-09-11 11:44:08 UTC (rev 12216)
+++ trunk/Examples/test-suite/python/rename_pcre_encoder_runme.py	2010-09-11 11:44:26 UTC (rev 12217)
@@ -1,6 +1,8 @@
 from rename_pcre_encoder import *
 
 s = SomeWidget()
+s.putBorderWidth(3)
+s.putSize(4, 5)
 a = AnotherWidget()
 a.DoSomething()
 

Modified: trunk/Examples/test-suite/rename_pcre_encoder.i
===================================================================
--- trunk/Examples/test-suite/rename_pcre_encoder.i	2010-09-11 11:44:08 UTC (rev 12216)
+++ trunk/Examples/test-suite/rename_pcre_encoder.i	2010-09-11 11:44:26 UTC (rev 12217)
@@ -9,12 +9,12 @@
 %inline %{
 
 struct wxSomeWidget {
-    void SetBorderWidth(int);
-    void SetSize(int, int);
+    void SetBorderWidth(int) {}
+    void SetSize(int, int) {}
 };
 
 struct wxAnotherWidget {
-    void wxDoSomething() {}
+    void DoSomething() {}
 };
 
 class wxEVTSomeEvent {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12294
          http://swig.svn.sourceforge.net/swig/?rev=12294&view=rev
Author:   klickverbot
Date:     2010-11-18 00:15:13 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
Renamed 'immutable' test-case to 'immutable_values'.

This is a part of the pending merge of the D module, where 'immutable' is a keyword (and thus not a valid module name).

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/immutable_values.i

Removed Paths:
-------------
    trunk/Examples/test-suite/immutable.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-11-16 14:09:39 UTC (rev 12293)
+++ trunk/Examples/test-suite/common.mk	2010-11-18 00:15:13 UTC (rev 12294)
@@ -466,7 +466,7 @@
 	extern_declaration \
 	funcptr \
 	function_typedef \
-	immutable \
+	immutable_values \
 	inctest \
 	integers \
         keyword_rename \

Deleted: trunk/Examples/test-suite/immutable.i
===================================================================
--- trunk/Examples/test-suite/immutable.i	2010-11-16 14:09:39 UTC (rev 12293)
+++ trunk/Examples/test-suite/immutable.i	2010-11-18 00:15:13 UTC (rev 12294)
@@ -1,20 +0,0 @@
-// test to make sure setters are not generated for constants
-
-%module immutable
-
-
-%immutable;
-%mutable;
-
-%inline %{
-#define ABC -11
-enum count {Zero, One, Two}; %}
-
-
-%clearimmutable;
-
-%inline %{
-#define XYZ -22
-enum backwards {Tre=3, Duo=2, Uno=1};
-%}
-

Copied: trunk/Examples/test-suite/immutable_values.i (from rev 12293, trunk/Examples/test-suite/immutable.i)
===================================================================
--- trunk/Examples/test-suite/immutable_values.i	                        (rev 0)
+++ trunk/Examples/test-suite/immutable_values.i	2010-11-18 00:15:13 UTC (rev 12294)
@@ -0,0 +1,20 @@
+// test to make sure setters are not generated for constants
+
+%module immutable_values
+
+
+%immutable;
+%mutable;
+
+%inline %{
+#define ABC -11
+enum count {Zero, One, Two}; %}
+
+
+%clearimmutable;
+
+%inline %{
+#define XYZ -22
+enum backwards {Tre=3, Duo=2, Uno=1};
+%}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12295
          http://swig.svn.sourceforge.net/swig/?rev=12295&view=rev
Author:   klickverbot
Date:     2010-11-18 00:15:41 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
Renamed 'template' test-case to 'template_basic'.

This is a part of the pending merge of the D module, where 'template' is a keyword (and thus not a valid module name).

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/template_basic.i

Removed Paths:
-------------
    trunk/Examples/test-suite/template.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-11-18 00:15:13 UTC (rev 12294)
+++ trunk/Examples/test-suite/common.mk	2010-11-18 00:15:41 UTC (rev 12295)
@@ -318,11 +318,11 @@
 	struct_initialization_cpp \
 	struct_value \
 	symbol_clash \
-	template \
 	template_arg_replace \
 	template_arg_scope \
 	template_arg_typename \
 	template_array_numeric \
+	template_basic \
 	template_base_template \
 	template_classes \
 	template_const_ref \

Deleted: trunk/Examples/test-suite/template.i
===================================================================
--- trunk/Examples/test-suite/template.i	2010-11-18 00:15:13 UTC (rev 12294)
+++ trunk/Examples/test-suite/template.i	2010-11-18 00:15:41 UTC (rev 12295)
@@ -1,52 +0,0 @@
-/* File : example.i */
-%module "template"
-
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<int>;         /* Ruby, wrong class name */
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<double>;      /* Ruby, wrong class name */
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<int (*)[10]>; /* Ruby, wrong class name */
-
-/* Let's just grab the original header file here */
-
-%{
-#ifdef max
-#undef max
-#endif
-%}
-
-%inline %{
-
-template<class T> T max(const T a, const T b) { return  a>b ? a : b; }
-
-template<class T> class vector {
-  T *v;
-  int sz;
- public:
-  vector(int _sz) {
-    v = new T[_sz];
-    sz = _sz;
-  }
-  T &get(int index) {
-    return v[index];
-  }
-  void set(int index, T &val) {
-    v[index] = val;
-  }
-  // This really doesn't do anything except test const handling 
-  void testconst(const T x) { }
-};
-
-%}
-
-/* Now instantiate some specific template declarations */
-
-%template(maxint) max<int>;
-%template(maxdouble) max<double>;
-%template(vecint) vector<int>;
-%template(vecdouble) vector<double>;
-
-/* Now try to break constness */
-
-%template(maxintp) max<int (*)[10]>;
-%template(vecintp) vector<int (*)[10]>;
-
-

Copied: trunk/Examples/test-suite/template_basic.i (from rev 12294, trunk/Examples/test-suite/template.i)
===================================================================
--- trunk/Examples/test-suite/template_basic.i	                        (rev 0)
+++ trunk/Examples/test-suite/template_basic.i	2010-11-18 00:15:41 UTC (rev 12295)
@@ -0,0 +1,52 @@
+/* File: template_basic.i */
+%module "template_basic"
+
+%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<int>;         /* Ruby, wrong class name */
+%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<double>;      /* Ruby, wrong class name */
+%warnfilter(SWIGWARN_RUBY_WRONG_NAME) vector<int (*)[10]>; /* Ruby, wrong class name */
+
+/* Let's just grab the original header file here */
+
+%{
+#ifdef max
+#undef max
+#endif
+%}
+
+%inline %{
+
+template<class T> T max(const T a, const T b) { return  a>b ? a : b; }
+
+template<class T> class vector {
+  T *v;
+  int sz;
+ public:
+  vector(int _sz) {
+    v = new T[_sz];
+    sz = _sz;
+  }
+  T &get(int index) {
+    return v[index];
+  }
+  void set(int index, T &val) {
+    v[index] = val;
+  }
+  // This really doesn't do anything except test const handling
+  void testconst(const T x) { }
+};
+
+%}
+
+/* Now instantiate some specific template declarations */
+
+%template(maxint) max<int>;
+%template(maxdouble) max<double>;
+%template(vecint) vector<int>;
+%template(vecdouble) vector<double>;
+
+/* Now try to break constness */
+
+%template(maxintp) max<int (*)[10]>;
+%template(vecintp) vector<int (*)[10]>;
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12298
          http://swig.svn.sourceforge.net/swig/?rev=12298&view=rev
Author:   klickverbot
Date:     2010-11-18 00:17:37 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
Added special cases to the test-suite as required for D.

This is a part of the pending merge of the D module.

Modified Paths:
--------------
    trunk/Examples/test-suite/abstract_virtual.i
    trunk/Examples/test-suite/contract.i
    trunk/Examples/test-suite/default_constructor.i
    trunk/Examples/test-suite/dynamic_cast.i
    trunk/Examples/test-suite/enums.i
    trunk/Examples/test-suite/evil_diamond.i
    trunk/Examples/test-suite/evil_diamond_ns.i
    trunk/Examples/test-suite/evil_diamond_prop.i
    trunk/Examples/test-suite/import_nomodule.i
    trunk/Examples/test-suite/inherit_target_language.i
    trunk/Examples/test-suite/li_boost_shared_ptr.i
    trunk/Examples/test-suite/li_boost_shared_ptr_bits.i
    trunk/Examples/test-suite/li_std_combinations.i
    trunk/Examples/test-suite/minherit2.i
    trunk/Examples/test-suite/multiple_inheritance.i
    trunk/Examples/test-suite/namespace_class.i
    trunk/Examples/test-suite/preproc_line_file.i
    trunk/Examples/test-suite/pure_virtual.i
    trunk/Examples/test-suite/samename.i
    trunk/Examples/test-suite/special_variable_macros.i
    trunk/Examples/test-suite/static_const_member.i
    trunk/Examples/test-suite/template_enum.i
    trunk/Examples/test-suite/template_inherit_abstract.i
    trunk/Examples/test-suite/typemap_namespace.i
    trunk/Examples/test-suite/typemap_out_optimal.i
    trunk/Examples/test-suite/typemap_subst.i
    trunk/Examples/test-suite/using_composition.i
    trunk/Examples/test-suite/using_extend.i
    trunk/Examples/test-suite/using_namespace.i

Modified: trunk/Examples/test-suite/abstract_virtual.i
===================================================================
--- trunk/Examples/test-suite/abstract_virtual.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/abstract_virtual.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -2,10 +2,12 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, D, Java, PHP multiple inheritance */
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, D, Java, PHP multiple inheritance */
 
 %inline %{
 #if defined(_MSC_VER)

Modified: trunk/Examples/test-suite/contract.i
===================================================================
--- trunk/Examples/test-suite/contract.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/contract.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -3,12 +3,17 @@
 %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, D, Java, PHP multiple inheritance */
 
 #ifdef SWIGCSHARP
 %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override
 #endif
 
+#ifdef SWIGD
+%ignore B::bar; // Prevents getting an error that C.bar does not override any function because multiple inheritance is not supported.
+#endif
+
 %contract test_preassert(int a, int b) {
 require:
 	a > 0;

Modified: trunk/Examples/test-suite/default_constructor.i
===================================================================
--- trunk/Examples/test-suite/default_constructor.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/default_constructor.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -5,11 +5,13 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, D, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, D, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */
 

Modified: trunk/Examples/test-suite/dynamic_cast.i
===================================================================
--- trunk/Examples/test-suite/dynamic_cast.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/dynamic_cast.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -1,7 +1,7 @@
 /* File : example.i */
 %module dynamic_cast
 
-#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO)
+#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO) && !defined(SWIGD)
 %apply SWIGTYPE *DYNAMIC { Foo * };
 #endif
 
@@ -17,7 +17,7 @@
 };
 %}
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGGO)
+#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGGO) || defined(SWIGD)
 %typemap(out) Foo *blah {
     Bar *downcast = dynamic_cast<Bar *>($1);
     *(Bar **)&$result = downcast;
@@ -37,6 +37,13 @@
   }
 #endif
 
+#if defined(SWIGD)
+%typemap(dout, excode=SWIGEXCODE) Foo * {
+  Bar ret = new Bar($wcall, $owner);$excode
+  return ret;
+}
+#endif
+
 #if defined(SWIGGO)
 %insert(go_runtime) %{
 func FooToBar(f Foo) Bar {
@@ -62,7 +69,7 @@
 }
 %}
 
-#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO)
+#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO) && !defined(SWIGD)
 // A general purpose function for dynamic casting of a Foo *
 %{
 static swig_type_info *

Modified: trunk/Examples/test-suite/enums.i
===================================================================
--- trunk/Examples/test-suite/enums.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/enums.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -58,6 +58,11 @@
   
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME) _iFoo;
 
+#ifdef SWIGD
+/* Work around missing support for proper char quoting due to parser shortcomings. */
+%dconstvalue("'a'") _iFoo::Char;
+#endif
+
 #ifndef __cplusplus
 %inline %{
 typedef struct _iFoo 

Modified: trunk/Examples/test-suite/evil_diamond.i
===================================================================
--- trunk/Examples/test-suite/evil_diamond.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/evil_diamond.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -6,7 +6,8 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C#, D & Java, PHP multiple inheritance
 
 %inline %{
 

Modified: trunk/Examples/test-suite/evil_diamond_ns.i
===================================================================
--- trunk/Examples/test-suite/evil_diamond_ns.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/evil_diamond_ns.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -6,7 +6,8 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam;	// Ruby, wrong class name - C#, D & Java, PHP multiple inheritance
 
 %inline %{
 namespace Blah {

Modified: trunk/Examples/test-suite/evil_diamond_prop.i
===================================================================
--- trunk/Examples/test-suite/evil_diamond_prop.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/evil_diamond_prop.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -6,6 +6,7 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
 	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
 
 %inline %{

Modified: trunk/Examples/test-suite/import_nomodule.i
===================================================================
--- trunk/Examples/test-suite/import_nomodule.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/import_nomodule.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -8,16 +8,16 @@
 
 %import "import_nomodule.h"
 
-#if !defined(SWIGJAVA) && !defined(SWIGRUBY) && !defined(SWIGCSHARP)
+#if !defined(SWIGJAVA) && !defined(SWIGRUBY) && !defined(SWIGCSHARP) && !defined(SWIGD)
 
 /**
  * The proxy class does not have Bar derived from Foo, yet an instance of Bar
  * can successfully be passed to a proxy function taking a Foo pointer (for some
  * language modules).
  * 
- * This violation of the type system is not possible in Java and C# due to static
- * type checking. It's also not (currently) possible in Ruby, but this may be
- * fixable (needs more investigation).
+ * This violation of the type system is not possible in Java, C# and D due to
+ * static type checking. It's also not (currently) possible in Ruby, but this may
+ * be fixable (needs more investigation).
  */
 
 %newobject create_Foo;

Modified: trunk/Examples/test-suite/inherit_target_language.i
===================================================================
--- trunk/Examples/test-suite/inherit_target_language.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/inherit_target_language.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -1,4 +1,4 @@
-// Test using a target language specified base class, primarily for Java/C# and possibly other single inheritance languages
+// Test using a target language specified base class, primarily for Java/C#/D and possibly other single inheritance languages
 
 // Note the multiple inheritance warnings don't appear because of the two techniques used in here: typemaps and %ignore
 
@@ -6,6 +6,8 @@
 
 #if defined(SWIGJAVA)
 # define csbase javabase
+#elif defined(SWIGD)
+# define csbase dbase
 #endif
 
 %pragma(csharp) moduleimports=%{
@@ -20,6 +22,10 @@
 class TargetLanguageBase2 { public void targetLanguageBase2Method() {} };
 %}
 
+%pragma(d) globalproxyimports=%{
+private class TargetLanguageBase { public void targetLanguageBaseMethod() {} };
+private class TargetLanguageBase2 { public void targetLanguageBase2Method() {} };
+%}
 
 %typemap(csbase) SWIGTYPE "TargetLanguageBase"
 

Modified: trunk/Examples/test-suite/li_boost_shared_ptr.i
===================================================================
--- trunk/Examples/test-suite/li_boost_shared_ptr.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/li_boost_shared_ptr.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -34,7 +34,7 @@
 # define SWIG_SHARED_PTR_NAMESPACE SwigBoost
 #endif
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON)
+#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 

Modified: trunk/Examples/test-suite/li_boost_shared_ptr_bits.i
===================================================================
--- trunk/Examples/test-suite/li_boost_shared_ptr_bits.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/li_boost_shared_ptr_bits.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -1,6 +1,6 @@
 %module li_boost_shared_ptr_bits
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON)
+#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD)
 #define SHARED_PTR_WRAPPERS_IMPLEMENTED
 #endif
 

Modified: trunk/Examples/test-suite/li_std_combinations.i
===================================================================
--- trunk/Examples/test-suite/li_std_combinations.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/li_std_combinations.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -14,7 +14,7 @@
 %template(VectorVectorString) std::vector< std::vector<std::string> >;
 %template(PairIntPairIntString) std::pair< int, std::pair<int, std::string> >;
 
-#if defined(SWIGCSHARP)
+#if defined(SWIGCSHARP) || defined(SWIGD)
 // Checks macro containing a type with a comma
 SWIG_STD_VECTOR_ENHANCED(std::pair< double, std::string >)
 #endif

Modified: trunk/Examples/test-suite/minherit2.i
===================================================================
--- trunk/Examples/test-suite/minherit2.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/minherit2.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -1,16 +1,18 @@
 %module minherit2
 
-// A multiple inheritance example, mainly for Java and C#.
-// The example shows how it is possible to turn C++ abstract base classes into Java/C# interface.
+// A multiple inheritance example, mainly for Java, C# and D.
+// The example shows how it is possible to turn C++ abstract base classes into
+// Java/C#/D interfaces.
 // In the future, all this trouble might be more automated.
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
 	    SWIGWARN_RUBY_MULTIPLE_INHERITANCE,
 	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) RemoteMpe;
 
 
-#if defined(SWIGJAVA) || defined(SWIGCSHARP)
+#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGD)
 
 #if defined(SWIGCSHARP)
 #define javaclassmodifiers   csclassmodifiers
@@ -22,6 +24,21 @@
 #define javabase             csbase
 #endif
 
+#if defined(SWIGD)
+#define javaclassmodifiers   dclassmodifiers
+#define javabody             dbody
+#define javafinalize         ddestructor
+#define javadestruct         ddispose
+#define javaout              dout
+#define javainterfaces       dinterfaces
+#define javabase             dbase
+
+%typemap(dimports) RemoteMpe %{
+$importtype(IRemoteSyncIO)
+$importtype(IRemoteAsyncIO)
+%}
+#endif
+
 // Modify multiple inherited base classes into inheriting interfaces
 %typemap(javainterfaces) RemoteMpe "IRemoteSyncIO, IRemoteAsyncIO";
 %typemap(javabase, replace="1") RemoteMpe "";
@@ -51,6 +68,12 @@
 // Features are inherited by derived classes, so override this
 %csmethodmodifiers RemoteMpe::syncmethod "public"
 %csmethodmodifiers RemoteMpe::asyncmethod "public"
+#elif defined(SWIGD)
+%dmethodmodifiers IRemoteSyncIO::syncmethod "";
+%dmethodmodifiers IRemoteAsyncIO::asyncmethod "";
+// Features are inherited by derived classes, so override this
+%dmethodmodifiers RemoteMpe::syncmethod "public"
+%dmethodmodifiers RemoteMpe::asyncmethod "public"
 #endif
 
 #endif

Modified: trunk/Examples/test-suite/multiple_inheritance.i
===================================================================
--- trunk/Examples/test-suite/multiple_inheritance.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/multiple_inheritance.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -5,11 +5,13 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;	/* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;	/* C#, D, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBarSpam;	/* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBarSpam;	/* C#, D, Java, PHP multiple inheritance */
 
 
 %inline %{

Modified: trunk/Examples/test-suite/namespace_class.i
===================================================================
--- trunk/Examples/test-suite/namespace_class.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/namespace_class.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -2,6 +2,10 @@
 
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Ala::Ola;
 
+#ifdef SWIGD
+%warnfilter(SWIGWARN_IGNORE_OPERATOR_LT);
+#endif
+
 %inline %{
   template<class T> void foobar(T t) {}
   namespace test {

Modified: trunk/Examples/test-suite/preproc_line_file.i
===================================================================
--- trunk/Examples/test-suite/preproc_line_file.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/preproc_line_file.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -33,12 +33,12 @@
 %javaconst(1);
 #elif defined(SWIGCSHARP)
 %csconst(1);
+#elif defined(SWIGD)
+%dnativeconst;
 #else
 %ignore LINE_NUMBER;
 %ignore LINE_NUM;
 /* spare space */
-
-
 #endif
 
 %{

Modified: trunk/Examples/test-suite/pure_virtual.i
===================================================================
--- trunk/Examples/test-suite/pure_virtual.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/pure_virtual.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -9,7 +9,8 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, D, Java, PHP multiple inheritance */
 
 %nodefaultctor C;
 %nodefaultdtor C;
@@ -65,7 +66,7 @@
 %}
 
 /* Fill in method from AA.  This class should be constructable */
-#ifdef SWIGCSHARP
+#if defined(SWIGCSHARP) || defined(SWIGD)
 %ignore F::method2(); // Work around for lack of multiple inheritance support - base AA is ignored.
 #endif
 

Modified: trunk/Examples/test-suite/samename.i
===================================================================
--- trunk/Examples/test-suite/samename.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/samename.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -1,6 +1,6 @@
 %module samename
 
-#if !(defined(SWIGCSHARP) || defined(SWIGJAVA))
+#if !(defined(SWIGCSHARP) || defined(SWIGJAVA) || defined(SWIGD))
 class samename {
  public:
   void do_something() {

Modified: trunk/Examples/test-suite/special_variable_macros.i
===================================================================
--- trunk/Examples/test-suite/special_variable_macros.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/special_variable_macros.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -165,7 +165,21 @@
     return new $typemap(jstype, Space::RenameMe)( new $typemap(jstype, Name)(s) ); 
   }
 %}
+#elif defined(SWIGD)
+#if (SWIG_D_VERSION == 1)
+%typemap(dcode) Space::RenameMe %{
+  public static NewName factory(char[] s) {
+    return new $typemap(dptype, Space::RenameMe)( new $typemap(dptype, Name)(s) );
+  }
+%}
+#else
+%typemap(dcode) Space::RenameMe %{
+  public static NewName factory(string s) {
+    return new $typemap(dptype, Space::RenameMe)( new $typemap(dptype, Name)(s) );
+  }
+%}
 #endif
+#endif
 
 %rename(NewName) Space::RenameMe;
 %inline %{

Modified: trunk/Examples/test-suite/static_const_member.i
===================================================================
--- trunk/Examples/test-suite/static_const_member.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/static_const_member.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -11,6 +11,9 @@
 #elif SWIGCSHARP
 %csconst(1) EN;
 %csconst(1) CHARTEST;
+#elif SWIGD
+%dnativeconst EN;
+%dnativeconst CHARTEST;
 #endif
 
 %inline %{

Modified: trunk/Examples/test-suite/template_enum.i
===================================================================
--- trunk/Examples/test-suite/template_enum.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/template_enum.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -13,6 +13,10 @@
 %template(foo_i) foo<int>;
 %template(foo_d) foo<double>;
 
+#ifdef SWIGD
+// Workaround for the D module which uses the literal value in the generated wrapper code.
+%dconstvalue("3") Manta::ColorSpace<Manta::RGBTraits>::NumComponents;
+#endif
 
 %inline {
   

Modified: trunk/Examples/test-suite/template_inherit_abstract.i
===================================================================
--- trunk/Examples/test-suite/template_inherit_abstract.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/template_inherit_abstract.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -4,7 +4,8 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module;	/* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module;	/* C#, D, Java, PHP multiple inheritance */
 
 %inline %{ 
  
@@ -56,7 +57,7 @@
 %inline %{ 
   namespace oss 
   { 
-#if defined(SWIG) && defined(SWIGCSHARP)
+#if defined(SWIG) && (defined(SWIGCSHARP) || defined(SWIGD))
 %ignore HModule<B>::get(); // Work around for lack of multiple inheritance support - base ModuleBase is ignored.
 #endif
     struct test : HModule<B> 

Modified: trunk/Examples/test-suite/typemap_namespace.i
===================================================================
--- trunk/Examples/test-suite/typemap_namespace.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/typemap_namespace.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -29,8 +29,15 @@
 #ifdef SWIGGO
     %typemap(gotype) Str1 * = char *;
 #endif
+#ifdef SWIGD
+    %typemap(cwtype) Str1 * = char *;
+    %typemap(dwtype) Str1 * = char *;
+    %typemap(dptype) Str1 * = char *;
+    %typemap(din) Str1 * = char *;
+    %typemap(dout) Str1 * = char *;
+#endif
     %typemap(in) Str1 * = char *;
-#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP) || defined(SWIGMZSCHEME) || defined(SWIGOCAML) || defined(SWIGGO))
+#if !(defined(SWIGCSHARP) || defined(SWIGLUA) || defined(SWIGPHP) || defined(SWIGMZSCHEME) || defined(SWIGOCAML) || defined(SWIGGO) || defined(SWIGD))
     %typemap(freearg) Str1 * = char *;
 #endif
     %typemap(typecheck) Str1 * = char *;

Modified: trunk/Examples/test-suite/typemap_out_optimal.i
===================================================================
--- trunk/Examples/test-suite/typemap_out_optimal.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/typemap_out_optimal.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -2,7 +2,7 @@
 %module typemap_out_optimal
 
 // Just the following languages tested
-#if defined (SWIGCSHARP)
+#if defined (SWIGCSHARP) || defined (SWIGD)
 %typemap(out, optimal="1") SWIGTYPE %{
   $result = new $1_ltype((const $1_ltype &)$1);
 %}
@@ -18,6 +18,10 @@
 
 %ignore XX::operator=;
 
+#ifdef SWIGD
+%rename(trace) XX::debug;
+#endif
+
 %inline %{
 #include <iostream>
 using namespace std;

Modified: trunk/Examples/test-suite/typemap_subst.i
===================================================================
--- trunk/Examples/test-suite/typemap_subst.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/typemap_subst.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -61,8 +61,8 @@
   $1 = ($ltype) temp;  
 }
 
-/* Java, C# and Go modules don't use SWIG's runtime type system */
-#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO)
+/* Java, C#, Go and D modules don't use SWIG's runtime type system */
+#if !defined(SWIGJAVA) && !defined(SWIGCSHARP) && !defined(SWIGGO) && !defined(SWIGD)
 %inline %{
   void foo(const struct xyzzy **TEST) {}
 %}

Modified: trunk/Examples/test-suite/using_composition.i
===================================================================
--- trunk/Examples/test-suite/using_composition.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/using_composition.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -2,13 +2,16 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, D, Java, PHP multiple inheritance
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2;   // C#, Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2;   // C#, D, Java, PHP multiple inheritance
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3;   // C#, Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3;   // C#, D, Java, PHP multiple inheritance
 #ifdef SWIGLUA	// lua only has one numeric type, so some overloads shadow each other creating warnings
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
 #endif

Modified: trunk/Examples/test-suite/using_extend.i
===================================================================
--- trunk/Examples/test-suite/using_extend.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/using_extend.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -2,7 +2,8 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, D, Java, PHP multiple inheritance
 #ifdef SWIGLUA	// lua only has one numeric type, so some overloads shadow each other creating warnings
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
 #endif

Modified: trunk/Examples/test-suite/using_namespace.i
===================================================================
--- trunk/Examples/test-suite/using_namespace.i	2010-11-18 00:16:23 UTC (rev 12297)
+++ trunk/Examples/test-suite/using_namespace.i	2010-11-18 00:17:37 UTC (rev 12298)
@@ -5,7 +5,8 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, Java, PHP multiple inheritance
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, D, Java, PHP multiple inheritance
 
 %inline %{
   namespace hello


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12336
          http://swig.svn.sourceforge.net/swig/?rev=12336&view=rev
Author:   wsfulton
Date:     2010-12-08 19:35:03 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
More extensive member function pointer test

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/member_funcptr_galore.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2010-12-08 16:58:14 UTC (rev 12335)
+++ trunk/Examples/test-suite/common.mk	2010-12-08 19:35:03 UTC (rev 12336)
@@ -231,6 +231,7 @@
 	li_windows \
 	long_long_apply \
 	memberin_extend \
+	member_funcptr_galore \
 	member_pointer \
 	member_template \
 	minherit \

Added: trunk/Examples/test-suite/member_funcptr_galore.i
===================================================================
--- trunk/Examples/test-suite/member_funcptr_galore.i	                        (rev 0)
+++ trunk/Examples/test-suite/member_funcptr_galore.i	2010-12-08 19:35:03 UTC (rev 12336)
@@ -0,0 +1,83 @@
+%module member_pointer
+
+%inline %{
+
+namespace FunkSpace {
+struct Funktions {
+  int addByValue(const int &a, int b) { return a+b; }
+  int * addByPointer(const int &a, int b) { static int val; val = a+b; return &val; }
+  int & addByReference(const int &a, int b) { static int val; val = a+b; return val; }
+};
+}
+
+template <typename T> struct Thing {};
+namespace Space {
+class Shape {
+public:
+  double  x, y;   
+  double  *z;
+
+  void    move(double dx, double dy);
+  virtual double area(Shape &ref, int & (FunkSpace::Funktions::*d)(const int &, int));
+  virtual double abc(Thing<short> ts, Thing< const Space::Shape * > tda[]);
+};
+}
+
+extern double do_op(Space::Shape *s, double (Space::Shape::*m)(void));
+
+/* Functions that return member pointers */
+
+extern double (Space::Shape::*areapt())(Space::Shape &, int & (FunkSpace::Funktions::*)(const int &, int));
+extern double (Space::Shape::*abcpt())(Thing<short>, Thing< const Space::Shape * > tda[]);
+
+/* Global variables that are member pointers */
+extern double (Space::Shape::*areavar)(Space::Shape &, int & (FunkSpace::Funktions::*)(const int &, int));
+extern double (Space::Shape::*abcvar)(Thing<short>, Thing< const Space::Shape * >[]);
+
+%}
+
+%{
+void Space::Shape::move(double dx, double dy) {
+  x += dx;
+  y += dy;
+}
+
+double do_op(Space::Shape *s, double (Space::Shape::*m)(void)) {
+  return (s->*m)();
+}
+
+double (Space::Shape::*areapt(Space::Shape &ref, int & (FunkSpace::Funktions::*d)(const int &, int)))(Space::Shape &, int & (FunkSpace::Funktions::*d)(const int &, int)) {
+  return &Space::Shape::area;
+}
+
+double (Space::Shape::*abcpt())(Thing<short>, Thing< const Space::Shape * >[]) {
+  return &Space::Shape::abc;
+}
+
+/* Member pointer variables */
+double (Space::Shape::*areavar)(Space::Shape &, int & (FunkSpace::Funktions::*)(const int &, int)) = &Space::Shape::area;
+double (Space::Shape::*abcvar)(Thing<short>, Thing< const Space::Shape * >[]) = &Space::Shape::abc;
+%}
+
+
+/* Some constants */
+%constant double (Space::Shape::*AREAPT)(Space::Shape &, int & (FunkSpace::Funktions::*)(const int &, int)) = &Space::Shape::area;
+%constant double (Space::Shape::*PERIMPT)(Thing<short>, Thing< const Space::Shape * >[]) = &Space::Shape::abc;
+%constant double (Space::Shape::*NULLPT)(void) = 0;
+
+%inline %{
+
+int call1(int (FunkSpace::Funktions::*d)(const int &, int), int a, int b) { FunkSpace::Funktions f; return (f.*d)(a, b); }
+int call2(int * (FunkSpace::Funktions::*d)(const int &, int), int a, int b) { FunkSpace::Funktions f; return *(f.*d)(a, b); }
+int call3(int & (FunkSpace::Funktions::*d)(const int &, int), int a, int b) { FunkSpace::Funktions f; return (f.*d)(a, b); }
+%}
+
+%constant int (FunkSpace::Funktions::*ADD_BY_VALUE)(const int &, int) = &FunkSpace::Funktions::addByValue;
+%constant int * (FunkSpace::Funktions::*ADD_BY_POINTER)(const int &, int) = &FunkSpace::Funktions::addByPointer;
+%constant int & (FunkSpace::Funktions::*ADD_BY_REFERENCE)(const int &, int) = &FunkSpace::Funktions::addByReference;
+
+%inline %{
+// parameter that is a member pointer containing a function ptr, urgh :)
+int unreal1(double (Space::Shape::*memptr)(Space::Shape &, int & (FunkSpace::Funktions::*)(const int &, int))) { return 0; }
+int unreal2(double (Space::Shape::*memptr)(Thing<short>)) { return 0; }
+%}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12338
          http://swig.svn.sourceforge.net/swig/?rev=12338&view=rev
Author:   wsfulton
Date:     2010-12-08 19:56:14 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
Fix wallkw runtime test since D was added

Modified Paths:
--------------
    trunk/Examples/test-suite/java/wallkw_runme.java
    trunk/Examples/test-suite/wallkw.i

Modified: trunk/Examples/test-suite/java/wallkw_runme.java
===================================================================
--- trunk/Examples/test-suite/java/wallkw_runme.java	2010-12-08 19:35:52 UTC (rev 12337)
+++ trunk/Examples/test-suite/java/wallkw_runme.java	2010-12-08 19:56:14 UTC (rev 12338)
@@ -19,7 +19,7 @@
       throw new RuntimeException("delegate keyword fail");
     if (!wallkw._pass().equals("pass"))
       throw new RuntimeException("pass keyword fail");
-    if (!wallkw.C_alias().equals("alias"))
+    if (!wallkw._alias().equals("alias"))
       throw new RuntimeException("alias keyword fail");
   }
 }

Modified: trunk/Examples/test-suite/wallkw.i
===================================================================
--- trunk/Examples/test-suite/wallkw.i	2010-12-08 19:35:52 UTC (rev 12337)
+++ trunk/Examples/test-suite/wallkw.i	2010-12-08 19:56:14 UTC (rev 12338)
@@ -5,12 +5,14 @@
 %warnfilter(SWIGWARN_PARSE_KEYWORD) clone; // 'clone' is a php keyword, renamed as 'c_clone'
 %warnfilter(SWIGWARN_PARSE_KEYWORD) delegate; // 'delegate' is a C# keyword, renaming to '_delegate'
 %warnfilter(SWIGWARN_PARSE_KEYWORD) pass; // 'pass' is a python keyword, renaming to '_pass'
-%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a ruby keyword, renaming to 'C_alias'
+%warnfilter(SWIGWARN_PARSE_KEYWORD) alias; // 'alias' is a D keyword, renaming to '_alias'
+%warnfilter(SWIGWARN_PARSE_KEYWORD) rescue; // 'rescue' is a ruby keyword, renaming to 'C_rescue'
 
 %inline %{
 const char * clone() { return "clone"; }
 const char * delegate() { return "delegate"; }
 const char * pass() { return "pass"; }
 const char * alias() { return "alias"; }
+const char * rescue() { return "rescue"; }
 %}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12372
          http://swig.svn.sourceforge.net/swig/?rev=12372&view=rev
Author:   wsfulton
Date:     2011-01-05 21:15:10 +0000 (Wed, 05 Jan 2011)

Log Message:
-----------
Fix rname testcase when run under OpenJDK icedtea on Linux because libjvm.so also contains a class called Base. Also remove need for Go specific handling in this testcase.

Modified Paths:
--------------
    trunk/Examples/test-suite/java/rname_runme.java
    trunk/Examples/test-suite/rname.i

Modified: trunk/Examples/test-suite/java/rname_runme.java
===================================================================
--- trunk/Examples/test-suite/java/rname_runme.java	2011-01-05 08:35:28 UTC (rev 12371)
+++ trunk/Examples/test-suite/java/rname_runme.java	2011-01-05 21:15:10 UTC (rev 12372)
@@ -30,7 +30,7 @@
       throw new RuntimeException("base.newname");
 
     RenamedDerived derived = new RenamedDerived();
-    derived.func(base, base, base);
+    derived.Xfunc(base, base, base);
     if (!derived.newname(10.0).equals("Derived"))
       throw new RuntimeException("derived.newname");
   }

Modified: trunk/Examples/test-suite/rname.i
===================================================================
--- trunk/Examples/test-suite/rname.i	2011-01-05 08:35:28 UTC (rev 12371)
+++ trunk/Examples/test-suite/rname.i	2011-01-05 21:15:10 UTC (rev 12372)
@@ -15,19 +15,14 @@
 %rename(foo_u) *::foo(unsigned);
 
 /* Rename classes in a class hierarchy */
-%rename (RenamedBase) Base;
-%rename (RenamedDerived) Derived;
+%rename (RenamedBase) Space::Base;
+%rename (RenamedDerived) Space::Derived;
 
 /* Rename base class method applies to derived classes too */#
-%rename (newname) Base::oldname(double d) const;
+%rename (newname) Space::Base::oldname(double d) const;
 
 /* Rename derived class method only */
-#ifndef SWIGGO
-%rename (func) Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
-#else
-/* func is a keyword in Go. */
-%rename (Xfunc) Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
-#endif
+%rename (Xfunc) Space::Derived::fn(Base baseValue, Base* basePtr, Base& baseRef);
 
 %inline %{
 class Bar {
@@ -43,20 +38,22 @@
 char *foo(short)    { return (char *) "foo-short"; }
 char *foo(unsigned) { return (char *) "foo-unsigned"; }
 
+namespace Space {
 class Base {
 public: 
   Base(){}; 
   virtual ~Base(){};
   void fn(Base baseValue, Base* basePtr, Base& baseRef){}
-  virtual const char * oldname(double d) const { return (char*) "Base"; }
+  virtual const char * oldname(double d) const { return "Base"; }
 };
 class Derived : public Base {
 public:
   Derived(){}
   ~Derived(){}
   void fn(Base baseValue, Base* basePtr, Base& baseRef){}
-  virtual const char * oldname(double d) const { return (char*) "Derived"; }
+  virtual const char * oldname(double d) const { return "Derived"; }
 };
+}
 
 %}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12397
          http://swig.svn.sourceforge.net/swig/?rev=12397&view=rev
Author:   wsfulton
Date:     2011-01-17 21:25:04 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
Move a couple of runme files which into the correct directories

Added Paths:
-----------
    trunk/Examples/test-suite/d/director_alternating_runme.1.d
    trunk/Examples/test-suite/octave/samename_runme.m

Removed Paths:
-------------
    trunk/Examples/test-suite/director_alternating_runme.1.d
    trunk/Examples/test-suite/samename_runme.m

Copied: trunk/Examples/test-suite/d/director_alternating_runme.1.d (from rev 12395, trunk/Examples/test-suite/director_alternating_runme.1.d)
===================================================================
--- trunk/Examples/test-suite/d/director_alternating_runme.1.d	                        (rev 0)
+++ trunk/Examples/test-suite/d/director_alternating_runme.1.d	2011-01-17 21:25:04 UTC (rev 12397)
@@ -0,0 +1,7 @@
+module director_alternating_runme;
+
+import director_alternating.director_alternating;
+
+void main() {
+   assert(getBar().id() == idFromGetBar());
+}

Deleted: trunk/Examples/test-suite/director_alternating_runme.1.d
===================================================================
--- trunk/Examples/test-suite/director_alternating_runme.1.d	2011-01-17 21:20:29 UTC (rev 12396)
+++ trunk/Examples/test-suite/director_alternating_runme.1.d	2011-01-17 21:25:04 UTC (rev 12397)
@@ -1,7 +0,0 @@
-module director_alternating_runme;
-
-import director_alternating.director_alternating;
-
-void main() {
-   assert(getBar().id() == idFromGetBar());
-}

Copied: trunk/Examples/test-suite/octave/samename_runme.m (from rev 12395, trunk/Examples/test-suite/samename_runme.m)
===================================================================
--- trunk/Examples/test-suite/octave/samename_runme.m	                        (rev 0)
+++ trunk/Examples/test-suite/octave/samename_runme.m	2011-01-17 21:25:04 UTC (rev 12397)
@@ -0,0 +1 @@
+samename

Deleted: trunk/Examples/test-suite/samename_runme.m
===================================================================
--- trunk/Examples/test-suite/samename_runme.m	2011-01-17 21:20:29 UTC (rev 12396)
+++ trunk/Examples/test-suite/samename_runme.m	2011-01-17 21:25:04 UTC (rev 12397)
@@ -1 +0,0 @@
-samename


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12407
          http://swig.svn.sourceforge.net/swig/?rev=12407&view=rev
Author:   klickverbot
Date:     2011-01-29 21:32:11 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
[D] Test C++ references in ?\194?\187d_nativepointers?\194?\171; normalized indentation.

Modified Paths:
--------------
    trunk/Examples/test-suite/d/d_nativepointers_runme.1.d
    trunk/Examples/test-suite/d/d_nativepointers_runme.2.d
    trunk/Examples/test-suite/d_nativepointers.i

Modified: trunk/Examples/test-suite/d/d_nativepointers_runme.1.d
===================================================================
--- trunk/Examples/test-suite/d/d_nativepointers_runme.1.d	2011-01-29 21:31:53 UTC (rev 12406)
+++ trunk/Examples/test-suite/d/d_nativepointers_runme.1.d	2011-01-29 21:32:11 UTC (rev 12407)
@@ -7,17 +7,30 @@
 import d_nativepointers.SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void;
 
 void main() {
-   check!(a, int*);
-   check!(b, float**);
-   check!(c, char***);
-   check!(d, SomeClass);
-   check!(e, SWIGTYPE_p_p_SomeClass);
-   check!(f, SWIGTYPE_p_OpaqueClass);
-   check!(g, void function(int**, char***));
-   check!(h, SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void);
+  check!(a, int*);
+  check!(b, float**);
+  check!(c, char***);
+  check!(d, SomeClass);
+  check!(e, SWIGTYPE_p_p_SomeClass);
+  check!(f, SWIGTYPE_p_OpaqueClass);
+  check!(g, void function(int**, char***));
+  check!(h, SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void);
+
+  {
+    static assert(is(int* function(int*) == typeof(&refA)));
+    int v = 2;
+    assert(*refA(&v) == 2);
+  }
+
+  {
+    static assert(is(float** function(float**) == typeof(&refB)));
+    float v = 1.0;
+    float* p = &v;
+    assert(**refB(&p) == 1.0);
+  }
 }
 
 void check(alias F, T)() {
-   static assert(is(T function(T) == typeof(&F)));
-   assert(F(null) is null);
+  static assert(is(T function(T) == typeof(&F)));
+  assert(F(null) is null);
 }

Modified: trunk/Examples/test-suite/d/d_nativepointers_runme.2.d
===================================================================
--- trunk/Examples/test-suite/d/d_nativepointers_runme.2.d	2011-01-29 21:31:53 UTC (rev 12406)
+++ trunk/Examples/test-suite/d/d_nativepointers_runme.2.d	2011-01-29 21:32:11 UTC (rev 12407)
@@ -7,17 +7,30 @@
 import d_nativepointers.SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void;
 
 void main() {
-   check!(a, int*);
-   check!(b, float**);
-   check!(c, char***);
-   check!(d, SomeClass);
-   check!(e, SWIGTYPE_p_p_SomeClass);
-   check!(f, SWIGTYPE_p_OpaqueClass);
-   check!(g, void function(int**, char***));
-   check!(h, SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void);
+  check!(a, int*);
+  check!(b, float**);
+  check!(c, char***);
+  check!(d, SomeClass);
+  check!(e, SWIGTYPE_p_p_SomeClass);
+  check!(f, SWIGTYPE_p_OpaqueClass);
+  check!(g, void function(int**, char***));
+  check!(h, SWIGTYPE_p_p_f_p_p_int_p_SomeClass__void);
+
+  {
+    static assert(is(int* function(int*) == typeof(&refA)));
+    int v = 2;
+    assert(*refA(&v) == 2);
+  }
+
+  {
+    static assert(is(float** function(float**) == typeof(&refB)));
+    float v = 1.0;
+    float* p = &v;
+    assert(**refB(&p) == 1.0);
+  }
 }
 
 void check(alias F, T)() {
-   static assert(is(T function(T) == typeof(&F)));
-   assert(F(null) is null);
+  static assert(is(T function(T) == typeof(&F)));
+  assert(F(null) is null);
 }

Modified: trunk/Examples/test-suite/d_nativepointers.i
===================================================================
--- trunk/Examples/test-suite/d_nativepointers.i	2011-01-29 21:31:53 UTC (rev 12406)
+++ trunk/Examples/test-suite/d_nativepointers.i	2011-01-29 21:32:11 UTC (rev 12407)
@@ -15,4 +15,7 @@
   OpaqueClass *f( OpaqueClass *value ){ return value; }
   FuncA g( FuncA value ){ return value; }
   FuncB* h( FuncB* value ){ return value; }
+
+  int &refA( int &value ){ return value; }
+  float *&refB( float *&value ){ return value; }
 %}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12475
          http://swig.svn.sourceforge.net/swig/?rev=12475&view=rev
Author:   wsfulton
Date:     2011-02-18 23:18:42 +0000 (Fri, 18 Feb 2011)

Log Message:
-----------
Rename covariant_return.i testcase as it is not testing covariant return types

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/overload_return_type.i

Removed Paths:
-------------
    trunk/Examples/test-suite/covariant_return.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2011-02-18 21:25:42 UTC (rev 12474)
+++ trunk/Examples/test-suite/common.mk	2011-02-18 23:18:42 UTC (rev 12475)
@@ -140,7 +140,6 @@
 	conversion \
 	conversion_namespace \
 	conversion_ns_template \
-	covariant_return \
 	cplusplus_throw \
 	cpp_basic \
 	cpp_enum \
@@ -269,6 +268,7 @@
 	overload_copy \
 	overload_extend \
 	overload_rename \
+	overload_return_type \
 	overload_simple \
 	overload_subtype \
 	overload_template \

Deleted: trunk/Examples/test-suite/covariant_return.i
===================================================================
--- trunk/Examples/test-suite/covariant_return.i	2011-02-18 21:25:42 UTC (rev 12474)
+++ trunk/Examples/test-suite/covariant_return.i	2011-02-18 23:18:42 UTC (rev 12475)
@@ -1,16 +0,0 @@
-%module covariant_return
-
-// Regression test for PHP from SF#3168531i (SWIG <= 2.0.1 segfaults).
-
-%inline %{
-
-#include <string>
-using namespace std;
-class A { };
-class B {
-    public:
-        int foo(int x);
-        A foo(string y);
-};
-
-%}

Copied: trunk/Examples/test-suite/overload_return_type.i (from rev 12473, trunk/Examples/test-suite/covariant_return.i)
===================================================================
--- trunk/Examples/test-suite/overload_return_type.i	                        (rev 0)
+++ trunk/Examples/test-suite/overload_return_type.i	2011-02-18 23:18:42 UTC (rev 12475)
@@ -0,0 +1,16 @@
+%module overload_return_type
+
+// Regression test for PHP from SF#3168531i (SWIG <= 2.0.1 segfaults).
+
+%inline %{
+
+#include <string>
+using namespace std;
+class A { };
+class B {
+    public:
+        int foo(int x);
+        A foo(string y);
+};
+
+%}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12482
          http://swig.svn.sourceforge.net/swig/?rev=12482&view=rev
Author:   wsfulton
Date:     2011-02-19 16:20:38 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
Rename symbol in test case as the name is clashing in some way with new versions of Octave (3.2.4)

Modified Paths:
--------------
    trunk/Examples/test-suite/global_ns_arg.i
    trunk/Examples/test-suite/go/global_ns_arg_runme.go
    trunk/Examples/test-suite/octave/global_ns_arg_runme.m
    trunk/Examples/test-suite/python/global_ns_arg_runme.py

Modified: trunk/Examples/test-suite/global_ns_arg.i
===================================================================
--- trunk/Examples/test-suite/global_ns_arg.i	2011-02-19 16:12:12 UTC (rev 12481)
+++ trunk/Examples/test-suite/global_ns_arg.i	2011-02-19 16:20:38 UTC (rev 12482)
@@ -8,7 +8,7 @@
    return x;
 }
 
-::Integer bar() {
+::Integer bar_fn() {
    return 1;
 }
 

Modified: trunk/Examples/test-suite/go/global_ns_arg_runme.go
===================================================================
--- trunk/Examples/test-suite/go/global_ns_arg_runme.go	2011-02-19 16:12:12 UTC (rev 12481)
+++ trunk/Examples/test-suite/go/global_ns_arg_runme.go	2011-02-19 16:20:38 UTC (rev 12482)
@@ -4,5 +4,5 @@
 
 func main() {
 	Foo(1)
-	Bar()
+	Bar_fn()
 }

Modified: trunk/Examples/test-suite/octave/global_ns_arg_runme.m
===================================================================
--- trunk/Examples/test-suite/octave/global_ns_arg_runme.m	2011-02-19 16:12:12 UTC (rev 12481)
+++ trunk/Examples/test-suite/octave/global_ns_arg_runme.m	2011-02-19 16:20:38 UTC (rev 12482)
@@ -1,5 +1,5 @@
 global_ns_arg
 
 a = foo(1);
-b = bar();
+b = bar_fn();
 

Modified: trunk/Examples/test-suite/python/global_ns_arg_runme.py
===================================================================
--- trunk/Examples/test-suite/python/global_ns_arg_runme.py	2011-02-19 16:12:12 UTC (rev 12481)
+++ trunk/Examples/test-suite/python/global_ns_arg_runme.py	2011-02-19 16:20:38 UTC (rev 12482)
@@ -1,5 +1,5 @@
 from global_ns_arg import *
 
 a = foo(1)
-b = bar()
+b = bar_fn()
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12486
          http://swig.svn.sourceforge.net/swig/?rev=12486&view=rev
Author:   wsfulton
Date:     2011-02-19 19:20:37 +0000 (Sat, 19 Feb 2011)

Log Message:
-----------
Additional %varargs and overloading testing

Modified Paths:
--------------
    trunk/Examples/test-suite/python/varargs_overload_runme.py
    trunk/Examples/test-suite/varargs_overload.i

Modified: trunk/Examples/test-suite/python/varargs_overload_runme.py
===================================================================
--- trunk/Examples/test-suite/python/varargs_overload_runme.py	2011-02-19 17:20:08 UTC (rev 12485)
+++ trunk/Examples/test-suite/python/varargs_overload_runme.py	2011-02-19 19:20:37 UTC (rev 12486)
@@ -20,3 +20,12 @@
 if varargs_overload.vararg_over3(2, 2.2, "hey") != "2 2.2 hey":
     raise RuntimeError, "Failed"
 
+if varargs_overload.vararg_over4("Hello") != "Hello":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over4(123) != "123":
+    raise RuntimeError, "Failed"
+
+if varargs_overload.vararg_over4("Hello", 123) != "Hello":
+    raise RuntimeError, "Failed"
+

Modified: trunk/Examples/test-suite/varargs_overload.i
===================================================================
--- trunk/Examples/test-suite/varargs_overload.i	2011-02-19 17:20:08 UTC (rev 12485)
+++ trunk/Examples/test-suite/varargs_overload.i	2011-02-19 19:20:37 UTC (rev 12486)
@@ -30,3 +30,15 @@
   return buffer;
 }
 %}
+
+%varargs(int mode = 0) vararg_over4;
+%inline %{
+const char *vararg_over4(const char *fmt, ...) {
+  return fmt;
+}
+const char *vararg_over4(int i) {
+  static char buffer[256];
+  sprintf(buffer, "%d", i);
+  return buffer;
+}
+%}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12505
          http://swig.svn.sourceforge.net/swig/?rev=12505&view=rev
Author:   wsfulton
Date:     2011-02-20 19:29:50 +0000 (Sun, 20 Feb 2011)

Log Message:
-----------
Solaris warnings/errors testcase fixes

Modified Paths:
--------------
    trunk/Examples/test-suite/member_funcptr_galore.i
    trunk/Examples/test-suite/member_pointer.i
    trunk/Examples/test-suite/nested_class.i

Modified: trunk/Examples/test-suite/member_funcptr_galore.i
===================================================================
--- trunk/Examples/test-suite/member_funcptr_galore.i	2011-02-20 18:37:46 UTC (rev 12504)
+++ trunk/Examples/test-suite/member_funcptr_galore.i	2011-02-20 19:29:50 UTC (rev 12505)
@@ -3,6 +3,8 @@
 %{
 #if defined(__SUNPRO_CC)
 #pragma error_messages (off, badargtype2w) /* Formal argument ... is being passed extern "C" ... */
+#pragma error_messages (off, wbadinit) /* Using extern "C" ... to initialize ... */
+#pragma error_messages (off, wbadasg) /* Assigning extern "C" ... */
 #endif
 %}
 

Modified: trunk/Examples/test-suite/member_pointer.i
===================================================================
--- trunk/Examples/test-suite/member_pointer.i	2011-02-20 18:37:46 UTC (rev 12504)
+++ trunk/Examples/test-suite/member_pointer.i	2011-02-20 19:29:50 UTC (rev 12505)
@@ -3,6 +3,8 @@
 %{
 #if defined(__SUNPRO_CC)
 #pragma error_messages (off, badargtype2w) /* Formal argument ... is being passed extern "C" ... */
+#pragma error_messages (off, wbadinit) /* Using extern "C" ... to initialize ... */
+#pragma error_messages (off, wbadasg) /* Assigning extern "C" ... */
 #endif
 %}
 

Modified: trunk/Examples/test-suite/nested_class.i
===================================================================
--- trunk/Examples/test-suite/nested_class.i	2011-02-20 18:37:46 UTC (rev 12504)
+++ trunk/Examples/test-suite/nested_class.i	2011-02-20 19:29:50 UTC (rev 12505)
@@ -39,6 +39,8 @@
   };
 
   ///////////////////////////////////////////
+#ifdef SWIG
+/* some compilers do not accept these */
   class {
   public:
     Integer a;
@@ -47,6 +49,7 @@
   struct {
     Integer b;
   };
+#endif
 
   union {
     Integer c;
@@ -151,6 +154,8 @@
     Integer xx;
   } MultipleInstanceAnonDerived1, MultipleInstanceAnonDerived2, *MultipleInstanceAnonDerived3, MultipleInstanceAnonDerived4[2];
 
+#ifdef SWIG
+/* some compilers do not accept these */
   struct : public InnerMultiple {
     Integer xx;
   };
@@ -159,6 +164,7 @@
   public:
     Integer yy;
   };
+#endif
 
   ///////////////////////////////////////////
   typedef struct {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12538
          http://swig.svn.sourceforge.net/swig/?rev=12538&view=rev
Author:   olly
Date:     2011-03-14 11:58:58 +0000 (Mon, 14 Mar 2011)

Log Message:
-----------
Simplify test-suite/overload_return_type.i (checked that it still fails before
the fix it's a regression test for) and added _runme.php for it.

Modified Paths:
--------------
    trunk/Examples/test-suite/overload_return_type.i

Added Paths:
-----------
    trunk/Examples/test-suite/php/overload_return_type_runme.php

Modified: trunk/Examples/test-suite/overload_return_type.i
===================================================================
--- trunk/Examples/test-suite/overload_return_type.i	2011-03-14 09:49:27 UTC (rev 12537)
+++ trunk/Examples/test-suite/overload_return_type.i	2011-03-14 11:58:58 UTC (rev 12538)
@@ -4,17 +4,10 @@
 
 %inline %{
 
-#include <string>
-using namespace std;
 class A { };
 class B {
     public:
-        int foo(int x);
-        A foo(string y);
+        int foo(int x) { return 0; }
+        A foo(const char * y) { return A(); }
 };
 %}
-
-%{
-int B::foo(int x) { return 0; }
-A B::foo(string y) { return A(); }
-%}

Added: trunk/Examples/test-suite/php/overload_return_type_runme.php
===================================================================
--- trunk/Examples/test-suite/php/overload_return_type_runme.php	                        (rev 0)
+++ trunk/Examples/test-suite/php/overload_return_type_runme.php	2011-03-14 11:58:58 UTC (rev 12538)
@@ -0,0 +1,10 @@
+<?php
+
+require "tests.php";
+require "overload_return_type.php";
+
+$b = new B;
+check::equal($b->foo(1), 0, "");
+check::classname("A", $b->foo("test"));
+
+?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12650
          http://swig.svn.sourceforge.net/swig/?rev=12650&view=rev
Author:   ianlancetaylor
Date:     2011-05-02 21:11:15 +0000 (Mon, 02 May 2011)

Log Message:
-----------
Rename varargs_typemap test case to python_varargs_typemap, and move
to Python Makefile.

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/python/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/python_varargs_typemap.i

Removed Paths:
-------------
    trunk/Examples/test-suite/varargs_typemap.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2011-05-02 21:08:17 UTC (rev 12649)
+++ trunk/Examples/test-suite/common.mk	2011-05-02 21:11:15 UTC (rev 12650)
@@ -511,8 +511,7 @@
 	typedef_struct \
 	typemap_subst \
 	union_parameter \
-	unions \
-	varargs_typemap
+	unions
 
 
 # Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest)

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2011-05-02 21:08:17 UTC (rev 12649)
+++ trunk/Examples/test-suite/python/Makefile.in	2011-05-02 21:11:15 UTC (rev 12650)
@@ -76,7 +76,8 @@
 	file_test \
 	li_cstring \
 	li_cwstring \
-	python_nondynamic
+	python_nondynamic \
+	python_varargs_typemap
 
 #
 # This test only works with modern C compilers

Copied: trunk/Examples/test-suite/python_varargs_typemap.i (from rev 12648, trunk/Examples/test-suite/varargs_typemap.i)
===================================================================
--- trunk/Examples/test-suite/python_varargs_typemap.i	                        (rev 0)
+++ trunk/Examples/test-suite/python_varargs_typemap.i	2011-05-02 21:11:15 UTC (rev 12650)
@@ -0,0 +1,43 @@
+%module python_varargs_typemap
+
+ /* The typemap and action are taken from the "Variable length arguments"
+  * chapter of the SWIG manual.
+  */
+
+%typemap(in) (...)(char *args[10]) {
+    int i;
+    int argc;
+    for (i = 0; i < 10; i++) args[i] = 0;
+    argc = PyTuple_Size(varargs);
+    if (argc > 10) {
+       PyErr_SetString(PyExc_ValueError,"Too many arguments");
+       return NULL;
+    }
+    for (i = 0; i < argc; i++) {
+       PyObject *o = PyTuple_GetItem(varargs,i);
+       if (!PyString_Check(o)) {
+           PyErr_SetString(PyExc_ValueError,"Expected a string");
+           return NULL;
+       }
+       args[i] = PyString_AsString(o);
+    }
+    $1 = (void *) args;
+}
+
+%feature("action") testfunc {
+   char **args = (char **) arg3;
+   result = testfunc(arg1, arg2, args[0], args[1], args[2], args[3], args[4],
+                   args[5],args[6],args[7],args[8],args[9], NULL);
+}
+
+%inline {
+char* testfunc (int arg1, double arg2, ...)
+{
+    va_list ap;
+    char *c;
+    va_start(ap, arg2);
+    c = va_arg(ap, char*);
+    va_end(ap);
+    return c;
+}
+}

Deleted: trunk/Examples/test-suite/varargs_typemap.i
===================================================================
--- trunk/Examples/test-suite/varargs_typemap.i	2011-05-02 21:08:17 UTC (rev 12649)
+++ trunk/Examples/test-suite/varargs_typemap.i	2011-05-02 21:11:15 UTC (rev 12650)
@@ -1,43 +0,0 @@
-%module varargs_typemap
-
- /* The typemap and action are taken from the "Variable length arguments"
-  * chapter of the SWIG manual.
-  */
-
-%typemap(in) (...)(char *args[10]) {
-    int i;
-    int argc;
-    for (i = 0; i < 10; i++) args[i] = 0;
-    argc = PyTuple_Size(varargs);
-    if (argc > 10) {
-       PyErr_SetString(PyExc_ValueError,"Too many arguments");
-       return NULL;
-    }
-    for (i = 0; i < argc; i++) {
-       PyObject *o = PyTuple_GetItem(varargs,i);
-       if (!PyString_Check(o)) {
-           PyErr_SetString(PyExc_ValueError,"Expected a string");
-           return NULL;
-       }
-       args[i] = PyString_AsString(o);
-    }
-    $1 = (void *) args;
-}
-
-%feature("action") testfunc {
-   char **args = (char **) arg3;
-   result = testfunc(arg1, arg2, args[0], args[1], args[2], args[3], args[4],
-                   args[5],args[6],args[7],args[8],args[9], NULL);
-}
-
-%inline {
-char* testfunc (int arg1, double arg2, ...)
-{
-    va_list ap;
-    char *c;
-    va_start(ap, arg2);
-    c = va_arg(ap, char*);
-    va_end(ap);
-    return c;
-}
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12715
          http://swig.svn.sourceforge.net/swig/?rev=12715&view=rev
Author:   olly
Date:     2011-05-25 05:19:48 +0000 (Wed, 25 May 2011)

Log Message:
-----------
Add testcase virtual_vs_nonvirtual_base as a regression test for SF#3124665.

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php
    trunk/Examples/test-suite/virtual_vs_nonvirtual_base.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2011-05-24 23:55:35 UTC (rev 12714)
+++ trunk/Examples/test-suite/common.mk	2011-05-25 05:19:48 UTC (rev 12715)
@@ -437,6 +437,7 @@
 	varargs_overload \
 	virtual_destructor \
 	virtual_poly \
+	virtual_vs_nonvirtual_base \
 	voidtest \
 	wallkw \
 	wrapmacro

Added: trunk/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php
===================================================================
--- trunk/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php	                        (rev 0)
+++ trunk/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php	2011-05-25 05:19:48 UTC (rev 12715)
@@ -0,0 +1,11 @@
+<? 
+
+require "tests.php";
+require "virtual_vs_nonvirtual_base.php";
+
+$fail = new SimpleClassFail();
+$work = new SimpleClassWork();
+
+check::equal($work->getInner()->get(), $fail->getInner()->get(), "should both be 10");
+
+?>

Added: trunk/Examples/test-suite/virtual_vs_nonvirtual_base.i
===================================================================
--- trunk/Examples/test-suite/virtual_vs_nonvirtual_base.i	                        (rev 0)
+++ trunk/Examples/test-suite/virtual_vs_nonvirtual_base.i	2011-05-25 05:19:48 UTC (rev 12715)
@@ -0,0 +1,48 @@
+%module virtual_vs_nonvirtual_base;
+// Regression test for SF#3124665.
+%inline {
+
+class SimpleVirtual
+{
+	public:
+		virtual int implementMe() = 0;
+};
+
+class SimpleNonVirtual
+{
+	public:
+		int dummy() { return 0; }
+};
+
+class SimpleReturnClass
+{
+	public:
+		SimpleReturnClass(int i) : value(i) {};
+		int get() const { return value; }
+	private:
+		int value;
+};
+
+class SimpleClassFail : public SimpleVirtual
+{
+	public:
+		SimpleClassFail() : inner(10) {}
+		SimpleReturnClass getInner() { return inner; }
+		
+		virtual int implementMe() { return 0; }
+	private:
+		SimpleReturnClass inner;
+};
+
+class SimpleClassWork : public SimpleNonVirtual
+{
+	public:
+		SimpleClassWork() : inner(10) {}
+		SimpleReturnClass getInner() { return inner; }
+		
+		virtual int implementMe() { return 0; }
+	private:
+		SimpleReturnClass inner;
+};
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12728
          http://swig.svn.sourceforge.net/swig/?rev=12728&view=rev
Author:   wsfulton
Date:     2011-06-03 06:07:46 +0000 (Fri, 03 Jun 2011)

Log Message:
-----------
rename python_autodoc testcase to autodoc for use with all languages (note it was once called autodoc.i in the python subdirectory)

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/python/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/autodoc.i

Removed Paths:
-------------
    trunk/Examples/test-suite/python_autodoc.i

Copied: trunk/Examples/test-suite/autodoc.i (from rev 12719, trunk/Examples/test-suite/python_autodoc.i)
===================================================================
--- trunk/Examples/test-suite/autodoc.i	                        (rev 0)
+++ trunk/Examples/test-suite/autodoc.i	2011-06-03 06:07:46 UTC (rev 12728)
@@ -0,0 +1,95 @@
+%module(docstring="hello") python_autodoc
+
+%feature("autodoc");
+
+// especial typemap and its docs
+%typemap(in) (int c, int d) "$1 =0; $2 = 0;";
+%typemap(doc,name="hello",type="Tuple") (int c, int d) "hello: int tuple[2]";
+
+// testing for different documentation levels
+%feature("autodoc","0") A::func0; // names
+%feature("autodoc","1") A::func1; // names + types
+%feature("autodoc","2") A::func2; // extended 
+%feature("autodoc","3") A::func3; // extended + types
+
+%feature("autodoc","just a string") A::func; // names
+
+%inline {
+
+  enum Hola {
+    hi, hello
+  };
+  
+  struct A
+  {
+    A(int a, short b, Hola h)
+    {
+    }
+
+    int func(int a)
+    {
+      return a;
+    }
+
+    int func0(int c, int d)
+    {
+      return c;
+    }
+    
+    int func1(int c, int d)
+    {
+      return c;
+    }    
+
+    int func2(A* c, double d = 2)
+    {
+      return 2;
+    }
+
+    int func3(A* c, double d = 2)
+    {
+      return 2;
+    }
+  }; 
+}
+
+
+// deleting typemaps and docs
+%typemap(in) (int c, int d) ;
+%typemap(doc) (int c, int d);
+
+// docs for some parameters
+%typemap(doc) int a "a: special comment for parameter a";
+%typemap(doc) int b "b: another special comment for parameter b";
+
+%callback(1) func_cb;
+
+%inline {
+  
+  struct B
+  {
+    B(int a, int b, Hola h)
+    {
+    }
+    
+    
+    int func(int c, int d)
+    {
+      return c;
+    }
+    
+  }; 
+
+  int func(int c, int d) {
+    return c;
+  }
+
+  int funcio(int *INOUT) {
+    return 1;
+  }
+
+  int func_cb(int c, int d) {
+    return c;
+  }
+  
+}

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2011-05-30 14:01:58 UTC (rev 12727)
+++ trunk/Examples/test-suite/common.mk	2011-06-03 06:07:46 UTC (rev 12728)
@@ -118,6 +118,7 @@
 	arrays_global \
 	arrays_global_twodim \
 	arrays_scope \
+	autodoc \
 	bloody_hell \
 	bools \
 	catches \

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2011-05-30 14:01:58 UTC (rev 12727)
+++ trunk/Examples/test-suite/python/Makefile.in	2011-06-03 06:07:46 UTC (rev 12728)
@@ -58,7 +58,6 @@
 	primitive_types \
         python_abstractbase \
 	python_append \
-	python_autodoc \
 	python_kwargs \
 	python_nondynamic \
 	python_overload_simple_cast \

Deleted: trunk/Examples/test-suite/python_autodoc.i
===================================================================
--- trunk/Examples/test-suite/python_autodoc.i	2011-05-30 14:01:58 UTC (rev 12727)
+++ trunk/Examples/test-suite/python_autodoc.i	2011-06-03 06:07:46 UTC (rev 12728)
@@ -1,95 +0,0 @@
-%module(docstring="hello") python_autodoc
-
-%feature("autodoc");
-
-// especial typemap and its docs
-%typemap(in) (int c, int d) "$1 =0; $2 = 0;";
-%typemap(doc,name="hello",type="Tuple") (int c, int d) "hello: int tuple[2]";
-
-// testing for different documentation levels
-%feature("autodoc","0") A::func0; // names
-%feature("autodoc","1") A::func1; // names + types
-%feature("autodoc","2") A::func2; // extended 
-%feature("autodoc","3") A::func3; // extended + types
-
-%feature("autodoc","just a string") A::func; // names
-
-%inline {
-
-  enum Hola {
-    hi, hello
-  };
-  
-  struct A
-  {
-    A(int a, short b, Hola h)
-    {
-    }
-
-    int func(int a)
-    {
-      return a;
-    }
-
-    int func0(int c, int d)
-    {
-      return c;
-    }
-    
-    int func1(int c, int d)
-    {
-      return c;
-    }    
-
-    int func2(A* c, double d = 2)
-    {
-      return 2;
-    }
-
-    int func3(A* c, double d = 2)
-    {
-      return 2;
-    }
-  }; 
-}
-
-
-// deleting typemaps and docs
-%typemap(in) (int c, int d) ;
-%typemap(doc) (int c, int d);
-
-// docs for some parameters
-%typemap(doc) int a "a: special comment for parameter a";
-%typemap(doc) int b "b: another special comment for parameter b";
-
-%callback(1) func_cb;
-
-%inline {
-  
-  struct B
-  {
-    B(int a, int b, Hola h)
-    {
-    }
-    
-    
-    int func(int c, int d)
-    {
-      return c;
-    }
-    
-  }; 
-
-  int func(int c, int d) {
-    return c;
-  }
-
-  int funcio(int *INOUT) {
-    return 1;
-  }
-
-  int func_cb(int c, int d) {
-    return c;
-  }
-  
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12880
          http://swig.svn.sourceforge.net/swig/?rev=12880&view=rev
Author:   wsfulton
Date:     2011-12-21 07:18:45 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
keyword variable workaround in testcase

Modified Paths:
--------------
    trunk/Examples/test-suite/extend_constructor_destructor.i
    trunk/Examples/test-suite/java/extend_constructor_destructor_runme.java

Modified: trunk/Examples/test-suite/extend_constructor_destructor.i
===================================================================
--- trunk/Examples/test-suite/extend_constructor_destructor.i	2011-12-21 07:16:44 UTC (rev 12879)
+++ trunk/Examples/test-suite/extend_constructor_destructor.i	2011-12-21 07:18:45 UTC (rev 12880)
@@ -1,7 +1,7 @@
 %module extend_constructor_destructor
 
 %inline %{
-int global = 0;
+int globalVar = 0;
 
 namespace Space {
   typedef struct tagAStruct {
@@ -41,11 +41,11 @@
   tagAStruct(int ivar0) {
     Space::AStruct *s = new Space::AStruct();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~tagAStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }
@@ -54,11 +54,11 @@
   BStruct(int ivar0) {
     Space::BStruct *s = new Space::BStruct();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~BStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }
@@ -67,11 +67,11 @@
   CStruct(int ivar0) {
     Space::CStruct *s = new Space::CStruct();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~CStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }
@@ -80,11 +80,11 @@
   DStruct(int ivar0) {
     Space::DStruct *s = new Space::DStruct();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~DStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }
@@ -95,11 +95,11 @@
   EStruct(int ivar0) {
     EStruct *s = new EStruct();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~EStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }
@@ -109,11 +109,11 @@
   FFStruct(int ivar0) {
     Space::FFStruct<T> *s = new Space::FFStruct<T>();
     s->ivar = ivar0;
-    global = ivar0;
+    globalVar = ivar0;
     return s;
   }
   ~FFStruct() {
-    global = -$self->ivar;
+    globalVar = -$self->ivar;
     delete $self;
   }
 }

Modified: trunk/Examples/test-suite/java/extend_constructor_destructor_runme.java
===================================================================
--- trunk/Examples/test-suite/java/extend_constructor_destructor_runme.java	2011-12-21 07:16:44 UTC (rev 12879)
+++ trunk/Examples/test-suite/java/extend_constructor_destructor_runme.java	2011-12-21 07:18:45 UTC (rev 12880)
@@ -44,7 +44,7 @@
   }
 
   public static void checkGlobal(int val) {
-    int global = extend_constructor_destructor.getGlobal();
+    int global = extend_constructor_destructor.getGlobalVar();
     if (global != val)
       throw new RuntimeException("global value incorrect. Expected: " + val + " got: " + global);
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12921
          http://swig.svn.sourceforge.net/swig/?rev=12921&view=rev
Author:   ianlancetaylor
Date:     2012-03-14 19:25:14 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Correct test cases to be valid C++ by doing a typedef to the
specialized type rather than to the not-visible general template type
parameter.

Modified Paths:
--------------
    trunk/Examples/test-suite/template_typemaps_typedef.i
    trunk/Examples/test-suite/template_typemaps_typedef2.i

Modified: trunk/Examples/test-suite/template_typemaps_typedef.i
===================================================================
--- trunk/Examples/test-suite/template_typemaps_typedef.i	2012-03-14 19:23:18 UTC (rev 12920)
+++ trunk/Examples/test-suite/template_typemaps_typedef.i	2012-03-14 19:25:14 UTC (rev 12921)
@@ -48,8 +48,8 @@
 namespace Standard {
 template<> class Multimap<A, int> {
   public:
-    typedef Key key_type;
-    typedef T mapped_type;
+    typedef A key_type;
+    typedef int mapped_type;
 
     class iterator;
 

Modified: trunk/Examples/test-suite/template_typemaps_typedef2.i
===================================================================
--- trunk/Examples/test-suite/template_typemaps_typedef2.i	2012-03-14 19:23:18 UTC (rev 12920)
+++ trunk/Examples/test-suite/template_typemaps_typedef2.i	2012-03-14 19:25:14 UTC (rev 12921)
@@ -50,8 +50,8 @@
 namespace Standard {
 template<> class Multimap<A, int> {
   public:
-    typedef Key key_type;
-    typedef T mapped_type;
+    typedef A key_type;
+    typedef int mapped_type;
 
     class iterator;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12927
          http://swig.svn.sourceforge.net/swig/?rev=12927&view=rev
Author:   drjoe
Date:     2012-03-17 18:37:51 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
add new test case for r to test scalar/vector conflicts

Modified Paths:
--------------
    trunk/Examples/test-suite/r/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/r_overload_array.i

Modified: trunk/Examples/test-suite/r/Makefile.in
===================================================================
--- trunk/Examples/test-suite/r/Makefile.in	2012-03-16 07:30:14 UTC (rev 12926)
+++ trunk/Examples/test-suite/r/Makefile.in	2012-03-17 18:37:51 UTC (rev 12927)
@@ -11,7 +11,7 @@
 top_builddir = @top_builddir@
 
 C_TEST_CASES = r_copy_struct r_legacy
-CPP_TEST_CASES = r_double_delete
+CPP_TEST_CASES = r_double_delete  r_overload_array
 
 include $(srcdir)/../common.mk
 

Added: trunk/Examples/test-suite/r_overload_array.i
===================================================================
--- trunk/Examples/test-suite/r_overload_array.i	                        (rev 0)
+++ trunk/Examples/test-suite/r_overload_array.i	2012-03-17 18:37:51 UTC (rev 12927)
@@ -0,0 +1,16 @@
+%module r_overload_array
+%include "stl.i"
+# this tests the situation in which there is a scalar function
+# corresponding with a vector one
+
+%inline %{
+class Foo {
+public:
+  double bar(double w) {return w;};
+  double bar(double *w) {return w[0];}
+  double bar(std::vector<double> w) {return w[0];}
+};
+%}
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12986
          http://swig.svn.sourceforge.net/swig/?rev=12986&view=rev
Author:   wsfulton
Date:     2012-04-14 21:11:19 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
As std_list.i is not available in many language, put this python specific test just in Python makefile

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/python/Makefile.in

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2012-04-14 20:37:39 UTC (rev 12985)
+++ trunk/Examples/test-suite/common.mk	2012-04-14 21:11:19 UTC (rev 12986)
@@ -466,7 +466,6 @@
 	director_string \
 	ignore_template_constructor \
 	li_std_combinations \
-	li_std_containers_int \
 	li_std_deque \
 	li_std_except \
 	li_std_map \

Modified: trunk/Examples/test-suite/python/Makefile.in
===================================================================
--- trunk/Examples/test-suite/python/Makefile.in	2012-04-14 20:37:39 UTC (rev 12985)
+++ trunk/Examples/test-suite/python/Makefile.in	2012-04-14 21:11:19 UTC (rev 12986)
@@ -46,6 +46,7 @@
 	li_cwstring \
 	li_factory \
 	li_implicit \
+	li_std_containers_int \
 	li_std_map_member \
 	li_std_multimap \
 	li_std_pair_extra \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12990
          http://swig.svn.sourceforge.net/swig/?rev=12990&view=rev
Author:   drjoe
Date:     2012-04-15 12:54:42 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
add test to confirm fix to sourceforge 3478922

Modified Paths:
--------------
    trunk/Examples/test-suite/r/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/r/r_base_test_runme.R
    trunk/Examples/test-suite/r_base_test.i

Modified: trunk/Examples/test-suite/r/Makefile.in
===================================================================
--- trunk/Examples/test-suite/r/Makefile.in	2012-04-15 12:25:50 UTC (rev 12989)
+++ trunk/Examples/test-suite/r/Makefile.in	2012-04-15 12:54:42 UTC (rev 12990)
@@ -11,7 +11,7 @@
 top_builddir = @top_builddir@
 
 C_TEST_CASES = r_copy_struct r_legacy
-CPP_TEST_CASES = r_double_delete  r_overload_array
+CPP_TEST_CASES = r_double_delete  r_overload_array r_base_test
 
 include $(srcdir)/../common.mk
 

Added: trunk/Examples/test-suite/r/r_base_test_runme.R
===================================================================
--- trunk/Examples/test-suite/r/r_base_test_runme.R	                        (rev 0)
+++ trunk/Examples/test-suite/r/r_base_test_runme.R	2012-04-15 12:54:42 UTC (rev 12990)
@@ -0,0 +1,13 @@
+source("unittest.R")
+dyn.load(paste("r_base_test", .Platform$dynlib.ext, sep=""))
+source("r_base_test.R")
+cacheMetaData(1)
+
+b <- Base()
+Base_method(b)
+Base_overloaded_method(b)
+Base_overloaded_method(b, 43)
+Base_overloaded_method(b)
+b$method()
+
+b$overloaded_method()

Added: trunk/Examples/test-suite/r_base_test.i
===================================================================
--- trunk/Examples/test-suite/r_base_test.i	                        (rev 0)
+++ trunk/Examples/test-suite/r_base_test.i	2012-04-15 12:54:42 UTC (rev 12990)
@@ -0,0 +1,20 @@
+/* This test confirms the fix to sourceforge bug #3478922 */
+
+%module r_base_test
+%inline %{
+class Base
+   {
+   public:
+
+   Base() : x(42) {}
+
+   int method() const { return x; }
+
+   void overloaded_method(int aArg) { x = aArg; }
+   int overloaded_method() const { return x; }
+
+   private:
+
+   int x;
+   };
+%}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12992
          http://swig.svn.sourceforge.net/swig/?rev=12992&view=rev
Author:   wsfulton
Date:     2012-04-15 18:10:58 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Rename r_base_test to overload_method as it is a useful test for all languages

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/r/Makefile.in

Added Paths:
-----------
    trunk/Examples/test-suite/overload_method.i
    trunk/Examples/test-suite/r/overload_method_runme.R

Removed Paths:
-------------
    trunk/Examples/test-suite/r/r_base_test_runme.R
    trunk/Examples/test-suite/r_base_test.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2012-04-15 17:44:09 UTC (rev 12991)
+++ trunk/Examples/test-suite/common.mk	2012-04-15 18:10:58 UTC (rev 12992)
@@ -277,6 +277,7 @@
         operbool \
 	ordering \
 	overload_copy \
+	overload_method \
 	overload_extend \
 	overload_rename \
 	overload_return_type \

Copied: trunk/Examples/test-suite/overload_method.i (from rev 12990, trunk/Examples/test-suite/r_base_test.i)
===================================================================
--- trunk/Examples/test-suite/overload_method.i	                        (rev 0)
+++ trunk/Examples/test-suite/overload_method.i	2012-04-15 18:10:58 UTC (rev 12992)
@@ -0,0 +1,20 @@
+/* This test confirms the fix to sourceforge bug #3478922 for R */
+
+%module overload_method
+%inline %{
+class Base
+   {
+   public:
+
+   Base() : x(42) {}
+
+   int method() const { return x; }
+
+   void overloaded_method(int aArg) { x = aArg; }
+   int overloaded_method() const { return x; }
+
+   private:
+
+   int x;
+   };
+%}

Modified: trunk/Examples/test-suite/r/Makefile.in
===================================================================
--- trunk/Examples/test-suite/r/Makefile.in	2012-04-15 17:44:09 UTC (rev 12991)
+++ trunk/Examples/test-suite/r/Makefile.in	2012-04-15 18:10:58 UTC (rev 12992)
@@ -16,8 +16,7 @@
 
 CPP_TEST_CASES += \
 	r_double_delete \
-	r_overload_array \
-	r_base_test
+	r_overload_array
 
 include $(srcdir)/../common.mk
 

Copied: trunk/Examples/test-suite/r/overload_method_runme.R (from rev 12990, trunk/Examples/test-suite/r/r_base_test_runme.R)
===================================================================
--- trunk/Examples/test-suite/r/overload_method_runme.R	                        (rev 0)
+++ trunk/Examples/test-suite/r/overload_method_runme.R	2012-04-15 18:10:58 UTC (rev 12992)
@@ -0,0 +1,13 @@
+source("unittest.R")
+dyn.load(paste("overload_method", .Platform$dynlib.ext, sep=""))
+source("overload_method.R")
+cacheMetaData(1)
+
+b <- Base()
+Base_method(b)
+Base_overloaded_method(b)
+Base_overloaded_method(b, 43)
+Base_overloaded_method(b)
+b$method()
+
+b$overloaded_method()

Deleted: trunk/Examples/test-suite/r/r_base_test_runme.R
===================================================================
--- trunk/Examples/test-suite/r/r_base_test_runme.R	2012-04-15 17:44:09 UTC (rev 12991)
+++ trunk/Examples/test-suite/r/r_base_test_runme.R	2012-04-15 18:10:58 UTC (rev 12992)
@@ -1,13 +0,0 @@
-source("unittest.R")
-dyn.load(paste("r_base_test", .Platform$dynlib.ext, sep=""))
-source("r_base_test.R")
-cacheMetaData(1)
-
-b <- Base()
-Base_method(b)
-Base_overloaded_method(b)
-Base_overloaded_method(b, 43)
-Base_overloaded_method(b)
-b$method()
-
-b$overloaded_method()

Deleted: trunk/Examples/test-suite/r_base_test.i
===================================================================
--- trunk/Examples/test-suite/r_base_test.i	2012-04-15 17:44:09 UTC (rev 12991)
+++ trunk/Examples/test-suite/r_base_test.i	2012-04-15 18:10:58 UTC (rev 12992)
@@ -1,20 +0,0 @@
-/* This test confirms the fix to sourceforge bug #3478922 */
-
-%module r_base_test
-%inline %{
-class Base
-   {
-   public:
-
-   Base() : x(42) {}
-
-   int method() const { return x; }
-
-   void overloaded_method(int aArg) { x = aArg; }
-   int overloaded_method() const { return x; }
-
-   private:
-
-   int x;
-   };
-%}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12993
          http://swig.svn.sourceforge.net/swig/?rev=12993&view=rev
Author:   wsfulton
Date:     2012-04-15 21:56:38 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Fix a few warnings/errors in the test-suite using Solaris compiler

Modified Paths:
--------------
    trunk/Examples/test-suite/python/autodoc_runme.py
    trunk/Examples/test-suite/template_typedef_class_template.i
    trunk/Examples/test-suite/template_typemaps.i
    trunk/Examples/test-suite/typedef_struct.i
    trunk/Examples/test-suite/typemap_various.i

Modified: trunk/Examples/test-suite/python/autodoc_runme.py
===================================================================
--- trunk/Examples/test-suite/python/autodoc_runme.py	2012-04-15 18:10:58 UTC (rev 12992)
+++ trunk/Examples/test-suite/python/autodoc_runme.py	2012-04-15 21:56:38 UTC (rev 12993)
@@ -2,7 +2,7 @@
 
 def check(got, expected):
   if expected != got:
-    raise RuntimeError("\n" + "Expected: [" + expected + "]\n" + "Got     : [" + got + "]")
+    raise RuntimeError("\n" + "Expected: [" + str(expected) + "]\n" + "Got     : [" + str(got) + "]")
 
 check(A.__doc__, "Proxy of C++ A class")
 check(A.funk.__doc__, "just a string")

Modified: trunk/Examples/test-suite/template_typedef_class_template.i
===================================================================
--- trunk/Examples/test-suite/template_typedef_class_template.i	2012-04-15 18:10:58 UTC (rev 12992)
+++ trunk/Examples/test-suite/template_typedef_class_template.i	2012-04-15 21:56:38 UTC (rev 12993)
@@ -24,8 +24,8 @@
     class const_iterator {};
 
     // test usage of a typedef of a nested class in a template
-    Standard::Pair<iterator,iterator> equal_range_1(const key_type& kt1) {}
-    Standard::Pair<const_iterator,const_iterator> equal_range_2(const key_type& kt2) const {}
+    Standard::Pair<iterator,iterator> equal_range_1(const key_type& kt1) { return Standard::Pair<iterator,iterator>(); }
+    Standard::Pair<const_iterator,const_iterator> equal_range_2(const key_type& kt2) const { return Standard::Pair<const_iterator,const_iterator>(); }
   };
 }
 %}

Modified: trunk/Examples/test-suite/template_typemaps.i
===================================================================
--- trunk/Examples/test-suite/template_typemaps.i	2012-04-15 18:10:58 UTC (rev 12992)
+++ trunk/Examples/test-suite/template_typemaps.i	2012-04-15 21:56:38 UTC (rev 12993)
@@ -3,6 +3,7 @@
 
 %typemap(in) Integer1 
 {
+  $1 = 0;
   /* do nothing */
 }
 
@@ -13,6 +14,7 @@
 
 %typemap(in) Integer2 
 {
+  $1 = 0;
   /* do nothing */
 }
 

Modified: trunk/Examples/test-suite/typedef_struct.i
===================================================================
--- trunk/Examples/test-suite/typedef_struct.i	2012-04-15 18:10:58 UTC (rev 12992)
+++ trunk/Examples/test-suite/typedef_struct.i	2012-04-15 21:56:38 UTC (rev 12993)
@@ -45,10 +45,18 @@
 
 %inline %{
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct _Foo {
   enum { NONAME1, NONAME2 } enumvar;
   int foovar;
   void (*fptr)(int);
 } Foo;
 
+#ifdef __cplusplus
+}
+#endif
+
 %}

Modified: trunk/Examples/test-suite/typemap_various.i
===================================================================
--- trunk/Examples/test-suite/typemap_various.i	2012-04-15 18:10:58 UTC (rev 12992)
+++ trunk/Examples/test-suite/typemap_various.i	2012-04-15 21:56:38 UTC (rev 12993)
@@ -65,10 +65,10 @@
 %typemap(out) double ABC::_3   "$1 = 0.0;"
 %inline %{
 struct ABC {
-  double meth() {}
-  double m1() {}
-  double _x2() {}
-  double y_() {}
-  double _3() {}
+  double meth() { return 0.0; }
+  double m1() { return 0.0; }
+  double _x2() { return 0.0; }
+  double y_() { return 0.0; }
+  double _3() { return 0.0; }
 };
 %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12996
          http://swig.svn.sourceforge.net/swig/?rev=12996&view=rev
Author:   wsfulton
Date:     2012-04-16 18:45:33 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Some test-suite fixes for visual studio

Modified Paths:
--------------
    trunk/Examples/test-suite/director_binary_string.i
    trunk/Examples/test-suite/operator_pointer_ref.i
    trunk/Examples/test-suite/refcount.i
    trunk/Examples/test-suite/special_variable_macros.i

Modified: trunk/Examples/test-suite/director_binary_string.i
===================================================================
--- trunk/Examples/test-suite/director_binary_string.i	2012-04-15 22:47:38 UTC (rev 12995)
+++ trunk/Examples/test-suite/director_binary_string.i	2012-04-16 18:45:33 UTC (rev 12996)
@@ -29,12 +29,12 @@
   void delCallback() { delete _callback; _callback = 0; }
   void setCallback(Callback *cb) { delCallback(); _callback = cb; }
   int call() {
+    int sum = 0;
     if (_callback) {
       char* aa = (char*)malloc(BUFFER_SIZE_AA);
       memset(aa, 9, BUFFER_SIZE_AA);
       char* bb = (char*)malloc(BUFFER_SIZE_BB);
       memset(bb, 13, BUFFER_SIZE_BB);
-      int sum = 0;
       _callback->run(aa, BUFFER_SIZE_AA, bb, BUFFER_SIZE_BB);
       for (int i = 0; i < BUFFER_SIZE_AA; i++)
         sum += aa[i];
@@ -42,8 +42,8 @@
         sum += bb[i];
       free(aa);
       free(bb);
-      return sum;
     }
+    return sum;
   }
 };
 

Modified: trunk/Examples/test-suite/operator_pointer_ref.i
===================================================================
--- trunk/Examples/test-suite/operator_pointer_ref.i	2012-04-15 22:47:38 UTC (rev 12995)
+++ trunk/Examples/test-suite/operator_pointer_ref.i	2012-04-16 18:45:33 UTC (rev 12996)
@@ -1,5 +1,11 @@
 %module operator_pointer_ref
 
+%{
+#if defined(_MSC_VER)
+  #pragma warning(disable: 4996) // 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup. See online help for details.
+#endif
+%}
+
 %rename(AsCharStarRef) operator char*&;
 
 %inline %{

Modified: trunk/Examples/test-suite/refcount.i
===================================================================
--- trunk/Examples/test-suite/refcount.i	2012-04-15 22:47:38 UTC (rev 12995)
+++ trunk/Examples/test-suite/refcount.i	2012-04-16 18:45:33 UTC (rev 12996)
@@ -97,7 +97,7 @@
     RCPtr<A> _a;
   };
 
-class B* global_create(A* a)
+struct B* global_create(A* a)
 {
   return new B(a);
 }

Modified: trunk/Examples/test-suite/special_variable_macros.i
===================================================================
--- trunk/Examples/test-suite/special_variable_macros.i	2012-04-15 22:47:38 UTC (rev 12995)
+++ trunk/Examples/test-suite/special_variable_macros.i	2012-04-16 18:45:33 UTC (rev 12996)
@@ -5,6 +5,12 @@
 
 %warnfilter(SWIGWARN_GO_NAME_CONFLICT);                       /* Ignoring 'NewName' due to Go name ('NewName') conflict with 'Name' */
 
+%{
+#if defined(_MSC_VER)
+  #pragma warning(disable: 4996) // 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup. See online help for details.
+#endif
+%}
+
 %ignore Name::operator=;
 
 %inline %{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13607
          http://swig.svn.sourceforge.net/swig/?rev=13607&view=rev
Author:   wsfulton
Date:     2012-08-13 21:59:14 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Fix additio of assumeoverride testcase

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk
    trunk/Examples/test-suite/java/Makefile.in

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2012-08-13 21:41:08 UTC (rev 13606)
+++ trunk/Examples/test-suite/common.mk	2012-08-13 21:59:14 UTC (rev 13607)
@@ -161,7 +161,6 @@
 	destructor_reprotected \
 	director_abstract \
 	director_alternating \
-	director_assumeoverride \
 	director_basic \
 	director_binary_string \
 	director_classes \

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2012-08-13 21:41:08 UTC (rev 13606)
+++ trunk/Examples/test-suite/java/Makefile.in	2012-08-13 21:59:14 UTC (rev 13607)
@@ -23,6 +23,7 @@
 	intermediary_classname \
 	java_constants \
 	java_director \
+	java_director_assumeoverride \
 	java_enums \
 	java_lib_arrays_dimensionless \
 	java_lib_various \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13839
          http://swig.svn.sourceforge.net/swig/?rev=13839&view=rev
Author:   wsfulton
Date:     2012-09-13 20:15:03 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Add a testcase for the Curiously Recurring Template Pattern - CRTP

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/curiously_recurring_template_pattern.i
    trunk/Examples/test-suite/java/curiously_recurring_template_pattern_runme.java

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2012-09-13 19:18:25 UTC (rev 13838)
+++ trunk/Examples/test-suite/common.mk	2012-09-13 20:15:03 UTC (rev 13839)
@@ -152,6 +152,7 @@
 	cpp_nodefault \
 	cpp_static \
 	cpp_typedef \
+	curiously_recurring_template_pattern \
 	default_args \
 	default_arg_values \
 	default_constructor \

Added: trunk/Examples/test-suite/curiously_recurring_template_pattern.i
===================================================================
--- trunk/Examples/test-suite/curiously_recurring_template_pattern.i	                        (rev 0)
+++ trunk/Examples/test-suite/curiously_recurring_template_pattern.i	2012-09-13 20:15:03 UTC (rev 13839)
@@ -0,0 +1,55 @@
+%module curiously_recurring_template_pattern
+
+// Test Curiously Recurring Template Pattern - CRTP
+
+%inline %{
+template <typename T> class Base {
+  int base1Param;
+  int base2Param;
+public:
+  Base() : base1Param(0) {}
+  int getBase1Param() {
+    return base1Param;
+  }
+  T& setBase1Param(int value) {
+    base1Param = value;
+    return *static_cast<T*>(this);
+  }
+  int getBase2Param() {
+    return base2Param;
+  }
+  T& setBase2Param(int value) {
+    base2Param = value;
+    return *static_cast<T*>(this);
+  }
+  virtual ~Base() {}
+};
+%}
+
+%template(basederived) Base<Derived>;
+
+%inline %{
+class Derived : public Base<Derived> {
+  int derived1Param;
+  int derived2Param;
+public:
+  Derived() : derived1Param(0), derived2Param(0) {}
+  int getDerived1Param() {
+    return derived1Param;
+  }
+  Derived& setDerived1Param(int value) {
+    derived1Param = value;
+    return *this;
+  }
+  int getDerived2Param() {
+    return derived2Param;
+  }
+  Derived& setDerived2Param(int value) {
+    derived2Param = value;
+    return *this;
+  }
+};
+%}
+
+
+

Added: trunk/Examples/test-suite/java/curiously_recurring_template_pattern_runme.java
===================================================================
--- trunk/Examples/test-suite/java/curiously_recurring_template_pattern_runme.java	                        (rev 0)
+++ trunk/Examples/test-suite/java/curiously_recurring_template_pattern_runme.java	2012-09-13 20:15:03 UTC (rev 13839)
@@ -0,0 +1,29 @@
+
+import curiously_recurring_template_pattern.*;
+
+public class curiously_recurring_template_pattern_runme {
+
+  static {
+    try {
+	System.loadLibrary("curiously_recurring_template_pattern");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Derived d = new Derived();
+    d.setBase1Param(1).setDerived1Param(10).setDerived2Param(20).setBase2Param(2);
+
+    if (d.getBase1Param() != 1)
+      throw new RuntimeException("fail");
+    if (d.getDerived1Param() != 10)
+      throw new RuntimeException("fail");
+    if (d.getBase2Param() != 2)
+      throw new RuntimeException("fail");
+    if (d.getDerived2Param() != 20)
+      throw new RuntimeException("fail");
+  }
+}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13872
          http://swig.svn.sourceforge.net/swig/?rev=13872&view=rev
Author:   wsfulton
Date:     2012-10-26 19:32:19 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
New director test highlighting a proble in Go

Modified Paths:
--------------
    trunk/Examples/test-suite/common.mk

Added Paths:
-----------
    trunk/Examples/test-suite/director_overload2.i

Modified: trunk/Examples/test-suite/common.mk
===================================================================
--- trunk/Examples/test-suite/common.mk	2012-10-11 19:28:02 UTC (rev 13871)
+++ trunk/Examples/test-suite/common.mk	2012-10-26 19:32:19 UTC (rev 13872)
@@ -180,6 +180,7 @@
 	director_nspace \
 	director_nested \
 	director_overload \
+	director_overload2 \
 	director_primitives \
 	director_protected \
 	director_protected_overloaded \

Added: trunk/Examples/test-suite/director_overload2.i
===================================================================
--- trunk/Examples/test-suite/director_overload2.i	                        (rev 0)
+++ trunk/Examples/test-suite/director_overload2.i	2012-10-26 19:32:19 UTC (rev 13872)
@@ -0,0 +1,22 @@
+%module(directors="1") director_overload2
+
+%feature("director");
+
+
+%inline %{
+struct OverloadBase {
+  virtual ~OverloadBase() {}
+  virtual void mmm() {}
+  virtual void nnn(int vvv) {}
+  virtual void nnn() {}
+};
+struct OverloadDerived1 : OverloadBase {
+  virtual void nnn(int vvv) {}
+//  virtual void nnn() {}
+};
+struct OverloadDerived2 : OverloadBase {
+//  virtual void nnn(int vvv) {}
+  virtual void nnn() {}
+};
+%}
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13880
          http://swig.svn.sourceforge.net/swig/?rev=13880&view=rev
Author:   wsfulton
Date:     2012-11-13 22:17:55 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Tweak test so it works if test-suite is run using -copyctor

Modified Paths:
--------------
    trunk/Examples/test-suite/java/java_prepost_runme.java
    trunk/Examples/test-suite/java_prepost.i

Modified: trunk/Examples/test-suite/java/java_prepost_runme.java
===================================================================
--- trunk/Examples/test-suite/java/java_prepost_runme.java	2012-11-13 22:17:10 UTC (rev 13879)
+++ trunk/Examples/test-suite/java/java_prepost_runme.java	2012-11-13 22:17:55 UTC (rev 13880)
@@ -16,7 +16,7 @@
   {
     // ensure checked exception is generated
     try {
-      PrePostThrows ppt = new PrePostThrows(null);
+      PrePostThrows ppt = new PrePostThrows(null, true);
     } catch (InstantiationException e) {
     }
   }

Modified: trunk/Examples/test-suite/java_prepost.i
===================================================================
--- trunk/Examples/test-suite/java_prepost.i	2012-11-13 22:17:10 UTC (rev 13879)
+++ trunk/Examples/test-suite/java_prepost.i	2012-11-13 22:17:55 UTC (rev 13880)
@@ -83,7 +83,7 @@
 
 %inline %{
 struct PrePostThrows {
-  PrePostThrows(PrePostTest *ppt) {
+  PrePostThrows(PrePostTest *ppt, bool) {
   }
 };
 %}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13950
          http://swig.svn.sourceforge.net/swig/?rev=13950&view=rev
Author:   wsfulton
Date:     2012-12-08 10:37:04 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Add runtime test for %implicitconv

Modified Paths:
--------------
    trunk/Examples/test-suite/implicittest.i

Added Paths:
-----------
    trunk/Examples/test-suite/python/implicittest_runme.py

Modified: trunk/Examples/test-suite/implicittest.i
===================================================================
--- trunk/Examples/test-suite/implicittest.i	2012-12-07 07:38:24 UTC (rev 13949)
+++ trunk/Examples/test-suite/implicittest.i	2012-12-08 10:37:04 UTC (rev 13950)
@@ -18,7 +18,6 @@
     explicit A(char *s) { ii = 4; }
 
     int get() const { return ii; }
-    
   };
 
   int get(const A& a) { return a.ii; }
@@ -33,7 +32,7 @@
     explicit A_T(char *s) { ii = 4; }
 
     int get() const { return ii; }
-    
+    static int sget(const A_T& a) { return a.ii; }
   };
 }
 

Added: trunk/Examples/test-suite/python/implicittest_runme.py
===================================================================
--- trunk/Examples/test-suite/python/implicittest_runme.py	                        (rev 0)
+++ trunk/Examples/test-suite/python/implicittest_runme.py	2012-12-08 10:37:04 UTC (rev 13950)
@@ -0,0 +1,73 @@
+from implicittest import *
+
+def check(a, b):
+    if a != b:
+        raise RuntimeError(str(a) + " does not equal " + str(b))
+
+#### Class ####
+
+# No implicit conversion
+check(1, A(1).get())
+check(2, A(1.0).get())
+check(3, A(B()).get())
+check(4, A("hello").get())
+
+check(1, get(1))
+check(2, get(1.0))
+check(3, get(B()))
+
+# Explicit constructor:
+try:
+    check(4, get("hello"))
+    raise RuntimeError
+except TypeError:
+    pass
+
+#### Template Class ####
+
+# No implicit conversion
+check(1, A_int(1).get())
+check(2, A_int(1.0).get())
+check(3, A_int(B()).get())
+check(4, A_int("hello").get())
+
+check(1, A_int.sget(1))
+check(2, A_int.sget(1.0))
+check(3, A_int.sget(B()))
+
+# explicit constructor:
+try:
+    check(4, A_int.sget("hello"))
+    raise RuntimeError
+except TypeError:
+    pass
+
+#### Global variable assignment ####
+
+cvar.foo = Foo(1);          check(cvar.foo.ii, 1)
+cvar.foo = 1;               check(cvar.foo.ii, 1)
+cvar.foo = 1.0;             check(cvar.foo.ii, 2)
+cvar.foo = Foo("hello");    check(cvar.foo.ii, 3)
+
+# explicit constructor:
+try:
+    cvar.foo = "hello"
+    raise RuntimeError
+except TypeError:
+    pass
+
+#### Member variable assignment ####
+# Note: also needs naturalvar
+
+b = Bar();                  check(b.f.ii, 0)
+b.f = Foo("hello");         check(b.f.ii, 3)
+b.f = 1;                    check(b.f.ii, 1)
+b.f = 1.0;                  check(b.f.ii, 2)
+
+# explicit constructor:
+try:
+    b.f = "hello"
+    raise RuntimeError
+except TypeError:
+    pass
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.