From: <wsf...@us...> - 2008-04-05 20:27:43
|
Revision: 10350 http://swig.svn.sourceforge.net/swig/?rev=10350&view=rev Author: wsfulton Date: 2008-04-05 13:27:42 -0700 (Sat, 05 Apr 2008) Log Message: ----------- fixes for languages without shared_ptr support Modified Paths: -------------- trunk/Examples/test-suite/li_boost_shared_ptr.i trunk/Examples/test-suite/li_boost_shared_ptr_bits.i Modified: trunk/Examples/test-suite/li_boost_shared_ptr.i =================================================================== --- trunk/Examples/test-suite/li_boost_shared_ptr.i 2008-04-05 20:24:31 UTC (rev 10349) +++ trunk/Examples/test-suite/li_boost_shared_ptr.i 2008-04-05 20:27:42 UTC (rev 10350) @@ -9,6 +9,8 @@ %module li_boost_shared_ptr +%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); + %inline %{ #include "boost/shared_ptr.hpp" #include "swig_examples_lock.h" @@ -36,8 +38,6 @@ #define SHARED_PTR_WRAPPERS_IMPLEMENTED #endif -%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); - #if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) %include <boost_shared_ptr.i> Modified: trunk/Examples/test-suite/li_boost_shared_ptr_bits.i =================================================================== --- trunk/Examples/test-suite/li_boost_shared_ptr_bits.i 2008-04-05 20:24:31 UTC (rev 10349) +++ trunk/Examples/test-suite/li_boost_shared_ptr_bits.i 2008-04-05 20:27:42 UTC (rev 10350) @@ -1,13 +1,20 @@ %module li_boost_shared_ptr_bits +#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) +#define SHARED_PTR_WRAPPERS_IMPLEMENTED +#endif + +#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) + %include <boost_shared_ptr.i> +SWIG_SHARED_PTR(NonDynamic, NonDynamic) +#endif + #if defined(SWIGPYTHON) %pythonnondynamic NonDynamic; #endif -SWIG_SHARED_PTR(NonDynamic, NonDynamic) - %inline %{ #include <boost/shared_ptr.hpp> struct NonDynamic { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xav...@us...> - 2008-04-12 13:49:04
|
Revision: 10370 http://swig.svn.sourceforge.net/swig/?rev=10370&view=rev Author: xavier98 Date: 2008-04-12 06:49:01 -0700 (Sat, 12 Apr 2008) Log Message: ----------- Move samename test to common. Modified Paths: -------------- trunk/Examples/test-suite/common.mk trunk/Examples/test-suite/octave/Makefile.in Added Paths: ----------- trunk/Examples/test-suite/samename.i trunk/Examples/test-suite/samename_runme.m Removed Paths: ------------- trunk/Examples/test-suite/octave/samename.i trunk/Examples/test-suite/octave/samename_runme.m Modified: trunk/Examples/test-suite/common.mk =================================================================== --- trunk/Examples/test-suite/common.mk 2008-04-11 22:28:30 UTC (rev 10369) +++ trunk/Examples/test-suite/common.mk 2008-04-12 13:49:01 UTC (rev 10370) @@ -87,11 +87,12 @@ arrays_scope \ bloody_hell \ bools \ + cast_operator \ casts \ - cast_operator \ char_strings \ class_ignore \ class_scope_weird \ + compactdefaultargs \ const_const_2 \ constant_pointers \ constover \ @@ -101,7 +102,6 @@ constructor_ignore \ constructor_value \ contract \ - compactdefaultargs \ conversion \ conversion_namespace \ conversion_ns_template \ @@ -112,8 +112,8 @@ cpp_nodefault \ cpp_static \ cpp_typedef \ + default_args \ default_constructor \ - default_args \ defvalue_constructor \ derived_byvalue \ derived_nested \ @@ -123,13 +123,13 @@ director_classes \ director_classic \ director_constructor \ + director_default \ director_detect \ - director_default \ director_enum \ director_exception \ director_extend \ + director_finalizer \ director_frob \ - director_finalizer \ director_ignore \ director_namespace_clash \ director_nested \ @@ -152,7 +152,7 @@ evil_diamond_ns \ evil_diamond_prop \ exception_order \ - extend \ + extend \ extend_default \ extend_placement \ extend_template \ @@ -160,9 +160,9 @@ extern_namespace \ extern_throws \ features \ + fragments \ + friends \ fvirtual \ - friends \ - fragments \ global_ns_arg \ global_vars \ grouping \ @@ -205,9 +205,9 @@ namespace_virtual_method \ naturalvar \ newobject1 \ - ordering \ operator_overload \ operator_overload_break \ + ordering \ overload_copy \ overload_extend \ overload_rename \ @@ -218,7 +218,7 @@ pointer_reference \ primitive_ref \ private_assign \ - protected_rename \ + protected_rename \ pure_virtual \ redefined \ refcount \ @@ -233,6 +233,7 @@ return_const_value \ return_value_scope \ rname \ + samename \ sizet \ smart_pointer_const \ smart_pointer_const2 \ @@ -246,10 +247,10 @@ smart_pointer_overload \ smart_pointer_protected \ smart_pointer_rename \ + smart_pointer_simple \ + smart_pointer_static \ smart_pointer_templatemethods \ smart_pointer_templatevariables \ - smart_pointer_simple \ - smart_pointer_static \ smart_pointer_typedef \ special_variables \ static_array_member \ @@ -257,10 +258,10 @@ static_const_member_2 \ struct_value \ template \ - template_array_numeric \ template_arg_replace \ template_arg_scope \ template_arg_typename \ + template_array_numeric \ template_base_template \ template_classes \ template_const_ref \ @@ -276,10 +277,10 @@ template_enum_ns_inherit \ template_enum_typedef \ template_explicit \ + template_extend1 \ + template_extend2 \ template_extend_overload \ template_extend_overload_2 \ - template_extend1 \ - template_extend2 \ template_forward \ template_inherit \ template_inherit_abstract \ @@ -326,8 +327,8 @@ typedef_inherit \ typedef_mptr \ typedef_reference \ + typedef_scope \ typedef_sizet \ - typedef_scope \ typedef_struct \ typemap_namespace \ typemap_ns_using \ Modified: trunk/Examples/test-suite/octave/Makefile.in =================================================================== --- trunk/Examples/test-suite/octave/Makefile.in 2008-04-11 22:28:30 UTC (rev 10369) +++ trunk/Examples/test-suite/octave/Makefile.in 2008-04-12 13:49:01 UTC (rev 10370) @@ -13,8 +13,7 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -CPP_TEST_CASES += \ - samename +#CPP_TEST_CASES += CPP_TEST_BROKEN += \ implicittest \ Deleted: trunk/Examples/test-suite/octave/samename.i =================================================================== --- trunk/Examples/test-suite/octave/samename.i 2008-04-11 22:28:30 UTC (rev 10369) +++ trunk/Examples/test-suite/octave/samename.i 2008-04-12 13:49:01 UTC (rev 10370) @@ -1,13 +0,0 @@ -%module samename - -%inline { - -class samename { - public: - void do_something() { - // ... - } -}; - -} - Deleted: trunk/Examples/test-suite/octave/samename_runme.m =================================================================== --- trunk/Examples/test-suite/octave/samename_runme.m 2008-04-11 22:28:30 UTC (rev 10369) +++ trunk/Examples/test-suite/octave/samename_runme.m 2008-04-12 13:49:01 UTC (rev 10370) @@ -1 +0,0 @@ -samename Added: trunk/Examples/test-suite/samename.i =================================================================== --- trunk/Examples/test-suite/samename.i (rev 0) +++ trunk/Examples/test-suite/samename.i 2008-04-12 13:49:01 UTC (rev 10370) @@ -0,0 +1,13 @@ +%module samename + +%inline { + +class samename { + public: + void do_something() { + // ... + } +}; + +} + Added: trunk/Examples/test-suite/samename_runme.m =================================================================== --- trunk/Examples/test-suite/samename_runme.m (rev 0) +++ trunk/Examples/test-suite/samename_runme.m 2008-04-12 13:49:01 UTC (rev 10370) @@ -0,0 +1 @@ +samename This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2008-05-10 10:36:43
|
Revision: 10433 http://swig.svn.sourceforge.net/swig/?rev=10433&view=rev Author: wsfulton Date: 2008-05-10 03:36:35 -0700 (Sat, 10 May 2008) Log Message: ----------- rename package testcase to packageoption as package is a Java keyword Modified Paths: -------------- trunk/Examples/test-suite/common.mk Added Paths: ----------- trunk/Examples/test-suite/packageoption.h trunk/Examples/test-suite/packageoption.list trunk/Examples/test-suite/packageoption_a.i trunk/Examples/test-suite/packageoption_b.i trunk/Examples/test-suite/perl5/packageoption_runme.pl Removed Paths: ------------- trunk/Examples/test-suite/package.h trunk/Examples/test-suite/package.list trunk/Examples/test-suite/package_a.i trunk/Examples/test-suite/package_b.i trunk/Examples/test-suite/perl5/package_runme.pl Modified: trunk/Examples/test-suite/common.mk =================================================================== --- trunk/Examples/test-suite/common.mk 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/common.mk 2008-05-10 10:36:35 UTC (rev 10433) @@ -422,7 +422,7 @@ MULTI_CPP_TEST_CASES += \ clientdata_prop \ imports \ - package \ + packageoption \ mod \ template_typedef_import \ multi_import Deleted: trunk/Examples/test-suite/package.h =================================================================== --- trunk/Examples/test-suite/package.h 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/package.h 2008-05-10 10:36:35 UTC (rev 10433) @@ -1,5 +0,0 @@ -class A -{ - public: - int testInt() { return 2;} -}; Deleted: trunk/Examples/test-suite/package.list =================================================================== --- trunk/Examples/test-suite/package.list 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/package.list 2008-05-10 10:36:35 UTC (rev 10433) @@ -1,2 +0,0 @@ -package_a -package_b \ No newline at end of file Deleted: trunk/Examples/test-suite/package_a.i =================================================================== --- trunk/Examples/test-suite/package_a.i 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/package_a.i 2008-05-10 10:36:35 UTC (rev 10433) @@ -1,10 +0,0 @@ -%module(package="C") "package_a"; - -%inline %{ -class A -{ - public: - int testInt() { return 2;} -}; - -%} \ No newline at end of file Deleted: trunk/Examples/test-suite/package_b.i =================================================================== --- trunk/Examples/test-suite/package_b.i 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/package_b.i 2008-05-10 10:36:35 UTC (rev 10433) @@ -1,10 +0,0 @@ -%module(package="C") "package_b"; - -%inline %{ -class B -{ - public: - int testInt() { return 4; } -}; - -%} \ No newline at end of file Copied: trunk/Examples/test-suite/packageoption.h (from rev 10431, trunk/Examples/test-suite/package.h) =================================================================== --- trunk/Examples/test-suite/packageoption.h (rev 0) +++ trunk/Examples/test-suite/packageoption.h 2008-05-10 10:36:35 UTC (rev 10433) @@ -0,0 +1,5 @@ +class A +{ + public: + int testInt() { return 2;} +}; Copied: trunk/Examples/test-suite/packageoption.list (from rev 10431, trunk/Examples/test-suite/package.list) =================================================================== --- trunk/Examples/test-suite/packageoption.list (rev 0) +++ trunk/Examples/test-suite/packageoption.list 2008-05-10 10:36:35 UTC (rev 10433) @@ -0,0 +1,2 @@ +packageoption_a +packageoption_b Copied: trunk/Examples/test-suite/packageoption_a.i (from rev 10431, trunk/Examples/test-suite/package_a.i) =================================================================== --- trunk/Examples/test-suite/packageoption_a.i (rev 0) +++ trunk/Examples/test-suite/packageoption_a.i 2008-05-10 10:36:35 UTC (rev 10433) @@ -0,0 +1,10 @@ +%module(package="C") "packageoption_a"; + +%inline %{ +class A +{ + public: + int testInt() { return 2;} +}; + +%} Copied: trunk/Examples/test-suite/packageoption_b.i (from rev 10431, trunk/Examples/test-suite/package_b.i) =================================================================== --- trunk/Examples/test-suite/packageoption_b.i (rev 0) +++ trunk/Examples/test-suite/packageoption_b.i 2008-05-10 10:36:35 UTC (rev 10433) @@ -0,0 +1,10 @@ +%module(package="C") "packageoption_b"; + +%inline %{ +class B +{ + public: + int testInt() { return 4; } +}; + +%} Deleted: trunk/Examples/test-suite/perl5/package_runme.pl =================================================================== --- trunk/Examples/test-suite/perl5/package_runme.pl 2008-05-10 10:30:31 UTC (rev 10432) +++ trunk/Examples/test-suite/perl5/package_runme.pl 2008-05-10 10:36:35 UTC (rev 10433) @@ -1,24 +0,0 @@ -#!/usr/bin/perl -w -use strict; -use Test::More tests => 4; - -BEGIN { use_ok('package_a'); } -BEGIN { use_ok('package_b'); } - -# Workaround for -# ok( not (expression) , "test description" ); -# does not working in older versions of Perl, eg 5.004_04 -sub ok_not ($;$) { - my($test, $name) = @_; - $test = not $test; - ok($test, $name); -} - -my $a = C::A->new(); - -isa_ok($a, 'C::A'); - -my $b = C::B->new(); - -isa_ok($b, 'C::B'); - Copied: trunk/Examples/test-suite/perl5/packageoption_runme.pl (from rev 10431, trunk/Examples/test-suite/perl5/package_runme.pl) =================================================================== --- trunk/Examples/test-suite/perl5/packageoption_runme.pl (rev 0) +++ trunk/Examples/test-suite/perl5/packageoption_runme.pl 2008-05-10 10:36:35 UTC (rev 10433) @@ -0,0 +1,24 @@ +#!/usr/bin/perl -w +use strict; +use Test::More tests => 4; + +BEGIN { use_ok('packageoption_a'); } +BEGIN { use_ok('packageoption_b'); } + +# Workaround for +# ok( not (expression) , "test description" ); +# does not working in older versions of Perl, eg 5.004_04 +sub ok_not ($;$) { + my($test, $name) = @_; + $test = not $test; + ok($test, $name); +} + +my $a = C::A->new(); + +isa_ok($a, 'C::A'); + +my $b = C::B->new(); + +isa_ok($b, 'C::B'); + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bh...@us...> - 2008-06-07 11:20:12
|
Revision: 10518 http://swig.svn.sourceforge.net/swig/?rev=10518&view=rev Author: bhy Date: 2008-06-07 04:20:07 -0700 (Sat, 07 Jun 2008) Log Message: ----------- Added a test case for keyword renaming. Now it works for Python in SWIG's -c++ mode, but in C mode it doesn't work! (you can try with make keyword_rename.ctest) Modified Paths: -------------- trunk/Examples/test-suite/common.mk Added Paths: ----------- trunk/Examples/test-suite/keyword_rename.i trunk/Examples/test-suite/python/keyword_rename_runme.py Modified: trunk/Examples/test-suite/common.mk =================================================================== --- trunk/Examples/test-suite/common.mk 2008-06-07 08:05:46 UTC (rev 10517) +++ trunk/Examples/test-suite/common.mk 2008-06-07 11:20:07 UTC (rev 10518) @@ -202,6 +202,7 @@ inherit_target_language \ inherit_void_arg \ inline_initializer \ + keyword_rename \ kind \ langobj \ li_attribute \ @@ -422,6 +423,7 @@ immutable \ inctest \ integers \ + keyword_rename \ lextype \ li_carrays \ li_cdata \ Added: trunk/Examples/test-suite/keyword_rename.i =================================================================== --- trunk/Examples/test-suite/keyword_rename.i (rev 0) +++ trunk/Examples/test-suite/keyword_rename.i 2008-06-07 11:20:07 UTC (rev 10518) @@ -0,0 +1,26 @@ +/* + * Test reserved keyword renaming + */ + +%module keyword_rename + +%inline %{ + +#define KW(x, y) int x (int y) { return y;} + +/* Python keywords */ +KW(in, except) +KW(except, in) +KW(raise, in) + +/* Perl keywords */ +KW(tie, die) +KW(use, next) + +/* Java keywords */ +KW(implements, native) +KW(byte, final) + +%} + + Added: trunk/Examples/test-suite/python/keyword_rename_runme.py =================================================================== --- trunk/Examples/test-suite/python/keyword_rename_runme.py (rev 0) +++ trunk/Examples/test-suite/python/keyword_rename_runme.py 2008-06-07 11:20:07 UTC (rev 10518) @@ -0,0 +1,4 @@ +#!/usr/bin/env python +import keyword_rename +keyword_rename._in(1) +keyword_rename._except(1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2008-06-21 16:18:55
|
Revision: 10541 http://swig.svn.sourceforge.net/swig/?rev=10541&view=rev Author: wsfulton Date: 2008-06-21 09:04:55 -0700 (Sat, 21 Jun 2008) Log Message: ----------- minor vc++ /W4 warning fixes Modified Paths: -------------- trunk/Examples/test-suite/apply_signed_char.i trunk/Examples/test-suite/bools.i trunk/Examples/test-suite/constant_pointers.i trunk/Examples/test-suite/cpp_basic.i trunk/Examples/test-suite/enum_thorough.i trunk/Examples/test-suite/java_typemaps_proxy.i Modified: trunk/Examples/test-suite/apply_signed_char.i =================================================================== --- trunk/Examples/test-suite/apply_signed_char.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/apply_signed_char.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -31,5 +31,7 @@ const char memberconstchar; virtual ~DirectorTest() {} + private: + DirectorTest& operator=(const DirectorTest &); }; %} Modified: trunk/Examples/test-suite/bools.i =================================================================== --- trunk/Examples/test-suite/bools.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/bools.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -57,6 +57,8 @@ m_rbool(m_bool2), m_const_pbool(m_pbool), m_const_rbool(m_rbool) {} +private: + BoolStructure& operator=(const BoolStructure &); }; %} Modified: trunk/Examples/test-suite/constant_pointers.i =================================================================== --- trunk/Examples/test-suite/constant_pointers.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/constant_pointers.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -46,6 +46,8 @@ int* array_member1[ARRAY_SIZE]; ParametersTest* array_member2[ARRAY_SIZE]; MemberVariablesTest() : member3(NULL), member4(NULL) {} +private: + MemberVariablesTest& operator=(const MemberVariablesTest&); }; void foo(const int *const i) {} @@ -69,6 +71,8 @@ void ret6(int*& a) {} int*& ret7() {return GlobalIntPtr;} ReturnValuesTest() : int3(NULL) {} +private: + ReturnValuesTest& operator=(const ReturnValuesTest&); }; const int* globalRet1() {return &GlobalInt;} @@ -100,6 +104,8 @@ A* ap; const A* cap; Acptr acptr; + private: + B& operator=(const B&); }; const B* bar(const B* b) { Modified: trunk/Examples/test-suite/cpp_basic.i =================================================================== --- trunk/Examples/test-suite/cpp_basic.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/cpp_basic.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -55,6 +55,8 @@ Foo *testFoo(int a, Foo *f) { return new Foo(2 * a + (f ? f->num : 0) + fval.num); } +private: + Bar& operator=(const Bar&); }; %} Modified: trunk/Examples/test-suite/enum_thorough.i =================================================================== --- trunk/Examples/test-suite/enum_thorough.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/enum_thorough.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -81,6 +81,8 @@ const colour myColour2; speedtd1 mySpeedtd1; SpeedClass() : myColour2(red), mySpeedtd1(slow) { } +private: + SpeedClass& operator=(const SpeedClass&); }; int speedTest0(int s) { return s; } Modified: trunk/Examples/test-suite/java_typemaps_proxy.i =================================================================== --- trunk/Examples/test-suite/java_typemaps_proxy.i 2008-06-21 15:23:02 UTC (rev 10540) +++ trunk/Examples/test-suite/java_typemaps_proxy.i 2008-06-21 16:04:55 UTC (rev 10541) @@ -119,6 +119,8 @@ void const_member_method(const ConstWithout *p) const {} const ConstWithout * const_var; const ConstWithout * const var_const; +private: + ConstWithout& operator=(const ConstWithout &); }; const ConstWithout * global_constwithout = 0; void global_method_constwithout(const ConstWithout *p) {} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2008-06-23 20:39:44
|
Revision: 10561 http://swig.svn.sourceforge.net/swig/?rev=10561&view=rev Author: wsfulton Date: 2008-06-23 13:39:41 -0700 (Mon, 23 Jun 2008) Log Message: ----------- correct message display when running the partialcheck-test-suite make target Modified Paths: -------------- trunk/Examples/test-suite/chicken/Makefile.in trunk/Examples/test-suite/csharp/Makefile.in trunk/Examples/test-suite/guilescm/Makefile.in trunk/Examples/test-suite/java/Makefile.in Modified: trunk/Examples/test-suite/chicken/Makefile.in =================================================================== --- trunk/Examples/test-suite/chicken/Makefile.in 2008-06-23 20:26:07 UTC (rev 10560) +++ trunk/Examples/test-suite/chicken/Makefile.in 2008-06-23 20:39:41 UTC (rev 10561) @@ -69,21 +69,21 @@ %.cppproxy: SWIGOPT += -proxy %.cppproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cppproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_cpp) $(run_testcase) %.cproxy: SWIGOPT += -proxy %.cproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.cproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_c) $(run_testcase) %.multiproxy: SWIGOPT += -proxy -noclosuses %.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.multiproxy: - echo "Checking testcase $* (with run test) under chicken with -proxy" + echo "$(ACTION)ing testcase $* (with run test) under chicken with -proxy" +$(swig_and_compile_multi_cpp) $(run_testcase) Modified: trunk/Examples/test-suite/csharp/Makefile.in =================================================================== --- trunk/Examples/test-suite/csharp/Makefile.in 2008-06-23 20:26:07 UTC (rev 10560) +++ trunk/Examples/test-suite/csharp/Makefile.in 2008-06-23 20:39:41 UTC (rev 10561) @@ -51,9 +51,9 @@ # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ Modified: trunk/Examples/test-suite/guilescm/Makefile.in =================================================================== --- trunk/Examples/test-suite/guilescm/Makefile.in 2008-06-23 20:26:07 UTC (rev 10560) +++ trunk/Examples/test-suite/guilescm/Makefile.in 2008-06-23 20:39:41 UTC (rev 10561) @@ -21,9 +21,9 @@ setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; swig_and_compile_multi_cpp = \ @@ -43,9 +43,9 @@ # Same as setup and run_testcase, but without the SCRIPTPREFIX (so the runme comes from the guilescm directory) local_setup = \ if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ fi; local_run_testcase = \ Modified: trunk/Examples/test-suite/java/Makefile.in =================================================================== --- trunk/Examples/test-suite/java/Makefile.in 2008-06-23 20:26:07 UTC (rev 10560) +++ trunk/Examples/test-suite/java/Makefile.in 2008-06-23 20:39:41 UTC (rev 10561) @@ -57,9 +57,9 @@ # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "Checking testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ else \ - echo "Checking testcase $* under $(LANGUAGE)" ; \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ fi; \ if [ ! -d $* ]; then \ mkdir $*; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2008-06-24 20:11:48
|
Revision: 10575 http://swig.svn.sourceforge.net/swig/?rev=10575&view=rev Author: wsfulton Date: 2008-06-24 13:11:46 -0700 (Tue, 24 Jun 2008) Log Message: ----------- variable name changes to remove php keywords Modified Paths: -------------- trunk/Examples/test-suite/csharp/char_strings_runme.cs trunk/Examples/test-suite/fvirtual.i trunk/Examples/test-suite/java/char_strings_runme.java trunk/Examples/test-suite/li_std_string.i trunk/Examples/test-suite/octave/fvirtual_runme.m trunk/Examples/test-suite/octave/li_std_string_runme.m trunk/Examples/test-suite/perl5/li_std_string_runme.pl trunk/Examples/test-suite/python/fvirtual_runme.py trunk/Examples/test-suite/python/li_std_string_runme.py trunk/Examples/test-suite/ruby/li_std_string_runme.rb trunk/Examples/test-suite/template_int_const.i trunk/Examples/test-suite/template_typedef_rec.i Modified: trunk/Examples/test-suite/csharp/char_strings_runme.cs =================================================================== --- trunk/Examples/test-suite/csharp/char_strings_runme.cs 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/csharp/char_strings_runme.cs 2008-06-24 20:11:46 UTC (rev 10575) @@ -5,7 +5,7 @@ public class char_strings_runme { private static string CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static string OTHERLAND_MSG = "Little message from the the safe world."; + private static string OTHERLAND_MSG = "Little message from the safe world."; public static void Main() { Modified: trunk/Examples/test-suite/fvirtual.i =================================================================== --- trunk/Examples/test-suite/fvirtual.i 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/fvirtual.i 2008-06-24 20:11:46 UTC (rev 10575) @@ -10,11 +10,11 @@ virtual ~Node() {} }; - class Switch : public Node { + class NodeSwitch : public Node { public : virtual int addChild( Node *child ) { return 2; } // This was hidden with -fvirtual virtual int addChild( Node *child, bool value ) { return 3; } - virtual ~Switch() {} + virtual ~NodeSwitch() {} }; %} Modified: trunk/Examples/test-suite/java/char_strings_runme.java =================================================================== --- trunk/Examples/test-suite/java/char_strings_runme.java 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/java/char_strings_runme.java 2008-06-24 20:11:46 UTC (rev 10575) @@ -12,7 +12,7 @@ } private static String CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible."; - private static String OTHERLAND_MSG = "Little message from the the safe world."; + private static String OTHERLAND_MSG = "Little message from the safe world."; public static void main(String argv[]) { Modified: trunk/Examples/test-suite/li_std_string.i =================================================================== --- trunk/Examples/test-suite/li_std_string.i 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/li_std_string.i 2008-06-24 20:11:46 UTC (rev 10575) @@ -129,7 +129,7 @@ %} %inline %{ - std::string empty() { + std::string stdstring_empty() { return std::string(); } Modified: trunk/Examples/test-suite/octave/fvirtual_runme.m =================================================================== --- trunk/Examples/test-suite/octave/fvirtual_runme.m 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/octave/fvirtual_runme.m 2008-06-24 20:11:46 UTC (rev 10575) @@ -1,6 +1,6 @@ fvirtual -sw = Switch(); +sw = NodeSwitch(); n = Node(); i = sw.addChild(n); Modified: trunk/Examples/test-suite/octave/li_std_string_runme.m =================================================================== --- trunk/Examples/test-suite/octave/li_std_string_runme.m 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/octave/li_std_string_runme.m 2008-06-24 20:11:46 UTC (rev 10575) @@ -148,7 +148,7 @@ endif -if (li_std_string.empty() != "") +if (li_std_string.stdstring_empty() != "") error endif Modified: trunk/Examples/test-suite/perl5/li_std_string_runme.pl =================================================================== --- trunk/Examples/test-suite/perl5/li_std_string_runme.pl 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/perl5/li_std_string_runme.pl 2008-06-24 20:11:46 UTC (rev 10575) @@ -98,7 +98,7 @@ is($gen1->testl("9234567890121111113"), "9234567890121111114", "ulonglong big number"); -is(li_std_string::empty(), "", "empty"); +is(li_std_string::stdstring_empty(), "", "stdstring_empty"); is(li_std_string::c_empty(), "", "c_empty"); @@ -110,4 +110,4 @@ is(li_std_string::get_null(li_std_string::c_empty()), "non-null", "c_empty"); -is(li_std_string::get_null(li_std_string::empty()), "non-null", "c_empty"); +is(li_std_string::get_null(li_std_string::stdstring_empty()), "non-null", "stdstring_empty"); Modified: trunk/Examples/test-suite/python/fvirtual_runme.py =================================================================== --- trunk/Examples/test-suite/python/fvirtual_runme.py 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/python/fvirtual_runme.py 2008-06-24 20:11:46 UTC (rev 10575) @@ -1,6 +1,6 @@ from fvirtual import * -sw = Switch() +sw = NodeSwitch() n = Node() i = sw.addChild(n); Modified: trunk/Examples/test-suite/python/li_std_string_runme.py =================================================================== --- trunk/Examples/test-suite/python/li_std_string_runme.py 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/python/li_std_string_runme.py 2008-06-24 20:11:46 UTC (rev 10575) @@ -121,7 +121,7 @@ raise RuntimeError -if li_std_string.empty() != "": +if li_std_string.stdstring_empty() != "": raise RuntimeError Modified: trunk/Examples/test-suite/ruby/li_std_string_runme.rb =================================================================== --- trunk/Examples/test-suite/ruby/li_std_string_runme.rb 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/ruby/li_std_string_runme.rb 2008-06-24 20:11:46 UTC (rev 10575) @@ -124,7 +124,7 @@ end -if (empty() != "") +if (stdstring_empty() != "") raise RuntimeError end Modified: trunk/Examples/test-suite/template_int_const.i =================================================================== --- trunk/Examples/test-suite/template_int_const.i 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/template_int_const.i 2008-06-24 20:11:46 UTC (rev 10575) @@ -10,7 +10,7 @@ static const Polarization polarization = UnaryPolarization; }; template <Polarization P> - struct Interface + struct Interface_ { }; @@ -26,16 +26,16 @@ }; %} -%template(Interface_UP) Interface<UnaryPolarization>; +%template(Interface_UP) Interface_<UnaryPolarization>; %template(Module_1) Module<1>; %inline %{ struct ExtInterface1 : - Interface<UnaryPolarization> // works + Interface_<UnaryPolarization> // works { }; struct ExtInterface2 : - Interface<interface_traits::polarization> // doesn't work + Interface_<interface_traits::polarization> // doesn't work { }; struct ExtModule1 : Modified: trunk/Examples/test-suite/template_typedef_rec.i =================================================================== --- trunk/Examples/test-suite/template_typedef_rec.i 2008-06-24 20:10:28 UTC (rev 10574) +++ trunk/Examples/test-suite/template_typedef_rec.i 2008-06-24 20:11:46 UTC (rev 10575) @@ -16,7 +16,7 @@ template <typename T> -class ArrayIterator +class ArrayIterator_ { public: typedef test_Array::intT intT; @@ -38,8 +38,8 @@ public: typedef T ValueT; typedef T valueT; - typedef ArrayIterator<T> Iterator; - typedef ArrayIterator<const T> ConstIterator; + typedef ArrayIterator_<T> Iterator; + typedef ArrayIterator_<const T> ConstIterator; typedef ArrayReverseIterator<T> ReverseIterator; typedef ArrayReverseIterator<const T> ConstReverseIterator; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |