[Swig-cvs] SF.net SVN: swig:[11057] trunk/Examples/test-suite

[<dr...@us...>]

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.