From d6cef9337f044f9482995d10ed05fc5c1a4e2c21 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 30 Apr 2012 05:27:09 +0000 Subject: [PATCH 001/538] Bump version to 2.0.7 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13029 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- ANNOUNCE | 8 ++++---- CHANGES | 13 +++++++++++++ CHANGES.current | 14 ++------------ Doc/Manual/Sections.html | 2 +- README | 2 +- configure.in | 2 +- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 825837614..46c570cb1 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,8 +1,8 @@ -*** ANNOUNCE: SWIG 2.0.6 (30 April 2012) *** +*** ANNOUNCE: SWIG 2.0.7 (in progress) *** http://www.swig.org -We're pleased to announce SWIG-2.0.6, the latest SWIG release. +We're pleased to announce SWIG-2.0.7, the latest SWIG release. What is SWIG? ============= @@ -21,11 +21,11 @@ Availability ============ The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-2.0.6.tar.gz + http://prdownloads.sourceforge.net/swig/swig-2.0.7.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-2.0.6.zip + http://prdownloads.sourceforge.net/swig/swigwin-2.0.7.zip Please report problems with this release to the swig-devel mailing list, details at http://www.swig.org/mail.html. diff --git a/CHANGES b/CHANGES index 70af78333..534d9cb71 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,19 @@ SWIG (Simplified Wrapper and Interface Generator) See the CHANGES.current file for changes in the current version. See the RELEASENOTES file for a summary of changes in each release. +Version 2.0.6 (30 April 2012) +============================= + +2012-04-25: wsfulton + [Lua] Fix uninitialised variable in SWIGTYPE **OUTPUT typemaps as reported by Jim Anderson. + +2012-04-28: wsfulton + [Python] Fix compilation errors when wrapping STL containers on Mac OSX and possibly other systems. + +2012-04-28: wsfulton + [Java] Patch 3521811 from Leo Davis - char **STRING_ARRAY typemaps fixed to handle + null pointers. + Version 2.0.5 (19 April 2012) ============================= diff --git a/CHANGES.current b/CHANGES.current index cb64a7937..12e378ed8 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -2,16 +2,6 @@ Below are the changes for the current release. See the CHANGES file for changes in older releases. See the RELEASENOTES file for a summary of changes in each release. -Version 2.0.6 (30 April 2012) -============================= - -2012-04-25: wsfulton - [Lua] Fix uninitialised variable in SWIGTYPE **OUTPUT typemaps as reported by Jim Anderson. - -2012-04-28: wsfulton - [Python] Fix compilation errors when wrapping STL containers on Mac OSX and possibly other systems. - -2012-04-28: wsfulton - [Java] Patch 3521811 from Leo Davis - char **STRING_ARRAY typemaps fixed to handle - null pointers. +Version 2.0.7 (in progress) +=========================== diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index 1151de1d5..61c94544e 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

SWIG-2.0 Documentation

-Last update : SWIG-2.0.6 (30 April 2012) +Last update : SWIG-2.0.7 (in progress)

Sections

diff --git a/README b/README index d846665e3..a683745ae 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 2.0.6 (30 April 2012) +Version: 2.0.7 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, diff --git a/configure.in b/configure.in index 77791bd02..79f780b67 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[2.0.6],[http://www.swig.org]) +AC_INIT([swig],[2.0.7],[http://www.swig.org]) dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED dnl definition below can be removed From 73b0431fbc29e34833f7fc4d8dbcc7b6a64b0f1b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 1 May 2012 18:44:22 +0000 Subject: [PATCH 002/538] Fix C enum forward declarations in some target languages (notably Java) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13030 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 ++ Examples/test-suite/common.mk | 1 + .../test-suite/csharp/enum_forward_runme.cs | 16 +++++++++ Examples/test-suite/enum_forward.i | 35 +++++++++++++++++++ .../test-suite/java/enum_forward_runme.java | 33 +++++++++++++++++ .../test-suite/python/enum_forward_runme.py | 10 ++++++ Source/Modules/lang.cxx | 6 +++- Source/Modules/typepass.cxx | 17 ++++++++- 8 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 Examples/test-suite/csharp/enum_forward_runme.cs create mode 100644 Examples/test-suite/enum_forward.i create mode 100644 Examples/test-suite/java/enum_forward_runme.java create mode 100644 Examples/test-suite/python/enum_forward_runme.py diff --git a/CHANGES.current b/CHANGES.current index 12e378ed8..682ae47a2 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,3 +5,6 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-01: wsfulton + Fix generated code for C forward enum declarations in some languages. + diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 7cc410e7a..84a81b08f 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -495,6 +495,7 @@ C_TEST_CASES += \ constant_expr \ empty \ enums \ + enum_forward \ extern_declaration \ funcptr \ function_typedef \ diff --git a/Examples/test-suite/csharp/enum_forward_runme.cs b/Examples/test-suite/csharp/enum_forward_runme.cs new file mode 100644 index 000000000..3ae714ff0 --- /dev/null +++ b/Examples/test-suite/csharp/enum_forward_runme.cs @@ -0,0 +1,16 @@ +using System; +using enum_forwardNamespace; + +public class runme { + static void Main() { + ForwardEnum1 f1 = enum_forward.get_enum1(); + f1 = enum_forward.test_function1(f1); + + ForwardEnum2 f2 = enum_forward.get_enum2(); + f2 = enum_forward.test_function2(f2); + + ForwardEnum3 f3 = enum_forward.get_enum3(); + f3 = enum_forward.test_function3(f3); + } +} + diff --git a/Examples/test-suite/enum_forward.i b/Examples/test-suite/enum_forward.i new file mode 100644 index 000000000..4540aecb6 --- /dev/null +++ b/Examples/test-suite/enum_forward.i @@ -0,0 +1,35 @@ +%module enum_forward + +%{ +enum ForwardEnum1 { AAA, BBB }; +enum ForwardEnum2 { CCC, DDD }; +%} + +%inline %{ +enum ForwardEnum1; +enum ForwardEnum1 get_enum1() { return AAA; } +enum ForwardEnum1 test_function1(enum ForwardEnum1 e) { + return e; +} +%} + +%inline %{ +enum ForwardEnum2; +enum ForwardEnum2; +enum ForwardEnum2 get_enum2() { return CCC; } +enum ForwardEnum2 test_function2(enum ForwardEnum2 e) { + return e; +} +enum ForwardEnum2; +%} + +%inline %{ +enum ForwardEnum3; +enum ForwardEnum3 { EEE, FFF }; +enum ForwardEnum3 get_enum3() { return EEE; } +enum ForwardEnum3 test_function3(enum ForwardEnum3 e) { + return e; +} +enum ForwardEnum3; +%} + diff --git a/Examples/test-suite/java/enum_forward_runme.java b/Examples/test-suite/java/enum_forward_runme.java new file mode 100644 index 000000000..3827e8320 --- /dev/null +++ b/Examples/test-suite/java/enum_forward_runme.java @@ -0,0 +1,33 @@ + +import enum_forward.*; + +public class enum_forward_runme { + + static { + try { + System.loadLibrary("enum_forward"); + } 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[]) + { + try { + ForwardEnum1 f1 = enum_forward.get_enum1(); + f1 = enum_forward.test_function1(f1); + } catch (IllegalArgumentException e) { + } + + try { + ForwardEnum2 f2 = enum_forward.get_enum2(); + f2 = enum_forward.test_function2(f2); + } catch (IllegalArgumentException e) { + } + + ForwardEnum3 f3 = enum_forward.get_enum3(); + f3 = enum_forward.test_function3(f3); + } +} + diff --git a/Examples/test-suite/python/enum_forward_runme.py b/Examples/test-suite/python/enum_forward_runme.py new file mode 100644 index 000000000..9af476f97 --- /dev/null +++ b/Examples/test-suite/python/enum_forward_runme.py @@ -0,0 +1,10 @@ +import enum_forward + +f1 = enum_forward.get_enum1(); +f1 = enum_forward.test_function1(f1); + +f2 = enum_forward.get_enum2(); +f2 = enum_forward.test_function2(f2); + +f3 = enum_forward.get_enum3(); +f3 = enum_forward.test_function3(f3); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index c797a101e..c90ebeb73 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1664,6 +1664,8 @@ int Language::enumvalueDeclaration(Node *n) { int Language::enumforwardDeclaration(Node *n) { (void) n; + if (GetFlag(n, "enumMissing")) + enumDeclaration(n); // Generate an empty enum in target language return SWIG_OK; } @@ -3156,7 +3158,9 @@ Node *Language::enumLookup(SwigType *s) { n = Swig_symbol_clookup(base, stab); if (!n) break; - if (Strcmp(nodeType(n), "enum") == 0) + if (Equal(nodeType(n), "enum")) + break; + if (Equal(nodeType(n), "enumforward") && GetFlag(n, "enumMissing")) break; n = parentNode(n); if (!n) diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index 15768f203..d757d53a7 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -886,7 +886,22 @@ class TypePass:private Dispatcher { // Use enumDeclaration() to do all the hard work. // Note that no children can be emitted in a forward declaration as there aren't any. - return enumDeclaration(n); + int result = enumDeclaration(n); + if (result == SWIG_OK) { + // Detect when the real enum matching the forward enum declaration has not been parsed/declared + SwigType *ty = SwigType_typedef_resolve_all(Getattr(n, "type")); + Replaceall(ty, "enum ", ""); + Node *nn = Swig_symbol_clookup(ty, 0); + + String *nodetype = nn ? nodeType(nn) : 0; + if (nodetype) { + if (Equal(nodetype, "enumforward")) { + SetFlag(nn, "enumMissing"); + } // if a real enum was declared this would be an "enum" node type + } + Delete(ty); + } + return result; } #ifdef DEBUG_OVERLOADED From c9d8e6720bf0721dce06cc7417a890443456f58e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 2 May 2012 18:10:45 +0000 Subject: [PATCH 003/538] Remove support for using gccgo 4.6 as the Go compiler. Gccgo 4.7 works, as does the more commonly used gc compiler. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13031 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES | 5 ++++ Doc/Manual/Go.html | 13 ----------- Source/Modules/go.cxx | 53 ++++++++----------------------------------- configure.in | 5 +++- 4 files changed, 19 insertions(+), 57 deletions(-) diff --git a/CHANGES b/CHANGES index 534d9cb71..dd0224b67 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,11 @@ SWIG (Simplified Wrapper and Interface Generator) See the CHANGES.current file for changes in the current version. See the RELEASENOTES file for a summary of changes in each release. +2012-05-02: ianlancetaylor + [Go] Remove compatibility support for gccgo 4.6. Using + SWIG with gccgo will now require gccgo 4.7. Using SWIG + with the more commonly used gc compiler is unaffected. + Version 2.0.6 (30 April 2012) ============================= diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html index 8abeada81..cd39d1fa1 100644 --- a/Doc/Manual/Go.html +++ b/Doc/Manual/Go.html @@ -99,19 +99,6 @@ swig -go -help 6g/8g/5g. - --gccgo-46 -Generate code for gccgo 4.6. The default is set by the configure - script. This generates code that does not use some facilities - that are only available in gccgo 4.7 and later. - - - --no-gccgo-46 -Turn off -gccgo-46, whether set by default or earlier - on the command line. - - -package <name> Set the name of the Go package to <name>. The default diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 668cb66df..e7a21d1bd 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -13,12 +13,6 @@ char cvsroot_go_cxx[] = "$Id"; #include "cparse.h" #include -#ifdef HAVE_GCCGO_46 - #define GCCGO_46_DEFAULT true -#else - #define GCCGO_46_DEFAULT false -#endif - class GO:public Language { static const char *const usage; @@ -26,8 +20,6 @@ class GO:public Language { String *package; // Flag for generating gccgo output. bool gccgo_flag; - // Flag for generating gccgo 4.6 output. - bool gccgo_46_flag; // Prefix to use with gccgo. String *go_prefix; // Name of shared library to import. @@ -90,7 +82,6 @@ class GO:public Language { public: GO():package(NULL), gccgo_flag(false), - gccgo_46_flag(GCCGO_46_DEFAULT), go_prefix(NULL), soname(NULL), long_type_size(32), @@ -148,12 +139,6 @@ private: } else if (strcmp(argv[i], "-gccgo") == 0) { Swig_mark_arg(i); gccgo_flag = true; - } else if (strcmp(argv[i], "-gccgo-46") == 0) { - Swig_mark_arg(i); - gccgo_46_flag = true; - } else if (strcmp(argv[i], "-no-gccgo-46") == 0) { - Swig_mark_arg(i); - gccgo_46_flag = false; } else if (strcmp(argv[i], "-go-prefix") == 0) { if (argv[i + 1]) { go_prefix = NewString(argv[i + 1]); @@ -794,7 +779,7 @@ private: if (needs_wrapper) { wrapper_name = buildGoWrapperName(name, overname); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL); } @@ -845,16 +830,12 @@ private: } } - if (gccgo_flag && gccgo_46_flag) { - Printv(f_go_wrappers, " __asm__ (\"", go_prefix, "_", wname, "\")", NULL); - } - Printv(f_go_wrappers, "\n\n", NULL); } // Start defining the Go function. - if (!needs_wrapper && gccgo_flag && !gccgo_46_flag) { + if (!needs_wrapper && gccgo_flag) { Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL); } @@ -959,7 +940,7 @@ private: } } - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL); Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL); } @@ -1003,10 +984,6 @@ private: } Printv(f_go_wrappers, ")\n", NULL); Printv(f_go_wrappers, "}\n", NULL); - } else { - if (gccgo_flag && gccgo_46_flag) { - Printv(f_go_wrappers, " __asm__ (\"", go_prefix, "_", wname, "\")\n", NULL); - } } Printv(f_go_wrappers, "\n", NULL); @@ -2522,7 +2499,7 @@ private: if (!is_ignored) { // Declare the C++ wrapper. - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL); } @@ -2541,13 +2518,7 @@ private: p = nextParm(p); } - Printv(f_go_wrappers, ") ", go_type_name, NULL); - - if (gccgo_flag && gccgo_46_flag) { - Printv(f_go_wrappers, " __asm__(\"", go_prefix, "_", wname, "\")", NULL); - } - - Printv(f_go_wrappers, "\n\n", NULL); + Printv(f_go_wrappers, ") ", go_type_name, "\n\n", NULL); Printv(f_go_wrappers, "func ", func_with_over_name, "(v interface{}", NULL); @@ -2566,7 +2537,7 @@ private: Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL); Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL); } @@ -3026,7 +2997,7 @@ private: String *upcall_gc_name = buildGoWrapperName(upcall_name, overname); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "//extern ", go_prefix, "_", upcall_wname, "\n", NULL); } @@ -3049,10 +3020,6 @@ private: Delete(tm); } - if (gccgo_flag && gccgo_46_flag) { - Printv(f_go_wrappers, " __asm__(\"", go_prefix, "_", upcall_wname, "\")", NULL); - } - Printv(f_go_wrappers, "\n", NULL); // Define the method on the director class in Go. @@ -3082,7 +3049,7 @@ private: Printv(f_go_wrappers, " {\n", NULL); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL); Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL); } @@ -3254,7 +3221,7 @@ private: Printv(f_go_wrappers, " {\n", NULL); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL); Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL); } @@ -3301,7 +3268,7 @@ private: } Printv(f_go_wrappers, "{\n", NULL); - if (gccgo_flag && !gccgo_46_flag) { + if (gccgo_flag) { Printv(f_go_wrappers, "\tsyscall.Exitsyscall()\n", NULL); Printv(f_go_wrappers, "\tdefer syscall.Entersyscall()\n", NULL); } diff --git a/configure.in b/configure.in index 79f780b67..4b2525b34 100644 --- a/configure.in +++ b/configure.in @@ -2082,9 +2082,12 @@ else if test -n "$GO" ; then if $GO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then GOGCC=true + AC_MSG_CHECKING([whether gccgo version is too old]) go_version=`$GO --version | sed -e 's/[^0-9]* \([0-9.]*\) .*$/\1/' -e 's/[.]//g'` if test "$go_version" -lt 470; then - AC_DEFINE(HAVE_GCCGO_46, 1, [Define if using gccgo before 4.7.0]) + AC_MSG_RESULT([yes - minimum version is 4.7.0]) + else + AC_MSG_RESULT([no]) fi elif test "`echo $GO | sed -e 's|.*/||'`" = "go"; then GO1=true From e3b79abcdca9a183e4ba14b0a98e3c066ba4eceb Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 9 May 2012 07:23:07 +0000 Subject: [PATCH 004/538] Fix comment typo git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13051 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/lua/luaruntime.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/lua/luaruntime.swg b/Lib/lua/luaruntime.swg index 0f59b0476..eea394308 100644 --- a/Lib/lua/luaruntime.swg +++ b/Lib/lua/luaruntime.swg @@ -19,7 +19,7 @@ extern "C" { #endif /* this is the initialization function added at the very end of the code - the function is always called SWIG_init, but an eariler #define will rename it + the function is always called SWIG_init, but an earlier #define will rename it */ #if ((SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)) LUALIB_API int SWIG_init(lua_State* L) From a6d005f78b933d566d1df607e9be27e58538ccf9 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 9 May 2012 07:28:46 +0000 Subject: [PATCH 005/538] Fix another comment typo git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13052 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/lua/luaruntime.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/lua/luaruntime.swg b/Lib/lua/luaruntime.swg index eea394308..423c7190b 100644 --- a/Lib/lua/luaruntime.swg +++ b/Lib/lua/luaruntime.swg @@ -53,7 +53,7 @@ SWIGEXPORT int SWIG_init(lua_State* L) /* default Lua action */ #endif #if (SWIG_LUA_TARGET != SWIG_LUA_FLAVOR_ELUAC) - /* set up base class pointers (the hierachy) */ + /* set up base class pointers (the hierarchy) */ for (i = 0; swig_types[i]; i++){ if (swig_types[i]->clientdata){ SWIG_Lua_init_base_class(L,(swig_lua_class*)(swig_types[i]->clientdata)); From af079aa439c4fed624b273799a29fe7b147e52fe Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 10 May 2012 05:43:23 +0000 Subject: [PATCH 006/538] Disable enum_forward test for Octave as this is a C only code test which does not compile as C++ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13058 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/enum_forward.i | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/enum_forward.i b/Examples/test-suite/enum_forward.i index 4540aecb6..1609fa8e9 100644 --- a/Examples/test-suite/enum_forward.i +++ b/Examples/test-suite/enum_forward.i @@ -1,5 +1,7 @@ %module enum_forward +/* This contains C code that is not valid C++03 and Octave wrappers are always compiled as C++ */ +#if !defined(SWIGOCTAVE) %{ enum ForwardEnum1 { AAA, BBB }; enum ForwardEnum2 { CCC, DDD }; @@ -32,4 +34,4 @@ enum ForwardEnum3 test_function3(enum ForwardEnum3 e) { } enum ForwardEnum3; %} - +#endif From dba3dc5148531b5747999a6e2bb5b888ab94b186 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 10 May 2012 06:09:15 +0000 Subject: [PATCH 007/538] Minor improvements to the text. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13059 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/Php.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index 19ace7192..659fb0a89 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -146,7 +146,7 @@ least work for Linux though):

To test the extension from a PHP script, you need to load it first. You -can load it for every script by adding this line the [PHP] section of +can load it for every script by adding this line to the [PHP] section of php.ini:

@@ -156,7 +156,7 @@ can load it for every script by adding this line the [PHP] section of

Alternatively, you can load it explicitly only for scripts which need it -by adding this line: +by adding this line to the start of each such PHP script:: 

@@ -164,7 +164,7 @@ by adding this line:

-to the start of each PHP file. SWIG also generates a php module, which +SWIG also generates a php module, which attempts to do the dl() call for you:

@@ -705,7 +705,7 @@ would be accessed in PHP as, 
 include("example.php");
 
-echo "There has now been " . Ko::threats() . " threats\n";
+echo "There have now been " . Ko::threats() . " threats\n";
@@ -718,7 +718,7 @@ function, e.g. Ko::threats(10); -echo "There has now been " . Ko::threats() . " threats\n"; +echo "There have now been " . Ko::threats() . " threats\n";

32.2.6.4 Static Member Functions

From 70a134872a9d3fdd1fa824167429cc7d8290e4a8 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 10 May 2012 10:37:42 +0000 Subject: [PATCH 008/538] Remove two instances of call-time pass by reference, which has been removed in PHP 5.4, and isn't needed for these tests anyway. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13060 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/php/argout_runme.php | 2 +- Examples/test-suite/php/template_arg_typename_runme.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/php/argout_runme.php b/Examples/test-suite/php/argout_runme.php index 1c9026b6c..08524e214 100644 --- a/Examples/test-suite/php/argout_runme.php +++ b/Examples/test-suite/php/argout_runme.php @@ -23,7 +23,7 @@ check::equal(5,intp_value($tr),"5==$tr"); # Check the voidhandle call, first with null unset($handle); -voidhandle(&$handle); +voidhandle($handle); check::resource($handle,"_p_void",'$handle is not _p_void'); $handledata=handle($handle); check::equal($handledata,"Here it is","\$handledata != \"Here it is\""); diff --git a/Examples/test-suite/php/template_arg_typename_runme.php b/Examples/test-suite/php/template_arg_typename_runme.php index 87d07de03..7d60285e3 100644 --- a/Examples/test-suite/php/template_arg_typename_runme.php +++ b/Examples/test-suite/php/template_arg_typename_runme.php @@ -11,7 +11,7 @@ $ufbb=new unaryfunction_bool_bool(); check::is_a($ufbb,"unaryfunction_bool_bool"); unset($whatisthis); -$bufb=new boolunaryfunction_bool(&$whatisthis); +$bufb=new boolunaryfunction_bool($whatisthis); check::is_a($bufb,"boolunaryfunction_bool"); check::done(); From 61829195113349542615617097c1840af94a8bc9 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 10 May 2012 11:35:39 +0000 Subject: [PATCH 009/538] Relocate entry incorrectly added to CHANGES git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13061 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES | 5 ----- CHANGES.current | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index dd0224b67..534d9cb71 100644 --- a/CHANGES +++ b/CHANGES @@ -3,11 +3,6 @@ SWIG (Simplified Wrapper and Interface Generator) See the CHANGES.current file for changes in the current version. See the RELEASENOTES file for a summary of changes in each release. -2012-05-02: ianlancetaylor - [Go] Remove compatibility support for gccgo 4.6. Using - SWIG with gccgo will now require gccgo 4.7. Using SWIG - with the more commonly used gc compiler is unaffected. - Version 2.0.6 (30 April 2012) ============================= diff --git a/CHANGES.current b/CHANGES.current index 682ae47a2..730f56228 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-02: ianlancetaylor + [Go] Remove compatibility support for gccgo 4.6. Using + SWIG with gccgo will now require gccgo 4.7. Using SWIG + with the more commonly used gc compiler is unaffected. + 2012-05-01: wsfulton Fix generated code for C forward enum declarations in some languages. From fcb46fe2fa2383c8ef2f1f0844a2d4e5038c204b Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 10 May 2012 11:41:19 +0000 Subject: [PATCH 010/538] [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously these used the wrong name for renamed constants. Add autodoc_runme.php to the testsuite as a regression test for this. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13062 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 5 +++++ Examples/test-suite/php/autodoc_runme.php | 9 +++++++++ Lib/php/const.i | 7 ++----- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 Examples/test-suite/php/autodoc_runme.php diff --git a/CHANGES.current b/CHANGES.current index 730f56228..9834ce2ea 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-10: olly + [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously + these used the wrong name for renamed constants. Add + autodoc_runme.php to the testsuite as a regression test for this. + 2012-05-02: ianlancetaylor [Go] Remove compatibility support for gccgo 4.6. Using SWIG with gccgo will now require gccgo 4.7. Using SWIG diff --git a/Examples/test-suite/php/autodoc_runme.php b/Examples/test-suite/php/autodoc_runme.php new file mode 100644 index 000000000..f2e19d3cb --- /dev/null +++ b/Examples/test-suite/php/autodoc_runme.php @@ -0,0 +1,9 @@ + diff --git a/Lib/php/const.i b/Lib/php/const.i index afd7d02b9..78f3a8a08 100644 --- a/Lib/php/const.i +++ b/Lib/php/const.i @@ -32,17 +32,14 @@ %typemap(consttab) SWIGTYPE *, SWIGTYPE &, SWIGTYPE [] { - /* This actually registers it as a global variable and constant. I don't - * like it, but I can't figure out the zend_constant code... */ zval *z_var; MAKE_STD_ZVAL(z_var); SWIG_SetPointerZval(z_var, (void*)$value, $1_descriptor, 0); - /* zend_hash_add(&EG(symbol_table), "$1", sizeof("$1"), (void *)&z_var,sizeof(zval *), NULL); */ zend_constant c; c.value = *z_var; zval_copy_ctor(&c.value); - size_t len = sizeof("$1") - 1; - c.name = zend_strndup("$1", len); + size_t len = sizeof("$symname") - 1; + c.name = zend_strndup("$symname", len); c.name_len = len+1; c.flags = CONST_CS | CONST_PERSISTENT; c.module_number = module_number; From 43b3e20d2f3c66ae2e65896ba6f59502db8f26c5 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 11 May 2012 05:58:18 +0000 Subject: [PATCH 011/538] Add wrapmacro_runme.php git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13065 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/php/wrapmacro_runme.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Examples/test-suite/php/wrapmacro_runme.php diff --git a/Examples/test-suite/php/wrapmacro_runme.php b/Examples/test-suite/php/wrapmacro_runme.php new file mode 100644 index 000000000..f32da990e --- /dev/null +++ b/Examples/test-suite/php/wrapmacro_runme.php @@ -0,0 +1,12 @@ + From ef7a8a82533ce13aba1cd89c0dc04319654fc097 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 May 2012 21:23:37 +0000 Subject: [PATCH 012/538] Fix typemap method hiding regression introduced in swig-2.0.5 - rev 12764 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13071 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES | 8 ++-- CHANGES.current | 6 +++ Examples/test-suite/common.mk | 1 + .../typemap_template_parm_typedef.i | 48 +++++++++++++++++++ Source/Swig/typemap.c | 22 +++++---- 5 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 Examples/test-suite/typemap_template_parm_typedef.i diff --git a/CHANGES b/CHANGES index 534d9cb71..625ed3d24 100644 --- a/CHANGES +++ b/CHANGES @@ -362,7 +362,7 @@ Version 2.0.5 (19 April 2012) namespace std { template struct map { class iterator; - } + }; } iterator was scoped as std::iterator, but now it is correctly std::map::iterator; @@ -374,10 +374,10 @@ Version 2.0.5 (19 April 2012) template struct Map { typedef Key key_type; typedef T mapped_type; - } + }; } - tyepdef double DOUBLE; - %typemap(MM) Std::Map; + typedef double DOUBLE; + %template(MM) Std::Map; All symbols within Map will be resolved correctly, eg key_type and mapped_type no matter if the wrapped code uses Std::Map or std::Map or Std::Map diff --git a/CHANGES.current b/CHANGES.current index 9834ce2ea..902e62d47 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,12 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-11: wsfulton + SF bug #3525050 - Fix regression introduced in swig-2.0.5 whereby defining one typemap + method such as an 'out' typemap may hide another typemap method such as an 'in' typemap - + only occurs when the type is a template type where the template parameters are the same + via a typedef. + 2012-05-10: olly [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously these used the wrong name for renamed constants. Add diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 84a81b08f..9e7e21ac4 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -430,6 +430,7 @@ CPP_TEST_CASES += \ typemap_ns_using \ typemap_numinputs \ typemap_template \ + typemap_template_parm_typedef \ typemap_out_optimal \ typemap_qualifier_strip \ typemap_variables \ diff --git a/Examples/test-suite/typemap_template_parm_typedef.i b/Examples/test-suite/typemap_template_parm_typedef.i new file mode 100644 index 000000000..6eab66c9c --- /dev/null +++ b/Examples/test-suite/typemap_template_parm_typedef.i @@ -0,0 +1,48 @@ +%module typemap_template_parm_typedef + +%typemap(in) SWIGTYPE " _in_will_not_compile_ " +%typemap(in) SWIGTYPE * " _in_will_not_compile_ " + +%typemap(out) SWIGTYPE " _out_will_not_compile_ " +%typemap(out) SWIGTYPE * " _out_will_not_compile_ " + +%{ +#include +#include +#include + + namespace jada { + typedef unsigned int uint; + void test_no_typedef(std::list bada) {} + void test_typedef(std::vector bada) {} + std::deque no_typedef_out() {} + } +%} + +%typemap(in) std::list (std::list tmp) { + $1 = tmp; +} + +%typemap(in) std::vector (std::vector tmp) { + $1 = tmp; +} + +%typemap(out) std::list { +} + +// The presennce of this 'out' typemap was hiding the std::vector 'in' typemap in swig-2.0.5 and swig-2.0.6 +%typemap(out) std::vector { +} + +// This typemap was not used for no_typedef_out in 2.0.4 and earlier +%typemap(out) std::deque { + $result = 0; +} + +namespace jada { + typedef unsigned int uint; + void test_no_typedef(std::list bada); + void test_typedef(std::vector bada); + std::deque no_typedef_out(); +} + diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 1b2150c3c..0488b1b62 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -89,13 +89,16 @@ static Hash *get_typemap(int tm_scope, const SwigType *type) { return tm; } -static void set_typemap(int tm_scope, const SwigType *type, Hash *tm) { +static void set_typemap(int tm_scope, const SwigType *type, Hash **tmhash) { SwigType *hashtype = 0; + Hash *new_tm = 0; + assert(*tmhash == 0); if (SwigType_istemplate(type)) { SwigType *rty = SwigType_typedef_resolve_all(type); String *ty = Swig_symbol_template_deftype(rty, 0); String *tyq = Swig_symbol_type_qualify(ty, 0); hashtype = SwigType_remove_global_scope_prefix(tyq); + *tmhash = Getattr(typemaps[tm_scope], hashtype); Delete(rty); Delete(tyq); Delete(ty); @@ -103,10 +106,17 @@ static void set_typemap(int tm_scope, const SwigType *type, Hash *tm) { hashtype = SwigType_remove_global_scope_prefix(type); } + if (!*tmhash) { + /* this type has not been seen before even after resolving template parameter types */ + new_tm = NewHash(); + *tmhash = new_tm; + } + /* note that the unary scope operator (::) prefix indicating global scope has been removed from the type */ - Setattr(typemaps[tm_scope], hashtype, tm); + Setattr(typemaps[tm_scope], hashtype, *tmhash); Delete(hashtype); + Delete(new_tm); } @@ -210,9 +220,7 @@ static void typemap_register(const_String_or_char_ptr tmap_method, ParmList *par /* See if this type has been seen before */ tm = get_typemap(tm_scope, type); if (!tm) { - tm = NewHash(); - set_typemap(tm_scope, type, tm); - Delete(tm); + set_typemap(tm_scope, type, &tm); } if (pname) { /* See if parameter has been seen before */ @@ -476,9 +484,7 @@ int Swig_typemap_apply(ParmList *src, ParmList *dest) { type = Getattr(lastdp, "type"); tm = get_typemap(tm_scope, type); if (!tm) { - tm = NewHash(); - set_typemap(tm_scope, type, tm); - Delete(tm); + set_typemap(tm_scope, type, &tm); } name = Getattr(lastdp, "name"); if (name) { From 0ebcf0563722eb587ae276c7a4bdf90a7068883b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 May 2012 23:13:35 +0000 Subject: [PATCH 013/538] Fix uninitialised size variable in char **STRING_ARRAY regression git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13072 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Lib/java/various.i | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 902e62d47..66d449471 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-11: wsfulton + [Java] SF patch #3522611 Fix uninitialised size regression in char **STRING_ARRAY + introduced in swig-2.0.6. + 2012-05-11: wsfulton SF bug #3525050 - Fix regression introduced in swig-2.0.5 whereby defining one typemap method such as an 'out' typemap may hide another typemap method such as an 'in' typemap - diff --git a/Lib/java/various.i b/Lib/java/various.i index 71569ca32..d87c0cea1 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -46,6 +46,7 @@ $1[i] = 0; } else { $1 = 0; + size = 0; } } From d9393bc22ad179e00850438ea08fb2c1b116caf6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 May 2012 23:13:55 +0000 Subject: [PATCH 014/538] Fix possible uninitialised memory access in char **STRING_OUT typemap git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13073 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Lib/java/various.i | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 66d449471..387a26e07 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-11: wsfulton + [Java] SF patch #3522674 Fix possible uninitialised memory access in char **STRING_OUT + typemap. + 2012-05-11: wsfulton [Java] SF patch #3522611 Fix uninitialised size regression in char **STRING_ARRAY introduced in swig-2.0.6. diff --git a/Lib/java/various.i b/Lib/java/various.i index d87c0cea1..f589bf714 100644 --- a/Lib/java/various.i +++ b/Lib/java/various.i @@ -114,6 +114,7 @@ return $null; } $1 = &temp; + *$1 = 0; } %typemap(argout) char **STRING_OUT { From 4dfe13120748810cd8d833bf5f88e036c03e4c1d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 May 2012 23:55:54 +0000 Subject: [PATCH 015/538] Fix unintended uninitialised memory access in OUTPUT typemaps git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13074 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Lib/java/typemaps.i | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 387a26e07..f3247cba7 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-11: wsfulton + [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps. + 2012-05-11: wsfulton [Java] SF patch #3522674 Fix possible uninitialised memory access in char **STRING_OUT typemap. diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index 6ada29e52..ae2377b70 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -195,6 +195,7 @@ There are no char *OUTPUT typemaps, however you can apply the signed char * type SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); return $null; } + temp = ($*1_ltype)0; $1 = &temp; } @@ -226,6 +227,20 @@ OUTPUT_TYPEMAP(double, jdouble, double, Double, "[Ljava/lang/Double;", jdoubleAr #undef OUTPUT_TYPEMAP +%typemap(in) bool *OUTPUT($*1_ltype temp), bool &OUTPUT($*1_ltype temp) +{ + if (!$input) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "array null"); + return $null; + } + if (JCALL1(GetArrayLength, jenv, $input) == 0) { + SWIG_JavaThrowException(jenv, SWIG_JavaIndexOutOfBoundsException, "Array must contain at least 1 element"); + return $null; + } + temp = false; + $1 = &temp; +} + /* Convert to BigInteger - byte array holds number in 2's complement big endian format */ /* Use first element in BigInteger array for output */ /* Overrides the typemap in the OUTPUT_TYPEMAP macro */ From d96db667f745d1e6c272e9d2d43e9aa754f64962 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sat, 12 May 2012 13:26:16 +0000 Subject: [PATCH 016/538] [PHP] Avoid using zend_error_noreturn() as it doesn't work with all builds of PHP (SF bug #3166423). Instead we now wrap it in a SWIG_FAIL() function which we annotate as "noreturn" for GCC to avoids warnings. This also reduces the size of the compiled wrapper (e.g. the stripped size is 6% for Xapian's PHP bindings). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13077 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 7 +++++++ Lib/php/phprun.swg | 1 + Source/Modules/php.cxx | 42 +++++++++++++++++------------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index f3247cba7..da9606e19 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-12: olly + [PHP] Avoid using zend_error_noreturn() as it doesn't work with all + builds of PHP (SF bug #3166423). Instead we now wrap it in a + SWIG_FAIL() function which we annotate as "noreturn" for GCC to + avoids warnings. This also reduces the size of the compiled + wrapper (e.g. the stripped size is 6% for Xapian's PHP bindings). + 2012-05-11: wsfulton [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps. diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg index 623b33705..1404955e0 100644 --- a/Lib/php/phprun.swg +++ b/Lib/php/phprun.swg @@ -12,6 +12,7 @@ extern "C" { #include "zend_exceptions.h" #include "php.h" #include "ext/standard/php_string.h" +#include /* for abort(), used in generated code. */ #ifdef ZEND_RAW_FENTRY /* ZEND_RAW_FENTRY was added somewhere between 5.2.0 and 5.2.3 */ diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 6bcb2d457..57105ac91 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -409,11 +409,19 @@ public: Printf(s_header, "#define SWIG_ErrorCode() (%s_globals.error_code)\n", module); Printf(s_header, "#endif\n\n"); - Printf(s_header, "// Allow the user to workaround a PHP bug on some platforms/architectures by\n"); - Printf(s_header, "// compiling with -DSWIG_ZEND_ERROR_NORETURN=zend_error\n"); - Printf(s_header, "#ifndef SWIG_ZEND_ERROR_NORETURN\n"); - Printf(s_header, "# define SWIG_ZEND_ERROR_NORETURN zend_error_noreturn\n"); - Printf(s_header, "#endif\n\n"); + /* The following can't go in Lib/php/phprun.swg as it uses SWIG_ErrorMsg(), etc + * which has to be dynamically generated as it depends on the module name. + */ + Append(s_header, "#ifdef __GNUC__\n"); + Append(s_header, "static void SWIG_FAIL() __attribute__ ((__noreturn__));\n"); + Append(s_header, "#endif\n\n"); + Append(s_header, "static void SWIG_FAIL() {\n"); + Append(s_header, " zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n"); + // zend_error() should never return with the parameters we pass, but if it + // does, we really don't want to let SWIG_FAIL() return. This also avoids + // a warning about returning from a function marked as "__noreturn__". + Append(s_header, " abort();\n"); + Append(s_header, "}\n\n"); Printf(s_header, "static void %s_init_globals(zend_%s_globals *globals ) {\n", module, module); Printf(s_header, " globals->error_msg = default_error_msg;\n"); @@ -716,7 +724,7 @@ public: Printf(f->code, "SWIG_ErrorCode() = E_ERROR;\n"); Printf(f->code, "SWIG_ErrorMsg() = \"No matching function for overloaded '%s'\";\n", symname); - Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n", NIL); + Printv(f->code, "SWIG_FAIL();\n", NIL); Printv(f->code, "}\n", NIL); Wrapper_print(f, s_wrappers); @@ -1000,11 +1008,7 @@ public: /* Error handling code */ Printf(f->code, "fail:\n"); Printv(f->code, cleanup, NIL); - /* This could be zend_error_noreturn(), but that's buggy in PHP ~5.3 and - * using zend_error() here shouldn't generate a warning, so just use that. - * At worst this may result in slightly less good code. - */ - Printv(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());", NIL); + Append(f->code, "SWIG_FAIL();\n"); Printf(f->code, "}\n"); @@ -2320,11 +2324,7 @@ done: Append(f->code, "return;\n"); Append(f->code, "fail:\n"); - /* This could be zend_error_noreturn(), but that's buggy in PHP ~5.3 and - * using zend_error() here shouldn't generate a warning, so just use that. - * At worst this may result in slightly less good code. - */ - Append(f->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); + Append(f->code, "SWIG_FAIL();\n"); Printf(f->code, "}\n"); Wrapper_print(f, s_wrappers); @@ -2715,15 +2715,7 @@ done: } Append(w->code, "fail:\n"); - if (!is_void) { - Append(w->code, "SWIG_ZEND_ERROR_NORETURN(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); - } else { - /* This could be zend_error_noreturn(), but that's buggy in PHP ~5.3 and - * using zend_error() here shouldn't generate a warning, so just use that. - * At worst this may result in slightly less good code. - */ - Append(w->code, "zend_error(SWIG_ErrorCode(),\"%s\",SWIG_ErrorMsg());\n"); - } + Append(w->code, "SWIG_FAIL();\n"); Append(w->code, "}\n"); // We expose protected methods via an extra public inline method which makes a straight call to the wrapped class' method From 9d8d50f034747e1346d7e67001645e0c193941a2 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sat, 12 May 2012 13:31:49 +0000 Subject: [PATCH 017/538] Fix typo git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13078 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index da9606e19..e123a0b2d 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -10,7 +10,8 @@ Version 2.0.7 (in progress) builds of PHP (SF bug #3166423). Instead we now wrap it in a SWIG_FAIL() function which we annotate as "noreturn" for GCC to avoids warnings. This also reduces the size of the compiled - wrapper (e.g. the stripped size is 6% for Xapian's PHP bindings). + wrapper (e.g. the stripped size is reduced by 6% for Xapian's PHP + bindings). 2012-05-11: wsfulton [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps. From d81770dd93b7bb978351545a1d80491372211cf1 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sat, 12 May 2012 13:52:00 +0000 Subject: [PATCH 018/538] [PHP] Fix memory leak in code generated for a callback. Patch from SF bug #3510806. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13079 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Source/Modules/php.cxx | 1 + 2 files changed, 5 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index e123a0b2d..96d6c6300 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.7 (in progress) =========================== +2012-05-12: olly + [PHP] Fix memory leak in code generated for a callback. Patch from + SF bug #3510806. + 2012-05-12: olly [PHP] Avoid using zend_error_noreturn() as it doesn't work with all builds of PHP (SF bug #3166423). Instead we now wrap it in a diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 57105ac91..76b1bffe7 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2575,6 +2575,7 @@ done: Replaceall(tm, "$owner", "0"); Printv(wrap_args, "zval ", source, ";\n", NIL); Printf(wrap_args, "args[%d] = &%s;\n", idx - 1, source); + Printv(wrap_args, "INIT_ZVAL(", source, ");\n", NIL); Printv(wrap_args, tm, "\n", NIL); Putc('O', parse_args); From 4f11fd51ab855fd0455d80275c801e9ae2bf9207 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 14 May 2012 03:31:04 +0000 Subject: [PATCH 019/538] Drop check for "ZEND_MODULE_API_NO > 20010900". We only support PHP5 now, and 5.0.0 was released in 2004. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13080 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/php.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 76b1bffe7..106a2e9ba 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -536,7 +536,8 @@ public: Append(s_init, "#undef ZEND_MODULE_BUILD_ID\n"); Append(s_init, "#define ZEND_MODULE_BUILD_ID (char*)\"API\" ZEND_TOSTR(ZEND_MODULE_API_NO) ZEND_BUILD_TS ZEND_BUILD_DEBUG ZEND_BUILD_SYSTEM ZEND_BUILD_EXTRA\n"); Append(s_init, "#endif\n"); - Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n" "#if ZEND_MODULE_API_NO > 20010900\n" " STANDARD_MODULE_HEADER,\n" "#endif\n", NIL); + Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n"); + Printf(s_init, " STANDARD_MODULE_HEADER,\n"); Printf(s_init, " (char*)\"%s\",\n", module); Printf(s_init, " %s_functions,\n", module); Printf(s_init, " PHP_MINIT(%s),\n", module); @@ -544,9 +545,7 @@ public: Printf(s_init, " PHP_RINIT(%s),\n", module); Printf(s_init, " PHP_RSHUTDOWN(%s),\n", module); Printf(s_init, " PHP_MINFO(%s),\n", module); - Printf(s_init, "#if ZEND_MODULE_API_NO > 20010900\n"); Printf(s_init, " NO_VERSION_YET,\n"); - Printf(s_init, "#endif\n"); Printf(s_init, " STANDARD_MODULE_PROPERTIES\n"); Printf(s_init, "};\n"); Printf(s_init, "zend_module_entry* SWIG_module_entry = &%s_module_entry;\n\n", module); From e4763231bef2eb3179f4cf330a006e24c8efd743 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 14 May 2012 04:58:08 +0000 Subject: [PATCH 020/538] Remove some commented out code git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13081 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/php.cxx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 106a2e9ba..b7e7478f6 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -471,10 +471,6 @@ public: Append(s_header, "}\n"); Printf(s_header, "#define SWIG_name \"%s\"\n", module); - /* Printf(s_header,"#ifdef HAVE_CONFIG_H\n"); - Printf(s_header,"#include \"config.h\"\n"); - Printf(s_header,"#endif\n\n"); - */ Printf(s_header, "#ifdef __cplusplus\n"); Printf(s_header, "extern \"C\" {\n"); Printf(s_header, "#endif\n"); From a2a42c70383999fe51ed8f19a0f5c43207fee03b Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 14 May 2012 05:11:02 +0000 Subject: [PATCH 021/538] Add back 'NIL', dropped by mistake in change before last. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13082 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/php.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index b7e7478f6..1ac9e8b24 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -532,7 +532,7 @@ public: Append(s_init, "#undef ZEND_MODULE_BUILD_ID\n"); Append(s_init, "#define ZEND_MODULE_BUILD_ID (char*)\"API\" ZEND_TOSTR(ZEND_MODULE_API_NO) ZEND_BUILD_TS ZEND_BUILD_DEBUG ZEND_BUILD_SYSTEM ZEND_BUILD_EXTRA\n"); Append(s_init, "#endif\n"); - Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n"); + Printv(s_init, "zend_module_entry ", module, "_module_entry = {\n", NIL); Printf(s_init, " STANDARD_MODULE_HEADER,\n"); Printf(s_init, " (char*)\"%s\",\n", module); Printf(s_init, " %s_functions,\n", module); From e4a92ee692b7f2d7f37aaeb5a253f91a995bc228 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:23:06 +0000 Subject: [PATCH 022/538] Link Octave tests and examples against Octave libraries - Tests for bugs associated with loading .oct modules git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13083 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 9 +++--- configure.in | 76 ++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 47 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index e6c0d2f33..8d63d02b5 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -331,12 +331,11 @@ python_clean: ################################################################## # Make sure these locate your Octave installation -OCTAVE_INCLUDE= $(DEFS) @OCTAVEEXT@ -OCTAVE_LIB = OCTAVE = @OCTAVE@ -qf +OCTAVE_CXX = $(DEFS) @OCTAVE_CPPFLAGS@ @OCTAVE_CXXFLAGS@ # Extra Octave specific dynamic linking options -OCTAVE_DLNK = @OCTAVEDYNAMICLINKING@ +OCTAVE_DLNK = @OCTAVE_LDFLAGS@ OCTAVE_SO = @OCTAVE_SO@ # ---------------------------------------------------------------- @@ -346,7 +345,7 @@ OCTAVE_SO = @OCTAVE_SO@ octave: $(SRCS) $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) + $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(INCLUDES) $(OCTAVE_CXX) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CSRCS) $(INCLUDES) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) @@ -356,7 +355,7 @@ octave: $(SRCS) octave_cpp: $(SRCS) $(SWIG) -c++ -octave $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) + $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(OCTAVE_CXX) $(CXXSHARED) -g $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) # ----------------------------------------------------------------- diff --git a/configure.in b/configure.in index 4b2525b34..94fd61e08 100644 --- a/configure.in +++ b/configure.in @@ -900,7 +900,6 @@ AC_SUBST(PERL5CCFLAGS) #---------------------------------------------------------------- OCTAVEBIN= -OCTAVEDYNAMICLINKING= OCTAVE_SO=.oct AC_ARG_WITH(octave, AS_HELP_STRING([--without-octave], [Disable Octave]) @@ -908,58 +907,51 @@ AS_HELP_STRING([--with-octave=path], [Set location of Octave executable]),[OCTAV # First, check for "--without-octave" or "--with-octave=no". if test x"${OCTAVEBIN}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling Octave]) -OCTAVE= -else + AC_MSG_NOTICE([Disabling Octave]) + OCTAVE= # First figure out what the name of Octave is +elif test "x$OCTAVEBIN" = xyes; then + AC_CHECK_PROGS(OCTAVE, octave) -if test "x$OCTAVEBIN" = xyes; then -AC_CHECK_PROGS(OCTAVE, octave) else -OCTAVE="$OCTAVEBIN" + OCTAVE="$OCTAVEBIN" fi - -AC_MSG_CHECKING(for Octave header files) if test -n "$OCTAVE"; then - OCTAVECONFIG=[`echo $OCTAVEBIN | sed 's|octave\([^/]*\)$|octave-config\1|'`] - if test -r "$OCTAVECONFIG"; then - OCTAVEDIR=`$OCTAVECONFIG -p OCTINCLUDEDIR | sed 's|/octave$||'` - else - OCTAVEDIR="/usr/include" - fi - if test "$OCTAVEDIR" != ""; then - dirs="$OCTAVEDIR/octave $OCTAVEDIR" - OCTAVEEXT="" - for i in $dirs; do - if test -r $i/octave/oct.h; then - OCTAVEEXT="$i" - break; - fi - done - if test "$OCTAVEEXT" = "" ; then - AC_MSG_RESULT(not found) - else - AC_MSG_RESULT($OCTAVEEXT) - fi - - AC_MSG_CHECKING(for Octave compiler options) - OCTAVECCFLAGS="" - AC_MSG_RESULT($OCTAVECCFLAGS) - fi + AC_MSG_CHECKING([for mkoctfile]) + AS_IF([test "x`${OCTAVE} -qfH --eval 'mkoctfile -p CXX' 2>/dev/null`" != x],[ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_ERROR([mkoctfile is not installed]) + ]) + AC_MSG_CHECKING([for Octave preprocessor flags]) + OCTAVE_CPPFLAGS= + for n in CPPFLAGS INCFLAGS; do + OCTAVE_CPPFLAGS="${OCTAVE_CPPFLAGS} "`$OCTAVE -qfH --eval "mkoctfile -p $n"` + done + AC_MSG_RESULT($OCTAVE_CPPFLAGS) + AC_MSG_CHECKING([for Octave compiler flags]) + OCTAVE_CXXFLAGS= + for n in ALL_CXXFLAGS; do + OCTAVE_CXXFLAGS="${OCTAVE_CXXFLAGS} "`$OCTAVE -qfH --eval "mkoctfile -p $n"` + done + AC_MSG_RESULT($OCTAVE_CXXFLAGS) + AC_MSG_CHECKING([for Octave linker flags]) + OCTAVE_LDFLAGS= + for n in RDYNAMIC_FLAG LFLAGS RLD_FLAG OCTAVE_LIBS LIBS; do + OCTAVE_LDFLAGS="${OCTAVE_LDFLAGS} "`$OCTAVE -qfH --eval "mkoctfile -p $n"` + done + AC_MSG_RESULT($OCTAVE_LDFLAGS) else - AC_MSG_RESULT(could not figure out how to run octave) -fi - + AC_MSG_RESULT(could not figure out how to run octave) fi AC_SUBST(OCTAVE) -AC_SUBST(OCTAVEEXT) AC_SUBST(OCTAVE_SO) -AC_SUBST(OCTAVEDYNAMICLINKING) -AC_SUBST(OCTAVELIB) -AC_SUBST(OCTAVECCFLAGS) +AC_SUBST(OCTAVE_CPPFLAGS) +AC_SUBST(OCTAVE_CXXFLAGS) +AC_SUBST(OCTAVE_LDFLAGS) #---------------------------------------------------------------- # Look for java @@ -2215,7 +2207,7 @@ AC_SUBST(SKIP_PERL5) SKIP_OCTAVE= -if test -z "$OCTAVE" || test -z "$OCTAVEEXT" ; then +if test -z "$OCTAVE" ; then SKIP_OCTAVE="1" fi AC_SUBST(SKIP_OCTAVE) From de49578c31c7092ba9667969e1a830235f9a1aad Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:23:20 +0000 Subject: [PATCH 023/538] Move Octave director-related code into Lib/octave/director.swg git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13084 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/director.swg | 123 ++++++++++++++++++++++++++- Lib/octave/octrun.swg | 178 ++++++++++------------------------------ 2 files changed, 164 insertions(+), 137 deletions(-) diff --git a/Lib/octave/director.swg b/Lib/octave/director.swg index 0d7e6c1b3..5e5d6f1f4 100644 --- a/Lib/octave/director.swg +++ b/Lib/octave/director.swg @@ -1,3 +1,124 @@ -// ***** move the director stuff from octrun.swg here... +# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast(ARG) +namespace Swig { + + class Director { + octave_swig_type *self; + bool swig_disowned; + + Director(const Director &x); + Director &operator=(const Director &rhs); + public: + + Director(void *vptr):self(0), swig_disowned(false) { + set_rtdir(vptr, this); + } + + ~Director() { + swig_director_destroyed(self, this); + if (swig_disowned) + self->decref(); + } + + void swig_set_self(octave_swig_type *new_self) { + assert(!swig_disowned); + self = new_self; + } + + octave_swig_type *swig_get_self() const { + return self; + } + + void swig_disown() { + if (swig_disowned) + return; + swig_disowned = true; + self->incref(); + } + }; + + struct DirectorTypeMismatchException { + static void raise(const char *msg) { + // ... todo + throw(DirectorTypeMismatchException()); + } + + static void raise(const octave_value &ov, const char *msg) { + // ... todo + raise(msg); + } + }; + + struct DirectorPureVirtualException { + static void raise(const char *msg) { + // ... todo + throw(DirectorPureVirtualException()); + } + + static void raise(const octave_value &ov, const char *msg) { + // ... todo + raise(msg); + } + }; + + SWIGINTERN rtdir_map* get_rtdir_map() { + static swig_module_info *module = 0; + if (!module) + module = SWIG_GetModule(0); + if (!module) + return 0; + if (!module->clientdata) + module->clientdata = new rtdir_map; + return (rtdir_map *) module->clientdata; + } + + SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d) { + rtdir_map* rm = get_rtdir_map(); + if (rm) + (*rm)[vptr] = d; + } + + SWIGINTERNINLINE void erase_rtdir(void *vptr) { + rtdir_map* rm = get_rtdir_map(); + if (rm) + (*rm).erase(vptr); + } + + SWIGINTERNINLINE Director *get_rtdir(void *vptr) { + rtdir_map* rm = get_rtdir_map(); + if (!rm) + return 0; + rtdir_map::const_iterator pos = rm->find(vptr); + Director *rtdir = (pos != rm->end())? pos->second : 0; + return rtdir; + } + + SWIGRUNTIME void swig_director_destroyed(octave_swig_type *self, Director *d) { + self->director_destroyed(d); + } + + SWIGRUNTIME octave_swig_type *swig_director_get_self(Director *d) { + return d->swig_get_self(); + } + + SWIGRUNTIME void swig_director_set_self(Director *d, octave_swig_type *self) { + d->swig_set_self(self); + } + +} + +SWIGRUNTIME void swig_acquire_ownership(void *vptr) { + // assert(0); + // ... todo +} + +SWIGRUNTIME void swig_acquire_ownership_array(void *vptr) { + // assert(0); + // ... todo +} + +SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own) { + // assert(0); + // ... todo +} diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index b006bfabe..cece12928 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -106,54 +106,33 @@ SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *point typedef octave_value_list(*octave_func) (const octave_value_list &, int); class octave_swig_type; -# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast(ARG) - namespace Swig { + +#ifdef SWIG_DIRECTORS + class Director; - //SWIGRUNTIME void swig_register_director(octave_swig_type *self, void *ptr, Director *d); + typedef std::map < void *, Director * > rtdir_map; + SWIGINTERN rtdir_map* get_rtdir_map(); + SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d); + SWIGINTERNINLINE void erase_rtdir(void *vptr); + SWIGINTERNINLINE Director *get_rtdir(void *vptr); + SWIGRUNTIME void swig_director_destroyed(octave_swig_type *self, Director *d); + SWIGRUNTIME octave_swig_type *swig_director_get_self(Director *d); SWIGRUNTIME void swig_director_set_self(Director *d, octave_swig_type *self); +#endif + SWIGRUNTIME octave_base_value *swig_value_ref(octave_swig_type *ost); SWIGRUNTIME octave_swig_type *swig_value_deref(octave_value ov); SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov); - - typedef std::map < void *, Director * > rtdir_map; - - SWIGINTERN rtdir_map* get_rtdir_map() { - static swig_module_info *module = 0; - if (!module) - module = SWIG_GetModule(0); - if (!module) - return 0; - if (!module->clientdata) - module->clientdata = new rtdir_map; - return (rtdir_map *) module->clientdata; - } - - SWIGINTERNINLINE void set_rtdir(void *vptr, Director *d) { - rtdir_map* rm = get_rtdir_map(); - if (rm) - (*rm)[vptr] = d; - } - - SWIGINTERNINLINE void erase_rtdir(void *vptr) { - rtdir_map* rm = get_rtdir_map(); - if (rm) - (*rm).erase(vptr); - } - - SWIGINTERNINLINE Director *get_rtdir(void *vptr) { - rtdir_map* rm = get_rtdir_map(); - if (!rm) - return 0; - rtdir_map::const_iterator pos = rm->find(vptr); - Director *rtdir = (pos != rm->end())? pos->second : 0; - return rtdir; - } } +SWIGRUNTIME void swig_acquire_ownership(void *vptr); +SWIGRUNTIME void swig_acquire_ownership_array(void *vptr); +SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); + struct swig_octave_member { const char *name; octave_func method; @@ -376,11 +355,13 @@ namespace Swig { always_static(_always_static) { if (_type || _ptr) types.push_back(std::make_pair(_type, _ptr)); +#ifdef SWIG_DIRECTORS if (_ptr) { Swig::Director *d = Swig::get_rtdir(_ptr); if (d) Swig::swig_director_set_self(d, this); } +#endif } ~octave_swig_type() { @@ -395,8 +376,10 @@ namespace Swig { } } } +#ifdef SWIG_DIRECTORS for (unsigned int j = 0; j < types.size(); ++j) Swig::erase_rtdir(types[j].second.ptr); +#endif } dim_vector dims(void) const { @@ -503,9 +486,11 @@ namespace Swig { rhs.own = 0; for (unsigned int j = 0; j < rhs.types.size(); ++j) { assert(!rhs.types[j].second.destroyed); +#ifdef SWIG_DIRECTORS Swig::Director *d = Swig::get_rtdir(rhs.types[j].second.ptr); if (d) Swig::swig_director_set_self(d, this); +#endif } types.insert(types.end(), rhs.types.begin(), rhs.types.end()); members.insert(rhs.members.begin(), rhs.members.end()); @@ -571,6 +556,7 @@ namespace Swig { return own; } +#ifdef SWIG_DIRECTORS void director_destroyed(Swig::Director *d) { bool found = false; for (unsigned int j = 0; j < types.size(); ++j) { @@ -582,6 +568,7 @@ namespace Swig { } assert(found); } +#endif void assign(const std::string &name, const octave_value &ov) { members[name] = std::make_pair((const swig_octave_member *) 0, ov); @@ -1225,111 +1212,28 @@ namespace Swig { return octave_value(octave_uint64((unsigned long long) ost->swig_this())); } -#define SWIG_DIRECTORS namespace Swig { - class Director { - octave_swig_type *self; - bool swig_disowned; - Director(const Director &x); - Director &operator=(const Director &rhs); - public: + SWIGRUNTIME octave_base_value *swig_value_ref(octave_swig_type *ost) { + return new octave_swig_ref(ost); + } - Director(void *vptr):self(0), swig_disowned(false) { - set_rtdir(vptr, this); - } + SWIGRUNTIME octave_swig_type *swig_value_deref(octave_value ov) { + if (ov.is_cell() && ov.rows() == 1 && ov.columns() == 1) + ov = ov.cell_value()(0); + return swig_value_deref(*ov.internal_rep()); + } - ~Director() { - swig_director_destroyed(self, this); - if (swig_disowned) - self->decref(); - } - - void swig_set_self(octave_swig_type *new_self) { - assert(!swig_disowned); - self = new_self; - } - - octave_swig_type *swig_get_self() const { - return self; - } - - void swig_disown() { - if (swig_disowned) - return; - swig_disowned = true; - self->incref(); - } - }; - - struct DirectorTypeMismatchException { - static void raise(const char *msg) { - // ... todo - throw(DirectorTypeMismatchException()); - } - - static void raise(const octave_value &ov, const char *msg) { - // ... todo - raise(msg); - } - }; - struct DirectorPureVirtualException { - static void raise(const char *msg) { - // ... todo - throw(DirectorPureVirtualException()); - } - - static void raise(const octave_value &ov, const char *msg) { - // ... todo - raise(msg); - } - }; + SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov) { + if (ov.type_id() != octave_swig_ref::static_type_id()) + return 0; + const octave_swig_ref *osr = static_cast < const octave_swig_ref *>(&ov); + return osr->get_ptr(); + } } - SWIGRUNTIME void swig_acquire_ownership(void *vptr) { - // assert(0); - // ... todo - } - - SWIGRUNTIME void swig_acquire_ownership_array(void *vptr) { - // assert(0); - // ... todo - } - - SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own) { - // assert(0); - // ... todo - } - - namespace Swig { - SWIGRUNTIME void swig_director_destroyed(octave_swig_type *self, Director *d) { - self->director_destroyed(d); - } - - SWIGRUNTIME void swig_director_set_self(Director *d, octave_swig_type *self) { - d->swig_set_self(self); - } - - SWIGRUNTIME octave_base_value *swig_value_ref(octave_swig_type *ost) { - return new octave_swig_ref(ost); - } - - SWIGRUNTIME octave_swig_type *swig_value_deref(octave_value ov) { - if (ov.is_cell() && ov.rows() == 1 && ov.columns() == 1) - ov = ov.cell_value()(0); - return swig_value_deref(*ov.internal_rep()); - } - - SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov) { - if (ov.type_id() != octave_swig_ref::static_type_id()) - return 0; - const octave_swig_ref *osr = static_cast < const octave_swig_ref *>(&ov); - return osr->get_ptr(); - } - - } #define swig_unary_op(name) \ SWIGRUNTIME octave_value swig_unary_op_##name(const octave_base_value &x) { \ @@ -1422,9 +1326,11 @@ octave_value_typeinfo::register_binary_op(octave_value::op_##name,tid1,tid2,swig SWIGRUNTIME octave_value SWIG_Octave_NewPointerObj(void *ptr, swig_type_info *type, int flags) { int own = (flags &SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0; +#ifdef SWIG_DIRECTORS Swig::Director *d = Swig::get_rtdir(ptr); - if (d && d->swig_get_self()) - return d->swig_get_self()->as_value(); + if (d && Swig::swig_director_get_self(d)) + return Swig::swig_director_get_self(d)->as_value(); +#endif return Swig::swig_value_ref(new octave_swig_type(ptr, type, own)); } From a0dbe43c73a0fae5a7c0b1189bd901c29f21468a Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:23:33 +0000 Subject: [PATCH 024/538] Move Octave SWIG runtime functions to Lib/octave/octruntime.swg - Add documentation strings for runtime functions git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13085 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octrun.swg | 68 ---------------------------- Lib/octave/octruntime.swg | 94 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 69 deletions(-) diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index cece12928..99e022e89 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -1144,74 +1144,6 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); } }; - octave_value_list swig_subclass(const octave_value_list &args, int nargout) { - octave_swig_type *top = new octave_swig_type; - for (int j = 0; j < args.length(); ++j) { - if (args(j).type_id() == octave_swig_ref::static_type_id()) { - octave_swig_ref *osr = static_cast < octave_swig_ref *>(args(j).internal_rep()); - octave_swig_type *ost = osr->get_ptr(); - if (!ost->is_owned()) { - error("cannot subclass object not constructed on octave side"); - return octave_value_list(); - } - top->merge(*ost); - } else if (args(j).is_function_handle()) { - top->assign(args(j).fcn_handle_value()->fcn_name(), args(j)); - } else if (args(j).is_string()) { - if (j + 1 >= args.length()) { - error("member assignments must be of string,value form"); - return octave_value_list(); - } - top->assign(args(j).string_value(), args(j + 1)); - ++j; - } else { - error("invalid arguments to subclass"); - return octave_value_list(); - } - } - return octave_value(Swig::swig_value_ref(top)); - } - - octave_value_list swig_type(const octave_value_list &args, int nargout) { - if (args.length() != 1) { - error("swig_typeinfo must be called with only a single object"); - return octave_value_list(); - } - octave_swig_type *ost = Swig::swig_value_deref(args(0)); - if (!ost) { - error("object is not a swig_ref"); - return octave_value_list(); - } - return octave_value(ost->swig_type_name()); - } - - octave_value_list swig_typequery(const octave_value_list &args, int nargout) { - if (args.length() != 1 || !args(0).is_string()) { - error("swig_typeinfo must be called with single string argument"); - return octave_value_list(); - } - swig_module_info *module = SWIG_GetModule(0); - swig_type_info *type = SWIG_TypeQueryModule(module, module, args(0).string_value().c_str()); - if (!type) - return octave_value(""); - return octave_value(type->name); - } - - octave_value_list swig_this(const octave_value_list &args, int nargout) { - if (args.length() != 1) { - error("swig_typeinfo must be called with only a single object"); - return octave_value_list(); - } - if (args(0).is_matrix_type() && args(0).rows() == 0 && args(0).columns() == 0) - return octave_value(octave_uint64(0)); - octave_swig_type *ost = Swig::swig_value_deref(args(0)); - if (!ost) { - error("object is not a swig_ref"); - return octave_value_list(); - } - return octave_value(octave_uint64((unsigned long long) ost->swig_this())); - } - namespace Swig { diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 650298d5c..3aa866264 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -22,6 +22,98 @@ static void SWIG_init_user(octave_swig_type* module_ns); octave_value_list SWIG_atexit_func(const octave_value_list &args, int nargout); #endif +static const char *const subclass_usage = "-*- texinfo -*- \n\ +@deftypefn {Loadable Function} {} subclass()\n\ +@deftypefnx{Loadable Function} {} subclass(@var{swigclass}, @var{name}, @var{fcn}, @dots{})\n\ +Subclass a C++ class from within Octave, and provide implementations of its virtual methods.\n\ +\n\ +See the SWIG manual for usage examples.\n\ +@end deftypefn"; + +DEFUN_DLD( subclass, args, nargout, subclass_usage ) { + octave_swig_type *top = new octave_swig_type; + for (int j = 0; j < args.length(); ++j) { + if (args(j).type_id() == octave_swig_ref::static_type_id()) { + octave_swig_ref *osr = static_cast < octave_swig_ref *>(args(j).internal_rep()); + octave_swig_type *ost = osr->get_ptr(); + if (!ost->is_owned()) { + error("cannot subclass object not constructed on octave side"); + return octave_value_list(); + } + top->merge(*ost); + } else if (args(j).is_function_handle()) { + top->assign(args(j).fcn_handle_value()->fcn_name(), args(j)); + } else if (args(j).is_string()) { + if (j + 1 >= args.length()) { + error("member assignments must be of string,value form"); + return octave_value_list(); + } + top->assign(args(j).string_value(), args(j + 1)); + ++j; + } else { + error("invalid arguments to subclass()"); + return octave_value_list(); + } + } + return octave_value(Swig::swig_value_ref(top)); +} + +static const char *const swig_type_usage = "-*- texinfo -*- \n\ +@deftypefn {Loadable Function} {} swig_type(@var{swigref})\n\ +Return the underlying C/C++ type name of a SWIG-wrapped object.\n\ +@end deftypefn"; + +DEFUN_DLD( swig_type, args, nargout, swig_type_usage ) { + if (args.length() != 1) { + error("swig_type() must be called with only a single object"); + return octave_value_list(); + } + octave_swig_type *ost = Swig::swig_value_deref(args(0)); + if (!ost) { + error("object is not a swig_ref"); + return octave_value_list(); + } + return octave_value(ost->swig_type_name()); +} + +static const char *const swig_typequery_usage = "-*- texinfo -*- \n\ +@deftypefn {Loadable Function} {} swig_typequery(@var{string})\n\ +Return @var{string} if it is a recognised SWIG-wrapped C/C++ type name;\n\ +otherwise return `'.\n\ +@end deftypefn"; + +DEFUN_DLD( swig_typequery, args, nargout, swig_typequery_usage ) { + if (args.length() != 1 || !args(0).is_string()) { + error("swig_typequery() must be called with single string argument"); + return octave_value_list(); + } + swig_module_info *module = SWIG_GetModule(0); + swig_type_info *type = SWIG_TypeQueryModule(module, module, args(0).string_value().c_str()); + if (!type) + return octave_value(""); + return octave_value(type->name); +} + +static const char *const swig_this_usage = "-*- texinfo -*- \n\ +@deftypefn {Loadable Function} {} swig_this(@var{swigref})\n\ +Return the underlying C/C++ pointer of a SWIG-wrapped object.\n\ +@end deftypefn"; + +DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { + if (args.length() != 1) { + error("swig_this() must be called with only a single object"); + return octave_value_list(); + } + if (args(0).is_matrix_type() && args(0).rows() == 0 && args(0).columns() == 0) + return octave_value(octave_uint64(0)); + octave_swig_type *ost = Swig::swig_value_deref(args(0)); + if (!ost) { + error("object is not a swig_ref"); + return octave_value_list(); + } + return octave_value(octave_uint64((unsigned long long) ost->swig_this())); +} + DEFUN_DLD (SWIG_name,args,nargout,SWIG_name_d) { // determine if module is already loaded @@ -90,7 +182,7 @@ DEFUN_DLD (SWIG_name,args,nargout,SWIG_name_d) { install_builtin_function(swig_type,"swig_type",std::string()); install_builtin_function(swig_typequery,"swig_typequery",std::string()); install_builtin_function(swig_this,"swig_this",std::string()); - install_builtin_function(swig_subclass,"subclass",std::string()); + install_builtin_function(subclass,"subclass",std::string()); octave_swig_type* cvar_ns=0; if (global_name != ".") { From bf0fe8346254d8bb0d0135d943965903b74ee968 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:23:45 +0000 Subject: [PATCH 025/538] New functions for handling Octave global variables - Creates a copy of the variable to be assigned to the symbol table, so it can be safely deallocated on exit git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13086 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octrun.swg | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index 99e022e89..a9ee5380f 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -1304,8 +1304,34 @@ void SWIG_Octave_SetConstant(octave_swig_type *module_ns, const std::string &nam module_ns->assign(name, ov); } +SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) { + return get_global_value(name, true); +} + +SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) { + // It is critical that a newly-allocated octave_value is passed to set_global_value(), + // since it and the Octave symbol table take references to the values assigned to it. + // If we were to pass a reference to 'value' to set_global_value(), then the Octave + // symbol table would hold a reference to a variable owned by the SWIG .oct module. + // Both will think that they own the reference (since the .oct module is dynamically + // loaded, it appears to have its own C++ runtime), and so they will both try to + // de-allocate the octave_value on exit, resulting in a double-free or seg-fault. + // This is prevented by giving Octave its own heap-allocated copy of 'value'. + octave_value *pov = new octave_value(value); + set_global_value(name, *pov); +} + +SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) { +#if OCTAVE_API_VERSION_NUMBER < 37 + link_to_global_variable(curr_sym_tab->lookup(name, true)); +#else + symbol_table::varref(name); + symbol_table::mark_global(name); +#endif +} + SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata) { - octave_value ov = get_global_value("__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION, true); + octave_value ov = SWIG_Octave_GetGlobalValue("__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION); if (!ov.is_defined() || ov.type_id() != octave_swig_packed::static_type_id()) return 0; @@ -1318,12 +1344,5 @@ SWIGRUNTIME swig_module_info *SWIG_Octave_GetModule(void *clientdata) { SWIGRUNTIME void SWIG_Octave_SetModule(void *clientdata, swig_module_info *pointer) { octave_value ov = new octave_swig_packed(0, &pointer, sizeof(swig_module_info *)); - const char *module_var = "__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION; -#if OCTAVE_API_VERSION_NUMBER<37 - link_to_global_variable(curr_sym_tab->lookup(module_var, true)); -#else - symbol_table::varref(module_var); - symbol_table::mark_global(module_var); -#endif - set_global_value(module_var, ov); + SWIG_Octave_SetGlobalValue("__SWIG_MODULE__" SWIG_TYPE_TABLE_NAME SWIG_RUNTIME_VERSION, ov); } From 4f11aaa8492b176ee15f5b3d9055585f46746351 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:24:00 +0000 Subject: [PATCH 026/538] Declare Octave public wrapping functions with DEFUNX_DLD - New helper function Octave_begin_function writes function declaration and installer function definition using SWIG_DEFUN macro, which in turn uses Octave DEFUNX_DLD macro - Can now use Octave's dynamic module loader to load functions safely - Link documentation of public wrapping functions through DEFUNX_DLD git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13087 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octrun.swg | 6 +++ Source/Modules/octave.cxx | 81 +++++++++++++++++++++++++-------------- 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index a9ee5380f..3ab6c7525 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -14,6 +14,12 @@ #endif +#if OCTAVE_API_VERSION_NUMBER < 37 +#define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc) +#else +#define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, G ## cname, args, nargout, doc) +#endif + SWIGRUNTIME bool SWIG_check_num_args(const char *func_name, int num_args, int max_args, int min_args, int varargs) { if (num_args > max_args && !varargs) error("function %s takes at most %i arguments", func_name, max_args); diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 296920000..aa28dc54c 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -50,6 +50,16 @@ private: Hash *docs; + void Octave_begin_function(Node *n, File *f, const_String_or_char_ptr cname, const_String_or_char_ptr wname, bool dld) { + if (dld) { + String *tname = texinfo_name(n, "std::string()"); + Printf(f, "SWIG_DEFUN( %s, %s, %s ) {", cname, wname, tname); + } + else { + Printf(f, "static octave_value_list %s (const octave_value_list& args, int nargout) {", wname); + } + } + public: OCTAVE():f_begin(0), f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), f_init(0), f_initbeforefunc(0), f_directors(0), f_directors_h(0), @@ -293,14 +303,14 @@ public: return !Len(synopsis) && !Len(decl_info) && !Len(cdecl_info) && !Len(args_info); } - String *texinfo_name(Node* n) { + String *texinfo_name(Node* n, const char* defval = "0") { String *tname = NewString(""); String *iname = Getattr(n, "sym:name"); String *wname = Swig_name_wrapper(iname); Node* d = Getattr(docs, wname); if (is_empty_doc_node(d)) - Printf(tname, "0"); + Printf(tname, defval); else Printf(tname, "%s_texinfo", wname); @@ -543,7 +553,10 @@ public: if (overloaded) Append(overname, Getattr(n, "sym:overname")); - Printv(f->def, "static octave_value_list ", overname, " (const octave_value_list& args, int nargout) {", NIL); + if (!overloaded || last_overload) + process_autodoc(n); + + Octave_begin_function(n, f->def, iname, overname, !overloaded); emit_parameter_variables(l, f); emit_attach_parmmaps(l, f); @@ -743,7 +756,6 @@ public: dispatchFunction(n); if (!overloaded || last_overload) { - process_autodoc(n); String *tname = texinfo_name(n); Printf(s_global_tab, "{\"%s\",%s,0,0,2,%s},\n", iname, wname, tname); Delete(tname); @@ -766,7 +778,7 @@ public: String *dispatch = Swig_overload_dispatch(n, "return %s(args, nargout);", &maxargs); String *tmp = NewString(""); - Printv(f->def, "static octave_value_list ", wname, " (const octave_value_list& args, int nargout) {", NIL); + Octave_begin_function(n, f->def, iname, wname, true); Wrapper_add_local(f, "argc", "int argc = args.length()"); Printf(tmp, "octave_value_ref argv[%d]={", maxargs); for (int j = 0; j < maxargs; ++j) @@ -800,7 +812,10 @@ public: String *getname = Swig_name_get(NSPACE_TODO, iname); String *setname = Swig_name_set(NSPACE_TODO, iname); - Printf(setf->def, "static octave_value_list _wrap_%s(const octave_value_list& args,int nargout) {", setname); + String *getwname = Swig_name_wrapper(getname); + String *setwname = Swig_name_wrapper(setname); + + Octave_begin_function(n, setf->def, setname, setwname, true); Printf(setf->def, "if (!SWIG_check_num_args(\"%s_set\",args.length(),1,1,0)) return octave_value_list();", iname); if (is_assignable(n)) { Setattr(n, "wrap:name", setname); @@ -826,7 +841,7 @@ public: Setattr(n, "wrap:name", getname); int addfail = 0; - Printf(getf->def, "static octave_value_list _wrap_%s(const octave_value_list& args,int nargout) {", getname); + Octave_begin_function(n, getf->def, getname, getwname, true); Wrapper_add_local(getf, "obj", "octave_value obj"); if ((tm = Swig_typemap_lookup("varout", n, name, 0))) { Replaceall(tm, "$source", name); @@ -845,7 +860,10 @@ public: Append(getf->code, "}\n"); Wrapper_print(getf, f_wrappers); - Printf(s_global_tab, "{\"%s\",0,_wrap_%s,_wrap_%s,2,0},\n", iname, getname, setname); + Printf(s_global_tab, "{\"%s\",0,%s,%s,2,0},\n", iname, getwname, setwname); + + Delete(getwname); + Delete(setwname); return SWIG_OK; } @@ -937,20 +955,21 @@ public: String *nspace = Getattr(n, "sym:nspace"); String *cname = Swig_name_disown(nspace, class_name); String *wcname = Swig_name_wrapper(cname); - String *disown_shadow = NewString(""); - Printf(disown_shadow, "static octave_value_list %s_shadow " "(const octave_value_list& args, int nargout) {\n", wcname); - Printf(disown_shadow, " if (args.length()!=1) {\n"); - Printf(disown_shadow, " error(\"disown takes no arguments\");\n"); - Printf(disown_shadow, " return octave_value_list();\n"); - Printf(disown_shadow, " }\n"); - Printf(disown_shadow, " %s (args, nargout);\n", wcname); - Printf(disown_shadow, " return args;\n"); - Printf(disown_shadow, "}\n"); - Printv(f_wrappers, disown_shadow, NIL); - Delete(disown_shadow); - Printf(s_members_tab, "{\"__disown\",%s_shadow,0,0,0,0},\n", wcname); + String *cnameshdw = NewStringf("%s_shadow", cname); + String *wcnameshdw = Swig_name_wrapper(cnameshdw); + Octave_begin_function(n, f_wrappers, cnameshdw, wcnameshdw, true); + Printf(f_wrappers, " if (args.length()!=1) {\n"); + Printf(f_wrappers, " error(\"disown takes no arguments\");\n"); + Printf(f_wrappers, " return octave_value_list();\n"); + Printf(f_wrappers, " }\n"); + Printf(f_wrappers, " %s (args, nargout);\n", wcname); + Printf(f_wrappers, " return args;\n"); + Printf(f_wrappers, "}\n"); + Printf(s_members_tab, "{\"__disown\",%s,0,0,0,0},\n", wcnameshdw); Delete(wcname); Delete(cname); + Delete(wcnameshdw); + Delete(cnameshdw); } Printf(s_members_tab, "{0,0,0,0}\n};\n"); @@ -1049,15 +1068,18 @@ public: assert(s_members_tab); assert(class_name); String *symname = Getattr(n, "sym:name"); - String *getname = Swig_name_wrapper(Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname))); - String *setname = GetFlag(n, "feature:immutable") ? - NewString("octave_set_immutable") : Swig_name_wrapper(Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname))); + String *getname = Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)); + String *setname = Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)); + String *getwname = Swig_name_wrapper(getname); + String *setwname = GetFlag(n, "feature:immutable") ? NewString("octave_set_immutable") : Swig_name_wrapper(setname); assert(s_members_tab); - Printf(s_members_tab, "{\"%s\",0,%s,%s,0,0},\n", symname, getname, setname); + Printf(s_members_tab, "{\"%s\",0,%s,%s,0,0},\n", symname, getwname, setwname); Delete(getname); Delete(setname); + Delete(getwname); + Delete(setwname); return SWIG_OK; } @@ -1132,15 +1154,18 @@ public: assert(s_members_tab); assert(class_name); String *symname = Getattr(n, "sym:name"); - String *getname = Swig_name_wrapper(Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname))); - String *setname = GetFlag(n, "feature:immutable") ? - NewString("octave_set_immutable") : Swig_name_wrapper(Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname))); + String *getname = Swig_name_get(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)); + String *setname = Swig_name_set(NSPACE_TODO, Swig_name_member(NSPACE_TODO, class_name, symname)); + String *getwname = Swig_name_wrapper(getname); + String *setwname = GetFlag(n, "feature:immutable") ? NewString("octave_set_immutable") : Swig_name_wrapper(setname); assert(s_members_tab); - Printf(s_members_tab, "{\"%s\",0,%s,%s,1,0},\n", symname, getname, setname); + Printf(s_members_tab, "{\"%s\",0,%s,%s,1,0},\n", symname, getwname, setwname); Delete(getname); Delete(setname); + Delete(getwname); + Delete(setwname); } return SWIG_OK; } From bc2a78fbab956fc87212da06f9dd5ef423aeeb40 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:24:15 +0000 Subject: [PATCH 027/538] New Octave module loading behaviour - Use call syntax instead of cmdline to choose global/noglobal load: global: 'example;', noglobal: 'example = example;' - All functions loaded with Octave 'autoload' command; correctly loads .oct module and prevents segfault in Octave 3.0.5 - Functions no longer installed as global variables as well, so global operator dispatch now only looks for functions - Octave at-exit function created from string, not function, so no dependence on loaded .oct files at cleanup time - C at-exit function now immediately exits Octave (with correct status) to prevent seg-fault due to dodgy memory cleanup in some Octave versions - Documentation string for module loading function git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13088 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octrun.swg | 40 +----- Lib/octave/octruntime.swg | 258 +++++++++++++++++++------------------- Source/Modules/octave.cxx | 22 ++-- 3 files changed, 146 insertions(+), 174 deletions(-) diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index 3ab6c7525..24dae705a 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -504,37 +504,9 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); rhs.members.clear(); } - void install_global(bool global_load) { - for (member_map::const_iterator it = members.begin(); it != members.end(); ++it) { - bool is_global_op = (it->first.substr(0, strlen(SWIG_op_prefix)) == SWIG_op_prefix); - bool is_func_defined = (it->second.first && it->second.first->method); - if (is_func_defined && (is_global_op || global_load)) { - install_builtin_function(it->second.first->method, it->first, - it->second.first->doc ? it->second.first->doc : std::string()); - } - octave_value global_val = is_global_op ? make_fcn_handle(it->first) : it->second.second; - if (global_val.is_defined() && (is_global_op || global_load)) { -#if OCTAVE_API_VERSION_NUMBER<37 - link_to_global_variable(curr_sym_tab->lookup(it->first, true)); -#else - symbol_table::varref(it->first); - symbol_table::mark_global(it->first); -#endif - set_global_value(it->first, global_val); - -#if OCTAVE_API_VERSION_NUMBER<37 - octave_swig_type *ost = Swig::swig_value_deref(global_val); - if (ost) { - const char* h = ost->help_text(); - if (h) { - symbol_record *sr = global_sym_tab->lookup (it->first, true); - sr->document(h); - } - } -#endif - } - } - } + typedef member_map::const_iterator swig_member_const_iterator; + swig_member_const_iterator swig_members_begin() { return members.begin(); } + swig_member_const_iterator swig_members_end() { return members.end(); } void *cast(swig_type_info *type, int *_own, int flags) { if (_own) @@ -835,10 +807,10 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); // we assume that SWIG_op_prefix-prefixed functions are installed in global namespace // (rather than any module namespace). - octave_value fcn = get_global_value(symbol, true); - if (!fcn.is_function() && !fcn.is_function_handle()) + octave_function *fcn = is_valid_function(symbol, std::string(), false); + if (!fcn) return false; - ret = fcn.subsref("(", std::list < octave_value_list > (1, args), 1); + ret = fcn->do_multi_index_op(1, args)(0); return true; } diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 3aa866264..e23068438 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -1,11 +1,14 @@ %insert(runtime) %{ #include #include -#include -#include #include +#include +#include #include +#include +#include #include +#include %} %insert(runtime) "swigrun.swg"; @@ -18,9 +21,12 @@ static void SWIG_init_user(octave_swig_type* module_ns); -#if OCTAVE_API_VERSION_NUMBER>=37 -octave_value_list SWIG_atexit_func(const octave_value_list &args, int nargout); -#endif +SWIGINTERN void SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { + octave_value_list args; + args.append(name); + args.append(octloadfcn->fcn_file_name()); + feval("autoload", args, 0); +} static const char *const subclass_usage = "-*- texinfo -*- \n\ @deftypefn {Loadable Function} {} subclass()\n\ @@ -114,87 +120,94 @@ DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { return octave_value(octave_uint64((unsigned long long) ost->swig_this())); } -DEFUN_DLD (SWIG_name,args,nargout,SWIG_name_d) { - - // determine if module is already loaded - bool already_load; -#if OCTAVE_API_VERSION_NUMBER<37 - { - symbol_record *rec = curr_sym_tab->lookup(SWIG_name_d); - already_load = (rec && rec->is_linked_to_global()); - } -#else - already_load = symbol_table::is_global(SWIG_name_d); +// workaround to prevent octave seg-faulting on exit: register at-exit +// function which exits octave immediately without trying to cleanup memory. +// definitely affects version 3.2.*, not sure about 3.3.*, seems to be +// fixed in version 3.4.* and above. can be turned on/off with macros. +#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK +#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 +#define SWIG_OCTAVE_SEGFAULT_HACK #endif - if (!already_load) { - - // parse command line - const char* usage="usage: " SWIG_name_d " [-global|-noglobal] [-globals {|.}]"; - bool global_load=SWIG_global_load; - std::string global_name=SWIG_global_name; - for (int j=0;j= 37 + octave_value_list eval_args; + eval_args.append("base"); + eval_args.append("function __swig_atexit__; " + " if mislocked() " + " clear -all; " + " else " + " mlock(); " + " endif; " + "endfunction; " + "__swig_atexit__; " + "atexit(\"__swig_atexit__\", false); " + "atexit(\"__swig_atexit__\")"); + feval("evalin", eval_args, 0); +#endif + octave_swig_ref::register_type(); octave_swig_packed::register_type(); SWIG_InitializeModule(0); SWIG_PropagateClientData(); - - install_builtin_function(swig_type,"swig_type",std::string()); - install_builtin_function(swig_typequery,"swig_typequery",std::string()); - install_builtin_function(swig_this,"swig_this",std::string()); - install_builtin_function(subclass,"subclass",std::string()); - + + octave_function *me = octave_call_stack::current(); + + SWIG_Octave_InstallFunction(me, "swig_type"); + SWIG_Octave_InstallFunction(me, "swig_typequery"); + SWIG_Octave_InstallFunction(me, "swig_this"); + SWIG_Octave_InstallFunction(me, "subclass"); + octave_swig_type* cvar_ns=0; - if (global_name != ".") { + if (SWIG_global_name != ".") { cvar_ns=new octave_swig_type; for (int j=0;swig_globals[j].name;++j) if (swig_globals[j].get_method) cvar_ns->assign(swig_globals[j].name,&swig_globals[j]); } - - octave_swig_type* module_ns=new octave_swig_type(0, 0, 0, true); - if (global_name != ".") { - module_ns->assign(global_name,Swig::swig_value_ref(cvar_ns)); + + module_ns=new octave_swig_type(0, 0, 0, true); + if (SWIG_global_name != ".") { + module_ns->assign(SWIG_global_name,Swig::swig_value_ref(cvar_ns)); } else { for (int j=0;swig_globals[j].name;++j) @@ -204,72 +217,63 @@ DEFUN_DLD (SWIG_name,args,nargout,SWIG_name_d) { for (int j=0;swig_globals[j].name;++j) if (swig_globals[j].method) module_ns->assign(swig_globals[j].name,&swig_globals[j]); - - // * need better solution here; swig_type -> octave_class mapping is - // * really n-to-1, in some cases such as template partial spec, etc. + + // * need better solution here; swig_type -> octave_class mapping is + // * really n-to-1, in some cases such as template partial spec, etc. // * see failing tests. for (int j=0;swig_types[j];++j) if (swig_types[j]->clientdata) { swig_octave_class* c=(swig_octave_class*)swig_types[j]->clientdata; module_ns->assign(c->name, - Swig::swig_value_ref - (new octave_swig_type(0,swig_types[j]))); + Swig::swig_value_ref + (new octave_swig_type(0,swig_types[j]))); } - - SWIG_init_user(module_ns); - - SWIG_InstallOps(octave_swig_ref::static_type_id()); - - // the incref is necessary so install_global doesn't destroy module_ns, - // as it would if it installed something with the same name as the module. - module_ns->incref(); - module_ns->install_global(global_load); - module_ns->decref(); - - // create global variable containing module - set_global_value(SWIG_name_d,Swig::swig_value_ref(module_ns)); - -#if OCTAVE_API_VERSION_NUMBER>=37 - install_builtin_function(SWIG_atexit_func,"__swig_atexit_" SWIG_name_d "__",std::string()); - octave_add_atexit_function("__swig_atexit_" SWIG_name_d "__"); - octave_remove_atexit_function("__finish__"); -#endif - // return from base frame -#if OCTAVE_API_VERSION_NUMBER<37 - curr_sym_tab = prev_sym_tab; + SWIG_init_user(module_ns); + + SWIG_InstallOps(octave_swig_ref::static_type_id()); + +#if OCTAVE_API_VERSION_NUMBER < 37 + mlock(me->name()); #else - octave_call_stack::pop(); -#endif - -#if OCTAVE_API_VERSION_NUMBER>=37 mlock(); #endif - } // !already_load - - // link variable to module in current context -#if OCTAVE_API_VERSION_NUMBER<37 - link_to_global_variable(curr_sym_tab->lookup(SWIG_name_d,true)); -#else - symbol_table::varref(SWIG_name_d); - symbol_table::mark_global(SWIG_name_d); -#endif + } - return octave_value_list(); -} + // return module if asked for + if (args.length() == 0 && nargout == 1) { + retval = octave_value(module_ns->as_value()); + } + + // if call with not output arguments, load globally + else if (args.length() == 0 && nargout == 0) { + + octave_function *me = octave_call_stack::current(); + + octave_swig_type::swig_member_const_iterator mb; + for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) { + if (mb->second.first && mb->second.first->method) { + SWIG_Octave_InstallFunction(me, mb->first); + } + else if (mb->second.second.is_defined()) { + SWIG_Octave_SetGlobalValue(mb->first, mb->second.second); + SWIG_Octave_LinkGlobalValue(mb->first); + } + } + + SWIG_Octave_SetGlobalValue(SWIG_name_d, module_ns->as_value()); + SWIG_Octave_LinkGlobalValue(SWIG_name_d); + + } + + // otherwise print usage + else { + print_usage(); + } + + return retval; -// workaround bug in octave where installing global variable of custom type and then -// exiting without explicitly clearing the variable causes octave to segfault. -#if OCTAVE_API_VERSION_NUMBER>=37 -octave_value_list SWIG_atexit_func(const octave_value_list &args, int nargout) { - string_vector vars = symbol_table::global_variable_names(); - for (int i = 0; i < vars.length(); i++) - symbol_table::clear_global(vars[i]); - symbol_table::clear_functions(); - return octave_value(); } -#endif %} - diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index aa28dc54c..1b8156b33 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -15,16 +15,13 @@ char cvsroot_octave_cxx[] = "$Id$"; #include "swigmod.h" -static bool global_load = true; static String *global_name = 0; static String *op_prefix = 0; static const char *usage = (char *) "\ Octave Options (available with -octave)\n\ - -global - Load all symbols into the global namespace [default]\n\ -globals - Set used to access C global variables [default: 'cvar']\n\ - - Use '.' to load C global variables into module namespace\n\ - -noglobal - Do not load all symbols into the global namespace\n\ + Use '.' to load C global variables into module namespace\n\ -opprefix - Prefix for global operator functions [default: 'op_']\n\ \n"; @@ -83,12 +80,13 @@ public: if (argv[i]) { if (strcmp(argv[i], "-help") == 0) { fputs(usage, stdout); - } else if (strcmp(argv[i], "-global") == 0) { - global_load = true; - Swig_mark_arg(i); - } else if (strcmp(argv[i], "-noglobal") == 0) { - global_load = false; - Swig_mark_arg(i); + } else if (strcmp(argv[i], "-global") == 0 || + strcmp(argv[i], "-noglobal") == 0) { + Printv(stderr, + "*** -global/-noglobal are no longer supported\n" + "*** global load behaviour is now determined at module load\n" + "*** see the Perl section in the manual for details.\n", NIL); + SWIG_exit(EXIT_FAILURE); } else if (strcmp(argv[i], "-globals") == 0) { if (argv[i + 1]) { global_name = NewString(argv[i + 1]); @@ -179,10 +177,8 @@ public: Printf(f_runtime, "#define SWIG_name %s\n", module); Printf(f_runtime, "\n"); - Printf(f_runtime, "#define SWIG_global_load %s\n", global_load ? "true" : "false"); Printf(f_runtime, "#define SWIG_global_name \"%s\"\n", global_name); Printf(f_runtime, "#define SWIG_op_prefix \"%s\"\n", op_prefix); - Printf(f_runtime, "#define SWIG_atexit_func swig_atexit_%s\n", module); if (directorsEnabled()) { Printf(f_runtime, "#define SWIG_DIRECTORS\n"); @@ -383,7 +379,7 @@ public: virtual int importDirective(Node *n) { String *modname = Getattr(n, "module"); if (modname) - Printf(f_init, "feval(\"%s\",octave_value_list(),0);\n", modname); + Printf(f_init, "feval(\"%s\",octave_value_list(),1);\n", modname); return Language::importDirective(n); } From daffde6c2814a145cb0658a3c8dff440fb9f0dbd Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:24:34 +0000 Subject: [PATCH 028/538] Updated Octave module_load examples for new module loading - Module compiled twice to check '-globals .' behaviour - Only one runme.m needed since clearing modules should now be safe for all Octave versions. - Tests new module loading syntax and behaviour git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13089 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 4 +- Examples/octave/module_load/Makefile | 12 +- Examples/octave/module_load/example.i | 2 +- Examples/octave/module_load/runme.m | 112 ++++++++++++++++++ Examples/octave/module_load/runme_args.m | 48 -------- Examples/octave/module_load/runme_gl_func.m | 59 --------- .../octave/module_load/runme_gl_func_base.m | 59 --------- Examples/octave/module_load/runme_nogl_func.m | 55 --------- .../octave/module_load/runme_nogl_func_base.m | 55 --------- 9 files changed, 118 insertions(+), 288 deletions(-) create mode 100644 Examples/octave/module_load/runme.m delete mode 100644 Examples/octave/module_load/runme_args.m delete mode 100644 Examples/octave/module_load/runme_gl_func.m delete mode 100644 Examples/octave/module_load/runme_gl_func_base.m delete mode 100644 Examples/octave/module_load/runme_nogl_func.m delete mode 100644 Examples/octave/module_load/runme_nogl_func_base.m diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 8d63d02b5..04f794f61 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -365,9 +365,7 @@ octave_cpp: $(SRCS) OCTSCRIPT = runme.m octave_run: $(OCTSCRIPT) - for file in $(OCTSCRIPT); do \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVE_PATH=$(srcdir):$$OCTAVE_PATH $(OCTAVE) $$file >/dev/null || break; \ - done + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVE_PATH=$(srcdir):$$OCTAVE_PATH $(OCTAVE) $(OCTSCRIPT) >/dev/null # ----------------------------------------------------------------- # Cleaning the octave examples diff --git a/Examples/octave/module_load/Makefile b/Examples/octave/module_load/Makefile index 4266ec184..da2c704e0 100644 --- a/Examples/octave/module_load/Makefile +++ b/Examples/octave/module_load/Makefile @@ -3,16 +3,12 @@ SWIG = $(TOP)/../preinst-swig SRCS = example.c TARGET = example INTERFACE = example.i -OCTSCRIPTS = \ - runme_args.m \ - runme_gl_func.m \ - runme_gl_func_base.m \ - runme_nogl_func.m \ - runme_nogl_func_base.m all:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave + TARGET='$(TARGET)' SWIGOPT='-module $$(TARGET)' INTERFACE='$(INTERFACE)' octave + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)2' SWIGOPT='-module $$(TARGET) -globals .' INTERFACE='$(INTERFACE)' octave static:: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ @@ -23,4 +19,4 @@ clean:: rm -f $(TARGET).m check: all - $(MAKE) -f $(TOP)/Makefile OCTSCRIPT="$(OCTSCRIPTS)" octave_run + $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/module_load/example.i b/Examples/octave/module_load/example.i index f5a50444d..fd074d4f2 100644 --- a/Examples/octave/module_load/example.i +++ b/Examples/octave/module_load/example.i @@ -1,5 +1,5 @@ /* File : example.i */ -%module example +/* module name given on cmdline */ %{ #include "example.h" %} diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m new file mode 100644 index 000000000..4942a02de --- /dev/null +++ b/Examples/octave/module_load/runme.m @@ -0,0 +1,112 @@ +# file: runme_args.m + +# test module loading with arguments +clear all + +# access module, no global load +example = example; +assert(example.cvar.ivar == example.ifunc()); +clear all +example = example; +assert(example.cvar.ivar == example.ifunc()); +clear all + +# load module globally +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +clear all +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +clear all + +# access module in a function, no global load +function testme + example = example; + assert(example.cvar.ivar == example.ifunc()); +endfunction +testme +testme +example = example; +assert(example.cvar.ivar == example.ifunc()); +clear all +function testme + example = example; + assert(example.cvar.ivar == example.ifunc()); +endfunction +testme +testme +example = example; +assert(example.cvar.ivar == example.ifunc()); +clear all + +# load module in a function globally before base context +function testme + example; + assert(cvar.ivar == ifunc); + assert(exist("example","var")); +endfunction +testme +testme +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +clear all +function testme + example; + assert(cvar.ivar == ifunc); + assert(exist("example","var")); +endfunction +testme +testme +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +clear all + +# load module in a function globally after base context +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +function testme + example; + assert(cvar.ivar == ifunc); + assert(exist("example","var")); +endfunction +testme +testme +clear all +example; +assert(cvar.ivar == ifunc); +assert(exist("example","var")); +function testme + example; + assert(cvar.ivar == ifunc); + assert(exist("example","var")); +endfunction +testme +testme +clear all + +# access module with no cvar, no global load +example2 = example2; +assert(example2.ivar == example2.ifunc()); +assert(!isglobal("cvar")) +clear all +example2 = example2; +assert(example2.ivar == example2.ifunc()); +assert(!isglobal("cvar")) +clear all + +# load module with no cvar globally +example2; +assert(example2.ivar == ifunc); +assert(exist("example2","var")); +assert(!isglobal("cvar")) +clear all +example2; +assert(example2.ivar == ifunc); +assert(exist("example2","var")); +assert(!isglobal("cvar")) +clear all diff --git a/Examples/octave/module_load/runme_args.m b/Examples/octave/module_load/runme_args.m deleted file mode 100644 index 716ee31f9..000000000 --- a/Examples/octave/module_load/runme_args.m +++ /dev/null @@ -1,48 +0,0 @@ -# file: runme_args.m - -# test module loading with arguments - -##### BEGIN TEST ##### -# test help -example -help -assert(!isglobal("example")) - -# load module with custom cvar -example -globals mycvar -assert(!isglobal("cvar")) -assert(mycvar.ivar == example.ifunc()) -##### END TEST ##### - -# clearing a module results in a segfault for Octave <= 3.0.* -# (tested on Octave 3.0.5), so skip the following test -try - vers = cellfun("str2num", strsplit(OCTAVE_VERSION, ".")); -catch - vers = cellfun("str2num", cellstr(split(OCTAVE_VERSION, "."))); -end_try_catch -assert(length(vers) >= 2); -if vers(1) < 3 || (vers(1) == 3 && vers(2) == 0) - disp("skipping 'clear all' test"); - return -endif - -clear all; - -##### BEGIN TEST ##### -# test help -example -help -assert(!isglobal("example")) - -# load module with custom cvar -example -globals mycvar -assert(!isglobal("cvar")) -assert(mycvar.ivar == example.ifunc()) -##### END TEST ##### - -clear all; - -##### BEGIN TEST ##### -# load module with root-level cvar -example -globals . -assert(example.ivar == example.ifunc()) -##### END TEST ##### diff --git a/Examples/octave/module_load/runme_gl_func.m b/Examples/octave/module_load/runme_gl_func.m deleted file mode 100644 index 1624cdd9a..000000000 --- a/Examples/octave/module_load/runme_gl_func.m +++ /dev/null @@ -1,59 +0,0 @@ -# file: runme_gl_func.m - -# test whether module can be loaded -# in a function (global cvar) - -1; - -##### BEGIN TEST ##### -function func - example - global cvar - assert(cvar.ivar == example.ifunc()) -endfunction - -# test that everything works from the base context -example -global cvar -assert(cvar.ivar == example.ifunc()) - -# test loading in a function -func - -# test a second time to check everything works -func -##### END TEST ##### - -# clearing a module results in a segfault for Octave <= 3.0.* -# (tested on Octave 3.0.5), so skip the following test -try - vers = cellfun("str2num", strsplit(OCTAVE_VERSION, ".")); -catch - vers = cellfun("str2num", cellstr(split(OCTAVE_VERSION, "."))); -end_try_catch -assert(length(vers) >= 2); -if vers(1) < 3 || (vers(1) == 3 && vers(2) == 0) - disp("skipping 'clear all' test"); - return -endif - -clear all; - -##### BEGIN TEST ##### -function func - example - global cvar - assert(cvar.ivar == example.ifunc()) -endfunction - -# test that everything works from the base context -example -global cvar -assert(cvar.ivar == example.ifunc()) - -# test loading in a function -func - -# test a second time to check everything works -func -##### END TEST ##### diff --git a/Examples/octave/module_load/runme_gl_func_base.m b/Examples/octave/module_load/runme_gl_func_base.m deleted file mode 100644 index 0e3eb6112..000000000 --- a/Examples/octave/module_load/runme_gl_func_base.m +++ /dev/null @@ -1,59 +0,0 @@ -# file: runme_gl_func_base.m - -# test whether module can be loaded in a function -# before the base context (global cvar) - -1; - -##### BEGIN TEST ##### -function func - example - global cvar - assert(cvar.ivar == example.ifunc()) -endfunction - -# test loading in a function -func - -# test a second time to check everything works -func - -# test that everything works from the base context -example -global cvar -assert(cvar.ivar == example.ifunc()) -##### END TEST ##### - -# clearing a module results in a segfault for Octave <= 3.0.* -# (tested on Octave 3.0.5), so skip the following test -try - vers = cellfun("str2num", strsplit(OCTAVE_VERSION, ".")); -catch - vers = cellfun("str2num", cellstr(split(OCTAVE_VERSION, "."))); -end_try_catch -assert(length(vers) >= 2); -if vers(1) < 3 || (vers(1) == 3 && vers(2) == 0) - disp("skipping 'clear all' test"); - return -endif - -clear all; - -##### BEGIN TEST ##### -function func - example - global cvar - assert(cvar.ivar == example.ifunc()) -endfunction - -# test loading in a function -func - -# test a second time to check everything works -func - -# test that everything works from the base context -example -global cvar -assert(cvar.ivar == example.ifunc()) -##### END TEST ##### diff --git a/Examples/octave/module_load/runme_nogl_func.m b/Examples/octave/module_load/runme_nogl_func.m deleted file mode 100644 index fd8e19f37..000000000 --- a/Examples/octave/module_load/runme_nogl_func.m +++ /dev/null @@ -1,55 +0,0 @@ -# file: runme_nogl_func.m - -# test whether module can be loaded -# in a function (no global cvar) - -1; - -##### BEGIN TEST ##### -function func - example -noglobal - assert(example.cvar.ivar == example.ifunc()) -endfunction - -# test that everything works from the base context -example -noglobal -assert(example.cvar.ivar == example.ifunc()) - -# test loading in a function -func - -# test a second time to check everything works -func -##### END TEST ##### - -# clearing a module results in a segfault for Octave <= 3.0.* -# (tested on Octave 3.0.5), so skip the following test -try - vers = cellfun("str2num", strsplit(OCTAVE_VERSION, ".")); -catch - vers = cellfun("str2num", cellstr(split(OCTAVE_VERSION, "."))); -end_try_catch -assert(length(vers) >= 2); -if vers(1) < 3 || (vers(1) == 3 && vers(2) == 0) - disp("skipping 'clear all' test"); - return -endif - -clear all; - -##### BEGIN TEST ##### -function func - example -noglobal - assert(example.cvar.ivar == example.ifunc()) -endfunction - -# test that everything works from the base context -example -noglobal -assert(example.cvar.ivar == example.ifunc()) - -# test loading in a function -func - -# test a second time to check everything works -func -##### END TEST ##### diff --git a/Examples/octave/module_load/runme_nogl_func_base.m b/Examples/octave/module_load/runme_nogl_func_base.m deleted file mode 100644 index bb8da9328..000000000 --- a/Examples/octave/module_load/runme_nogl_func_base.m +++ /dev/null @@ -1,55 +0,0 @@ -# file: runme_nogl_func_base.m - -# test whether module can be loaded in a function -# before the base context (no global cvar) - -1; - -##### BEGIN TEST ##### -function func - example -noglobal - assert(example.cvar.ivar == example.ifunc()) -endfunction - -# test loading in a function -func - -# test a second time to check everything works -func - -# test that everything works from the base context -example -noglobal -assert(example.cvar.ivar == example.ifunc()) -##### END TEST ##### - -# clearing a module results in a segfault for Octave <= 3.0.* -# (tested on Octave 3.0.5), so skip the following test -try - vers = cellfun("str2num", strsplit(OCTAVE_VERSION, ".")); -catch - vers = cellfun("str2num", cellstr(split(OCTAVE_VERSION, "."))); -end_try_catch -assert(length(vers) >= 2); -if vers(1) < 3 || (vers(1) == 3 && vers(2) == 0) - disp("skipping 'clear all' test"); - return -endif - -clear all; - -##### BEGIN TEST ##### -function func - example -noglobal - assert(example.cvar.ivar == example.ifunc()) -endfunction - -# test loading in a function -func - -# test a second time to check everything works -func - -# test that everything works from the base context -example -noglobal -assert(example.cvar.ivar == example.ifunc()) -##### END TEST ##### From 6329b81ab40d46dec201ac90edcd59eb85b109ac Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 14 May 2012 09:24:45 +0000 Subject: [PATCH 029/538] Updated Octave documentation on module load behaviour git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13090 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/Octave.html | 88 ++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index 3229299d5..b8cf02a77 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -63,7 +63,7 @@ The SWIG implemention was first based on Octave 2.9.12, so this is the minimum v

-As of SWIG 2.0.5, the Octave module should work with Octave versions 3.0.5, 3.2.4, and 3.4.0. +As of SWIG 2.0.7, the Octave module has been tested with Octave versions 3.0.5, 3.2.4, 3.4.3, and 3.6.1.

30.2 Running SWIG

@@ -95,7 +95,7 @@ The -c++ option is also required when wrapping C++ code: 
$ swig -octave -c++ -o example_wrap.cpp example.i

-This creates a C++ source file example_wrap.cpp. A C++ file is generated even when wrapping C code as Octave is itself written in C++ and requires wrapper code to be in the same language. The generated C++ source file contains the low-level wrappers that need to be compiled and linked with the rest of your C/C++ application (in this case, the gcd implementation) to create an extension module. +This creates a C++ source file "example_wrap.cpp". A C++ file is generated even when wrapping C code as Octave is itself written in C++ and requires wrapper code to be in the same language. The generated C++ source file contains the low-level wrappers that need to be compiled and linked with the rest of your C/C++ application (in this case, the gcd implementation) to create an extension module.

30.2.1 Command-line options

@@ -110,15 +110,12 @@ Options specific to the Octave module are: 
$ swig -octave -help
 ...
 Octave Options (available with -octave)
-     -global       - Load all symbols into the global namespace [default]
      -globals name - Set name used to access C global variables [default: 'cvar']
-                         - Use '.' to load C global variables into module namespace
-     -noglobal     - Do not load all symbols into the global namespace
+                     Use '.' to load C global variables into module namespace
      -opprefix str - Prefix str for global operator functions [default: 'op_']

-The -global and -noglobal options determine whether the Octave module will load all symbols into the global namespace in addition to the global namespace. The -globals option sets the name of the variable which is the namespace for C global variables exported by the module. The special name "." loads C global variables into the module namespace, i.e. alongside C functions and structs exported by the module. The -opprefix options sets the prefix of the names of global/friend operator functions. @@ -138,7 +135,7 @@ $ mkoctfile example_wrap.cpp example.c

- where example.c is the file containing the gcd() implementation. + where "example.c" is the file containing the gcd() implementation.

@@ -146,7 +143,7 @@ $ mkoctfile example_wrap.cpp example.c

- mkoctfile will produce example.oct, which contains the compiled extension module. Loading it into Octave is then a matter of invoking + mkoctfile will produce "example.oct", which contains the compiled extension module. Loading it into Octave is then a matter of invoking 

octave:1> example
@@ -176,58 +173,67 @@ ans = 4

-The SWIG module directive specifies the name of the Octave module. If you specify `module example', then in Octave everything in the module will be accessible under "example", as in the above example. When choosing a module name, make sure you don't use the same name as a built-in Octave command or standard module name. +The SWIG module directive specifies the name of the Octave module. If you specify "module example", then in Octave everything in the module will be accessible under "example", as in the above example. When choosing a module name, make sure you don't use the same name as a built-in Octave command or standard module name.

-When Octave is asked to invoke example, it will try to find the .m or .oct file that defines the function "example". It will thusly find example.oct, that upon loading will register all of the module's symbols. +When Octave is asked to invoke example, it will try to find the ".m" or ".oct" file that defines the function "example". You therefore need to make sure that "example.oct" is in Octave's search path, which can be specified with the environment variable "OCTAVE_PATH".

-An Octave module takes three options, -global, -noglobal, and -globals, which behave the same as the corresponding swig command-line options. -Here are some example usages: +An Octave module can either load its symbols into the global namespace, so that they can be accessed directly without having to type the module name. +Alternatively, an Octave module can be accessed through a local variable, without being loaded globally.

- 
-octave:1> example -help
-usage: example [-global|-noglobal] [-globals <name>]
-octave:2> example -global
-octave:3> gcd(4,6)
+

+To load an Octave module globally, simply type its name:
+

+
+
+octave:1> example;
+octave:2> gcd(4,6)
 ans =  2
-octave:4> cvar.Foo
+octave:3> cvar.Foo
 ans =  3
-octave:5> cvar.Foo=4;
-octave:6> cvar.Foo
+octave:4> cvar.Foo=4;
+octave:5> cvar.Foo
 ans =  4
 

-

-    
-octave:1> example -noglobal
-octave:2> gcd(6,9)
+
+

+To access an Octave module through a local variable, without loading it globally, simply assign the module name (e.g. "example") to the desired local variable:
+

+
+
+octave:1> example = example;
+octave:2> example.gcd(6,9)
 ans =  3
-octave:3> cvar.Foo
-error: `cvar' undefined near line 3 column 1
 octave:3> example.cvar.Foo
 ans =  3
 

-

-    
-octave:1> example -globals mycvar
-octave:2> cvar.Foo
-error: `cvar' undefined near line 2 column 1
-octave:2> mycvar.Foo
+
+

+The variable may have the same name as the module, or a shorter one:
+

+
+
+octave:1> ex = example;
+octave:2> ex.gcd(6,9)
+ans =  3
+octave:3> ex.cvar.Foo
 ans =  3
 

 
 

-     It is also possible to rename the module / global variables namespaces with an assignment, as in: 

-    
-octave:1> example
-octave:2> c=example;
-octave:3> c.gcd(10,4)
+It is also possible to rename the global variables namespaces with an assignment, as in:
+

+
+
+octave:1> example;
+octave:2> cvar.gcd(10,4)
 ans =  2
-octave:4> some_vars = cvar;
-octave:5> some_vars.Foo
+octave:3> some_vars = cvar;
+octave:4> some_vars.Foo
 ans =  3
 

 
@@ -274,9 +280,9 @@ int fact(int n); 

      Global variables are a little special in Octave. Given a global variable: 
 

 
-    
%module example
+
%module example
 extern double Foo;
-      

+

 
 

     To expose variables, SWIG actually generates two functions, to get and set the value. In this case, Foo_set and Foo_set would be generated. SWIG then automatically calls these functions when you get and set the variable-- in the former case creating a local copy in the interpreter of the C variables, and in the latter case copying an interpreter variables onto the C variable. 

From 71cdda6a55e0bec77a87b77a6859aee136043f4d Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Mon, 14 May 2012 09:24:53 +0000
Subject: [PATCH 030/538] Documented recent Octave changes in CHANGELOG.current

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13091 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 96d6c6300..9e7824664 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,36 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.7 (in progress)
 ===========================
 
+2012-05-14: kwwette (signed off by xavier98)
+            [Octave] Prevent Octave from seg-faulting at exit when SWIG
+            modules are loaded, due to bugs in Octave's cleanup code:
+            * Wrapping functions now declared with Octave DEFUN_DLD macro,
+              and loaded through Octave's dynamic module loader
+            * Global variables of swigref type are now assigned a new()
+              copy of the swigref class, to prevent double-free errors
+            * SWIG module at-exit cleanup function now created in Octave
+              through eval(), so not dependent on loaded .oct library
+            * For Octave versions 3.1.* to 3.3.*, register C-level at-exit
+              function which terminates Octave immediately (with correct
+              status code) without performing memory cleanup. This function
+              can be controlled with macros in Lib/octave/octruntime.swg
+
+            [Octave] New syntax for determing whether SWIG module should be
+            loaded globally or non-globally. To load module "example" globally,
+            type the module name
+            $ example;
+            as before; to load module non-globally, assign it to a variable:
+            $ example = example;
+            or
+            $ ex = example;
+            for a shorter (local) module name. -global/-noglobal command-line
+            options and module command line are deprecated. Added usage info
+            to module, so typing
+            $ help example
+            or incorrect usage should display proper usage, with examples.
+
+            *** POTENTIAL INCOMPATIBILITY  ***
+
 2012-05-12: olly
 	    [PHP] Fix memory leak in code generated for a callback.  Patch from
 	    SF bug #3510806.

From 142f1e72bb1e2606d7afc11770f0d4dad98a7c9c Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 15 May 2012 19:51:06 +0000
Subject: [PATCH 031/538] Fix some language's std::map wrappers to recognise
 difference_type, size_type, key_type and mapped_type.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13092 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current        | 4 ++++
 Lib/csharp/std_map.i   | 9 +++++----
 Lib/guile/std_map.i    | 4 ++++
 Lib/mzscheme/std_map.i | 4 ++++
 Lib/ocaml/std_map.i    | 4 ++++
 Lib/perl5/std_map.i    | 4 ++++
 Lib/php/std_map.i      | 4 ++++
 Lib/tcl/std_map.i      | 4 ++++
 8 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 9e7824664..2092bd6e4 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.7 (in progress)
 ===========================
 
+2012-05-14: wsfulton
+            Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
+            and mapped_type.
+
 2012-05-14: kwwette (signed off by xavier98)
             [Octave] Prevent Octave from seg-faulting at exit when SWIG
             modules are loaded, due to bugs in Octave's cleanup code:
diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i
index 0fd95725b..6a7da16b6 100644
--- a/Lib/csharp/std_map.i
+++ b/Lib/csharp/std_map.i
@@ -215,12 +215,13 @@
 %}
 
   public:
-    map();
-    map(const map< K, T > &other);
-
+    typedef size_t size_type;
+    typedef ptrdiff_t difference_type;
     typedef K key_type;
     typedef T mapped_type;
-    typedef size_t size_type;
+
+    map();
+    map(const map< K, T > &other);
     size_type size() const;
     bool empty() const;
     %rename(Clear) clear;
diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i
index 600075ebe..eb28c2831 100644
--- a/Lib/guile/std_map.i
+++ b/Lib/guile/std_map.i
@@ -217,6 +217,10 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         
diff --git a/Lib/mzscheme/std_map.i b/Lib/mzscheme/std_map.i
index ffd76d213..849f8baf5 100644
--- a/Lib/mzscheme/std_map.i
+++ b/Lib/mzscheme/std_map.i
@@ -217,6 +217,10 @@ namespace std {
         %rename("delete!") __delitem__;
         %rename("has-key?") has_key;
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         
diff --git a/Lib/ocaml/std_map.i b/Lib/ocaml/std_map.i
index 924120f24..5656b7fa2 100644
--- a/Lib/ocaml/std_map.i
+++ b/Lib/ocaml/std_map.i
@@ -22,6 +22,10 @@ namespace std {
     template class map {
         // add typemaps here
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         
diff --git a/Lib/perl5/std_map.i b/Lib/perl5/std_map.i
index 898c84484..e7812f38a 100644
--- a/Lib/perl5/std_map.i
+++ b/Lib/perl5/std_map.i
@@ -23,6 +23,10 @@ namespace std {
     template class map {
         // add typemaps here
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         
diff --git a/Lib/php/std_map.i b/Lib/php/std_map.i
index ff74b7b0b..6d5e3db13 100644
--- a/Lib/php/std_map.i
+++ b/Lib/php/std_map.i
@@ -23,6 +23,10 @@ namespace std {
     template class map {
         // add typemaps here
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         
diff --git a/Lib/tcl/std_map.i b/Lib/tcl/std_map.i
index e36cc96f2..1b7e7696c 100644
--- a/Lib/tcl/std_map.i
+++ b/Lib/tcl/std_map.i
@@ -24,6 +24,10 @@ namespace std {
     template class map {
         // add typemaps here
       public:
+        typedef size_t size_type;
+        typedef ptrdiff_t difference_type;
+        typedef K key_type;
+        typedef T mapped_type;
         map();
         map(const map &);
         

From 9e624db5bf464dd4b90f6eb0108af867da7ed5a1 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 15 May 2012 19:51:41 +0000
Subject: [PATCH 032/538] Better display of parms when using -debug-module and
 -debug-top

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13093 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Swig/tree.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c
index e66670c7c..265f5a12e 100644
--- a/Source/Swig/tree.c
+++ b/Source/Swig/tree.c
@@ -77,9 +77,9 @@ void Swig_print_node(Node *obj) {
     if ((Cmp(k, "nodeType") == 0) || (Cmp(k, "firstChild") == 0) || (Cmp(k, "lastChild") == 0) ||
 	(Cmp(k, "parentNode") == 0) || (Cmp(k, "nextSibling") == 0) || (Cmp(k, "previousSibling") == 0) || (*(Char(k)) == '$')) {
       /* Do nothing */
-    } else if (Cmp(k, "parms") == 0) {
+    } else if (Cmp(k, "parms") == 0 || Cmp(k, "wrap:parms") == 0) {
       print_indent(2);
-      Printf(stdout, "%-12s - %s\n", k, ParmList_protostr(Getattr(obj, k)));
+      Printf(stdout, "%-12s - %s\n", k, ParmList_str_defaultargs(Getattr(obj, k)));
     } else {
       DOH *o;
       char *trunc = "";

From 95821b7a04f60ea70be6b997139f31dbaeee75f6 Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Fri, 18 May 2012 02:19:46 +0000
Subject: [PATCH 033/538] Note that technique relying on call-time pass by
 reference won't work with PHP 5.4.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13094 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Php.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 659fb0a89..76031d07e 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -506,6 +506,12 @@ this, one needs to include phppointers.i which defines the
 named typemap REFERENCE.
 

 
+

+However, this relies on call-time pass-by-reference, which has been
+deprecated in PHP for some time, and was finally removed in PHP 5.4.
+So you should avoid creating new wrappers which rely on this approach.
+

+
 
 %module example
 %include "phppointers.i"

From b32c70e244c1e4284f077017fcba186513991e40 Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Fri, 18 May 2012 02:42:23 +0000
Subject: [PATCH 034/538] Comment out use of call-time pass by reference, which
 has been deprecated for ages, and is no longer supported by PHP 5.4.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13095 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/php/argout_runme.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Examples/test-suite/php/argout_runme.php b/Examples/test-suite/php/argout_runme.php
index 08524e214..33fbd8129 100644
--- a/Examples/test-suite/php/argout_runme.php
+++ b/Examples/test-suite/php/argout_runme.php
@@ -23,15 +23,16 @@ check::equal(5,intp_value($tr),"5==$tr");
 
 # Check the voidhandle call, first with null
 unset($handle);
-voidhandle($handle);
-check::resource($handle,"_p_void",'$handle is not _p_void');
-$handledata=handle($handle);
-check::equal($handledata,"Here it is","\$handledata != \"Here it is\"");
+# FIXME: Call-time pass-by-reference has been deprecated for ages, and was
+# removed in PHP 5.4.  We need to rework 
+#voidhandle(&$handle);
+#check::resource($handle,"_p_void",'$handle is not _p_void');
+#$handledata=handle($handle);
+#check::equal($handledata,"Here it is","\$handledata != \"Here it is\"");
 
 unset($handle);
-// without reference, should fatal error so can't test here
-//voidhandle($handle);
-//check::isnull($handle,'$handle not null');
+voidhandle($handle);
+check::isnull($handle,'$handle not null');
 
 check::done();
 ?>

From de9d01dbcdc3128e74ad290093dbf57e6df31bd5 Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Fri, 18 May 2012 02:43:52 +0000
Subject: [PATCH 035/538] [PHP] Fix getters for template members. (SF#3428833)

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13096 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  3 ++
 Examples/test-suite/common.mk                 |  1 +
 .../test-suite/li_std_vector_member_var.i     | 23 +++++++++
 .../php/li_std_vector_member_var_runme.php    | 24 ++++++++++
 Source/Modules/php.cxx                        | 47 +++++++++++--------
 5 files changed, 78 insertions(+), 20 deletions(-)
 create mode 100644 Examples/test-suite/li_std_vector_member_var.i
 create mode 100644 Examples/test-suite/php/li_std_vector_member_var_runme.php

diff --git a/CHANGES.current b/CHANGES.current
index 2092bd6e4..dd5132efa 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.7 (in progress)
 ===========================
 
+2012-05-18: olly
+	    [PHP] Fix getters for template members. (SF#3428833)
+
 2012-05-14: wsfulton
             Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
             and mapped_type.
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 9e7e21ac4..73c0c4254 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -475,6 +475,7 @@ CPP_STD_TEST_CASES += \
 	li_std_string \
 	li_std_vector \
 	li_std_vector_enum \
+	li_std_vector_member_var\
 	naturalvar \
 	smart_pointer_inherit \
 	template_typedef_fnc \
diff --git a/Examples/test-suite/li_std_vector_member_var.i b/Examples/test-suite/li_std_vector_member_var.i
new file mode 100644
index 000000000..b6e0727db
--- /dev/null
+++ b/Examples/test-suite/li_std_vector_member_var.i
@@ -0,0 +1,23 @@
+%module li_std_vector_member_var
+
+%include "std_vector.i"
+
+%template(vectorDbl) std::vector;
+
+%inline %{
+#include 
+
+typedef std::vector DblVector;
+
+struct Test {
+    DblVector v;
+    int x;
+
+    Test() : x(0) { }
+
+    void f(int n) {
+        x += n;
+        v.push_back(1.0 / n);
+    }
+};
+%}
diff --git a/Examples/test-suite/php/li_std_vector_member_var_runme.php b/Examples/test-suite/php/li_std_vector_member_var_runme.php
new file mode 100644
index 000000000..96accf39f
--- /dev/null
+++ b/Examples/test-suite/php/li_std_vector_member_var_runme.php
@@ -0,0 +1,24 @@
+x, 0, "Test::x != 0");
+check::equal($t->v->size(), 0, "Test::v.size() != 0");
+
+$t->f(1);
+check::equal($t->x, 1, "Test::x != 1");
+check::equal($t->v->size(), 1, "Test::v.size() != 1");
+
+$t->f(2);
+check::equal($t->x, 3, "Test::x != 3");
+check::equal($t->v->size(), 2, "Test::v.size() != 2");
+
+$t->f(3);
+check::equal($t->x, 6, "Test::x != 6");
+check::equal($t->v->size(), 3, "Test::v.size() != 3");
+
+check::done();
+?>
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index 1ac9e8b24..c5391a2e0 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -1032,7 +1032,7 @@ public:
 	p += strlen(p) - 4;
 	String *varname = Getattr(n, "membervariableHandler:sym:name");
 	if (strcmp(p, "_get") == 0) {
-	  Setattr(shadow_get_vars, varname, iname);
+	  Setattr(shadow_get_vars, varname, Getattr(n, "type"));
 	} else if (strcmp(p, "_set") == 0) {
 	  Setattr(shadow_set_vars, varname, iname);
 	}
@@ -2012,7 +2012,6 @@ done:
     classnode = 0;
 
     if (shadow) {
-      DOH *key;
       List *baselist = Getattr(n, "bases");
       Iterator ki, base;
 
@@ -2055,10 +2054,10 @@ done:
 	// FIXME: tune this threshold...
 	if (Len(shadow_set_vars) <= 2) {
 	  // Not many setters, so avoid call_user_func.
-	  while (ki.key) {
-	    key = ki.key;
-	    Printf(s_phpclasses, "\t\tif ($var === '%s') return %s($this->%s,$value);\n", key, ki.item, SWIG_PTR);
-	    ki = Next(ki);
+	  for (; ki.key; ki = Next(ki)) {
+	    DOH *key = ki.key;
+	    String *iname = ki.item;
+	    Printf(s_phpclasses, "\t\tif ($var === '%s') return %s($this->%s,$value);\n", key, iname, SWIG_PTR);
 	  }
 	} else {
 	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_set';\n", shadow_classname);
@@ -2106,21 +2105,29 @@ done:
       if (ki.key) {
 	// This class has getters.
 	Printf(s_phpclasses, "\n\tfunction __get($var) {\n");
-	// FIXME: Currently we always use call_user_func for __get, so we can
-	// check and wrap the result.  This is needless if all the properties
-	// are primitive types.  Also this doesn't handle all the cases which
-	// a method returning an object does.
-	Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_get';\n", shadow_classname);
-	Printf(s_phpclasses, "\t\tif (function_exists($func)) {\n");
-	Printf(s_phpclasses, "\t\t\t$r = call_user_func($func,$this->%s);\n", SWIG_PTR);
-	Printf(s_phpclasses, "\t\t\tif (!is_resource($r)) return $r;\n");
-	if (Len(prefix) == 0) {
-	  Printf(s_phpclasses, "\t\t\t$c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n");
-	} else {
-	  Printf(s_phpclasses, "\t\t\t$c='%s'.substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n", prefix);
+	int non_class_getters = 0;
+	for (; ki.key; ki = Next(ki)) {
+	  DOH *key = ki.key;
+	  SwigType *d = ki.item;
+	  if (!is_class(d)) {
+	    ++non_class_getters;
+	    continue;
+	  }
+	  Printv(s_phpclasses, "\t\tif ($var === '", key, "') return new ", prefix, Getattr(classLookup(d), "sym:name"), "(", shadow_classname, "_", key, "_get($this->", SWIG_PTR, "));\n", NIL);
+	}
+	// FIXME: tune this threshold...
+	if (non_class_getters <= 2) {
+	  // Not many non-class getters, so avoid call_user_func.
+	  for (ki = First(shadow_get_vars); non_class_getters && ki.key; --non_class_getters, ki = Next(ki)) {
+	    DOH *key = ki.key;
+	    SwigType *d = ki.item;
+	    if (is_class(d)) continue;
+	    Printv(s_phpclasses, "\t\tif ($var === '", key, "') return ", shadow_classname, "_", key, "_get($this->", SWIG_PTR, ");\n", NIL);
+	  }
+	} else {
+	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_get';\n", shadow_classname);
+	  Printf(s_phpclasses, "\t\tif (function_exists($func)) return call_user_func($func,$this->%s);\n", SWIG_PTR);
 	}
-	Printf(s_phpclasses, "\t\t\treturn new $c($r);\n");
-	Printf(s_phpclasses, "\t\t}\n");
 	Printf(s_phpclasses, "\t\tif ($var === 'thisown') return swig_%s_get_newobject($this->%s);\n", module, SWIG_PTR);
 	if (baseclass) {
 	  Printf(s_phpclasses, "\t\treturn %s%s::__get($var);\n", prefix, baseclass);

From b665377ad5ecc14b6e622f5bad787ed26f291921 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 21 May 2012 18:13:58 +0000
Subject: [PATCH 036/538] Autoconf to check for a few more later versions of
 Python 3.x - can anyone think of a better way to do this?

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13097 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 94fd61e08..c78ab16c8 100644
--- a/configure.in
+++ b/configure.in
@@ -737,16 +737,16 @@ else
 # First figure out the name of the Python3 executable 
 
 if test "x$PY3BIN" = xyes; then
-  AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1])
+  AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1 python3.2 python3.3 python3.4 python3.5 python3.6])
 else
   PYTHON3="$PY3BIN"
 fi
 
 # Check for Python 3.x development tools (header files, static library and python3-config)
 if test "x$PYTHON3" = x; then
-  AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config])
+  AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
 else
-  AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config])
+  AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
 fi
 
 if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then

From 7196e556a58c6b8adfa13027b129309b3954e92c Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Wed, 23 May 2012 02:58:24 +0000
Subject: [PATCH 037/538] Fix SF#3528035, a regression introduced by the fix
 for SF#3428833.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13105 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                                       |  2 +-
 Examples/test-suite/li_std_vector_member_var.i        | 11 +++++++++++
 .../test-suite/php/li_std_vector_member_var_runme.php |  6 ++++++
 Source/Modules/php.cxx                                |  3 ++-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index dd5132efa..f1809e184 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -6,7 +6,7 @@ Version 2.0.7 (in progress)
 ===========================
 
 2012-05-18: olly
-	    [PHP] Fix getters for template members. (SF#3428833)
+	    [PHP] Fix getters for template members. (SF#3428833, SF#3528035)
 
 2012-05-14: wsfulton
             Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
diff --git a/Examples/test-suite/li_std_vector_member_var.i b/Examples/test-suite/li_std_vector_member_var.i
index b6e0727db..90de905c4 100644
--- a/Examples/test-suite/li_std_vector_member_var.i
+++ b/Examples/test-suite/li_std_vector_member_var.i
@@ -20,4 +20,15 @@ struct Test {
         v.push_back(1.0 / n);
     }
 };
+
+// Regression test for SF#3528035:
+struct S {
+    int x;
+    S() : x(4) { }
+};
+
+struct T {
+    S start_t;
+    unsigned length;
+};
 %}
diff --git a/Examples/test-suite/php/li_std_vector_member_var_runme.php b/Examples/test-suite/php/li_std_vector_member_var_runme.php
index 96accf39f..238350352 100644
--- a/Examples/test-suite/php/li_std_vector_member_var_runme.php
+++ b/Examples/test-suite/php/li_std_vector_member_var_runme.php
@@ -20,5 +20,11 @@ $t->f(3);
 check::equal($t->x, 6, "Test::x != 6");
 check::equal($t->v->size(), 3, "Test::v.size() != 3");
 
+$T = new T();
+$T->start_t = new S();
+$T->length = 7;
+check::equal($T->start_t->x, 4, "S::x != 4");
+check::equal($T->length, 7, "T::length != 7");
+
 check::done();
 ?>
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index c5391a2e0..70b6e41ef 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -2118,11 +2118,12 @@ done:
 	// FIXME: tune this threshold...
 	if (non_class_getters <= 2) {
 	  // Not many non-class getters, so avoid call_user_func.
-	  for (ki = First(shadow_get_vars); non_class_getters && ki.key; --non_class_getters, ki = Next(ki)) {
+	  for (ki = First(shadow_get_vars); non_class_getters && ki.key;  ki = Next(ki)) {
 	    DOH *key = ki.key;
 	    SwigType *d = ki.item;
 	    if (is_class(d)) continue;
 	    Printv(s_phpclasses, "\t\tif ($var === '", key, "') return ", shadow_classname, "_", key, "_get($this->", SWIG_PTR, ");\n", NIL);
+	    --non_class_getters;
 	  }
 	} else {
 	  Printf(s_phpclasses, "\t\t$func = '%s_'.$var.'_get';\n", shadow_classname);

From 00328ccdb31a1e219c559a6f53e9bac598d5eaed Mon Sep 17 00:00:00 2001
From: Stefan Zager 
Date: Wed, 23 May 2012 04:05:11 +0000
Subject: [PATCH 038/538] python: disambiguate SWIG_From_unsigned_SS_int and
 SWIG_From_unsigned_SS_long.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13106 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current            |  2 ++
 Lib/python/pyprimtypes.swg | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index f1809e184..b94133ac6 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,8 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.7 (in progress)
 ===========================
+2012-05-22: szager
+	    [python] Disambiguate SWIG_From_unsigned_SS_int and SWIG_From_unsigned_SS_long.
 
 2012-05-18: olly
 	    [PHP] Fix getters for template members. (SF#3428833, SF#3528035)
diff --git a/Lib/python/pyprimtypes.swg b/Lib/python/pyprimtypes.swg
index aa5ddaf62..290f9312f 100644
--- a/Lib/python/pyprimtypes.swg
+++ b/Lib/python/pyprimtypes.swg
@@ -35,6 +35,16 @@ SWIGINTERNINLINE PyObject*
 }
 }
 
+/* unsigned int */
+
+%fragment(SWIG_From_frag(unsigned int),"header") {
+SWIGINTERNINLINE PyObject*
+  SWIG_From_dec(unsigned int)(unsigned int value)
+{
+  return PyInt_FromSize_t((size_t) value);
+}
+}
+
 /* long */
 
 %fragment(SWIG_From_frag(long),"header") {

From f8135379a1ba43f2c63f3a4a768aeadbffeef3ee Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Wed, 23 May 2012 09:32:38 +0000
Subject: [PATCH 039/538] [octave] Make sure SWIG_global_name is a std::string
 for comparison

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13107 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/octave/octruntime.swg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg
index e23068438..8c14bedfe 100644
--- a/Lib/octave/octruntime.swg
+++ b/Lib/octave/octruntime.swg
@@ -198,7 +198,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
     SWIG_Octave_InstallFunction(me, "subclass");
 
     octave_swig_type* cvar_ns=0;
-    if (SWIG_global_name != ".") {
+    if (std::string(SWIG_global_name) != ".") {
       cvar_ns=new octave_swig_type;
       for (int j=0;swig_globals[j].name;++j)
         if (swig_globals[j].get_method)
@@ -206,7 +206,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
     }
 
     module_ns=new octave_swig_type(0, 0, 0, true);
-    if (SWIG_global_name != ".") {
+    if (std::string(SWIG_global_name) != ".") {
       module_ns->assign(SWIG_global_name,Swig::swig_value_ref(cvar_ns));
     }
     else {

From f76d63419f611c0b4526415f7883d6e5ec4df3b6 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Wed, 23 May 2012 09:32:51 +0000
Subject: [PATCH 040/538] [octave] Declare these functions only if directors
 are used

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13108 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/octave/octrun.swg | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg
index 24dae705a..dfb4a7702 100644
--- a/Lib/octave/octrun.swg
+++ b/Lib/octave/octrun.swg
@@ -135,9 +135,11 @@ namespace Swig {
   SWIGRUNTIME octave_swig_type *swig_value_deref(const octave_base_value &ov);
 }
 
+#ifdef SWIG_DIRECTORS
 SWIGRUNTIME void swig_acquire_ownership(void *vptr);
 SWIGRUNTIME void swig_acquire_ownership_array(void *vptr);
 SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
+#endif
 
   struct swig_octave_member {
     const char *name;

From 1d000ef6a6b4bf531a61df3f12d9a7f77e49604e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 23 May 2012 19:09:18 +0000
Subject: [PATCH 041/538] Cosmetic - reformat python3 detection code

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13109 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 113 +++++++++++++++++++++++++--------------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/configure.in b/configure.in
index c78ab16c8..2524b9cb2 100644
--- a/configure.in
+++ b/configure.in
@@ -626,17 +626,16 @@ AS_HELP_STRING([--with-python=path], [Set location of Python executable]),[ PYBI
 
 # First, check for "--without-python" or "--with-python=no".
 if test x"${PYBIN}" = xno -o x"${with_alllang}" = xno ; then 
-AC_MSG_NOTICE([Disabling Python])
+  AC_MSG_NOTICE([Disabling Python])
 else
-# First figure out the name of the Python executable
+  # First figure out the name of the Python executable
+  if test "x$PYBIN" = xyes; then
+    AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python])
+  else
+    PYTHON="$PYBIN"
+  fi
 
-if test "x$PYBIN" = xyes; then
-AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python])
-else
-PYTHON="$PYBIN"
-fi
-
-if test -n "$PYTHON"; then
+  if test -n "$PYTHON"; then
     AC_MSG_CHECKING(for Python prefix)
     PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null`
     AC_MSG_RESULT($PYPREFIX)
@@ -669,12 +668,12 @@ if test -n "$PYTHON"; then
 
     AC_MSG_CHECKING(for Python header files)
     if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
-        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
+      PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
     fi
     if test -z "$PYINCLUDE"; then
-        if test -r $PYPREFIX/include/Py/Python.h; then
-            PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
-        fi
+      if test -r $PYPREFIX/include/Py/Python.h; then
+        PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
+      fi
     fi
     AC_MSG_RESULT($PYINCLUDE)
 
@@ -682,32 +681,32 @@ if test -n "$PYTHON"; then
     AC_MSG_CHECKING(for Python library)
     dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
     for i in $dirs; do
-        if test -d $PYEPREFIX/$PYLIBDIR/$i; then
-           PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
-           break
-        fi
+      if test -d $PYEPREFIX/$PYLIBDIR/$i; then
+        PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
+        break
+      fi
     done
     if test -z "$PYLIB"; then
-        AC_MSG_RESULT(Not found)
+      AC_MSG_RESULT(Not found)
     else
-        AC_MSG_RESULT($PYLIB)
+      AC_MSG_RESULT($PYLIB)
     fi
 
     # Check for really old versions
     if test -r $PYLIB/libPython.a; then
-         PYLINK="-lModules -lPython -lObjects -lParser"
+      PYLINK="-lModules -lPython -lObjects -lParser"
     else
-         PYLINK="-l$PYVERSION"
+      PYLINK="-l$PYVERSION"
     fi
-fi
+  fi
 
-# Cygwin (Windows) needs the library for dynamic linking
-case $host in
-*-*-cygwin* | *-*-mingw*) PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
-         DEFS="-DUSE_DL_IMPORT $DEFS" PYINCLUDE="$PYINCLUDE"
-         ;;
-*)PYTHONDYNAMICLINKING="";;
-esac
+  # Cygwin (Windows) needs the library for dynamic linking
+  case $host in
+  *-*-cygwin* | *-*-mingw*) PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
+    DEFS="-DUSE_DL_IMPORT $DEFS" PYINCLUDE="$PYINCLUDE"
+    ;;
+  *)PYTHONDYNAMICLINKING="";;
+  esac
 fi
 
 AC_SUBST(PYINCLUDE)
@@ -732,24 +731,24 @@ AS_HELP_STRING([--with-python3=path], [Set location of Python 3.x executable]),[
 
 # First, check for "--without-python3" or "--with-python3=no".
 if test x"${PY3BIN}" = xno -o x"${with_alllang}" = xno ; then 
-AC_MSG_NOTICE([Disabling Python 3.x support])
+  AC_MSG_NOTICE([Disabling Python 3.x support])
 else
-# First figure out the name of the Python3 executable 
+  # First figure out the name of the Python3 executable 
 
-if test "x$PY3BIN" = xyes; then
-  AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1 python3.2 python3.3 python3.4 python3.5 python3.6])
-else
-  PYTHON3="$PY3BIN"
-fi
+  if test "x$PY3BIN" = xyes; then
+    AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1 python3.2 python3.3 python3.4 python3.5 python3.6])
+  else
+    PYTHON3="$PY3BIN"
+  fi
 
-# Check for Python 3.x development tools (header files, static library and python3-config)
-if test "x$PYTHON3" = x; then
-  AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
-else
-  AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
-fi
+  # Check for Python 3.x development tools (header files, static library and python3-config)
+  if test "x$PYTHON3" = x; then
+    AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
+  else
+    AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
+  fi
 
-if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then
+  if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then
     AC_MSG_CHECKING([for Python 3.x prefix])
     PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null`
     AC_MSG_RESULT($PY3PREFIX)
@@ -787,27 +786,27 @@ if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then
     AC_MSG_CHECKING([for Python 3.x library])
     dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
     for i in $dirs; do
-        if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
-           PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"
-           break
-        fi
+      if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
+        PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"
+        break
+      fi
     done
     if test -z "$PY3LIB"; then
-        AC_MSG_RESULT([Not found])
+      AC_MSG_RESULT([Not found])
     else
-        AC_MSG_RESULT($PY3LIB)
+      AC_MSG_RESULT($PY3LIB)
     fi
 
     PY3LINK="-l$PY3VERSION"
-fi
+  fi
 
-# Cygwin (Windows) needs the library for dynamic linking
-case $host in
-*-*-cygwin* | *-*-mingw*) PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK"
-         DEFS="-DUSE_DL_IMPORT $DEFS" PY3INCLUDE="$PY3INCLUDE"
-         ;;
-*)PYTHON3DYNAMICLINKING="";;
-esac
+  # Cygwin (Windows) needs the library for dynamic linking
+  case $host in
+  *-*-cygwin* | *-*-mingw*) PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK"
+    DEFS="-DUSE_DL_IMPORT $DEFS" PY3INCLUDE="$PY3INCLUDE"
+    ;;
+  *)PYTHON3DYNAMICLINKING="";;
+  esac
 fi
 
 AC_SUBST(PY3INCLUDE)

From 6f8e77d7b05a0e6c4bddbcf1e7fddc242aada236 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 23 May 2012 19:10:44 +0000
Subject: [PATCH 042/538] Better search for python3 based on code from Vadim
 Zeitlin

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13110 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 2524b9cb2..eedc5b110 100644
--- a/configure.in
+++ b/configure.in
@@ -630,7 +630,7 @@ if test x"${PYBIN}" = xno -o x"${with_alllang}" = xno ; then
 else
   # First figure out the name of the Python executable
   if test "x$PYBIN" = xyes; then
-    AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python])
+    AC_CHECK_PROGS(PYTHON, [python python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4])
   else
     PYTHON="$PYBIN"
   fi
@@ -733,20 +733,15 @@ AS_HELP_STRING([--with-python3=path], [Set location of Python 3.x executable]),[
 if test x"${PY3BIN}" = xno -o x"${with_alllang}" = xno ; then 
   AC_MSG_NOTICE([Disabling Python 3.x support])
 else
-  # First figure out the name of the Python3 executable 
-
-  if test "x$PY3BIN" = xyes; then
-    AC_CHECK_PROGS(PYTHON3, [python3 python3.0 python3.1 python3.2 python3.3 python3.4 python3.5 python3.6])
-  else
-    PYTHON3="$PY3BIN"
-  fi
-
-  # Check for Python 3.x development tools (header files, static library and python3-config)
-  if test "x$PYTHON3" = x; then
-    AC_CHECK_PROGS(PY3CONFIG, [python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
-  else
-    AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config python3-config python3.0-config python3.1-config python3.2-config python3.3-config python3.4-config python3.5-config python3.6-config])
-  fi
+  for py_ver in 3 3.6 3.5 3.4 3.3 3.2 3.1 3.0; do
+    AC_CHECK_PROGS(PYTHON3, [python$py_ver])
+    if test -n "$PYTHON3"; then
+      AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config])
+      if test -n "$PY3CONFIG"; then
+        break
+      fi
+    fi
+  done
 
   if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then
     AC_MSG_CHECKING([for Python 3.x prefix])

From 706736a73d5b282d67d4fa53b3197065b6ae3558 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 23 May 2012 20:24:21 +0000
Subject: [PATCH 043/538] Fix some warning messages to correctly show class
 names.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13111 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/lang.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index c90ebeb73..9999fd3fe 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -2623,7 +2623,7 @@ int Language::constructorDeclaration(Node *n) {
 	  Delete(expected_name_resolved);
 	}
 	if (illegal_name) {
-	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", SwigType_namestr(name));
+	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name));
 	  Swig_restore(n);
 	  return SWIG_NOWRAP;
 	}
@@ -2760,7 +2760,7 @@ int Language::destructorDeclaration(Node *n) {
     }
 
     if (illegal_name) {
-      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", SwigType_namestr(name));
+      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name));
       Swig_restore(n);
       Delete(expected_name);
       return SWIG_NOWRAP;

From 8de02343134700ebc055d3c355743504b7c743e8 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 06:29:58 +0000
Subject: [PATCH 044/538] Release notes for swig-2.0.7

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13112 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 RELEASENOTES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASENOTES b/RELEASENOTES
index faa57bf63..a69631a85 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -4,6 +4,11 @@ and CHANGES files.
 
 Release Notes
 =============
+SWIG-2.0.7 summary:
+- Important regression fixes since 2.0.5 for typemaps in general and
+  in Python.
+- Fixes and enhancements for Go, Java, Octave and PHP.
+
 SWIG-2.0.6 summary:
 - Regression fix for Python STL wrappers on some systems.
 

From 76a115ea41d1320e1243003cf119bdacc6c5425e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 18:42:32 +0000
Subject: [PATCH 045/538] Test fix

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13114 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/typemap_template_parm_typedef.i | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/typemap_template_parm_typedef.i b/Examples/test-suite/typemap_template_parm_typedef.i
index 6eab66c9c..95ec98d4a 100644
--- a/Examples/test-suite/typemap_template_parm_typedef.i
+++ b/Examples/test-suite/typemap_template_parm_typedef.i
@@ -15,7 +15,10 @@
     typedef unsigned int uint;
     void test_no_typedef(std::list bada) {}
     void test_typedef(std::vector bada) {}
-    std::deque no_typedef_out() {}
+    std::deque no_typedef_out() {
+      std::deque x;
+      return x;
+    }
   }
 %}
 

From a276c0b45ab4afc113666b7e491a1e5be903e3ff Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Thu, 24 May 2012 21:18:50 +0000
Subject: [PATCH 046/538] [octave] skip part of module_load test for older
 Octaves

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13115 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/octave/module_load/runme.m | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m
index 4942a02de..16b437ee8 100644
--- a/Examples/octave/module_load/runme.m
+++ b/Examples/octave/module_load/runme.m
@@ -89,6 +89,12 @@ testme
 testme
 clear all
 
+# octave 3.0.5 randomly crashes on the remaining tests, so skip them
+api_version = sscanf(octave_config_info("api_version"), "api-v%i");
+if api_version < 37
+  exit
+endif
+
 # access module with no cvar, no global load
 example2 = example2;
 assert(example2.ivar == example2.ifunc());

From 522382c05e3bc90365ee7f5738af67f69b22f5cc Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 22:20:22 +0000
Subject: [PATCH 047/538] test fix

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13116 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/typemap_template_parm_typedef.i | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/test-suite/typemap_template_parm_typedef.i b/Examples/test-suite/typemap_template_parm_typedef.i
index 95ec98d4a..a27b9afea 100644
--- a/Examples/test-suite/typemap_template_parm_typedef.i
+++ b/Examples/test-suite/typemap_template_parm_typedef.i
@@ -39,7 +39,6 @@
 
 // This typemap was not used for no_typedef_out in 2.0.4 and earlier
 %typemap(out) std::deque {
-  $result = 0;
 }
 
 namespace jada {

From 020e1373471e57e341cc70bd536da9c1d07c00b0 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 22:37:57 +0000
Subject: [PATCH 048/538] test fix again

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13117 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/typemap_template_parm_typedef.i | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Examples/test-suite/typemap_template_parm_typedef.i b/Examples/test-suite/typemap_template_parm_typedef.i
index a27b9afea..9718db2cd 100644
--- a/Examples/test-suite/typemap_template_parm_typedef.i
+++ b/Examples/test-suite/typemap_template_parm_typedef.i
@@ -38,8 +38,14 @@
 }
 
 // This typemap was not used for no_typedef_out in 2.0.4 and earlier
+#ifdef SWIGTCL
 %typemap(out) std::deque {
 }
+#else
+%typemap(out) std::deque {
+  $result = 0;
+}
+#endif
 
 namespace jada {
   typedef unsigned int uint;

From 184519b6a6e967c57563e8a8a8a9a09e8214785b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 23:01:28 +0000
Subject: [PATCH 049/538] attempt to fix test again

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13118 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/typemap_template_parm_typedef.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/typemap_template_parm_typedef.i b/Examples/test-suite/typemap_template_parm_typedef.i
index 9718db2cd..3bec7aa49 100644
--- a/Examples/test-suite/typemap_template_parm_typedef.i
+++ b/Examples/test-suite/typemap_template_parm_typedef.i
@@ -38,12 +38,12 @@
 }
 
 // This typemap was not used for no_typedef_out in 2.0.4 and earlier
-#ifdef SWIGTCL
+#if defined(SWIGJAVA) || defined(SWIGCSHARP)
 %typemap(out) std::deque {
+  $result = 0;
 }
 #else
 %typemap(out) std::deque {
-  $result = 0;
 }
 #endif
 

From 49b6c39d98967c5bad997bf1490deab0161b18a5 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 24 May 2012 23:05:07 +0000
Subject: [PATCH 050/538] Lua fix for -external-runtime

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13119 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current        |  3 +++
 Lib/lua/lua.swg        | 24 ------------------------
 Lib/lua/luarun.swg     | 29 +++++++++++++++++++++++++++++
 Source/Modules/lua.cxx | 21 +++++++++++++++------
 4 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index b94133ac6..acbd8b642 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.7 (in progress)
 ===========================
+2012-05-25: wsfulton
+            [Lua] Fixes for -external-runtime to work again.
+
 2012-05-22: szager
 	    [python] Disambiguate SWIG_From_unsigned_SS_int and SWIG_From_unsigned_SS_long.
 
diff --git a/Lib/lua/lua.swg b/Lib/lua/lua.swg
index 1cd7201c2..39ea1fea7 100644
--- a/Lib/lua/lua.swg
+++ b/Lib/lua/lua.swg
@@ -5,30 +5,6 @@
  * This file is parsed by SWIG before reading any other interface file.
  * ----------------------------------------------------------------------------- */
 
-%insert("runtime") %{
-/* Lua flavors */
-#define SWIG_LUA_FLAVOR_LUA 1
-#define SWIG_LUA_FLAVOR_ELUA 2
-#define SWIG_LUA_FLAVOR_ELUAC 3
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-#  define SWIG_LUA_CONSTTAB_INT(B, C) LSTRKEY(B), LNUMVAL(C)
-#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) LSTRKEY(B), LNUMVAL(C)
-#  define SWIG_LUA_CONSTTAB_STRING(B, C) LSTRKEY(B), LSTRVAL(C)
-#  define SWIG_LUA_CONSTTAB_CHAR(B, C) LSTRKEY(B), LNUMVAL(C)
-# else /* SWIG_LUA_FLAVOR_LUA */
-#  define SWIG_LUA_CONSTTAB_INT(B, C) SWIG_LUA_INT, (char *)B, (long)C, 0, 0, 0
-#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) SWIG_LUA_FLOAT, (char *)B, 0, (double)C, 0, 0
-#  define SWIG_LUA_CONSTTAB_STRING(B, C) SWIG_LUA_STRING, (char *)B, 0, 0, (void *)C, 0
-#  define SWIG_LUA_CONSTTAB_CHAR(B, C) SWIG_LUA_CHAR, (char *)B, (long)C, 0, 0, 0
-#endif
-
-#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
-#  define LRO_STRVAL(v) {{.p = (char *) v}, LUA_TSTRING}
-#  define LSTRVAL LRO_STRVAL
-#endif
-%}
-
 /* -----------------------------------------------------------------------------
  *                          includes
  * ----------------------------------------------------------------------------- */
diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index af3e7a3af..9b94e1efa 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -15,6 +15,35 @@ extern "C" {
 #include   /* for malloc */
 #include   /* for a few sanity tests */
 
+/* -----------------------------------------------------------------------------
+ * Lua flavors
+ * ----------------------------------------------------------------------------- */
+
+#define SWIG_LUA_FLAVOR_LUA 1
+#define SWIG_LUA_FLAVOR_ELUA 2
+#define SWIG_LUA_FLAVOR_ELUAC 3
+
+#if !defined(SWIG_LUA_TARGET)
+# error SWIG_LUA_TARGET not defined
+#endif
+
+#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
+#  define SWIG_LUA_CONSTTAB_INT(B, C) LSTRKEY(B), LNUMVAL(C)
+#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) LSTRKEY(B), LNUMVAL(C)
+#  define SWIG_LUA_CONSTTAB_STRING(B, C) LSTRKEY(B), LSTRVAL(C)
+#  define SWIG_LUA_CONSTTAB_CHAR(B, C) LSTRKEY(B), LNUMVAL(C)
+#else /* SWIG_LUA_FLAVOR_LUA */
+#  define SWIG_LUA_CONSTTAB_INT(B, C) SWIG_LUA_INT, (char *)B, (long)C, 0, 0, 0
+#  define SWIG_LUA_CONSTTAB_FLOAT(B, C) SWIG_LUA_FLOAT, (char *)B, 0, (double)C, 0, 0
+#  define SWIG_LUA_CONSTTAB_STRING(B, C) SWIG_LUA_STRING, (char *)B, 0, 0, (void *)C, 0
+#  define SWIG_LUA_CONSTTAB_CHAR(B, C) SWIG_LUA_CHAR, (char *)B, (long)C, 0, 0, 0
+#endif
+
+#if (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUA) || (SWIG_LUA_TARGET == SWIG_LUA_FLAVOR_ELUAC)
+#  define LRO_STRVAL(v) {{.p = (char *) v}, LUA_TSTRING}
+#  define LSTRVAL LRO_STRVAL
+#endif
+
 /* -----------------------------------------------------------------------------
  * compatibility defines
  * ----------------------------------------------------------------------------- */
diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx
index ba121d28c..a6076a230 100644
--- a/Source/Modules/lua.cxx
+++ b/Source/Modules/lua.cxx
@@ -284,12 +284,7 @@ public:
     Printf(f_runtime, "\n");
     Printf(f_runtime, "#define SWIGLUA\n");
 
-    if (elua_ltr)
-      Printf(f_runtime, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUA\n");
-    else if (eluac_ltr)
-      Printf(f_runtime, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUAC\n");
-    else
-      Printf(f_runtime, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA\n");
+    emitLuaFlavor(f_runtime);
 
     if (nomoduleglobal) {
       Printf(f_runtime, "#define SWIG_LUA_NO_MODULE_GLOBAL\n");
@@ -1269,6 +1264,9 @@ public:
   String *runtimeCode() {
     String *s = NewString("");
     const char *filenames[] = { "luarun.swg", 0 } ; // must be 0 terminated
+
+    emitLuaFlavor(s);
+
     String *sfile;
     for (int i = 0; filenames[i] != 0; i++) {
       sfile = Swig_include_sys(filenames[i]);
@@ -1279,6 +1277,7 @@ public:
         Delete(sfile);
       }
     }
+
     return s;
   }
 
@@ -1290,6 +1289,16 @@ public:
    * helpers
    * --------------------------------------------------------------------- */
 
+  void emitLuaFlavor(String *s) {
+    if (elua_ltr)
+      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUA\n");
+    else if (eluac_ltr)
+      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_ELUAC\n");
+    else
+      Printf(s, "#define SWIG_LUA_TARGET SWIG_LUA_FLAVOR_LUA\n");
+  }
+  
+
   /* This is to convert the string of Lua code into a proper string, which can then be
      emitted into the C/C++ code.
      Basically is is a lot of search & replacing of odd sequences

From 12a9671440e9408a07d59a8936e75da096fea5fc Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 06:33:49 +0000
Subject: [PATCH 051/538] std::string typemap modifications so they can be used
 with %apply for other string classes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13120 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current            |  4 ++++
 Lib/allegrocl/std_string.i | 10 +++++-----
 Lib/chicken/std_string.i   |  2 +-
 Lib/csharp/std_string.i    |  4 ++--
 Lib/d/std_string.i         |  4 ++--
 Lib/go/std_string.i        |  4 ++--
 Lib/guile/std_string.i     |  4 ++--
 Lib/java/std_string.i      | 12 ++++++------
 Lib/lua/std_string.i       |  4 ++--
 Lib/mzscheme/std_string.i  |  2 +-
 Lib/ocaml/std_string.i     | 10 +++++-----
 Lib/php/std_string.i       |  6 +++---
 Lib/pike/std_string.i      |  4 ++--
 13 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index acbd8b642..d6de00200 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.7 (in progress)
 ===========================
+2012-05-26: wsfulton
+            std::string typemap modifications so they can be used with %apply for other string
+            classes.
+
 2012-05-25: wsfulton
             [Lua] Fixes for -external-runtime to work again.
 
diff --git a/Lib/allegrocl/std_string.i b/Lib/allegrocl/std_string.i
index 372758dee..cbcd250a9 100644
--- a/Lib/allegrocl/std_string.i
+++ b/Lib/allegrocl/std_string.i
@@ -121,7 +121,7 @@ namespace std {
 //             SWIG_exception(SWIG_TypeError, "string expected");
 //     }
 
-//     %typemap(in) const string & (std::string temp) {
+//     %typemap(in) const string & ($*1_ltype temp) {
 //         if (caml_ptr_check($input)) {
 //             temp.assign((char *)caml_ptr_val($input,0),
 // 			   caml_string_len($input));
@@ -131,7 +131,7 @@ namespace std {
 //         }
 //     }
 
-//     %typemap(in) string & (std::string temp) {
+//     %typemap(in) string & ($*1_ltype temp) {
 //         if (caml_ptr_check($input)) {
 //             temp.assign((char *)caml_ptr_val($input,0),
 // 			   caml_string_len($input));
@@ -141,9 +141,9 @@ namespace std {
 //         }
 //     }
 
-//     %typemap(in) string * (std::string *temp) {
+//     %typemap(in) string * ($*1_ltype *temp) {
 //         if (caml_ptr_check($input)) {
-//             temp = new std::string((char *)caml_ptr_val($input,0),
+//             temp = new $*1_ltype((char *)caml_ptr_val($input,0),
 // 				   caml_string_len($input));
 //             $1 = temp;
 //         } else {
@@ -151,7 +151,7 @@ namespace std {
 //         }
 //     }
 
-//     %typemap(free) string * (std::string *temp) {
+//     %typemap(free) string * ($*1_ltype *temp) {
 // 	delete temp;
 //     }
 
diff --git a/Lib/chicken/std_string.i b/Lib/chicken/std_string.i
index 9907a58bc..fa77c1533 100644
--- a/Lib/chicken/std_string.i
+++ b/Lib/chicken/std_string.i
@@ -44,7 +44,7 @@ namespace std {
       }
     }
 
-    %typemap(in) const string& (std::string temp, char *tempptr) {
+    %typemap(in) const string& ($*1_ltype temp, char *tempptr) {
 
       if ($input == C_SCHEME_FALSE) {
 	temp.resize(0);
diff --git a/Lib/csharp/std_string.i b/Lib/csharp/std_string.i
index 0d804518b..5f8fa44cb 100644
--- a/Lib/csharp/std_string.i
+++ b/Lib/csharp/std_string.i
@@ -69,7 +69,7 @@ class string;
     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return $null;
    }
-   std::string $1_str($input);
+   $*1_ltype $1_str($input);
    $1 = &$1_str; %}
 %typemap(out) const string & %{ $result = SWIG_csharp_string_callback($1->c_str()); %}
 
@@ -85,7 +85,7 @@ class string;
     return $null;
    }
    /* possible thread/reentrant code problem */
-   static std::string $1_str;
+   static $*1_ltype $1_str;
    $1_str = $input;
    $result = &$1_str; %}
 
diff --git a/Lib/d/std_string.i b/Lib/d/std_string.i
index 7a4accf18..8d75d23e4 100644
--- a/Lib/d/std_string.i
+++ b/Lib/d/std_string.i
@@ -36,7 +36,7 @@ class string;
     SWIG_DSetPendingException(SWIG_DIllegalArgumentException, "null string");
     return $null;
    }
-   std::string $1_str($input);
+   $*1_ltype $1_str($input);
    $1 = &$1_str; %}
 
 %typemap(out) string %{ $result = SWIG_d_string_callback($1.c_str()); %}
@@ -63,7 +63,7 @@ class string;
     return $null;
   }
   /* possible thread/reentrant code problem */
-  static std::string $1_str;
+  static $*1_ltype $1_str;
   $1_str = $input;
   $result = &$1_str; %}
 
diff --git a/Lib/go/std_string.i b/Lib/go/std_string.i
index e7c964263..9922fbe13 100644
--- a/Lib/go/std_string.i
+++ b/Lib/go/std_string.i
@@ -35,13 +35,13 @@ class string;
 
 %typemap(in) const string &
 %{
-  std::string $1_str($input.p, $input.n);
+  $*1_ltype $1_str($input.p, $input.n);
   $1 = &$1_str;
 %}
 
 %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
 %{
-  static std::string $1_str;
+  static $*1_ltype $1_str;
   $1_str.assign($input.p, $input.n);
   $result = &$1_str;
 %}
diff --git a/Lib/guile/std_string.i b/Lib/guile/std_string.i
index 65ab6efbf..83e0dd26d 100644
--- a/Lib/guile/std_string.i
+++ b/Lib/guile/std_string.i
@@ -36,7 +36,7 @@ namespace std {
         }
     }
 
-    %typemap(in) const string & (std::string temp, char *tempptr) {
+    %typemap(in) const string & ($*1_ltype temp, char *tempptr) {
         if (gh_string_p($input)) {
             tempptr = SWIG_scm2str($input);
             temp.assign(tempptr);
@@ -50,7 +50,7 @@ namespace std {
     %typemap(in) string * (char *tempptr) {
         if (gh_string_p($input)) {
             tempptr = SWIG_scm2str($input);
-            $1 = new std::string(tempptr);
+            $1 = new $*1_ltype(tempptr);
             if (tempptr) SWIG_free(tempptr);
         } else {
             SWIG_exception(SWIG_TypeError, "string expected");
diff --git a/Lib/java/std_string.i b/Lib/java/std_string.i
index f0d837696..f178e6d43 100644
--- a/Lib/java/std_string.i
+++ b/Lib/java/std_string.i
@@ -28,7 +28,7 @@ class string;
 
 %typemap(in) string 
 %{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
+     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
      return $null;
     } 
     const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
@@ -38,7 +38,7 @@ class string;
 
 %typemap(directorout) string 
 %{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
+     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
      return $null;
    } 
    const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
@@ -73,24 +73,24 @@ class string;
 
 %typemap(in) const string &
 %{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
+     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
      return $null;
    }
    const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
    if (!$1_pstr) return $null;
-   std::string $1_str($1_pstr);
+   $*1_ltype $1_str($1_pstr);
    $1 = &$1_str;
    jenv->ReleaseStringUTFChars($input, $1_pstr); %}
 
 %typemap(directorout,warning=SWIGWARN_TYPEMAP_THREAD_UNSAFE_MSG) const string &
 %{ if(!$input) {
-     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null std::string");
+     SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "null string");
      return $null;
    }
    const char *$1_pstr = (const char *)jenv->GetStringUTFChars($input, 0); 
    if (!$1_pstr) return $null;
    /* possible thread/reentrant code problem */
-   static std::string $1_str;
+   static $*1_ltype $1_str;
    $1_str = $1_pstr;
    $result = &$1_str;
    jenv->ReleaseStringUTFChars($input, $1_pstr); %}
diff --git a/Lib/lua/std_string.i b/Lib/lua/std_string.i
index 64c0957b1..b754eaf1c 100644
--- a/Lib/lua/std_string.i
+++ b/Lib/lua/std_string.i
@@ -51,7 +51,7 @@ Not using: lua_tolstring() as this is only found in Lua 5.1 & not 5.0.2
 %typemap(out) std::string
 %{ lua_pushlstring(L,$1.data(),$1.size()); SWIG_arg++;%}
 
-%typemap(in,checkfn="lua_isstring")	const std::string& (std::string temp)
+%typemap(in,checkfn="lua_isstring")	const std::string& ($*1_ltype temp)
 %{temp.assign(lua_tostring(L,$input),lua_rawlen(L,$input)); $1=&temp;%}
 
 %typemap(out) const std::string&
@@ -84,7 +84,7 @@ typemaps to tell SWIG what to do.
 */
 
 %typemap(in) std::string &INPUT=const std::string &;
-%typemap(in, numinputs=0) std::string &OUTPUT (std::string temp)
+%typemap(in, numinputs=0) std::string &OUTPUT ($*1_ltype temp)
 %{ $1 = &temp; %}
 %typemap(argout) std::string &OUTPUT
 %{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_arg++;%}
diff --git a/Lib/mzscheme/std_string.i b/Lib/mzscheme/std_string.i
index b8b99d9ad..b19e8567a 100644
--- a/Lib/mzscheme/std_string.i
+++ b/Lib/mzscheme/std_string.i
@@ -35,7 +35,7 @@ namespace std {
             SWIG_exception(SWIG_TypeError, "string expected");
     }
 
-    %typemap(in) const string & (std::string temp) {
+    %typemap(in) const string & ($*1_ltype temp) {
         if (SCHEME_STRINGP($input)) {
             temp.assign(SCHEME_STR_VAL($input));
             $1 = &temp;
diff --git a/Lib/ocaml/std_string.i b/Lib/ocaml/std_string.i
index 5b6966dec..bd5be0da2 100644
--- a/Lib/ocaml/std_string.i
+++ b/Lib/ocaml/std_string.i
@@ -36,7 +36,7 @@ class wstring;
     SWIG_exception(SWIG_TypeError, "string expected");
 }
 
-%typemap(in) const string & (std::string temp) {
+%typemap(in) const string & ($*1_ltype temp) {
   /* %typemap(in) const string & */
   if (caml_ptr_check($input)) {
     temp.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
@@ -46,7 +46,7 @@ class wstring;
   }
 }
 
-%typemap(in) string & (std::string temp) {
+%typemap(in) string & ($*1_ltype temp) {
   /* %typemap(in) string & */
   if (caml_ptr_check($input)) {
     temp.assign((char *)caml_ptr_val($input,0), caml_string_len($input));
@@ -56,17 +56,17 @@ class wstring;
   }
 }
 
-%typemap(in) string * (std::string *temp) {
+%typemap(in) string * ($*1_ltype *temp) {
   /* %typemap(in) string * */
   if (caml_ptr_check($input)) {
-    temp = new std::string((char *)caml_ptr_val($input,0), caml_string_len($input));
+    temp = new $*1_ltype((char *)caml_ptr_val($input,0), caml_string_len($input));
     $1 = temp;
   } else {
     SWIG_exception(SWIG_TypeError, "string expected");
   }
 }
 
-%typemap(free) string * (std::string *temp) {
+%typemap(free) string * ($*1_ltype *temp) {
   delete temp;
 }
 
diff --git a/Lib/php/std_string.i b/Lib/php/std_string.i
index ff70bc83c..10d7fdd31 100644
--- a/Lib/php/std_string.i
+++ b/Lib/php/std_string.i
@@ -56,15 +56,15 @@ namespace std {
 
     /* These next two handle a function which takes a non-const reference to
      * a std::string and modifies the string. */
-    %typemap(in) string & (std::string temp) %{
+    %typemap(in) string & ($*1_ltype temp) %{
         convert_to_string_ex($input);
         temp.assign(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
         $1 = &temp;
     %}
 
-    %typemap(directorout) string & (std::string *temp) %{
+    %typemap(directorout) string & ($*1_ltype *temp) %{
         convert_to_string_ex($input);
-        temp = new std::string(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
+        temp = new $*1_ltype(Z_STRVAL_PP($input), Z_STRLEN_PP($input));
         swig_acquire_ownership(temp);
         $result = temp;
     %}
diff --git a/Lib/pike/std_string.i b/Lib/pike/std_string.i
index c6fc48c8d..b32b3c112 100644
--- a/Lib/pike/std_string.i
+++ b/Lib/pike/std_string.i
@@ -25,7 +25,7 @@ namespace std {
       $1.assign(STR0($input.u.string));
     }
 
-    %typemap(in, pikedesc="tStr") const string & (std::string temp) {
+    %typemap(in, pikedesc="tStr") const string & ($*1_ltype temp) {
       if ($input.type != T_STRING)
         Pike_error("Bad argument: Expected a string.\n");
       temp.assign(STR0($input.u.string));
@@ -47,7 +47,7 @@ namespace std {
         throw Swig::DirectorTypeMismatchException("string expected");
     }
     
-    %typemap(directorout) const string & (std::string temp) {
+    %typemap(directorout) const string & ($*1_ltype temp) {
       if ($input.type == T_STRING) {
         temp.assign(STR0($input.u.string));
         $result = &temp;

From e62dc28f16fb239dec341dcb34e2e199f7e4b816 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 07:07:00 +0000
Subject: [PATCH 052/538] Clean up Lua std::string typemaps

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13121 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/lua/std_string.i | 103 ++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 64 deletions(-)

diff --git a/Lib/lua/std_string.i b/Lib/lua/std_string.i
index b754eaf1c..64f17dd88 100644
--- a/Lib/lua/std_string.i
+++ b/Lib/lua/std_string.i
@@ -5,8 +5,9 @@
  * ----------------------------------------------------------------------------- */
 
 %{
-	#include 
+#include 
 %}
+
 /*
 Only std::string and const std::string& are typemaped
 they are converted to the Lua strings automatically
@@ -25,13 +26,14 @@ can be used as
 s="hello world"
 s2=test_value(s)
 assert(s==s2)
-
 */
 
-%naturalvar std::string;
+namespace std {
+
+%naturalvar string;
 
 /*
-Bug report #1526022 by neomantra
+Bug report #1526022:
 Lua strings and std::string can contain embeded zero's
 Therefore a standard out typemap should not be:
   lua_pushstring(L,$1.c_str());
@@ -46,26 +48,27 @@ becomes
 Not using: lua_tolstring() as this is only found in Lua 5.1 & not 5.0.2
 */
 
-%typemap(in,checkfn="lua_isstring") std::string
+%typemap(in,checkfn="lua_isstring") string
 %{$1.assign(lua_tostring(L,$input),lua_rawlen(L,$input));%}
-%typemap(out) std::string
+
+%typemap(out) string
 %{ lua_pushlstring(L,$1.data(),$1.size()); SWIG_arg++;%}
 
-%typemap(in,checkfn="lua_isstring")	const std::string& ($*1_ltype temp)
+%typemap(in,checkfn="lua_isstring") const string& ($*1_ltype temp)
 %{temp.assign(lua_tostring(L,$input),lua_rawlen(L,$input)); $1=&temp;%}
 
-%typemap(out) const std::string&
+%typemap(out) const string&
 %{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_arg++;%}
 
 // for throwing of any kind of string, string ref's and string pointers
 // we convert all to lua strings
-%typemap(throws) std::string,std::string&,const std::string&
+%typemap(throws) string, string&, const string&
 %{ lua_pushlstring(L,$1.data(),$1.size()); SWIG_fail;%}
-%typemap(throws) std::string*,const std::string*
+
+%typemap(throws) string*, const string*
 %{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_fail;%}
 
-// and the typechecks
-%typecheck(SWIG_TYPECHECK_STRING) std::string,const std::string& {
+%typecheck(SWIG_TYPECHECK_STRING) string, const string& {
   $1 = lua_isstring(L,$input);
 }
 
@@ -77,46 +80,19 @@ void fn(std::string& str);
 Is this an in/out/inout value?
 
 Therefore you need the usual
-%apply (std::string& INOUT) {(std::string& str)};
+%apply (std::string& INOUT) {std::string& str};
 or
 %apply std::string& INOUT {std::string& str};
 typemaps to tell SWIG what to do.
 */
 
-%typemap(in) std::string &INPUT=const std::string &;
-%typemap(in, numinputs=0) std::string &OUTPUT ($*1_ltype temp)
+%typemap(in) string &INPUT=const string &;
+%typemap(in, numinputs=0) string &OUTPUT ($*1_ltype temp)
 %{ $1 = &temp; %}
-%typemap(argout) std::string &OUTPUT
+%typemap(argout) string &OUTPUT
 %{ lua_pushlstring(L,$1->data(),$1->size()); SWIG_arg++;%}
-%typemap(in) std::string &INOUT =const std::string &;
-%typemap(argout) std::string &INOUT = std::string &OUTPUT;
-
-/*
-For const std::string* and std::string* is not clear
-is this a pointer or an array?
-
-Therefore just leaving it as is
-(there is some rough code below which could be used if needed
-
-// SWIG wraps const ref's as pointer
-// typemaps to deal with this and const ptrs
-%typemap(in,checkfn="lua_isstring")
-	const std::string& INPUT(std::string temp),
-	const std::string* INPUT(std::string temp)
-%{temp=(char*)lua_tostring(L, $input); $1=&temp;%}
-%typemap(out) const std::string&, const std::string*
-%{  lua_pushstring(L,$1->c_str()); SWIG_arg++;%}
-
-// the non-const pointer version
-%typemap(in) std::string *INPUT=const std::string *INPUT;
-%typemap(in, numinputs=0) std::string *OUTPUT (std::string temp)
-%{ $1 = &temp; %}
-%typemap(argout) std::string *OUTPUT
-%{  lua_pushstring(L,$1->c_str()); SWIG_arg++;%}
-%typemap(in) std::string *INOUT = std::string *INPUT;
-%typemap(argout) std::string *INOUT = std::string *OUTPUT;
-
-*/
+%typemap(in) string &INOUT =const string &;
+%typemap(argout) string &INOUT = string &OUTPUT;
 
 /*
 A really cut down version of the string class
@@ -128,25 +104,24 @@ and little else
 note: no fn's taking the const string&
 as this is overloaded by the const char* version
 */
-namespace std {
 
-    class string {
-      public:
-        string();
-        string(const char*);
-        //string(const string&);
-        unsigned int size() const;
-        unsigned int length() const;
-        bool empty() const;
-        // no support for operator[]
-        const char* c_str()const;
-        const char* data()const;
-        // assign does not return a copy of this object
-        // (no point in a scripting language)
-        void assign(const char*);
-        //void assign(const string&);
-        // no support for all the other features
-        // its probably better to do it in lua
-    };
+  class string {
+    public:
+      string();
+      string(const char*);
+      //string(const string&);
+      unsigned int size() const;
+      unsigned int length() const;
+      bool empty() const;
+      // no support for operator[]
+      const char* c_str()const;
+      const char* data()const;
+      // assign does not return a copy of this object
+      // (no point in a scripting language)
+      void assign(const char*);
+      //void assign(const string&);
+      // no support for all the other features
+      // its probably better to do it in lua
+  };
 }
 

From 1b4e3280461115c2b59b8313969b9647f8d7874b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 07:09:54 +0000
Subject: [PATCH 053/538] swig-2.0.7 release date

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13122 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE                 | 2 +-
 CHANGES.current          | 2 +-
 Doc/Manual/Sections.html | 2 +-
 README                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 46c570cb1..a58858306 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 2.0.7 (in progress) ***
+*** ANNOUNCE: SWIG 2.0.7 (26 May 2012) ***
 
 http://www.swig.org
 
diff --git a/CHANGES.current b/CHANGES.current
index d6de00200..84afba381 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,7 +2,7 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.7 (in progress)
+Version 2.0.7 (26 May 2012)
 ===========================
 2012-05-26: wsfulton
             std::string typemap modifications so they can be used with %apply for other string
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 61c94544e..b891a903e 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
SWIG-2.0 Documentation

 
-Last update : SWIG-2.0.7 (in progress)
+Last update : SWIG-2.0.7 (26 May 2012)
 
 
Sections

 
diff --git a/README b/README
index a683745ae..0ec8bdd11 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.7 (in progress)
+Version: 2.0.7 (26 May 2012)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua,

From 3a55dd3df1021f1230868cfee5aee95627010985 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 08:05:16 +0000
Subject: [PATCH 054/538] Bump version to 2.0.8

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13125 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE                 |  8 ++--
 CHANGES                  | 91 ++++++++++++++++++++++++++++++++++++++++
 CHANGES.current          | 91 +---------------------------------------
 Doc/Manual/Sections.html |  2 +-
 README                   |  2 +-
 configure.in             |  2 +-
 6 files changed, 99 insertions(+), 97 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index a58858306..32b6c4fe5 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 2.0.7 (26 May 2012) ***
+*** ANNOUNCE: SWIG 2.0.8 (in progress) ***
 
 http://www.swig.org
 
-We're pleased to announce SWIG-2.0.7, the latest SWIG release.
+We're pleased to announce SWIG-2.0.8, the latest SWIG release.
 
 What is SWIG?
 =============
@@ -21,11 +21,11 @@ Availability
 ============
 The release is available for download on Sourceforge at
 
-     http://prdownloads.sourceforge.net/swig/swig-2.0.7.tar.gz
+     http://prdownloads.sourceforge.net/swig/swig-2.0.8.tar.gz
 
 A Windows version is also available at
 
-     http://prdownloads.sourceforge.net/swig/swigwin-2.0.7.zip
+     http://prdownloads.sourceforge.net/swig/swigwin-2.0.8.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at http://www.swig.org/mail.html.
diff --git a/CHANGES b/CHANGES
index 625ed3d24..7afa119ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,97 @@ SWIG (Simplified Wrapper and Interface Generator)
 See the CHANGES.current file for changes in the current version.
 See the RELEASENOTES file for a summary of changes in each release.
 
+Version 2.0.7 (26 May 2012)
+===========================
+2012-05-26: wsfulton
+            std::string typemap modifications so they can be used with %apply for other string
+            classes.
+
+2012-05-25: wsfulton
+            [Lua] Fixes for -external-runtime to work again.
+
+2012-05-22: szager
+	    [python] Disambiguate SWIG_From_unsigned_SS_int and SWIG_From_unsigned_SS_long.
+
+2012-05-18: olly
+	    [PHP] Fix getters for template members. (SF#3428833, SF#3528035)
+
+2012-05-14: wsfulton
+            Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
+            and mapped_type.
+
+2012-05-14: kwwette (signed off by xavier98)
+            [Octave] Prevent Octave from seg-faulting at exit when SWIG
+            modules are loaded, due to bugs in Octave's cleanup code:
+            * Wrapping functions now declared with Octave DEFUN_DLD macro,
+              and loaded through Octave's dynamic module loader
+            * Global variables of swigref type are now assigned a new()
+              copy of the swigref class, to prevent double-free errors
+            * SWIG module at-exit cleanup function now created in Octave
+              through eval(), so not dependent on loaded .oct library
+            * For Octave versions 3.1.* to 3.3.*, register C-level at-exit
+              function which terminates Octave immediately (with correct
+              status code) without performing memory cleanup. This function
+              can be controlled with macros in Lib/octave/octruntime.swg
+
+            [Octave] New syntax for determing whether SWIG module should be
+            loaded globally or non-globally. To load module "example" globally,
+            type the module name
+            $ example;
+            as before; to load module non-globally, assign it to a variable:
+            $ example = example;
+            or
+            $ ex = example;
+            for a shorter (local) module name. -global/-noglobal command-line
+            options and module command line are deprecated. Added usage info
+            to module, so typing
+            $ help example
+            or incorrect usage should display proper usage, with examples.
+
+            *** POTENTIAL INCOMPATIBILITY  ***
+
+2012-05-12: olly
+	    [PHP] Fix memory leak in code generated for a callback.  Patch from
+	    SF bug #3510806.
+
+2012-05-12: olly
+	    [PHP] Avoid using zend_error_noreturn() as it doesn't work with all
+	    builds of PHP (SF bug #3166423).  Instead we now wrap it in a
+	    SWIG_FAIL() function which we annotate as "noreturn" for GCC to
+	    avoids warnings.  This also reduces the size of the compiled
+	    wrapper (e.g. the stripped size is reduced by 6% for Xapian's PHP
+	    bindings).
+
+2012-05-11: wsfulton
+            [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps.
+
+2012-05-11: wsfulton
+            [Java] SF patch #3522674 Fix possible uninitialised memory access in char **STRING_OUT
+            typemap.
+
+2012-05-11: wsfulton
+            [Java] SF patch #3522611 Fix uninitialised size regression in char **STRING_ARRAY
+            introduced in swig-2.0.6.
+
+2012-05-11: wsfulton
+            SF bug #3525050 - Fix regression introduced in swig-2.0.5 whereby defining one typemap
+            method such as an 'out' typemap may hide another typemap method such as an 'in' typemap -
+            only occurs when the type is a template type where the template parameters are the same
+            via a typedef.
+
+2012-05-10: olly
+	    [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously
+	    these used the wrong name for renamed constants.  Add
+	    autodoc_runme.php to the testsuite as a regression test for this.
+
+2012-05-02: ianlancetaylor
+	    [Go] Remove compatibility support for gccgo 4.6.  Using
+	    SWIG with gccgo will now require gccgo 4.7.  Using SWIG
+	    with the more commonly used gc compiler is unaffected.
+
+2012-05-01: wsfulton
+            Fix generated code for C forward enum declarations in some languages.
+
 Version 2.0.6 (30 April 2012)
 =============================
 
diff --git a/CHANGES.current b/CHANGES.current
index 84afba381..34b13439c 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,94 +2,5 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.7 (26 May 2012)
+Version 2.0.8 (in progress)
 ===========================
-2012-05-26: wsfulton
-            std::string typemap modifications so they can be used with %apply for other string
-            classes.
-
-2012-05-25: wsfulton
-            [Lua] Fixes for -external-runtime to work again.
-
-2012-05-22: szager
-	    [python] Disambiguate SWIG_From_unsigned_SS_int and SWIG_From_unsigned_SS_long.
-
-2012-05-18: olly
-	    [PHP] Fix getters for template members. (SF#3428833, SF#3528035)
-
-2012-05-14: wsfulton
-            Fix some language's std::map wrappers to recognise difference_type, size_type, key_type
-            and mapped_type.
-
-2012-05-14: kwwette (signed off by xavier98)
-            [Octave] Prevent Octave from seg-faulting at exit when SWIG
-            modules are loaded, due to bugs in Octave's cleanup code:
-            * Wrapping functions now declared with Octave DEFUN_DLD macro,
-              and loaded through Octave's dynamic module loader
-            * Global variables of swigref type are now assigned a new()
-              copy of the swigref class, to prevent double-free errors
-            * SWIG module at-exit cleanup function now created in Octave
-              through eval(), so not dependent on loaded .oct library
-            * For Octave versions 3.1.* to 3.3.*, register C-level at-exit
-              function which terminates Octave immediately (with correct
-              status code) without performing memory cleanup. This function
-              can be controlled with macros in Lib/octave/octruntime.swg
-
-            [Octave] New syntax for determing whether SWIG module should be
-            loaded globally or non-globally. To load module "example" globally,
-            type the module name
-            $ example;
-            as before; to load module non-globally, assign it to a variable:
-            $ example = example;
-            or
-            $ ex = example;
-            for a shorter (local) module name. -global/-noglobal command-line
-            options and module command line are deprecated. Added usage info
-            to module, so typing
-            $ help example
-            or incorrect usage should display proper usage, with examples.
-
-            *** POTENTIAL INCOMPATIBILITY  ***
-
-2012-05-12: olly
-	    [PHP] Fix memory leak in code generated for a callback.  Patch from
-	    SF bug #3510806.
-
-2012-05-12: olly
-	    [PHP] Avoid using zend_error_noreturn() as it doesn't work with all
-	    builds of PHP (SF bug #3166423).  Instead we now wrap it in a
-	    SWIG_FAIL() function which we annotate as "noreturn" for GCC to
-	    avoids warnings.  This also reduces the size of the compiled
-	    wrapper (e.g. the stripped size is reduced by 6% for Xapian's PHP
-	    bindings).
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522855 Fix unintended uninitialised memory access in OUTPUT typemaps.
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522674 Fix possible uninitialised memory access in char **STRING_OUT
-            typemap.
-
-2012-05-11: wsfulton
-            [Java] SF patch #3522611 Fix uninitialised size regression in char **STRING_ARRAY
-            introduced in swig-2.0.6.
-
-2012-05-11: wsfulton
-            SF bug #3525050 - Fix regression introduced in swig-2.0.5 whereby defining one typemap
-            method such as an 'out' typemap may hide another typemap method such as an 'in' typemap -
-            only occurs when the type is a template type where the template parameters are the same
-            via a typedef.
-
-2012-05-10: olly
-	    [PHP] Fix the constant typemaps for SWIGTYPE, etc - previously
-	    these used the wrong name for renamed constants.  Add
-	    autodoc_runme.php to the testsuite as a regression test for this.
-
-2012-05-02: ianlancetaylor
-	    [Go] Remove compatibility support for gccgo 4.6.  Using
-	    SWIG with gccgo will now require gccgo 4.7.  Using SWIG
-	    with the more commonly used gc compiler is unaffected.
-
-2012-05-01: wsfulton
-            Fix generated code for C forward enum declarations in some languages.
-
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index b891a903e..0e78de84a 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
SWIG-2.0 Documentation

 
-Last update : SWIG-2.0.7 (26 May 2012)
+Last update : SWIG-2.0.8 (in progress)
 
 
Sections

 
diff --git a/README b/README
index 0ec8bdd11..154efc013 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.7 (26 May 2012)
+Version: 2.0.8 (in progress)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua,
diff --git a/configure.in b/configure.in
index eedc5b110..69685e0ed 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl The macros which aren't shipped with the autotools are stored in the
 dnl Tools/config directory in .m4 files.
 
-AC_INIT([swig],[2.0.7],[http://www.swig.org])
+AC_INIT([swig],[2.0.8],[http://www.swig.org])
 
 dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
 dnl     definition below can be removed

From 290c43b9e5c3d5438831200d7b4a9fbf26de893f Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 08:14:37 +0000
Subject: [PATCH 055/538] Update list of languages

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13126 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 32b6c4fe5..4fa6694f4 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -9,13 +9,13 @@ What is SWIG?
 
 SWIG is a software development tool that reads C/C++ header files and
 generates the wrapper code needed to make C and C++ code accessible
-from other languages including Perl, Python, Tcl, Ruby, PHP, Java,
-Scheme (Guile, MzScheme, CHICKEN), D, Ocaml, Lua, Pike, C#, Modula-3,
-Octave, R, Common Lisp (CLISP, Allegro CL, CFFI, UFFI). SWIG can also
-export its parse tree in the form of XML and Lisp s-expressions.  Major
-applications of SWIG include generation of scripting language extension
-modules, rapid prototyping, testing, and user interface development for
-large C/C++ systems.
+from other programming languages including Perl, Python, Tcl, Ruby,
+PHP, C#, Go, Java, Lua, Scheme (Guile, MzScheme, CHICKEN), D, Ocaml,
+Pike, Modula-3, Octave, R, Common Lisp (CLISP, Allegro CL, CFFI, UFFI).
+SWIG can also export its parse tree in the form of XML and Lisp
+s-expressions.  Major applications of SWIG include generation of
+scripting language extension modules, rapid prototyping, testing,
+and user interface development for large C/C++ systems.
 
 Availability
 ============

From eb5837b69775e169f69ddbc2d18810a119cdf88f Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 26 May 2012 08:20:20 +0000
Subject: [PATCH 056/538] cosmetic wording in release script

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13127 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Tools/mkrelease.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py
index af97a189f..9ca96bc6f 100755
--- a/Tools/mkrelease.py
+++ b/Tools/mkrelease.py
@@ -48,4 +48,4 @@ os.system("svn copy -m \"rel-" + version + "\" https://swig.svn.sourceforge.net/
 
 print "Finished"
 
-print "Now log in to SourceForge and set the operating system and link the release notes to each of the tarball and zip file in the File Manager."
+print "Now log in to SourceForge and set the operating systems applicable to the newly uploaded tarball and zip file."

From 55bda8f9f24262f323022584ae280a05caf5a337 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 28 May 2012 06:20:45 +0000
Subject: [PATCH 057/538] Fix seg fault attempting to warn about illegal
 destructors - introduced in rev 13111

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13128 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                         |  3 +++
 Examples/test-suite/errors/expected.log | 26 ++++++++++++-------------
 Source/Modules/lang.cxx                 |  4 ++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 34b13439c..d71372167 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,3 +4,6 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.8 (in progress)
 ===========================
+2012-05-28: wsfulton
+            Fix seg fault when attempting to warn about an illegal destructor - #3530055 and #3530118.
+
diff --git a/Examples/test-suite/errors/expected.log b/Examples/test-suite/errors/expected.log
index b7883c403..bcaf4efd8 100644
--- a/Examples/test-suite/errors/expected.log
+++ b/Examples/test-suite/errors/expected.log
@@ -227,17 +227,17 @@ cpp_extend_destructors.i:87: Warning 302: Identifier '~JStruct' redefined (ignor
 cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'.
 cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored),
 cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'.
-cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored.
-cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored.
-cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored.
-cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored.
-cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored.
-cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored.
-cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored.
-cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored.
-cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored.
-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored.
-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored.
+cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored.
+cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored.
+cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored.
+cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored.
+cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored.
+cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored.
+cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored.
+cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored.
+cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored.
+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored.
+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored.
 
 :::::::::::::::::::::::::::::::: cpp_extend_redefine.i :::::::::::::::::::::::::::::::::::
 cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored),
@@ -312,8 +312,8 @@ cpp_nested.i:12: Warning 325: Nested class not currently supported (Grok ignored
 cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored).
 
 :::::::::::::::::::::::::::::::: cpp_no_return_type.i :::::::::::::::::::::::::::::::::::
-cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored.
-cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored.
+cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored.
+cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored.
 
 :::::::::::::::::::::::::::::::: cpp_nobase.i :::::::::::::::::::::::::::::::::::
 cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored.
diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 9999fd3fe..3c7b1f5a0 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -2623,7 +2623,7 @@ int Language::constructorDeclaration(Node *n) {
 	  Delete(expected_name_resolved);
 	}
 	if (illegal_name) {
-	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name));
+	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n));
 	  Swig_restore(n);
 	  return SWIG_NOWRAP;
 	}
@@ -2760,7 +2760,7 @@ int Language::destructorDeclaration(Node *n) {
     }
 
     if (illegal_name) {
-      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name));
+      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n));
       Swig_restore(n);
       Delete(expected_name);
       return SWIG_NOWRAP;

From 9a758998c98e2a69619dccf0f4a4a8123139bfab Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 28 May 2012 06:27:35 +0000
Subject: [PATCH 058/538] Add in another SF bug reference

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13129 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index d71372167..96f1d881d 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,5 +5,5 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 2012-05-28: wsfulton
-            Fix seg fault when attempting to warn about an illegal destructor - #3530055 and #3530118.
+            Fix seg fault when attempting to warn about an illegal destructor - #3530055, 3530078 and #3530118.
 

From 5b2f38101f83b01096ae1947fb499eac21dc8cca Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Mon, 28 May 2012 18:32:24 +0000
Subject: [PATCH 059/538] Fix comment typos in Lua typemaps

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13132 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/lua/_std_common.i   |  6 +++---
 Lib/lua/carrays.i       |  2 +-
 Lib/lua/lua.swg         |  6 +++---
 Lib/lua/lua_fnptr.i     | 10 +++++-----
 Lib/lua/luarun.swg      | 12 ++++++------
 Lib/lua/luatypemaps.swg | 16 ++++++++--------
 Lib/lua/std_except.i    |  4 ++--
 Lib/lua/std_pair.i      |  2 +-
 Lib/lua/std_string.i    |  8 ++++----
 Lib/lua/std_vector.i    |  2 +-
 Lib/lua/typemaps.i      | 16 ++++++++--------
 11 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Lib/lua/_std_common.i b/Lib/lua/_std_common.i
index e552d0c8f..567e68b7b 100644
--- a/Lib/lua/_std_common.i
+++ b/Lib/lua/_std_common.i
@@ -4,7 +4,7 @@
  * std::helpers for LUA
  * ----------------------------------------------------------------------------- */
 
-%include  // the general exepctions
+%include  // the general exceptions
 
 /*
 The basic idea here, is instead of trying to feed SWIG all the
@@ -16,9 +16,9 @@ so the class declarations become just a set of %defines
 */
 
 /* #define for basic container features
-note: I allow front(), back() & pop_back() to throw execptions
+note: I allow front(), back() & pop_back() to throw exceptions
 upon empty containers, rather than coredump
-(as we have'nt defined the methods, we can use %extend to add with
+(as we haven't defined the methods, we can use %extend to add with
 new features)
 
 */
diff --git a/Lib/lua/carrays.i b/Lib/lua/carrays.i
index 9a210d243..1bc45d81f 100644
--- a/Lib/lua/carrays.i
+++ b/Lib/lua/carrays.i
@@ -1,5 +1,5 @@
 /* Small change to the standard carrays.i
-renaming the field to __getitem__ & __setitem__ 
+renaming the field to __getitem & __setitem
 for operator[] access
 */
 %rename(__getitem) *::getitem; // the v=X[i] (get operator)
diff --git a/Lib/lua/lua.swg b/Lib/lua/lua.swg
index 39ea1fea7..d3b335129 100644
--- a/Lib/lua/lua.swg
+++ b/Lib/lua/lua.swg
@@ -142,8 +142,8 @@
 /* ------------------------------------------------------------
  *                              Exceptions
  * ------------------------------------------------------------ */
-/* Confession: I dont really like C++ exceptions
-The python/lua ones are great, but C++ ones I dont like
+/* Confession: I don't really like C++ exceptions
+The python/lua ones are great, but C++ ones I don't like
 (mainly because I cannot get the stack trace out of it)
 Therefore I have not bothered to try doing much in this
 
@@ -191,7 +191,7 @@ There are a few options:
 - return a copy of it: but not all objects are copyable
 	(see exception_partial_info in the test suite for a case where you cannot do this)
 - convert to a string & throw that
-	its not so useful, but it works (this is more lua like).
+	it's not so useful, but it works (this is more lua like).
 The third option (though not nice) is used
 For a more useful solution: see std_except for more details
 */
diff --git a/Lib/lua/lua_fnptr.i b/Lib/lua/lua_fnptr.i
index 7e9facdf3..4e2c8dc6a 100644
--- a/Lib/lua/lua_fnptr.i
+++ b/Lib/lua/lua_fnptr.i
@@ -8,7 +8,7 @@
  *                          Basic function pointer support
  * ----------------------------------------------------------------------------- */
 /*
-The structure: SWIGLUA_FN provides a simple (local only) wrappering for a function.
+The structure: SWIGLUA_FN provides a simple (local only) wrapping for a function.
 
 For example if you wanted to have a C/C++ function take a lua function as a parameter.
 You could declare it as:
@@ -29,7 +29,7 @@ just push the parameters, call the function and return the result.
     return luaL_checknumber(fn.L,-1);
   }
 
-SWIG will automatically performs the wrappering of the arguments in and out.
+SWIG will automatically performs the wrapping of the arguments in and out.
 
 However: if you wish to store the function between calls, look to the SWIGLUA_REF below.
 
@@ -64,8 +64,8 @@ Then call it later, You could declare it as:
 note: it should be passed by value, not byref or as a pointer.
 
 The SWIGLUA_REF holds a pointer to the lua_State, and an integer reference to the object.
-Because it holds a permenet ref to an object, the SWIGLUA_REF must be handled with a bit more care.
-It should be initalised to {0,0}. The function swiglua_ref_set() should be used to set it.
+Because it holds a permanent ref to an object, the SWIGLUA_REF must be handled with a bit more care.
+It should be initialised to {0,0}. The function swiglua_ref_set() should be used to set it.
 swiglua_ref_clear() should be used to clear it when not in use, and swiglua_ref_get() to get the
 data back.
 
@@ -82,7 +82,7 @@ if you need that you must add it yourself.
     return luaL_checknumber(fn.L,-1);
   }
 
-SWIG will automatically performs the wrappering of the arguments in and out.
+SWIG will automatically performs the wrapping of the arguments in and out.
 
 However: if you wish to store the function between calls, look to the SWIGLUA_REF below.
 
diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index 9b94e1efa..e4f39e07f 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -121,7 +121,7 @@ typedef struct swig_lua_class {
   const char **base_names;
 } swig_lua_class;
 
-/* this is the struct for wrappering all pointers in SwigLua
+/* this is the struct for wrapping all pointers in SwigLua
 */
 typedef struct {
   swig_type_info   *type;
@@ -129,7 +129,7 @@ typedef struct {
   void        *ptr;
 } swig_lua_userdata;
 
-/* this is the struct for wrapping arbitary packed binary data
+/* this is the struct for wrapping arbitrary packed binary data
 (currently it is only used for member function pointers)
 the data ordering is similar to swig_lua_userdata, but it is currently not possible
 to tell the two structures apart within SWIG, other than by looking at the type
@@ -213,7 +213,7 @@ SWIG_Lua_SetModule(lua_State* L, swig_module_info *module) {
  * ----------------------------------------------------------------------------- */
 
 /* this function is called when trying to set an immutable.
-default value is to print an error.
+default action is to print an error.
 This can removed with a compile flag SWIGLUA_IGNORE_SET_IMMUTABLE */
 SWIGINTERN int SWIG_Lua_set_immutable(lua_State* L)
 {
@@ -634,7 +634,7 @@ SWIGINTERN void SWIG_Lua_init_base_class(lua_State* L,swig_lua_class* clss)
       swig_type_info *info = SWIG_TypeQueryModule(module,module,clss->base_names[i]);
       if (info) clss->bases[i] = (swig_lua_class *) info->clientdata;
     }
-  }	
+  }
 }
 
 /* performs the entire class registration process */
@@ -882,8 +882,8 @@ SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]) {
 #ifndef SWIG_DOSTRING_FAIL /* Allows redefining of error function */
 #define SWIG_DOSTRING_FAIL(S) fprintf(stderr,"%s\n",S)
 #endif
-/* Executes a C string in Lua a really simple way of calling lua from C
-Unfortunately lua keeps changing its API's, so we need a conditional compile
+/* Executes a C string in Lua which is a really simple way of calling lua from C
+Unfortunately lua keeps changing its APIs, so we need a conditional compile
 In lua 5.0.X its lua_dostring()
 In lua 5.1.X its luaL_dostring()
 */
diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg
index f3ea6f14c..f6791a224 100644
--- a/Lib/lua/luatypemaps.swg
+++ b/Lib/lua/luatypemaps.swg
@@ -13,7 +13,7 @@
    the fn call must be of the form
      int checkfn(lua_State *L, int index);
    and return 1/0 depending upon if this is the correct type
-   For the typemap(out), an additional SWIG_arg parmeter must be incremented
+   For the typemap(out), an additional SWIG_arg parameter must be incremented
    to reflect the number of values returned (normally SWIG_arg++; will do)
 */
 // numbers
@@ -33,7 +33,7 @@ $1 = ($type)lua_tonumber(L, $input);%}
              float,double
 %{  lua_pushnumber(L, (lua_Number) $1); SWIG_arg++;%}
 
-// we must also provide typemaps for privitives by const reference:
+// we must also provide typemaps for primitives by const reference:
 // given a function:
 //	int intbyref(const int& i);
 // SWIG assumes that this code will need a pointer to int to be passed in
@@ -132,7 +132,7 @@ SWIGINTERN int SWIG_lua_isnilstring(lua_State *L, int idx) {
 // it should be converted to a SWIG NULL.
 // This will only be allowed for pointers & arrays, not refs or by value
 // the checkfn lua_isuserdata will only work for userdata
-// the checkfn SWIG_isptrtype will work for both userdata and nil's
+// the checkfn SWIG_isptrtype will work for both userdata and nil
 %typemap(in,checkfn="SWIG_isptrtype") SWIGTYPE*,SWIGTYPE[]
 %{
   if (!SWIG_IsOK(SWIG_ConvertPtr(L,$input,(void**)&$1,$descriptor,$disown))){
@@ -219,9 +219,9 @@ $1=($1_ltype)&temp;%}
 
 // member function pointer
 // a member fn ptr is not 4 bytes like a normal pointer, but 8 bytes (at least on mingw)
-// so the standard wrappering cannot be done
+// so the standard wrapping cannot be done
 // nor can you cast a member function pointer to a void* (obviously)
-// therefore a special wrappering functions SWIG_ConvertMember() & SWIG_NewMemberObj() were written
+// therefore a special wrapping functions SWIG_ConvertMember() & SWIG_NewMemberObj() were written
 #ifdef __cplusplus
 %typemap(in,checkfn="lua_isuserdata") SWIGTYPE (CLASS::*)
 %{
@@ -241,7 +241,7 @@ $1=($1_ltype)&temp;%}
 
 /* void* is a special case
 A function void fn(void*) should take any kind of pointer as a parameter (just like C/C++ does)
-but if its an output, then it should be wrappered like any other SWIG object (using default typemap)
+but if its an output, then it should be wrapped like any other SWIG object (using default typemap)
 */
 %typemap(in,checkfn="SWIG_isptrtype") void*
 %{$1=($1_ltype)SWIG_MustGetPtr(L,$input,0,0,$argnum,"$symname");%}
@@ -269,7 +269,7 @@ void fn(int a, float b, lua_State* s) is wrappable as
  * ----------------------------------------------------------------------------- */
 /* These are needed for the overloaded functions
 These define the detection routines which will spot what
-parmeters match which function
+parameters match which function
 */
 
 // unfortunately lua only considers one type of number
@@ -341,7 +341,7 @@ parmeters match which function
   }
 }
 
-// Also needed for object ptrs by const ref
+// Also needed for object pointers by const ref
 // eg const A* ref_pointer(A* const& a);
 // found in mixed_types.i
 %typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE *const&
diff --git a/Lib/lua/std_except.i b/Lib/lua/std_except.i
index 9c736b9ef..160828723 100644
--- a/Lib/lua/std_except.i
+++ b/Lib/lua/std_except.i
@@ -24,8 +24,8 @@ namespace std
   }; 
 }
 
-// normally object which are thrown are returned to interpreter as errors
-// (which potentally may have problems if they are not copied)
+// normally objects which are thrown are returned to the interpreter as errors
+// (which potentially may have problems if they are not copied)
 // therefore all classes based upon std::exception are converted to their strings & returned as errors
 %typemap(throws) std::bad_exception     "SWIG_exception(SWIG_RuntimeError, $1.what());"
 %typemap(throws) std::domain_error      "SWIG_exception(SWIG_ValueError, $1.what());"
diff --git a/Lib/lua/std_pair.i b/Lib/lua/std_pair.i
index c76361554..06728533b 100644
--- a/Lib/lua/std_pair.i
+++ b/Lib/lua/std_pair.i
@@ -10,7 +10,7 @@
 /*
 A really cut down version of the pair class.
 
-this is not useful on its owns is it needs a %template definition with it
+this is not useful on its own - it needs a %template definition with it
 
 eg.
 namespace std {
diff --git a/Lib/lua/std_string.i b/Lib/lua/std_string.i
index 64f17dd88..e9f326b52 100644
--- a/Lib/lua/std_string.i
+++ b/Lib/lua/std_string.i
@@ -9,7 +9,7 @@
 %}
 
 /*
-Only std::string and const std::string& are typemaped
+Only std::string and const std::string& are typemapped
 they are converted to the Lua strings automatically
 
 std::string& and std::string* are not
@@ -34,7 +34,7 @@ namespace std {
 
 /*
 Bug report #1526022:
-Lua strings and std::string can contain embeded zero's
+Lua strings and std::string can contain embedded zero bytes
 Therefore a standard out typemap should not be:
   lua_pushstring(L,$1.c_str());
 but
@@ -73,7 +73,7 @@ Not using: lua_tolstring() as this is only found in Lua 5.1 & not 5.0.2
 }
 
 /*
-std::string& can be wrappered, but you must inform SWIG if it is in or out
+std::string& can be wrapped, but you must inform SWIG if it is in or out
 
 eg:
 void fn(std::string& str);
@@ -121,7 +121,7 @@ as this is overloaded by the const char* version
       void assign(const char*);
       //void assign(const string&);
       // no support for all the other features
-      // its probably better to do it in lua
+      // it's probably better to do it in lua
   };
 }
 
diff --git a/Lib/lua/std_vector.i b/Lib/lua/std_vector.i
index f248f0340..a4ea978db 100644
--- a/Lib/lua/std_vector.i
+++ b/Lib/lua/std_vector.i
@@ -7,7 +7,7 @@
 %{
 #include 
 %}
-%include  // the general exepctions
+%include  // the general exceptions
 /*
 A really cut down version of the vector class.
 
diff --git a/Lib/lua/typemaps.i b/Lib/lua/typemaps.i
index 63cb49a0d..a7ecec528 100644
--- a/Lib/lua/typemaps.i
+++ b/Lib/lua/typemaps.i
@@ -140,21 +140,21 @@ a few things of note:
 	so for the above mentioned return_array_5() would look like
 	arr=return_array_5() -- no parameters passed in
 * for INOUT arrays, a table must be passed in, and a new table will be returned
-	(this is consistant with the way that numbers are processed)
+	(this is consistent with the way that numbers are processed)
 	if you want just use
 	arr={...}
 	arr=process_var_array_inout(arr)	-- arr is replaced by the new version
 
 The following are not yet supported:
-* variable length output only array (inout's work ok)
-* multidimentional arrays
+* variable length output only array (inout works ok)
+* multidimensional arrays
 * arrays of objects/structs
 * arrays of pointers
 
 */
 
 /*
-The internals of the array managment stuff
+The internals of the array management stuff
 helper fns/macros
 SWIG_ALLOC_ARRAY(TYPE,LEN)	// returns a typed array TYPE[LEN]
 SWIG_FREE_ARRAY(PTR)		// delete the ptr (if not zero)
@@ -367,7 +367,7 @@ SWIG_TYPEMAP_NUM_ARR(double,double);
 %typemap(freearg) enum SWIGTYPE INPUT[ANY]
 %{	SWIG_FREE_ARRAY($1);%}
 
-// variable size array's
+// variable size arrays
 %typemap(in) (enum SWIGTYPE *INPUT,int)
 %{	$1 = ($ltype)SWIG_get_int_num_array_var(L,$input,&$2);
 	if (!$1) SWIG_fail;%}
@@ -414,7 +414,7 @@ void** SWIG_get_ptr_array_var(lua_State* L, int index, int* size,swig_type_info
 	// all pointers have the ownership value 'own' (normally 0)
 void SWIG_write_ptr_array(lua_State* L,void **array,int size,int own);
 	// read the specified table, and fills the array with ptrs
-	// returns 1 of ok (only fails if it doesnt find correct type of ptrs)
+	// returns 1 of ok (only fails if it doesn't find correct type of ptrs)
 	// helper fn (called by SWIG_get_ptr_array_*() fns)
 int SWIG_read_ptr_array(lua_State* L,int index,void **array,int size,swig_type_info *type);
 
@@ -424,7 +424,7 @@ modification of pointers ownership in the arrays
 eg A fn:
 void pointers_in(TYPE* arr[],int len);
 will make copies of the pointer into a temp array and then pass it into the fn
-Lua does not remeber that this fn held the pointers, so it is not safe to keep
+Lua does not remember that this fn held the pointers, so it is not safe to keep
 these pointers until later
 
 eg A fn:
@@ -551,7 +551,7 @@ free(ptr);
 With the following SWIG code
 %apply SWIGTYPE** OUTPUT{iMath **pptr };
 
-You can get natural wrappering in Lua as follows:
+You can get natural wrapping in Lua as follows:
 ok,ptr=Create_Math() -- ptr is a iMath* which is returned with the int
 ptr=nil -- the iMath* will be GC'ed as normal
 */

From 7ec1e11604abfe0bdf444a8fbda75b4eed72de45 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 29 May 2012 22:02:43 +0000
Subject: [PATCH 060/538] Fix bug 3529601 - seg fault when a protected method
 has the director feature but the parent class does not. Also fix similar
 problems with the allprotected feature.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13135 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                        |  5 +++++
 Examples/test-suite/allprotected_not.i | 27 +++++++++++++++++++++++
 Examples/test-suite/common.mk          |  1 +
 Source/Modules/go.cxx                  |  2 +-
 Source/Modules/lang.cxx                | 30 +++++++++++++++++---------
 Source/Modules/swigmod.h               |  4 ++++
 6 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 Examples/test-suite/allprotected_not.i

diff --git a/CHANGES.current b/CHANGES.current
index 96f1d881d..8458e45e0 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.8 (in progress)
 ===========================
+2012-05-29: wsfulton
+            Fix #3529601 - seg fault when a protected method has the "director"
+            feature but the parent class does not. Also fix similar problems with
+            the allprotected feature.
+
 2012-05-28: wsfulton
             Fix seg fault when attempting to warn about an illegal destructor - #3530055, 3530078 and #3530118.
 
diff --git a/Examples/test-suite/allprotected_not.i b/Examples/test-suite/allprotected_not.i
new file mode 100644
index 000000000..61ed78954
--- /dev/null
+++ b/Examples/test-suite/allprotected_not.i
@@ -0,0 +1,27 @@
+// Tests directors and allprotected option when the class does not have the "director" feature
+// Was previously crashing and/or generating uncompilable code.
+
+%module(directors="1", allprotected="1") allprotected_not
+
+//%feature("director") AllProtectedNot;
+%feature("director") AllProtectedNot::ProtectedMethod;
+%feature("director") AllProtectedNot::StaticNonVirtualProtectedMethod;
+%feature("director") AllProtectedNot::NonVirtualProtectedMethod;
+%feature("director") AllProtectedNot::ProtectedVariable;
+%feature("director") AllProtectedNot::StaticProtectedVariable;
+%feature("director") AllProtectedNot::PublicMethod;
+
+%inline %{
+class AllProtectedNot {
+public:
+	virtual ~AllProtectedNot() {}
+	virtual void PublicMethod() {}
+protected:
+	virtual void ProtectedMethod() {}
+	static void StaticNonVirtualProtectedMethod() {}
+	void NonVirtualProtectedMethod() {}
+        int ProtectedVariable;
+        static int StaticProtectedVariable;
+};
+int AllProtectedNot::StaticProtectedVariable = 0;
+%}
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 73c0c4254..5660ec99e 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -108,6 +108,7 @@ CPP_TEST_CASES += \
 	aggregate \
 	allowexcept \
 	allprotected \
+	allprotected_not \
 	anonymous_bitfield \
 	apply_signed_char \
 	apply_strings \
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index e7a21d1bd..9966efb64 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -2088,7 +2088,7 @@ private:
     }
 
     int flags = Extend | SmartPointer | use_naturalvar_mode(var);
-    if (is_non_virtual_protected_access(var)) {
+    if (isNonVirtualProtectedAccess(var)) {
       flags |= CWRAP_ALL_PROTECTED_ACCESS;
     }
 
diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 3c7b1f5a0..75254d69f 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -841,7 +841,7 @@ int Language::cDeclaration(Node *n) {
     if (!isfriend) {
       /* Check what the director needs. If the method is pure virtual, it is always needed.
        * Also wrap non-virtual protected members if asked for (allprotected mode). */
-      if (!(directorsEnabled() && ((is_member_director(CurrentClass, n) && need_nonpublic_member(n)) || is_non_virtual_protected_access(n)))) {
+      if (!(directorsEnabled() && ((is_member_director(CurrentClass, n) && need_nonpublic_member(n)) || isNonVirtualProtectedAccess(n)))) {
           return SWIG_NOWRAP;
       }
       // Prevent wrapping protected overloaded director methods more than once -
@@ -1224,7 +1224,7 @@ int Language::memberfunctionHandler(Node *n) {
   // Set up the type for the cast to this class for use when wrapping const director (virtual) methods.
   // Note: protected director methods or when allprotected mode turned on.
   String *director_type = 0;
-  if (!is_public(n) && (is_member_director(CurrentClass, n) || GetFlag(n, "explicitcall") || is_non_virtual_protected_access(n))) {
+  if (!is_public(n) && (is_member_director(CurrentClass, n) || GetFlag(n, "explicitcall") || isNonVirtualProtectedAccess(n))) {
     director_type = Copy(DirectorClassName);
     String *qualifier = Getattr(n, "qualifier");
     if (qualifier)
@@ -1270,7 +1270,7 @@ int Language::staticmemberfunctionHandler(Node *n) {
   if (!Extend) {
     Node *sb = Getattr(n, "cplus:staticbase");
     String *sname = Getattr(sb, "name");
-    if (is_non_virtual_protected_access(n))
+    if (isNonVirtualProtectedAccess(n))
       cname = NewStringf("%s::%s", DirectorClassName, name);
     else
       cname = NewStringf("%s::%s", sname, name);
@@ -1415,14 +1415,14 @@ int Language::membervariableHandler(Node *n) {
 	    Delete(pname);
 	  }
 	} else {
-	  String *pname = is_non_virtual_protected_access(n) ? NewString("darg") : Swig_cparm_name(0, 0);
+	  String *pname = isNonVirtualProtectedAccess(n) ? NewString("darg") : Swig_cparm_name(0, 0);
 	  target = NewStringf("%s->%s", pname, name);
 	  Delete(pname);
 	}
 	tm = Swig_typemap_lookup("memberin", n, target, 0);
       }
       int flags = Extend | SmartPointer | use_naturalvar_mode(n);
-      if (is_non_virtual_protected_access(n))
+      if (isNonVirtualProtectedAccess(n))
         flags = flags | CWRAP_ALL_PROTECTED_ACCESS;
 
       Swig_MembersetToFunction(n, ClassType, flags);
@@ -1470,7 +1470,7 @@ int Language::membervariableHandler(Node *n) {
     /* Emit get function */
     {
       int flags = Extend | SmartPointer | use_naturalvar_mode(n);
-      if (is_non_virtual_protected_access(n))
+      if (isNonVirtualProtectedAccess(n))
         flags = flags | CWRAP_ALL_PROTECTED_ACCESS;
       Swig_MembergetToFunction(n, ClassType, flags);
       Setattr(n, "sym:name", mrename_get);
@@ -1530,7 +1530,7 @@ int Language::membervariableHandler(Node *n) {
 int Language::staticmembervariableHandler(Node *n) {
   Swig_require("staticmembervariableHandler", n, "*name", "*sym:name", "*type", "?value", NIL);
   String *value = Getattr(n, "value");
-  String *classname = !SmartPointer ? (is_non_virtual_protected_access(n) ? DirectorClassName : ClassName) : Getattr(CurrentClass, "allocate:smartpointerbase");
+  String *classname = !SmartPointer ? (isNonVirtualProtectedAccess(n) ? DirectorClassName : ClassName) : Getattr(CurrentClass, "allocate:smartpointerbase");
 
   if (!value || !Getattr(n, "hasconsttype")) {
     String *name = Getattr(n, "name");
@@ -1695,7 +1695,7 @@ int Language::memberconstantHandler(Node *n) {
   if (Extend)
     new_name = Copy(value);
   else
-    new_name = NewStringf("%s::%s", is_non_virtual_protected_access(n) ? DirectorClassName : ClassName, name);
+    new_name = NewStringf("%s::%s", isNonVirtualProtectedAccess(n) ? DirectorClassName : ClassName, name);
   Setattr(n, "name", new_name);
 
   constantWrapper(n);
@@ -2116,7 +2116,7 @@ int Language::classDirector(Node *n) {
     Node *nodeType = Getattr(ni, "nodeType");
     bool cdeclaration = (Cmp(nodeType, "cdecl") == 0);
     if (cdeclaration && !GetFlag(ni, "feature:ignore")) {
-      if (is_non_virtual_protected_access(ni)) {
+      if (isNonVirtualProtectedAccess(ni)) {
         Node *overloaded = Getattr(ni, "sym:overloaded");
         // emit the using base::member statement (but only once if the method is overloaded)
         if (!overloaded || (overloaded && (overloaded == ni)))
@@ -3331,7 +3331,7 @@ int Language::need_nonpublic_ctor(Node *n) {
  * Language::need_nonpublic_member()
  * ----------------------------------------------------------------------------- */
 int Language::need_nonpublic_member(Node *n) {
-  if (directorsEnabled()) {
+  if (directorsEnabled() && DirectorClassName) {
     if (is_protected(n)) {
       if (dirprot_mode()) {
 	/* when using dirprot mode, the protected members are always needed. */
@@ -3355,6 +3355,16 @@ int Language::is_smart_pointer() const {
   return SmartPointer;
 }
 
+/* -----------------------------------------------------------------------------
+ * Language::()
+ * ----------------------------------------------------------------------------- */
+
+bool Language::isNonVirtualProtectedAccess(Node *n) const {
+  // Ideally is_non_virtual_protected_access() would contain all this logic, see
+  // comments therein about vtable. 
+  return DirectorClassName && is_non_virtual_protected_access(n);
+}
+
 /* -----------------------------------------------------------------------------
  * Language::extraDirectorProtectedCPPMethodsRequired()
  * ----------------------------------------------------------------------------- */
diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h
index 7733391fc..4a65444fc 100644
--- a/Source/Modules/swigmod.h
+++ b/Source/Modules/swigmod.h
@@ -294,6 +294,10 @@ protected:
   /* Some language modules require additional wrappers for virtual methods not declared in sub-classes */
   virtual bool extraDirectorProtectedCPPMethodsRequired() const;
 
+  /* Identifies if a protected members that are generated when the allprotected option is used.
+     This does not include protected virtual methods as they are turned on with the dirprot option. */
+  bool isNonVirtualProtectedAccess(Node *n) const;
+
   /* Director subclass comparison test */
   String *none_comparison;
 

From c47fd5fdd5763ae85d05c6c49bf781a2ad24dceb Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 30 May 2012 05:59:46 +0000
Subject: [PATCH 061/538] Director documentation corrections to match reality.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13136 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Java.html   | 3 ---
 Doc/Manual/Php.html    | 3 ---
 Doc/Manual/Python.html | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index 76e147be5..2473e7cd1 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -3354,9 +3354,6 @@ The %feature directive can be applied globally, to specific classes, and to spec
 
 // generate directors for all virtual methods in class Foo
 %feature("director") Foo;      
-
-// generate a director for just Foo::bar()
-%feature("director") Foo::bar; 
 

 

 
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 76031d07e..78ee6ea7f 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -901,9 +901,6 @@ globally, to specific classes, and to specific methods, like this:
 
 // generate directors for all virtual methods in class Foo
 %feature("director") Foo;      
-
-// generate a director for just Foo::bar()
-%feature("director") Foo::bar; 
 

 

 
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index a9a9bc44e..f718f981f 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -2782,9 +2782,6 @@ globally, to specific classes, and to specific methods, like this:
 
 // generate directors for all virtual methods in class Foo
 %feature("director") Foo;      
-
-// generate a director for just Foo::bar()
-%feature("director") Foo::bar; 
 

 

 

From 8fe63be0517ed21a8545bbe21b62d461830ceff6 Mon Sep 17 00:00:00 2001
From: Olly Betts 
Date: Thu, 31 May 2012 04:12:17 +0000
Subject: [PATCH 062/538] Fix doc typo

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13137 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Python.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index f718f981f..bd48a37f2 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -2345,7 +2345,7 @@ doesn't know how to add an instance of MyString to itself.
 
 
 
  • If you have multiple SWIG modules that share type information (more info),
-the -builtin option requiress a bit of extra discipline to ensure that base classes are initialized before derived classes.  Specifically:
    
+the -builtin option requires a bit of extra discipline to ensure that base classes are initialized before derived classes.  Specifically:
    
 
      
 
    • There must be an unambiguous dependency graph for the modules.
      • 
 
    • Module dependencies must be explicitly stated with %import statements in the SWIG interface file.
      

From 7ec208da05defb990593940c06bf13d6f6fcfc55 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor 
Date: Mon, 4 Jun 2012 05:37:10 +0000
Subject: [PATCH 063/538] Fix Go support to use appropriate interface for
 entering and leaving C/C++ code, depending on GCC version.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13146 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/go/goruntime.swg  | 51 +++++++++++++++++++++++++++++++++++++++++++
 Source/Modules/go.cxx | 38 +++++++++++++++++++++-----------
 2 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index ef23d1211..f5f1f6e73 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -84,6 +84,57 @@ extern "C" {
 #endif
 extern void *_cgo_allocate(size_t);
 extern void _cgo_panic(const char *);
+
+/* Implementations of SwigCgocall and friends for different versions
+   of gccgo.  The Go code will call these functions using C names with
+   a prefix of the module name.  The implementations here call the
+   routine in libgo.  The routines to call vary depending on the gccgo
+   version.  We assume that the version of gcc used to compile this
+   file is the same as the version of gccgo.  */
+
+#define SWIGCONCAT2(s1, s2) s1 ## s2
+#define SWIGCONCAT1(s1, s2) SWIGCONCAT2(s1, s2)
+#define SwigCgocall SWIGCONCAT1(SWIGMODULE, SwigCgocall)
+#define SwigCgocallDone SWIGCONCAT1(SWIGMODULE, SwigCgocallDone)
+#define SwigCgocallBack SWIGCONCAT1(SWIGMODULE, SwigCgocallBack)
+#define SwigCgocallBackDone SWIGCONCAT1(SWIGMODULE, SwigCgocallBackDone)
+
+#define SWIG_GCC_VERSION \
+  (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC__PATH_LEVEL__)
+
+#if SWIG_GCC_VERSION < 40700
+#define SwigDoCgocall()
+#define SwigDoCgocalldone()
+#define SwigDoCgocallBack()
+#define SwigDoCgocallBackDone()
+#elif SWIG_GCC_VERSION == 40700
+void SwigDoCgocall(void) __asm__("libgo_syscall.syscall.Entersyscall");
+void SwigDoCgocallDone(void) __asm__("libgo_syscall.syscall.Exitsyscall");
+void SwigDoCgocallBack(void) __asm__("libgo_syscall.syscall.Exitsyscall");
+void SwigDoCgocallBackDone(void) __asm__("libgo_syscall.syscall.Entersyscall");
+#else
+void SwigDoCgocall(void) __asm__("syscall.Cgocall");
+void SwigDoCgocallDone(void) __asm__("syscall.CgocallDone");
+void SwigDoCgocallBack(void) __asm__("syscall.CgocallBack");
+void SwigDoCgocallBackDone(void) __asm__("syscall.CgocallBackDone");
+#endif
+
+void SwigCgocall() {
+  SwigDoCgocall();
+}
+
+void SwigCgocallDone() {
+  SwigDoCgocallDone();
+}
+
+void SwigCgocallBack() {
+  SwigDoCgocallBack();
+}
+
+void SwigCgocallBackDone() {
+  SwigDoCgocallBackDone();
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 9966efb64..d76ae82a3 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -326,6 +326,8 @@ private:
 
     Swig_banner(f_c_begin);
 
+    Printf(f_c_runtime, "#define SWIGMODULE %s\n", module);
+
     if (directorsEnabled()) {
       Printf(f_c_runtime, "#define SWIG_DIRECTORS\n");
 
@@ -349,6 +351,15 @@ private:
 
     Printf(f_go_begin, "\npackage %s\n\n", package);
 
+    Printf(f_go_runtime, "//extern %sSwigCgocall\n", module);
+    Printf(f_go_runtime, "func SwigCgocall()\n");
+    Printf(f_go_runtime, "//extern %sSwigCgocallDone\n", module);
+    Printf(f_go_runtime, "func SwigCgocallDone()\n");
+    Printf(f_go_runtime, "//extern %sSwigCgocallBack\n", module);
+    Printf(f_go_runtime, "func SwigCgocallBack()\n");
+    Printf(f_go_runtime, "//extern %sSwigCgocallBackDone\n", module);
+    Printf(f_go_runtime, "func SwigCgocallBackDone()\n\n");
+
     // All the C++ wrappers should be extern "C".
 
     Printv(f_c_wrappers, "#ifdef __cplusplus\n", "extern \"C\" {\n", "#endif\n\n", NULL);
@@ -941,8 +952,8 @@ private:
       }
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);
@@ -2538,8 +2549,8 @@ private:
       Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\tp.", class_receiver, " = ", fn_name, NULL);
@@ -3049,11 +3060,6 @@ private:
 
       Printv(f_go_wrappers, " {\n", NULL);
 
-      if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL);
-      }
-
       Printv(f_go_wrappers, "\tif swig_g, swig_ok := swig_p.v.(", interface_name, "); swig_ok {\n", NULL);
       Printv(f_go_wrappers, "\t\t", NULL);
       if (SwigType_type(result) != T_VOID) {
@@ -3076,6 +3082,12 @@ private:
 	Printv(f_go_wrappers, "\t\treturn\n", NULL);
       }
       Printv(f_go_wrappers, "\t}\n", NULL);
+
+      if (gccgo_flag) {
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+      }
+
       Printv(f_go_wrappers, "\t", NULL);
       if (SwigType_type(result) != T_VOID) {
 	Printv(f_go_wrappers, "return ", NULL);
@@ -3222,8 +3234,8 @@ private:
       Printv(f_go_wrappers, " {\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tsyscall.Entersyscall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer syscall.Exitsyscall()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);
@@ -3269,8 +3281,8 @@ private:
       Printv(f_go_wrappers, "{\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tsyscall.Exitsyscall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer syscall.Entersyscall()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);

From 9a6dc5ac408567f3501e07344099c904d8bbb3ea Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor 
Date: Tue, 5 Jun 2012 13:32:28 +0000
Subject: [PATCH 064/538] Fix typo in name of SwigDoCgocallDone for GCC < 4.7.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13151 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/go/goruntime.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index f5f1f6e73..ad044f8ba 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -104,7 +104,7 @@ extern void _cgo_panic(const char *);
 
 #if SWIG_GCC_VERSION < 40700
 #define SwigDoCgocall()
-#define SwigDoCgocalldone()
+#define SwigDoCgocallDone()
 #define SwigDoCgocallBack()
 #define SwigDoCgocallBackDone()
 #elif SWIG_GCC_VERSION == 40700

From 5a191134329a0cc53fd8b7568d10bd808727300a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor 
Date: Tue, 5 Jun 2012 20:54:08 +0000
Subject: [PATCH 065/538] Import unsafe in generated Go code, so that pointers
 stored as type uintptr do not get garbage collected.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13153 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/go/goruntime.swg | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index ad044f8ba..ff33c3b41 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -165,6 +165,9 @@ static _gostring_ _swig_makegostring(const char *p, size_t l) {
 %insert(go_header) %{
 
 import _ "runtime/cgo"
+import "unsafe"
+
+type _ unsafe.Pointer
 
 %}
 
@@ -173,9 +176,12 @@ import _ "runtime/cgo"
 %insert(go_header) %{
 
 import "syscall"
+import "unsafe"
 
 type _ syscall.Sockaddr
 
+type _ unsafe.Pointer
+
 %}
 
 #endif

From 6a20df2bb8885d8bf2b7cfcac0c22a882a98caad Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor 
Date: Tue, 5 Jun 2012 23:02:42 +0000
Subject: [PATCH 066/538] Don't convert uintptr to interface type while not
 connected to Go scheduler.  Likewise with calls to defer.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13154 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/go.cxx | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index d76ae82a3..47bfc4ea1 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -952,13 +952,32 @@ private:
       }
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	if (!is_constructor) {
+	  Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	  Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	} else {
+	  // For a constructor the wrapper function will return a
+	  // uintptr but we will return an interface.  We want to
+	  // convert the uintptr to the interface after calling
+	  // SwigCgocallDone, so that we don't try to allocate memory
+	  // while the Go scheduler can't see us.
+	  Printv(f_go_wrappers, "\tvar done bool\n", NULL);
+	  Printv(f_go_wrappers, "\tdefer func() {\n", NULL);
+	  Printv(f_go_wrappers, "\t\tif !done {\n", NULL);
+	  Printv(f_go_wrappers, "\t\t\tSwigCgocallDone()\n", NULL);
+	  Printv(f_go_wrappers, "\t\t}\n", NULL);
+	  Printv(f_go_wrappers, "\t}()\n", NULL);
+	  Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
+	}
       }
 
       Printv(f_go_wrappers, "\t", NULL);
       if (SwigType_type(result) != T_VOID) {
-	Printv(f_go_wrappers, "return ", NULL);
+	if (gccgo_flag && is_constructor) {
+	  Printv(f_go_wrappers, "swig_r := ", NULL);
+	} else {
+	  Printv(f_go_wrappers, "return ", NULL);
+	}
       }
 
       Printv(f_go_wrappers, wrapper_name, "(", NULL);
@@ -994,6 +1013,13 @@ private:
 	p = nextParm(p);
       }
       Printv(f_go_wrappers, ")\n", NULL);
+
+      if (gccgo_flag && is_constructor) {
+	Printv(f_go_wrappers, "\tSwigCgocallDone()\n", NULL);
+	Printv(f_go_wrappers, "\tdone = true\n", NULL);
+	Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
+      }
+
       Printv(f_go_wrappers, "}\n", NULL);
     }
 
@@ -2549,8 +2575,8 @@ private:
       Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
 	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\tp.", class_receiver, " = ", fn_name, NULL);
@@ -3084,8 +3110,8 @@ private:
       Printv(f_go_wrappers, "\t}\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
 	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);
@@ -3234,8 +3260,8 @@ private:
       Printv(f_go_wrappers, " {\n", NULL);
 
       if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
 	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
+	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
       }
 
       Printv(f_go_wrappers, "\t", NULL);

From cf16f43e511761217782295dc7c548c749512d4a Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Sun, 10 Jun 2012 13:54:27 +0000
Subject: [PATCH 067/538] add std_vector items`

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13159 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/r/std_vector.i | 518 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 428 insertions(+), 90 deletions(-)

diff --git a/Lib/r/std_vector.i b/Lib/r/std_vector.i
index 9fb95c597..155626aa5 100644
--- a/Lib/r/std_vector.i
+++ b/Lib/r/std_vector.i
@@ -2,7 +2,7 @@
 /*
   Vectors
   Thanks to Richard Beare - richard.beare@ieee.org for StdVectorTraits
-*/ 
+*/
 
 %fragment("StdVectorTraits","header",fragment="StdSequenceTraits")
 %{
@@ -11,86 +11,87 @@
     template <>
       struct traits_from_ptr > {
       static SEXP from (std::vector *val, int owner = 0) {
-	SEXP result;
-	PROTECT(result = Rf_allocVector(REALSXP, val->size()));
-	for (unsigned pos = 0; pos < val->size(); pos++)
-	  {
-	    NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
-	  }
-	UNPROTECT(1);
-	return(result);
+        SEXP result;
+        PROTECT(result = Rf_allocVector(REALSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
+          }
+        UNPROTECT(1);
+        return(result);
       }
     };
     // vectors of floats
     template <>
       struct traits_from_ptr > {
       static SEXP from (std::vector *val, int owner = 0) {
-	SEXP result;
-	PROTECT(result = Rf_allocVector(REALSXP, val->size()));
-	for (unsigned pos = 0; pos < val->size(); pos++)
-	  {
-	    NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
-	  }
-	UNPROTECT(1);
-	return(result);
+        SEXP result;
+        PROTECT(result = Rf_allocVector(REALSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            NUMERIC_POINTER(result)[pos] = ((*val)[pos]);
+          }
+        UNPROTECT(1);
+        return(result);
       }
     };
     // vectors of unsigned int
     template <>
       struct traits_from_ptr > {
       static SEXP from (std::vector *val, int owner = 0) {
-	SEXP result;
-	PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-	for (unsigned pos = 0; pos < val->size(); pos++)
-	  {
-	    INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-	  }
-	UNPROTECT(1);
-	return(result);
+        SEXP result;
+        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
+          }
+        UNPROTECT(1);
+        return(result);
       }
     };
     // vectors of int
     template <>
       struct traits_from_ptr > {
       static SEXP from (std::vector *val, int owner = 0) {
-	SEXP result;
-	PROTECT(result = Rf_allocVector(INTSXP, val->size()));
-	for (unsigned pos = 0; pos < val->size(); pos++)
-	  {
-	    INTEGER_POINTER(result)[pos] = ((*val)[pos]);
-	  }
-	UNPROTECT(1);
-	return(result);
+        SEXP result;
+        PROTECT(result = Rf_allocVector(INTSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            INTEGER_POINTER(result)[pos] = ((*val)[pos]);
+          }
+        UNPROTECT(1);
+        return(result);
       }
     };
+
     // vectors of bool
     template <>
       struct traits_from_ptr > {
       static SEXP from (std::vector *val, int owner = 0) {
-	SEXP result;
-	PROTECT(result = Rf_allocVector(LGLSXP, val->size()));
-	for (unsigned pos = 0; pos < val->size(); pos++)
-	  {
-	    LOGICAL_POINTER(result)[pos] = ((*val)[pos]);
-	  }
-	UNPROTECT(1);
-	return(result);
-	//return SWIG_R_NewPointerObj(val, type_info< std::vector >(), owner);
+        SEXP result;
+        PROTECT(result = Rf_allocVector(LGLSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            LOGICAL_POINTER(result)[pos] = ((*val)[pos]);
+          }
+        UNPROTECT(1);
+        return(result);
+        //return SWIG_R_NewPointerObj(val, type_info< std::vector >(), owner);
       }
     };
     // vectors of strings
     template <>
       struct traits_from_ptr > > {
       static SEXP from (std::vector > *val, int owner = 0) {
-	SEXP result;
-	 PROTECT(result = Rf_allocVector(STRSXP, val->size()));
-	 for (unsigned pos = 0; pos < val->size(); pos++)
-	   {
-	     CHARACTER_POINTER(result)[pos] = Rf_mkChar(((*val)[pos]).c_str()); 
-	   } 
-	UNPROTECT(1);
-	return(result);
-	//return SWIG_R_NewPointerObj(val, type_info< std::vector >(), owner);
+        SEXP result;
+         PROTECT(result = Rf_allocVector(STRSXP, val->size()));
+         for (unsigned pos = 0; pos < val->size(); pos++)
+           {
+             CHARACTER_POINTER(result)[pos] = Rf_mkChar(((*val)[pos]).c_str());
+           }
+        UNPROTECT(1);
+        return(result);
+        //return SWIG_R_NewPointerObj(val, type_info< std::vector >(), owner);
       }
     };
 
@@ -98,12 +99,12 @@
     template 
       struct traits_from_ptr< std::vector< T > > {
       static SEXP from (std::vector< T > *val, int owner = 0) {
-	return SWIG_R_NewPointerObj(val, type_info< std::vector< T >  >(), owner);
+        return SWIG_R_NewPointerObj(val, type_info< std::vector< T >  >(), owner);
       }
     };
 
     template <>
-  struct traits_asptr < std::vector > {   
+  struct traits_asptr < std::vector > {
     static int asptr(SEXP obj, std::vector **val) {
       std::vector *p;
       // not sure how to check the size of the SEXP obj is correct
@@ -111,19 +112,19 @@
       p = new std::vector(sexpsz);
       double *S = NUMERIC_POINTER(obj);
       for (unsigned pos = 0; pos < p->size(); pos++)
-	{
-	  (*p)[pos] = static_cast(S[pos]);
-	}
+        {
+          (*p)[pos] = static_cast(S[pos]);
+        }
       int res = SWIG_OK;
       if (SWIG_IsOK(res)) {
-	if (val) *val = p;
+        if (val) *val = p;
       }
       return res;
     }
-  }; 
+  };
 
     template <>
-  struct traits_asptr < std::vector > {   
+  struct traits_asptr < std::vector > {
     static int asptr(SEXP obj, std::vector **val) {
       std::vector *p;
       // not sure how to check the size of the SEXP obj is correct
@@ -131,19 +132,19 @@
       p = new std::vector(sexpsz);
       double *S = NUMERIC_POINTER(obj);
       for (unsigned pos = 0; pos < p->size(); pos++)
-	{
-	  (*p)[pos] = static_cast(S[pos]);
-	}
+        {
+          (*p)[pos] = static_cast(S[pos]);
+        }
       int res = SWIG_OK;
       if (SWIG_IsOK(res)) {
-	if (val) *val = p;
+        if (val) *val = p;
       }
       return res;
     }
-  }; 
-   
+  };
+
     template <>
-  struct traits_asptr < std::vector > {   
+  struct traits_asptr < std::vector > {
     static int asptr(SEXP obj, std::vector **val) {
       std::vector *p;
       unsigned int sexpsz = Rf_length(obj);
@@ -152,20 +153,20 @@
       PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
       int *S = INTEGER_POINTER(coerced);
       for (unsigned pos = 0; pos < p->size(); pos++)
-	{
-	  (*p)[pos] = static_cast(S[pos]);
-	}
+        {
+          (*p)[pos] = static_cast(S[pos]);
+        }
       int res = SWIG_OK;
       if (SWIG_IsOK(res)) {
-	if (val) *val = p;
+        if (val) *val = p;
       }
       UNPROTECT(1);
       return res;
     }
-  }; 
+  };
 
     template <>
-  struct traits_asptr < std::vector > {   
+  struct traits_asptr < std::vector > {
     static int asptr(SEXP obj, std::vector **val) {
       std::vector *p;
       // not sure how to check the size of the SEXP obj is correct
@@ -175,31 +176,313 @@
       PROTECT(coerced = Rf_coerceVector(obj, INTSXP));
       int *S = INTEGER_POINTER(coerced);
       for (unsigned pos = 0; pos < p->size(); pos++)
-	{
-	  (*p)[pos] = static_cast(S[pos]);
-	}
+        {
+          (*p)[pos] = static_cast(S[pos]);
+        }
       int res = SWIG_OK;
       if (SWIG_IsOK(res)) {
-	if (val) *val = p;
+        if (val) *val = p;
       }
       UNPROTECT(1);
       return res;
     }
-  }; 
+  };
+
+    template <>
+  struct traits_asptr < std::vector > {
+    static int asptr(SEXP obj, std::vector **val) {
+      std::vector *p;
+      // not sure how to check the size of the SEXP obj is correct
+      int sexpsz = Rf_length(obj);
+      p = new std::vector(sexpsz);
+      SEXP coerced;
+      PROTECT(coerced = Rf_coerceVector(obj, LGLSXP));
+      int *S = LOGICAL_POINTER(coerced);
+      for (unsigned pos = 0; pos < p->size(); pos++)
+        {
+          (*p)[pos] = static_cast(S[pos]);
+        }
+      int res = SWIG_OK;
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      UNPROTECT(1);
+      return res;
+    }
+  };
 
     // catchall for R to vector conversion
   template 
-  struct traits_asptr < std::vector > {   
+  struct traits_asptr < std::vector > {
     static int asptr(SEXP obj, std::vector **val) {
       std::vector *p;
+      Rprintf("my asptr\n");
      int res = SWIG_R_ConvertPtr(obj, (void**)&p, type_info< std::vector >(), 0);
       if (SWIG_IsOK(res)) {
-	if (val) *val = p;
+        if (val) *val = p;
       }
       return res;
     }
-  }; 
+  };
 
+  // now for vectors of vectors. These will be represented as lists of vectors on the
+  // catch all that does everything with vectors
+  template <>
+    struct traits_from_ptr > > {
+      static SEXP from (std::vector< std::vector > *val, int owner = 0) {
+        SEXP result;
+        // allocate the R list
+        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            // allocate the R vector
+            SET_VECTOR_ELT(result, pos, Rf_allocVector(INTSXP, val->at(pos).size()));
+            // Fill the R vector
+            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
+              {
+                INTEGER_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast(val->at(pos).at(vpos));
+              }
+          }
+        UNPROTECT(1);
+        return(result);
+      }
+    };
+
+  template <>
+    struct traits_from_ptr > > {
+      static SEXP from (std::vector< std::vector > *val, int owner = 0) {
+        SEXP result;
+        // allocate the R list
+        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            // allocate the R vector
+            SET_VECTOR_ELT(result, pos, Rf_allocVector(INTSXP, val->at(pos).size()));
+            // Fill the R vector
+            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
+              {
+                INTEGER_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast(val->at(pos).at(vpos));
+              }
+          }
+        UNPROTECT(1);
+        return(result);
+      }
+    };
+
+  template <>
+    struct traits_from_ptr > > {
+      static SEXP from (std::vector< std::vector > *val, int owner = 0) {
+        SEXP result;
+        // allocate the R list
+        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            // allocate the R vector
+            SET_VECTOR_ELT(result, pos, Rf_allocVector(REALSXP, val->at(pos).size()));
+            // Fill the R vector
+            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
+              {
+                NUMERIC_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast(val->at(pos).at(vpos));
+              }
+          }
+        UNPROTECT(1);
+        return(result);
+      }
+    };
+
+  template <>
+    struct traits_from_ptr > > {
+      static SEXP from (std::vector< std::vector > *val, int owner = 0) {
+        SEXP result;
+        // allocate the R list
+        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            // allocate the R vector
+            SET_VECTOR_ELT(result, pos, Rf_allocVector(REALSXP, val->at(pos).size()));
+            // Fill the R vector
+            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
+              {
+                NUMERIC_POINTER(VECTOR_ELT(result, pos))[vpos] = static_cast(val->at(pos).at(vpos));
+              }
+          }
+        UNPROTECT(1);
+        return(result);
+      }
+    };
+
+  template <>
+    struct traits_from_ptr > > {
+      static SEXP from (std::vector< std::vector > *val, int owner = 0) {
+        SEXP result;
+        // allocate the R list
+        PROTECT(result = Rf_allocVector(VECSXP, val->size()));
+        for (unsigned pos = 0; pos < val->size(); pos++)
+          {
+            // allocate the R vector
+            SET_VECTOR_ELT(result, pos, Rf_allocVector(LGLSXP, val->at(pos).size()));
+            // Fill the R vector
+            for (unsigned vpos = 0; vpos < val->at(pos).size(); ++vpos)
+              {
+                LOGICAL_POINTER(VECTOR_ELT(result, pos))[vpos] = (val->at(pos).at(vpos));
+              }
+          }
+        UNPROTECT(1);
+        return(result);
+      }
+    };
+
+  template 
+    struct traits_from_ptr< std::vector < std::vector< T > > > {
+    static SEXP from (std::vector < std::vector< T > > *val, int owner = 0) {
+      return SWIG_R_NewPointerObj(val, type_info< std::vector < std::vector< T > > >(), owner);
+    }
+  };
+
+  // R side
+  template <>
+    struct traits_asptr < std::vector< std::vector > > {
+    static int asptr(SEXP obj, std::vector< std::vector > **val) {
+      std::vector  > *p;
+      // this is the length of the list
+      unsigned int sexpsz = Rf_length(obj);
+      p = new std::vector< std::vector > (sexpsz);
+
+      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
+        {
+          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
+          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
+            {
+              (*p)[listpos].push_back(static_cast(INTEGER_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
+            }
+        }
+
+      int res = SWIG_OK;
+
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
+
+  template <>
+    struct traits_asptr < std::vector< std::vector< int> > > {
+    static int asptr(SEXP obj, std::vector< std::vector< int> > **val) {
+      std::vector  > *p;
+      // this is the length of the list
+      unsigned int sexpsz = Rf_length(obj);
+      p = new std::vector< std::vector< int> > (sexpsz);
+
+      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
+        {
+          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
+          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
+            {
+              (*p)[listpos].push_back(static_cast(INTEGER_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
+            }
+        }
+
+      int res = SWIG_OK;
+
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
+
+  template <>
+    struct traits_asptr < std::vector< std::vector< float> > > {
+    static int asptr(SEXP obj, std::vector< std::vector< float> > **val) {
+      std::vector  > *p;
+      // this is the length of the list
+      unsigned int sexpsz = Rf_length(obj);
+      p = new std::vector< std::vector< float> > (sexpsz);
+
+      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
+        {
+          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
+          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
+            {
+              (*p)[listpos].push_back(static_cast(NUMERIC_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
+            }
+        }
+
+      int res = SWIG_OK;
+
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
+
+  template <>
+    struct traits_asptr < std::vector< std::vector< double> > > {
+    static int asptr(SEXP obj, std::vector< std::vector< double> > **val) {
+      std::vector  > *p;
+      // this is the length of the list
+      unsigned int sexpsz = Rf_length(obj);
+      p = new std::vector< std::vector< double> > (sexpsz);
+
+      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
+        {
+          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
+          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
+            {
+              (*p)[listpos].push_back(static_cast(NUMERIC_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
+            }
+        }
+
+      int res = SWIG_OK;
+
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
+
+  template <>
+    struct traits_asptr < std::vector< std::vector< bool > > > {
+    static int asptr(SEXP obj, std::vector< std::vector< bool> > **val) {
+      std::vector  > *p;
+      // this is the length of the list
+      unsigned int sexpsz = Rf_length(obj);
+      p = new std::vector< std::vector< bool > > (sexpsz);
+
+      for (unsigned listpos = 0; listpos < sexpsz; ++listpos)
+        {
+          unsigned vecsize = Rf_length(VECTOR_ELT(obj, listpos));
+          for (unsigned vpos = 0; vpos < vecsize; ++vpos)
+            {
+              (*p)[listpos].push_back(static_cast(LOGICAL_POINTER(VECTOR_ELT(obj, listpos))[vpos]));
+            }
+        }
+
+      int res = SWIG_OK;
+
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
+
+  //  catchall
+  template 
+    struct traits_asptr < std::vector< std::vector > > {
+    static int asptr(SEXP obj, std::vector< std::vector > **val) {
+      std::vector< std::vector > *p;
+      Rprintf("vector of vectors - unsupported content\n");
+      int res = SWIG_R_ConvertPtr(obj, (void**)&p, type_info< std::vector< std::vector > > (), 0);
+      if (SWIG_IsOK(res)) {
+        if (val) *val = p;
+      }
+      return res;
+    }
+  };
 
   }
 %}
@@ -209,12 +492,12 @@
 
 %define %traits_type_name(Type...)
 %fragment(SWIG_Traits_frag(Type), "header",
-	  fragment="StdTraits",fragment="StdVectorTraits") {
+          fragment="StdTraits",fragment="StdVectorTraits") {
   namespace swig {
     template <>  struct traits< Type > {
       typedef pointer_category category;
       static const char* type_name() {
-	return #Type;
+        return #Type;
       }
     };
   }
@@ -225,33 +508,72 @@
 
 %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector)
 %traits_type_name(std::vector)
-%typemap("rtypecheck") std::vector %{ is.numeric($arg) %}
+%typemap("rtypecheck") std::vector, std::vector const, std::vector const&
+    %{ is.numeric($arg) %}
 %typemap("rtype") std::vector "numeric"
 
 %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector)
 %traits_type_name(std::vector)
-%typemap("rtypecheck") std::vector %{ is.numeric($arg) %}
+%typemap("rtypecheck") std::vector, std::vector const, std::vector const&
+   %{ is.numeric($arg) %}
 %typemap("rtype") std::vector "numeric"
 
 %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector);
 %traits_type_name(std::vector);
-%typemap("rtypecheck") std::vector %{ is.logical($arg) %}
+%typemap("rtypecheck") std::vector , std::vector const, std::vector const&
+   %{ is.logical($arg) %}
 %typemap("rtype") std::vector "logical"
+%typemap("scoercein") std::vector "$input = as.logical($input);";
 
 %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector);
 %traits_type_name(std::vector);
-%typemap("rtypecheck") std::vector 
+%typemap("rtypecheck") std::vector , std::vector const, std::vector const&
    %{ is.integer($arg) || is.numeric($arg) %}
 %typemap("rtype") std::vector "integer"
 %typemap("scoercein") std::vector "$input = as.integer($input);";
 
 %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector);
 %traits_type_name(std::vector);
-%typemap("rtypecheck") std::vector 
+%typemap("rtypecheck") std::vector, std::vector const, std::vector const&
 %{ is.integer($arg) || is.numeric($arg) %}
 %typemap("rtype") std::vector "integer"
 %typemap("scoercein") std::vector "$input = as.integer($input);";
 
+%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >);
+%traits_type_name(std::vector< std::vector >);
+%typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const&
+   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
+%typemap("rtype") std::vector > "list"
+%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.integer);";
+
+%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >);
+%traits_type_name(std::vector< std::vector >);
+%typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const&
+   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
+%typemap("rtype") std::vector > "list"
+%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.integer);";
+
+%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >);
+%traits_type_name(std::vector< std::vector >);
+%typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const&
+   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
+%typemap("rtype") std::vector > "list"
+%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.numeric);";
+
+%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >);
+%traits_type_name(std::vector< std::vector >);
+%typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const&
+   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
+%typemap("rtype") std::vector > "list"
+%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.numeric);";
+
+%typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >);
+%traits_type_name(std::vector< std::vector >);
+%typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const&
+   %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %}
+%typemap("rtype") std::vector > "list"
+%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.logical);";
+
 // we don't want these to be given R classes as they
 // have already been turned into R vectors.
 %typemap(scoerceout) std::vector,
@@ -262,7 +584,23 @@
    std::vector &,
    std::vector,
    std::vector *,
-   std::vector &
+   std::vector &,
+ // vectors of vectors
+   std::vector< std::vector >,
+   std::vector< std::vector >*,
+   std::vector< std::vector >&,
+   std::vector< std::vector >,
+   std::vector< std::vector >*,
+   std::vector< std::vector >&,
+   std::vector< std::vector >,
+   std::vector< std::vector >*,
+   std::vector< std::vector >&,
+   std::vector< std::vector >,
+   std::vector< std::vector >*,
+   std::vector< std::vector >&,
+   std::vector< std::vector >,
+   std::vector< std::vector >*,
+   std::vector< std::vector >&
+
+
  %{    %}
-
-

From e4a3a004ae0bd23c22e70e4d93f5a46d3e05199e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 11 Jun 2012 18:05:56 +0000
Subject: [PATCH 068/538] Move contributor names to where they belong

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13160 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 COPYRIGHT          | 2 +-
 Lib/r/std_vector.i | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 2fe0099b8..d2b87770a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -65,7 +65,7 @@ Past contributors include:
  James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran
  Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn,
  Edward Zimmermann, David Ascher, Dominique Dumont, Pier Giorgio Esposito, Hasan Baran Kovuk,
- Klaus Wiederänders
+ Klaus Wiederänders, Richard Beare
  (See CHANGES and CHANGES.current and the bug tracker for a more complete list).
 
 Past students:
diff --git a/Lib/r/std_vector.i b/Lib/r/std_vector.i
index 155626aa5..f7ad94aac 100644
--- a/Lib/r/std_vector.i
+++ b/Lib/r/std_vector.i
@@ -1,7 +1,6 @@
 // R specific swig components
 /*
   Vectors
-  Thanks to Richard Beare - richard.beare@ieee.org for StdVectorTraits
 */
 
 %fragment("StdVectorTraits","header",fragment="StdSequenceTraits")

From 1ce005825696c33b2040ae703e12c3698daa3815 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 25 Jun 2012 06:36:29 +0000
Subject: [PATCH 069/538] Fix symbol table bug with combinations of using
 directives and using declarations

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13190 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               | 13 +++
 Examples/test-suite/common.mk                 |  1 +
 ...using_directive_and_declaration_runme.java | 28 ++++++
 .../using_directive_and_declaration.i         | 85 +++++++++++++++++++
 Source/Swig/symbol.c                          | 19 +++++
 5 files changed, 146 insertions(+)
 create mode 100644 Examples/test-suite/java/using_directive_and_declaration_runme.java
 create mode 100644 Examples/test-suite/using_directive_and_declaration.i

diff --git a/CHANGES.current b/CHANGES.current
index 8458e45e0..ccf7a1e18 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,19 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.8 (in progress)
 ===========================
+2012-06-25: wsfulton
+            Fix using declarations combined with using directives so that types are correctly found in scope.
+            Example:
+
+              namespace Outer2 {
+                namespace Space2 {
+                  class Thing2 {};
+                }
+              }
+              using namespace Outer2; // using directive
+              using Space2::Thing2; // using declaration
+              void useit2(Thing2 t) {}
+
 2012-05-29: wsfulton
             Fix #3529601 - seg fault when a protected method has the "director"
             feature but the parent class does not. Also fix similar problems with
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 5660ec99e..fd7ecb1f3 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -442,6 +442,7 @@ CPP_TEST_CASES += \
 	using1 \
 	using2 \
 	using_composition \
+	using_directive_and_declaration \
 	using_extend \
 	using_inherit \
 	using_namespace \
diff --git a/Examples/test-suite/java/using_directive_and_declaration_runme.java b/Examples/test-suite/java/using_directive_and_declaration_runme.java
new file mode 100644
index 000000000..2be189dd5
--- /dev/null
+++ b/Examples/test-suite/java/using_directive_and_declaration_runme.java
@@ -0,0 +1,28 @@
+
+import using_directive_and_declaration.*;
+
+public class using_directive_and_declaration_runme {
+
+  static {
+    try {
+        System.loadLibrary("using_directive_and_declaration");
+    } 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[]) 
+  {
+    using_directive_and_declaration.useit1(new Thing1());
+    using_directive_and_declaration.useit2(new Thing2());
+    using_directive_and_declaration.useit3(new Thing3());
+    using_directive_and_declaration.useit4(new Thing4());
+    using_directive_and_declaration.useit5(new Thing5());
+    Thing6a t6a = new Thing6a();
+    t6a.a();
+    Thing6 t6b = new Thing6();
+    t6b.b();
+    using_directive_and_declaration.useit6(t6a, t6b);
+  }
+}
diff --git a/Examples/test-suite/using_directive_and_declaration.i b/Examples/test-suite/using_directive_and_declaration.i
new file mode 100644
index 000000000..7196d39f1
--- /dev/null
+++ b/Examples/test-suite/using_directive_and_declaration.i
@@ -0,0 +1,85 @@
+%module using_directive_and_declaration
+// Test using directives combined with using declarations
+
+%inline %{
+namespace Outer1 {
+  namespace Space1 {
+    class Thing1 {};
+  }
+}
+using namespace Outer1::Space1;
+using Outer1::Space1::Thing1;
+void useit1(Thing1 t) {}
+
+
+namespace Outer2 {
+  namespace Space2 {
+    class Thing2 {};
+  }
+}
+using namespace Outer2;
+using Space2::Thing2;
+void useit2(Thing2 t) {}
+
+
+namespace Outer3 {
+  namespace Space3 {
+    namespace Middle3 {
+      class Thing3 {};
+    }
+  }
+}
+using namespace Outer3;
+using namespace Space3;
+using Middle3::Thing3;
+void useit3(Thing3 t) {}
+
+
+namespace Outer4 {
+  namespace Space4 {
+    namespace Middle4 {
+      class Thing4 {};
+    }
+  }
+}
+using namespace Outer4::Space4;
+using Middle4::Thing4;
+void useit4(Thing4 t) {}
+
+
+namespace Outer5 {
+  namespace Space5 {
+    namespace Middle5 {
+      namespace More5 {
+        class Thing5 {};
+      }
+    }
+  }
+}
+using namespace ::Outer5::Space5;
+using namespace Middle5;
+using More5::Thing5;
+void useit5(Thing5 t) {}
+
+%}
+
+// Same symbol name in different namespaces
+%rename(Thing6a) Outer6::Space6a::Thing6;
+
+%inline %{
+namespace Outer6 {
+  namespace Space6a {
+    struct Thing6 {
+      void a() {}
+    };
+  }
+  namespace Space6b {
+    struct Thing6 {
+      void b() {}
+    };
+  }
+}
+using namespace Outer6::Space6b;
+void useit6(Outer6::Space6a::Thing6 ta, Thing6 tb) {}
+%}
+
diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c
index 5ee6c3ec0..af0c7d015 100644
--- a/Source/Swig/symbol.c
+++ b/Source/Swig/symbol.c
@@ -1053,6 +1053,25 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt
 	Node *pn = Getattr(symtab, "parentNode");
 	if (pn)
 	  n = symbol_lookup_qualified(name, pn, prefix, local, checkfunc);
+
+	/* Check inherited scopes */
+	if (!n) {
+	  List *inherit = Getattr(symtab, "inherit");
+	  if (inherit) {
+	    int i, len;
+	    len = Len(inherit);
+	    for (i = 0; i < len; i++) {
+	      Node *prefix_node = symbol_lookup(prefix, Getitem(inherit, i), checkfunc);
+	      if (prefix_node) {
+		Node *prefix_symtab = Getattr(prefix_node, "symtab");
+		if (prefix_symtab) {
+		  n = symbol_lookup(name, prefix_symtab, checkfunc);
+		  break;
+		}
+	      }
+	    }
+	  }
+	}
       } else {
 	n = 0;
       }

From b6c76bcd949c354dc2ea3bd2dee43f29651c5f6e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 25 Jun 2012 18:22:17 +0000
Subject: [PATCH 070/538] Cosmetic changes and some docs on some symbol
 functions

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13192 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Swig/symbol.c | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c
index af0c7d015..739767558 100644
--- a/Source/Swig/symbol.c
+++ b/Source/Swig/symbol.c
@@ -463,6 +463,7 @@ Symtab *Swig_symbol_current(void) {
  * Swig_symbol_alias()
  *
  * Makes an alias for a symbol in the global symbol table.
+ * Primarily for namespace aliases such as 'namespace X = Y;'.
  * ----------------------------------------------------------------------------- */
 
 void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) {
@@ -482,6 +483,8 @@ void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) {
  * Swig_symbol_inherit()
  *
  * Inherit symbols from another scope.
+ * Primarily for using directives, such as 'using namespace X;'.
+ * Not for using declarations, such as 'using A;'.
  * ----------------------------------------------------------------------------- */
 
 void Swig_symbol_inherit(Symtab *s) {
@@ -535,6 +538,7 @@ void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) {
 
   if (!name)
     return;
+
   if (SwigType_istemplate(name)) {
     String *cname = NewString(name);
     String *dname = Swig_symbol_template_deftype(cname, 0);
@@ -880,7 +884,7 @@ Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) {
     /* Well, we made it this far.  Guess we can drop the symbol in place */
     Setattr(n, "sym:symtab", current_symtab);
     Setattr(n, "sym:name", symname);
-    /* Printf(stdout,"%s %x\n", Getattr(n,"sym:overname"), current_symtab); */
+    /* Printf(stdout,"%s %p\n", Getattr(n,"sym:overname"), current_symtab); */
     assert(!Getattr(n, "sym:overname"));
     overname = NewStringf("__SWIG_%d", pn);
     Setattr(n, "sym:overname", overname);
@@ -927,7 +931,6 @@ static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (No
     return 0;
   Setmark(symtab, 1);
 
-
   n = Getattr(sym, name);
 
 #ifdef SWIG_DEBUG
@@ -1084,8 +1087,9 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt
  * Swig_symbol_clookup()
  *
  * Look up a symbol in the symbol table.   This uses the C name, not scripting
- * names.   Note: If we come across a using a directive, we follow it to
- * to get the real node.
+ * names.   Note: If we come across a using declaration, we follow it to
+ * to get the real node. Any using directives are also followed (but this is
+ * implemented in symbol_lookup()).
  * ----------------------------------------------------------------------------- */
 
 Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) {
@@ -1226,6 +1230,9 @@ Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (*
 
 /* -----------------------------------------------------------------------------
  * Swig_symbol_clookup_local()
+ *
+ * Same as Swig_symbol_clookup but parent nodes are not searched, that is, just
+ * this symbol table is searched.
  * ----------------------------------------------------------------------------- */
 
 Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) {
@@ -1446,14 +1453,14 @@ Node *Swig_symbol_isoverloaded(Node *n) {
 }
 
 /* -----------------------------------------------------------------------------
- * Swig_symbol_type_qualify()
+ * symbol_template_qualify()
  *
- * Create a fully qualified type name
+ * Internal function to create a fully qualified type name for templates
  * ----------------------------------------------------------------------------- */
 
 /* This cache produces problems with OSS, don't active it */
 /* #define SWIG_TEMPLATE_QUALIFY_CACHE */
-static SwigType *Swig_symbol_template_qualify(const SwigType *e, Symtab *st) {
+static SwigType *symbol_template_qualify(const SwigType *e, Symtab *st) {
   String *tprefix, *tsuffix;
   SwigType *qprefix;
   List *targs;
@@ -1518,10 +1525,16 @@ static SwigType *Swig_symbol_template_qualify(const SwigType *e, Symtab *st) {
 }
 
 
-static int no_constructor(Node *n) {
+static int symbol_no_constructor(Node *n) {
   return !Checkattr(n, "nodeType", "constructor");
 }
 
+/* -----------------------------------------------------------------------------
+ * Swig_symbol_type_qualify()
+ *
+ * Create a fully qualified type name
+ * ----------------------------------------------------------------------------- */
+
 SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) {
   List *elements;
   String *result = NewStringEmpty();
@@ -1538,7 +1551,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) {
   for (i = 0; i < len; i++) {
     String *e = Getitem(elements, i);
     if (SwigType_issimple(e)) {
-      Node *n = Swig_symbol_clookup_check(e, st, no_constructor);
+      Node *n = Swig_symbol_clookup_check(e, st, symbol_no_constructor);
       if (n) {
 	String *name = Getattr(n, "name");
 	Clear(e);
@@ -1558,7 +1571,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) {
 	  Delete(qname);
 	}
       } else if (SwigType_istemplate(e)) {
-	SwigType *ty = Swig_symbol_template_qualify(e, st);
+	SwigType *ty = symbol_template_qualify(e, st);
 	Clear(e);
 	Append(e, ty);
 	Delete(ty);

From 33926f12013336ba285a52e84802319abe283186 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 9 Jul 2012 20:06:09 +0000
Subject: [PATCH 071/538] Note lack of support for %shared_ptr and directors

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13308 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Library.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html
index dcec21c90..1c7b84a1a 100644
--- a/Doc/Manual/Library.html
+++ b/Doc/Manual/Library.html
@@ -1871,6 +1871,8 @@ Adding the missing %shared_ptr macros will fix this:
    • +Note: There is currently no support for %shared_ptr and the director feature. +

    8.5 Utility Libraries

    From d1ae77bdc20845144b0cf9038cd7687ba270603f Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Thu, 12 Jul 2012 17:53:02 +0000 Subject: [PATCH 072/538] octave: use _Exit instead of _exit - _exit is a POSIX function (unistd.h), whereas _Exit is in C99 (stdlib.h) and is therefore more likely to be supported by C++ compilers (cstdlib) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13318 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octruntime.swg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 8c14bedfe..fbb1157b5 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -132,8 +132,9 @@ DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { #ifdef SWIG_OCTAVE_SEGFAULT_HACK #define _SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) SWIG_OCT_SEGF_HACK_ATEXIT_FCN_##NAME #define SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) _SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) +#include void SWIG_OCT_SEGF_HACK_ATEXIT_FCN(SWIG_name)(void) { - _exit(exit_status); + _Exit(exit_status); } #endif From ae0c4d37b9a91581f0fc56354c8a616325fac1ce Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Fri, 20 Jul 2012 07:31:32 +0000 Subject: [PATCH 073/538] octave: improved segfault-on-exit prevention hack - Now simply set exit function pointer "octave_exit" to _Exit. This correctly preserves exit status when error() is called. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13336 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/octave/octruntime.swg | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index fbb1157b5..16ad3f7c9 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -1,4 +1,5 @@ %insert(runtime) %{ +#include #include #include #include @@ -120,24 +121,6 @@ DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { return octave_value(octave_uint64((unsigned long long) ost->swig_this())); } -// workaround to prevent octave seg-faulting on exit: register at-exit -// function which exits octave immediately without trying to cleanup memory. -// definitely affects version 3.2.*, not sure about 3.3.*, seems to be -// fixed in version 3.4.* and above. can be turned on/off with macros. -#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK -#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 -#define SWIG_OCTAVE_SEGFAULT_HACK -#endif -#endif -#ifdef SWIG_OCTAVE_SEGFAULT_HACK -#define _SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) SWIG_OCT_SEGF_HACK_ATEXIT_FCN_##NAME -#define SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) _SWIG_OCT_SEGF_HACK_ATEXIT_FCN(NAME) -#include -void SWIG_OCT_SEGF_HACK_ATEXIT_FCN(SWIG_name)(void) { - _Exit(exit_status); -} -#endif - static const char *const SWIG_name_usage = "-*- texinfo -*- \n\ @deftypefn {Loadable Module} {} " SWIG_name_d "\n\ Loads the SWIG-generated module `" SWIG_name_d "'.\n\ @@ -164,8 +147,14 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { // create module on first function call if (!module_ns) { -#ifdef SWIG_OCTAVE_SEGFAULT_HACK - atexit(SWIG_OCT_SEGF_HACK_ATEXIT_FCN(SWIG_name)); + // workaround to prevent octave seg-faulting on exit: set Octave exit function + // octave_exit to _Exit, which exits immediately without trying to cleanup memory. + // definitely affects version 3.2.*, not sure about 3.3.*, seems to be + // fixed in version 3.4.* and above. can be turned off with macro def. +#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK +#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 + octave_exit = ::_Exit; +#endif #endif // workaround bug in octave where installing global variable of custom type and then From 4ef525c713c81306bc3853331f175797d03b8850 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Fri, 20 Jul 2012 08:53:51 +0000 Subject: [PATCH 074/538] Updated changelog for previous 2 octave commits git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13337 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index ccf7a1e18..51dd78e10 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== +2012-07-20: kwwette + [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit(). + 2012-06-25: wsfulton Fix using declarations combined with using directives so that types are correctly found in scope. Example: From 4241dd1e93f21eccd531f3a53b90fa6f98368011 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 21 Jul 2012 06:58:28 +0000 Subject: [PATCH 075/538] Warning removal for autoconf 2.66 and later git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13338 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 69685e0ed..d04c76f6f 100644 --- a/configure.in +++ b/configure.in @@ -1236,16 +1236,16 @@ CFLAGS="`echo $CFLAGS | sed 's/-ansi//g;s/-pedantic//g;'` $GUILEINCLUDE" LIBS="$LIBS $GUILELINK" AC_MSG_CHECKING(whether Guile's gh_ API works) -AC_LINK_IFELSE([#include - int main() { SCM s; return gh_scm2int(s); }], GUILE_GH_INTERFACE=1, ) +AC_LINK_IFELSE([AC_LANG_SOURCE([#include + int main() { SCM s; return gh_scm2int(s); }])], GUILE_GH_INTERFACE=1, ) if test -n "$GUILE_GH_INTERFACE" ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) fi AC_MSG_CHECKING(whether Guile's SCM_ API works) -AC_LINK_IFELSE([#include - int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }], GUILE_SCM_INTERFACE=1, ) +AC_LINK_IFELSE([AC_LANG_SOURCE([#include + int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }])], GUILE_SCM_INTERFACE=1, ) if test -n "$GUILE_SCM_INTERFACE" ; then AC_MSG_RESULT(yes) else From 594fd2b41095ca1a22e809a0285d68a7fc9bdb38 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 21 Jul 2012 14:04:37 +0000 Subject: [PATCH 076/538] Fix gdb debugger functions to display to the gdb output window rather than stdout. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13339 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 5 +++++ Tools/swig.gdb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 51dd78e10..143efc7eb 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== +2012-06-27: wsfulton + Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window + rather than stdout. This fixes display problems in gdbtui and the ensures the output + appears where expected in other gdb based debuggers such as Eclipse CDT. + 2012-07-20: kwwette [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit(). diff --git a/Tools/swig.gdb b/Tools/swig.gdb index 195032955..61872c5d6 100644 --- a/Tools/swig.gdb +++ b/Tools/swig.gdb @@ -15,7 +15,7 @@ define swigprint else set $expand_count = -1 end - call Swig_print($arg0, $expand_count) + Printf "%s\n", Swig_to_string($arg0, $expand_count) end document swigprint Displays any SWIG DOH object @@ -31,7 +31,7 @@ define locswigprint else set $expand_count = -1 end - call Swig_print_with_location($arg0, $expand_count) + Printf "%s\n", Swig_to_string_with_location($arg0, $expand_count) end document locswigprint Displays any SWIG DOH object prefixed with file and line location From 7b58300cbdc98fa52c42572cffd3f31f10728864 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 21 Jul 2012 22:52:30 +0000 Subject: [PATCH 077/538] Fix display of pointers on 64 bit systems, only 32 bit values were being shown. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13340 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 ++ Source/CParse/parser.y | 2 +- Source/DOH/hash.c | 6 ++-- Source/DOH/list.c | 2 +- Source/Modules/allegrocl.cxx | 64 ++++++++++++++++++------------------ Source/Modules/browser.cxx | 32 +++++++++--------- Source/Modules/cffi.cxx | 2 +- Source/Modules/modula3.cxx | 2 +- Source/Modules/perl5.cxx | 2 +- Source/Modules/python.cxx | 2 +- Source/Modules/s-exp.cxx | 2 +- Source/Modules/xml.cxx | 20 +++++------ Source/Swig/symbol.c | 12 +++---- Source/Swig/tree.c | 2 +- Source/Swig/typesys.c | 14 ++++---- 15 files changed, 85 insertions(+), 82 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 143efc7eb..4b3a2679c 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== +2012-06-27: wsfulton + Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown. + 2012-06-27: wsfulton Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window rather than stdout. This fixes display problems in gdbtui and the ensures the output diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index e2033f01b..27344598a 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -2988,7 +2988,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va if (am) { Symtab *st = Swig_symbol_current(); Swig_symbol_setscope(Getattr(templnode,"symtab")); - /* Printf(stdout,"%s: %s %x %x\n", Getattr(templnode,"name"), clsname, Swig_symbol_current(), Getattr(templnode,"symtab")); */ + /* Printf(stdout,"%s: %s %p %p\n", Getattr(templnode,"name"), clsname, Swig_symbol_current(), Getattr(templnode,"symtab")); */ merge_extensions(templnode,am); Swig_symbol_setscope(st); append_previous_extension(templnode,am); diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 241383327..566cb349a 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -415,12 +415,12 @@ static DOH *Hash_str(DOH *ho) { s = NewStringEmpty(); if (ObjGetMark(ho)) { - Printf(s, "Hash(0x%x)", ho); + Printf(s, "Hash(%p)", ho); return s; } if (expanded >= max_expand) { /* replace each hash attribute with a '.' */ - Printf(s, "Hash(0x%x) {", ho); + Printf(s, "Hash(%p) {", ho); for (i = 0; i < h->hashsize; i++) { n = h->hashtable[i]; while (n) { @@ -432,7 +432,7 @@ static DOH *Hash_str(DOH *ho) { return s; } ObjSetMark(ho, 1); - Printf(s, "Hash(0x%x) {\n", ho); + Printf(s, "Hash(%p) {\n", ho); for (i = 0; i < h->hashsize; i++) { n = h->hashtable[i]; while (n) { diff --git a/Source/DOH/list.c b/Source/DOH/list.c index d5b532409..d20311150 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -242,7 +242,7 @@ static DOH *List_str(DOH *lo) { List *l = (List *) ObjData(lo); s = NewStringEmpty(); if (ObjGetMark(lo)) { - Printf(s, "List(%x)", lo); + Printf(s, "List(%p)", lo); return s; } ObjSetMark(lo, 1); diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 84644a61c..b6c5385fb 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -206,7 +206,7 @@ static String *namespace_of(String *str) { void add_linked_type(Node *n) { #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "Adding linked node of type: %s(%s) %s(%x)\n\n", nodeType(n), Getattr(n, "storage"), Getattr(n, "name"), n); + Printf(stderr, "Adding linked node of type: %s(%s) %s(%p)\n\n", nodeType(n), Getattr(n, "storage"), Getattr(n, "name"), n); // Swig_print_node(n); #endif if (!first_linked_type) { @@ -300,13 +300,13 @@ Node *get_primary_synonym_of(Node *n) { Node *p = Getattr(n, "allegrocl:synonym-of"); Node *prim = n; - // Printf(stderr, "getting primary synonym of %x\n", n); + // Printf(stderr, "getting primary synonym of %p\n", n); while (p) { - // Printf(stderr, " found one! %x\n", p); + // Printf(stderr, " found one! %p\n", p); prim = p; p = Getattr(p, "allegrocl:synonym-of"); } - // Printf(stderr,"get_primary_syn: DONE. returning %s(%x)\n", Getattr(prim,"name"),prim); + // Printf(stderr,"get_primary_syn: DONE. returning %s(%p)\n", Getattr(prim,"name"),prim); return prim; } @@ -331,7 +331,7 @@ void add_forward_referenced_type(Node *n, int overwrite = 0) { // , name); #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "Linking forward reference type = %s(%x)\n", k, n); + Printf(stderr, "Linking forward reference type = %s(%p)\n", k, n); #endif add_linked_type(n); } @@ -346,8 +346,8 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, String *cDeclName = n ? Getattr(n, "name") : 0; #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "IN A-D-F-T. (n=%x, ow=%d, k=%s, name=%s, ns=%s\n", n, overwrite, k, name, ns); - Printf(stderr, " templated = '%x', classDecl = '%x'\n", templated, cDeclName); + Printf(stderr, "IN A-D-F-T. (n=%p, ow=%d, k=%s, name=%s, ns=%s\n", n, overwrite, k, name, ns); + Printf(stderr, " templated = '%p', classDecl = '%p'\n", templated, cDeclName); #endif if (n) { if (!name) @@ -456,7 +456,7 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, } } #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "looking to add %s/%s(%x) to linked_type_list...\n", k, name, n); + Printf(stderr, "looking to add %s/%s(%p) to linked_type_list...\n", k, name, n); #endif if (is_fwd_ref) { // Printf(stderr,"*** 1\n"); @@ -509,7 +509,7 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, Setattr(new_node, "allegrocl:synonym:is-primary", "1"); } else { // a synonym type was found (held in variable 'match') - // Printf(stderr, "setting primary synonym of %x to %x\n", new_node, match); + // Printf(stderr, "setting primary synonym of %p to %p\n", new_node, match); if (new_node == match) Printf(stderr, "Hey-4 * - '%s' is a synonym of iteself!\n", Getattr(new_node, "name")); Setattr(new_node, "allegrocl:synonym-of", match); @@ -556,8 +556,8 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, Setattr(n, "allegrocl:synonym-of", match); Setattr(n, "real-name", Copy(lookup_type)); - // Printf(stderr, "*** pre-5: found match of '%s'(%x)\n", Getattr(match,"name"),match); - // if(n == match) Printf(stderr, "Hey-5 *** setting synonym of %x to %x\n", n, match); + // Printf(stderr, "*** pre-5: found match of '%s'(%p)\n", Getattr(match,"name"),match); + // if(n == match) Printf(stderr, "Hey-5 *** setting synonym of %p to %p\n", n, match); // Printf(stderr,"*** 5\n"); add_linked_type(n); } else { @@ -615,7 +615,7 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, match = find_linked_type_by_name(resolved); if (!match) { #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "found no implicit instantiation of %%template node %s(%x)\n", Getattr(n, "name"), n); + Printf(stderr, "found no implicit instantiation of %%template node %s(%p)\n", Getattr(n, "name"), n); #endif add_linked_type(n); } else { @@ -624,14 +624,14 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, Setattr(n, "allegrocl:synonym:is-primary", "1"); Delattr(primary, "allegrocl:synonym:is-primary"); if (n == match) - Printf(stderr, "Hey-7 * setting synonym of %x to %x\n (match = %x)", primary, n, match); + Printf(stderr, "Hey-7 * setting synonym of %p to %p\n (match = %p)", primary, n, match); Setattr(primary, "allegrocl:synonym-of", n); // Printf(stderr,"*** 7\n"); add_linked_type(n); } } else { #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "linking type '%s'(%x)\n", k, n); + Printf(stderr, "linking type '%s'(%p)\n", k, n); #endif // Printf(stderr,"*** 8\n"); add_linked_type(n); @@ -821,7 +821,7 @@ String *compose_foreign_type(Node *n, SwigType *ty, String * /*id*/ = 0) { Printf(stderr, "compose_foreign_type: ENTER (%s)...\n ", ty); // Printf(stderr, "compose_foreign_type: ENTER (%s)(%s)...\n ", ty, (id ? id : 0)); /* String *id_ref = SwigType_str(ty, id); - Printf(stderr, "looking up typemap for %s, found '%s'(%x)\n", + Printf(stderr, "looking up typemap for %s, found '%s'(%p)\n", id_ref, lookup_res ? Getattr(lookup_res, "code") : 0, lookup_res); if (lookup_res) Swig_print_node(lookup_res); */ @@ -860,7 +860,7 @@ void update_package_if_needed(Node *n, File *f = f_clwrap) { Printf(stderr, "update_package: ENTER... \n"); Printf(stderr, " current_package = '%s'\n", current_package); Printf(stderr, " node_package = '%s'\n", Getattr(n, "allegrocl:package")); - Printf(stderr, " node(%x) = '%s'\n", n, Getattr(n, "name")); + Printf(stderr, " node(%p) = '%s'\n", n, Getattr(n, "name")); #endif String *node_package = Getattr(n, "allegrocl:package"); if (Strcmp(current_package, node_package)) { @@ -1119,7 +1119,7 @@ String *convert_literal(String *literal, String *type, bool try_to_split) { void emit_stub_class(Node *n) { #ifdef ALLEGROCL_WRAP_DEBUG - Printf(stderr, "emit_stub_class: ENTER... '%s'(%x)\n", Getattr(n, "sym:name"), n); + Printf(stderr, "emit_stub_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n); Swig_print_node(n); #endif @@ -1157,7 +1157,7 @@ void emit_synonym(Node *synonym) { Printf(stderr, "emit_synonym: ENTER... \n"); #endif - // Printf(stderr,"in emit_synonym for %s(%x)\n", Getattr(synonym,"name"),synonym); + // Printf(stderr,"in emit_synonym for %s(%p)\n", Getattr(synonym,"name"),synonym); int is_tempInst = !Strcmp(nodeType(synonym), "templateInst"); String *synonym_type; @@ -1214,7 +1214,7 @@ void emit_full_class(Node *n) { String *name = Getattr(n, "sym:name"); String *kind = Getattr(n, "kind"); - // Printf(stderr,"in emit_full_class: '%s'(%x).", Getattr(n,"name"),n); + // Printf(stderr,"in emit_full_class: '%s'(%p).", Getattr(n,"name"),n); if (Getattr(n, "allegrocl:synonym-of")) { // Printf(stderr,"but it's a synonym of something.\n"); update_package_if_needed(n, f_clhead); @@ -1314,7 +1314,7 @@ void emit_full_class(Node *n) { void emit_class(Node *n) { #ifdef ALLEGROCL_WRAP_DEBUG - Printf(stderr, "emit_class: ENTER... '%s'(%x)\n", Getattr(n, "sym:name"), n); + Printf(stderr, "emit_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n); #endif int is_tempInst = !Strcmp(nodeType(n), "templateInst"); @@ -1373,7 +1373,7 @@ void emit_typedef(Node *n) { Delete(type); Node *in_class = Getattr(n, "allegrocl:typedef:in-class"); - // Printf(stderr,"in emit_typedef: '%s'(%x).",Getattr(n,"name"),n); + // Printf(stderr,"in emit_typedef: '%s'(%p).",Getattr(n,"name"),n); if (Getattr(n, "allegrocl:synonym-of")) { // Printf(stderr," but it's a synonym of something.\n"); emit_synonym(n); @@ -1536,11 +1536,11 @@ void dump_linked_types(File *f) { Node *n = first_linked_type; int i = 0; while (n) { - Printf(f, "%d: (%x) node '%s' name '%s'\n", i++, n, nodeType(n), Getattr(n, "sym:name")); + Printf(f, "%d: (%p) node '%s' name '%s'\n", i++, n, nodeType(n), Getattr(n, "sym:name")); Node *t = Getattr(n, "allegrocl:synonym-of"); if (t) - Printf(f, " synonym-of %s(%x)\n", Getattr(t, "name"), t); + Printf(f, " synonym-of %s(%p)\n", Getattr(t, "name"), t); n = Getattr(n, "allegrocl:next_linked_type"); } } @@ -1556,7 +1556,7 @@ void emit_linked_types() { while (n) { String *node_type = nodeType(n); - // Printf(stderr,"emitting node %s(%x) of type %s.", Getattr(n,"name"),n, nodeType(n)); + // Printf(stderr,"emitting node %s(%p) of type %s.", Getattr(n,"name"),n, nodeType(n)); if (!Strcmp(node_type, "class") || !Strcmp(node_type, "templateInst")) { // may need to emit a stub, so it will update the package itself. // Printf(stderr," Passing to emit_class."); @@ -2049,7 +2049,7 @@ int emit_num_lin_arguments(ParmList *parms) { int nargs = 0; while (p) { - // Printf(stderr,"enla: '%s' lin='%x' numinputs='%s'\n", Getattr(p,"name"), Getattr(p,"tmap:lin"), Getattr(p,"tmap:lin:numinputs")); + // Printf(stderr,"enla: '%s' lin='%p' numinputs='%s'\n", Getattr(p,"name"), Getattr(p,"tmap:lin"), Getattr(p,"tmap:lin:numinputs")); if (Getattr(p, "tmap:lin")) { nargs += GetInt(p, "tmap:lin:numinputs"); p = Getattr(p, "tmap:lin:next"); @@ -2283,7 +2283,7 @@ IDargs *id_converter_arguments(Node *n) { result->arity = NewStringf("%d", // emit_num_arguments(Getattr(n, "wrap:parms"))); emit_num_lin_arguments(Getattr(n, "wrap:parms"))); - // Printf(stderr, "got arity of '%s' node '%s' '%x'\n", result->arity, Getattr(n,"name"), Getattr(n,"wrap:parms")); + // Printf(stderr, "got arity of '%s' node '%s' '%p'\n", result->arity, Getattr(n,"name"), Getattr(n,"wrap:parms")); } SetVoid(n, "allegrocl:id-converter-args", result); @@ -2361,7 +2361,7 @@ int ALLEGROCL::emit_dispatch_defun(Node *n) { #endif List *overloads = Swig_overload_rank(n, true); - // Printf(stderr,"\ndispatch node=%x\n\n", n); + // Printf(stderr,"\ndispatch node=%p\n\n", n); // Swig_print_node(n); Node *overloaded_from = Getattr(n,"sym:overloaded"); @@ -2669,7 +2669,7 @@ int ALLEGROCL::functionWrapper(Node *n) { if (Getattr(n, "overload:ignore")) { // if we're the last overload, make sure to force the emit // of the rest of the overloads before we leave. - // Printf(stderr, "ignored overload %s(%x)\n", name, Getattr(n, "sym:nextSibling")); + // Printf(stderr, "ignored overload %s(%p)\n", name, Getattr(n, "sym:nextSibling")); if (!Getattr(n, "sym:nextSibling")) { update_package_if_needed(n); emit_buffered_defuns(n); @@ -2798,7 +2798,7 @@ int ALLEGROCL::functionWrapper(Node *n) { int ALLEGROCL::namespaceDeclaration(Node *n) { #ifdef ALLEGROCL_DEBUG - Printf(stderr, "namespaceDecl: '%s'(0x%x) (fc=0x%x)\n", Getattr(n, "sym:name"), n, firstChild(n)); + Printf(stderr, "namespaceDecl: '%s'(%p) (fc=%p)\n", Getattr(n, "sym:name"), n, firstChild(n)); #endif /* don't wrap a namespace with no contents. package bloat. @@ -3018,7 +3018,7 @@ int ALLEGROCL::typedefHandler(Node *n) { if (in_class) { #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, " typedef in class '%s'(%x)\n", Getattr(in_class, "sym:name"), in_class); + Printf(stderr, " typedef in class '%s'(%p)\n", Getattr(in_class, "sym:name"), in_class); #endif Setattr(n, "allegrocl:typedef:in-class", in_class); @@ -3036,7 +3036,7 @@ int ALLEGROCL::typedefHandler(Node *n) { String *lookup = lookup_defined_foreign_type(typedef_type); #ifdef ALLEGROCL_TYPE_DEBUG - Printf(stderr, "** lookup='%s'(%x), typedef_type='%s', strcmp = '%d' strstr = '%d'\n", lookup, lookup, typedef_type, Strcmp(typedef_type,"void"), Strstr(ff_type,"__SWIGACL_FwdReference")); + Printf(stderr, "** lookup='%s'(%p), typedef_type='%s', strcmp = '%d' strstr = '%d'\n", lookup, lookup, typedef_type, Strcmp(typedef_type,"void"), Strstr(ff_type,"__SWIGACL_FwdReference")); #endif if(lookup || (!lookup && Strcmp(typedef_type,"void")) || @@ -3162,7 +3162,7 @@ int ALLEGROCL::cppClassHandler(Node *n) { SwigType *childType = NewStringf("%s%s", Getattr(c, "decl"), Getattr(c, "type")); #ifdef ALLEGROCL_CLASS_DEBUG - Printf(stderr, "looking at child '%x' of type '%s' '%d'\n", c, childType, SwigType_isfunction(childType)); + Printf(stderr, "looking at child '%p' of type '%s' '%d'\n", c, childType, SwigType_isfunction(childType)); // Swig_print_node(c); #endif if (!SwigType_isfunction(childType)) diff --git a/Source/Modules/browser.cxx b/Source/Modules/browser.cxx index 592e12783..b1365c0b4 100644 --- a/Source/Modules/browser.cxx +++ b/Source/Modules/browser.cxx @@ -29,9 +29,9 @@ class Browser:public Dispatcher { v = 1; } if (v) { - Printf(out, "[-] ", n, t, n, n); + Printf(out, "[-] ", n, t, n, n); } else { - Printf(out, "[+] ", n, t, n, n); + Printf(out, "[+] ", n, t, n, n); } } void show_attributes(Node *obj) { @@ -52,7 +52,7 @@ class Browser:public Dispatcher { Replaceall(o, "&", "&"); Replaceall(o, "<", "<"); Replaceall(o, ">", ">"); - Printf(os, "? %-12s - %s\n", Getattr(obj, k), k, o); + Printf(os, "? %-12s - %s\n", Getattr(obj, k), k, o); Delete(o); } else { DOH *o; @@ -64,10 +64,10 @@ class Browser:public Dispatcher { } Replaceall(o, "&", "&"); Replaceall(o, "<", "<"); - Printf(os, "? %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc); + Printf(os, "? %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc); Delete(o); } else { - Printf(os, "? %-12s - 0x%x\n", Getattr(obj, k), k, Getattr(obj, k)); + Printf(os, "? %-12s - %p\n", Getattr(obj, k), k, Getattr(obj, k)); } } ki = Next(ki); @@ -84,7 +84,7 @@ public: char *name = GetChar(n, "name"); show_checkbox(view_top, n); - Printf(out, "%s", n, tag); + Printf(out, "%s", n, tag); if (name) { Printf(out, " (%s)", name); } @@ -184,9 +184,9 @@ static void display(FILE *f, Node *n) { Printf(f, "SWIG-%s\n", Swig_package_version()); Printf(f, "SWIG-%s
    \n", Swig_package_version()); Printf(f, "[ Exit ]"); - Printf(f, " [ Top ]", tree_top); + Printf(f, " [ Top ]", tree_top); if (n != tree_top) { - Printf(f, " [ Up ]", parentNode(n)); + Printf(f, " [ Up ]", parentNode(n)); } Printf(f, " [ Symbols ]"); Printf(f, "

    \n"); @@ -255,10 +255,10 @@ void raw_data(FILE *out, Node *obj) { trunc = "..."; } Replaceall(o, "<", "<"); - Printf(os, " ? %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc); + Printf(os, " ? %-12s - \"%(escape)-0.70s%s\"\n", Getattr(obj, k), k, o, trunc); Delete(o); } else { - Printf(os, " ? %-12s - 0x%x\n", Getattr(obj, k), k, Getattr(obj, k)); + Printf(os, " ? %-12s - %p\n", Getattr(obj, k), k, Getattr(obj, k)); } ki = Next(ki); } @@ -283,10 +283,10 @@ void raw_data(FILE *out, Node *obj) { trunc = "..."; } Replaceall(o, "<", "<"); - Printf(os, " ? [%d] - \"%(escape)-0.70s%s\"\n", o, i, s, trunc); + Printf(os, " ? [%d] - \"%(escape)-0.70s%s\"\n", o, i, s, trunc); Delete(s); } else { - Printf(os, " ? [%d] - 0x%x\n", o, i, o); + Printf(os, " ? [%d] - %p\n", o, i, o); } } Printf(os, "\n]\n"); @@ -303,7 +303,7 @@ void data_handler(FILE *f) { Printf(f, "SWIG-%s\n", Swig_package_version()); Printf(f, "SWIG-%s
    \n", Swig_package_version()); Printf(f, "[ Exit ]"); - Printf(f, " [ Top ]", tree_top); + Printf(f, " [ Top ]", tree_top); Printf(f, "

    \n"); if (n) { raw_data(f, n); @@ -319,7 +319,7 @@ void symbol_handler(FILE *f) { Printf(f, "SWIG-%s\n", Swig_package_version()); Printf(f, "SWIG-%s
    \n", Swig_package_version()); Printf(f, "[ Exit ]"); - Printf(f, " [ Top ]", tree_top); + Printf(f, " [ Top ]", tree_top); Printf(f, " [ Symbols ]"); Printf(f, "

    \n"); @@ -343,7 +343,7 @@ void symbol_handler(FILE *f) { fprintf(f, "

    \n"); fprintf(f, "Symbol lookup:
    \n"); - fprintf(f, "\n", sym); + fprintf(f, "\n", sym); fprintf(f, "Submit : \n"); fprintf(f, "
    "); @@ -365,7 +365,7 @@ void symbol_handler(FILE *f) { Hash *h; h = firstChild(sym); while (h) { - Printf(f, "%s\n", h, Getattr(h, "name")); + Printf(f, "%s\n", h, Getattr(h, "name")); h = nextSibling(h); } } diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index f2cce4fef..2bb95188b 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -671,7 +671,7 @@ int CFFI::enumDeclaration(Node *n) { void CFFI::emit_class(Node *n) { #ifdef CFFI_WRAP_DEBUG - Printf(stderr, "emit_class: ENTER... '%s'(%x)\n", Getattr(n, "sym:name"), n); + Printf(stderr, "emit_class: ENTER... '%s'(%p)\n", Getattr(n, "sym:name"), n); #endif String *name = Getattr(n, "sym:name"); diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index 19a02cbbc..bcb99e46a 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -2030,7 +2030,7 @@ MODULA3(): if (oldname != NIL) { Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "The value <%s> is already assigned to <%s>.\n", value, oldname); } -//printf("items %lx, set %s = %s\n", (long) items, Char(newvalue), Char(m3name)); +//printf("items %p, set %s = %s\n", items, Char(newvalue), Char(m3name)); Setattr(items, newvalue, m3name); if (max < numvalue) { max = numvalue; diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 00a66b801..077b5fe83 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -132,7 +132,7 @@ public: Node *is_shadow(SwigType *t) { Node *n; n = classLookup(t); - /* Printf(stdout,"'%s' --> '%x'\n", t, n); */ + /* Printf(stdout,"'%s' --> '%p'\n", t, n); */ if (n) { if (!Getattr(n, "perl5:proxy")) { setclassname(n); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index c762fb93c..c180b4a79 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -3809,7 +3809,7 @@ public: if (new_repr) { Printv(f_shadow_file, tab4, "__repr__ = _swig_repr\n", NIL); } else { - Printv(f_shadow_file, tab4, "def __repr__(self):\n", tab8, "return \"\" % (self.this,)\n", NIL); + Printv(f_shadow_file, tab4, "def __repr__(self):\n", tab8, "return \"\" % (self.this,)\n", NIL); } Delete(rname); } diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 62b93f7c7..9f2cda2f2 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -310,7 +310,7 @@ public: close_paren(); } else { // What is it? - Printf(out, "#", ObjType(obj)->objname, obj); + Printf(out, "#", ObjType(obj)->objname, obj); } } } diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index 438205f68..4bd524815 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -118,7 +118,7 @@ public: String *k; indent_level += 4; print_indent(0); - Printf(out, "\n", ++id, obj); + Printf(out, "\n", ++id, obj); indent_level += 4; Iterator ki; ki = First(obj); @@ -160,14 +160,14 @@ public: Replaceall(o, "\"", """); Replaceall(o, "\\", "\\\\"); Replaceall(o, "\n", " "); - Printf(out, "\n", ck, o, ++id, o); + Printf(out, "\n", ck, o, ++id, o); Delete(o); Delete(ck); } else { o = Getattr(obj, k); String *ck = NewString(k); Replaceall(ck, ":", "_"); - Printf(out, "\n", ck, o, ++id, o); + Printf(out, "\n", ck, o, ++id, o); Delete(ck); } } @@ -183,7 +183,7 @@ public: Node *cobj; print_indent(0); - Printf(out, "<%s id=\"%ld\" addr=\"%x\" >\n", nodeType(obj), ++id, obj); + Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", nodeType(obj), ++id, obj); Xml_print_attributes(obj); cobj = firstChild(obj); if (cobj) { @@ -203,7 +203,7 @@ public: void Xml_print_parmlist(ParmList *p, const char* markup = "parmlist") { print_indent(0); - Printf(out, "<%s id=\"%ld\" addr=\"%x\" >\n", markup, ++id, p); + Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", markup, ++id, p); indent_level += 4; while (p) { print_indent(0); @@ -221,13 +221,13 @@ public: void Xml_print_baselist(List *p) { print_indent(0); - Printf(out, "\n", ++id, p); + Printf(out, "\n", ++id, p); indent_level += 4; Iterator s; for (s = First(p); s.item; s = Next(s)) { print_indent(0); String *item_name = Xml_escape_string(s.item); - Printf(out, "\n", item_name, ++id, s.item); + Printf(out, "\n", item_name, ++id, s.item); Delete(item_name); } indent_level -= 4; @@ -251,7 +251,7 @@ public: void Xml_print_module(Node *p) { print_indent(0); - Printf(out, "\n", Getattr(p, "name"), ++id, p); + Printf(out, "\n", Getattr(p, "name"), ++id, p); } void Xml_print_kwargs(Hash *p) { @@ -272,13 +272,13 @@ public: void Xml_print_hash(Hash *p, const char *markup) { print_indent(0); - Printf(out, "<%s id=\"%ld\" addr=\"%x\" >\n", markup, ++id, p); + Printf(out, "<%s id=\"%ld\" addr=\"%p\" >\n", markup, ++id, p); Xml_print_attributes(p); indent_level += 4; Iterator n = First(p); while (n.key) { print_indent(0); - Printf(out, "<%ssitem id=\"%ld\" addr=\"%x\" >\n", markup, ++id, n.item); + Printf(out, "<%ssitem id=\"%ld\" addr=\"%p\" >\n", markup, ++id, n.item); Xml_print_attributes(n.item); print_indent(0); Printf(out, "\n", markup); diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 739767558..0cf6cdb53 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -549,7 +549,7 @@ void Swig_symbol_cadd(const_String_or_char_ptr name, Node *n) { Delete(cname); } #ifdef SWIG_DEBUG - Printf(stderr, "symbol_cadd %s %x\n", name, n); + Printf(stderr, "symbol_cadd %s %p\n", name, n); #endif cn = Getattr(ccurrent, name); @@ -934,7 +934,7 @@ static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (No n = Getattr(sym, name); #ifdef SWIG_DEBUG - Printf(stderr, "symbol_look %s %x %x %s\n", name, n, symtab, Getattr(symtab, "name")); + Printf(stderr, "symbol_look %s %p %p %s\n", name, n, symtab, Getattr(symtab, "name")); #endif if (n) { @@ -1437,7 +1437,7 @@ String *Swig_symbol_qualified(Node *n) { if (!symtab) return NewStringEmpty(); #ifdef SWIG_DEBUG - Printf(stderr, "symbol_qscope %s %x %s\n", Getattr(n, "name"), symtab, Getattr(symtab, "name")); + Printf(stderr, "symbol_qscope %s %p %s\n", Getattr(n, "name"), symtab, Getattr(symtab, "name")); #endif return Swig_symbol_qualifiedscopename(symtab); } @@ -1557,7 +1557,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) { Clear(e); Append(e, name); #ifdef SWIG_DEBUG - Printf(stderr, "symbol_qual_ei %d %s %s %x\n", i, name, e, st); + Printf(stderr, "symbol_qual_ei %d %s %s %p\n", i, name, e, st); #endif if (!Swig_scopename_check(name)) { String *qname = Swig_symbol_qualified(n); @@ -1566,7 +1566,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) { Insert(e, 0, qname); } #ifdef SWIG_DEBUG - Printf(stderr, "symbol_qual_sc %d %s %s %x\n", i, qname, e, st); + Printf(stderr, "symbol_qual_sc %d %s %s %p\n", i, qname, e, st); #endif Delete(qname); } @@ -1604,7 +1604,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) { } Delete(elements); #ifdef SWIG_DEBUG - Printf(stderr, "symbol_qualify %s %s %x %s\n", t, result, st, st ? Getattr(st, "name") : 0); + Printf(stderr, "symbol_qualify %s %s %p %s\n", t, result, st, st ? Getattr(st, "name") : 0); #endif return result; diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index 265f5a12e..af22da156 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -92,7 +92,7 @@ void Swig_print_node(Node *obj) { Printf(stdout, "%-12s - \"%(escape)-0.80s%s\"\n", k, o, trunc); Delete(o); } else { - Printf(stdout, "%-12s - 0x%x\n", k, Getattr(obj, k)); + Printf(stdout, "%-12s - %p\n", k, Getattr(obj, k)); } } ki = Next(ki); diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index a6b23a225..ab6475b9c 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -297,7 +297,7 @@ void SwigType_inherit_scope(Typetab *scope) { void SwigType_scope_alias(String *aliasname, Typetab *ttab) { String *q; - /* Printf(stdout,"alias: '%s' '%x'\n", aliasname, ttab); */ + /* Printf(stdout,"alias: '%s' '%p'\n", aliasname, ttab); */ q = SwigType_scope_name(current_scope); if (Len(q)) { Append(q, "::"); @@ -398,13 +398,13 @@ void SwigType_print_scope(void) { Printf(stdout, "-------------------------------------------------------------\n"); ttab = Getattr(i.item, "typetab"); - Printf(stdout, "Type scope '%s' (%x)\n", i.key, i.item); + Printf(stdout, "Type scope '%s' (%p)\n", i.key, i.item); { List *inherit = Getattr(i.item, "inherit"); if (inherit) { Iterator j; for (j = First(inherit); j.item; j = Next(j)) { - Printf(stdout, " Inherits from '%s' (%x)\n", Getattr(j.item, "qname"), j.item); + Printf(stdout, " Inherits from '%s' (%p)\n", Getattr(j.item, "qname"), j.item); } } } @@ -1114,14 +1114,14 @@ int SwigType_typedef_using(const_String_or_char_ptr name) { /* See if the using name is a scope */ /* tt = SwigType_find_scope(current_scope,name); - Printf(stdout,"tt = %x, name = '%s'\n", tt, name); */ + Printf(stdout,"tt = %p, name = '%s'\n", tt, name); */ /* We set up a typedef B --> A::B */ Setattr(current_typetab, base, name); /* Find the scope name where the symbol is defined */ td = SwigType_typedef_resolve(name); - /* Printf(stdout,"td = '%s' %x\n", td, resolved_scope); */ + /* Printf(stdout,"td = '%s' %p\n", td, resolved_scope); */ if (resolved_scope) { defined_name = Getattr(resolved_scope, "qname"); if (defined_name) { @@ -1803,13 +1803,13 @@ void SwigType_inherit_equiv(File *out) { Append(rlist, ck.key); } /* Printf(stdout,"rk.key = '%s'\n", rk.key); - Printf(stdout,"rh = %x '%s'\n", rh,rh); */ + Printf(stdout,"rh = %p '%s'\n", rh,rh); */ bk = First(sub); while (bk.key) { prefix = SwigType_prefix(rk.key); Append(prefix, bk.key); - /* Printf(stdout,"set %x = '%s' : '%s'\n", rh, SwigType_manglestr(prefix),prefix); */ + /* Printf(stdout,"set %p = '%s' : '%s'\n", rh, SwigType_manglestr(prefix),prefix); */ mprefix = SwigType_manglestr(prefix); Setattr(rh, mprefix, prefix); mkey = SwigType_manglestr(rk.key); From 1e1c0ad951588872404853b1742d0e69f2eb504a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 24 Jul 2012 05:43:39 +0000 Subject: [PATCH 078/538] Fix Go -package option. Previously SWIG could get confused if the module name was not the same as the package name, as is the default. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13395 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/go.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 47bfc4ea1..39b4d261a 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -18,6 +18,8 @@ class GO:public Language { // Go package name. String *package; + // SWIG module name. + String *module; // Flag for generating gccgo output. bool gccgo_flag; // Prefix to use with gccgo. @@ -81,6 +83,7 @@ class GO:public Language { public: GO():package(NULL), + module(NULL), gccgo_flag(false), go_prefix(NULL), soname(NULL), @@ -235,7 +238,7 @@ private: allow_allprotected(GetFlag(optionsnode, "allprotected")); } - String *module = Getattr(n, "name"); + module = Getattr(n, "name"); if (!package) { package = Copy(module); } @@ -4397,7 +4400,7 @@ private: ret = exportedName(ret); Node *cnmod = Getattr(cn, "module"); - if (!cnmod || Strcmp(Getattr(cnmod, "name"), package) == 0) { + if (!cnmod || Strcmp(Getattr(cnmod, "name"), module) == 0) { Setattr(undefined_types, t, t); } else { String *nw = NewString(""); @@ -4579,7 +4582,7 @@ private: } ex = exportedName(cname); Node *cnmod = Getattr(cn, "module"); - if (!cnmod || Strcmp(Getattr(cnmod, "name"), package) == 0) { + if (!cnmod || Strcmp(Getattr(cnmod, "name"), module) == 0) { if (add_to_hash) { Setattr(undefined_types, ty, ty); } From 6e6ce16e4e08bae2b03d4fef30605cfc0337d65c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:23:07 +0000 Subject: [PATCH 079/538] Fix using declarations combined with using directives with forward class references. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13502 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 42 ++++++ Examples/test-suite/common.mk | 2 + .../namespace_forward_declaration_runme.java | 26 ++++ ...rective_and_declaration_forward_runme.java | 53 ++++++++ ...using_directive_and_declaration_runme.java | 1 + .../namespace_forward_declaration.i | 35 +++++ .../using_directive_and_declaration.i | 21 +++ .../using_directive_and_declaration_forward.i | 124 ++++++++++++++++++ Source/CParse/parser.y | 82 ++++++++++-- Source/Swig/swig.h | 1 + Source/Swig/symbol.c | 17 ++- 11 files changed, 388 insertions(+), 16 deletions(-) create mode 100644 Examples/test-suite/java/namespace_forward_declaration_runme.java create mode 100644 Examples/test-suite/java/using_directive_and_declaration_forward_runme.java create mode 100644 Examples/test-suite/namespace_forward_declaration.i create mode 100644 Examples/test-suite/using_directive_and_declaration_forward.i diff --git a/CHANGES.current b/CHANGES.current index 4b3a2679c..663f2c451 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,7 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== + 2012-06-27: wsfulton Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown. @@ -15,6 +16,45 @@ Version 2.0.8 (in progress) 2012-07-20: kwwette [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit(). +2012-06-30: wsfulton + Fix namespace problems for symbols declared with a forward class declarations, such as: + + namespace Space1 { + namespace Space2 { + struct XXX; + struct YYY; + } + + struct Space2::YYY {}; + struct Space1::Space2::XXX {}; + + void testXXX2(Space2::XXX xx) {} + void testYYY2(Space2::YYY yy) {} + } + + where xx and yy were not recognised as the proxy classes XXX and YYY. + +2012-06-30: wsfulton + Fix using declarations combined with using directives with forward class declarations so that + types are correctly found in scope. + + namespace Outer2 { + namespace Space2 { + class Thing2; + } + } + using namespace Outer2; + using Space2::Thing2; + class Thing2 {}; + // None of the methods below correctly used the Thing2 proxy class + void useit2(Thing2 t) {} + void useit2a(Outer2::Space2::Thing2 t) {} + void useit2b(::Outer2::Space2::Thing2 t) {} + void useit2c(Space2::Thing2 t) {} + namespace Outer2 { + void useit2d(Space2::Thing2 t) {} + } + 2012-06-25: wsfulton Fix using declarations combined with using directives so that types are correctly found in scope. Example: @@ -28,6 +68,8 @@ Version 2.0.8 (in progress) using Space2::Thing2; // using declaration void useit2(Thing2 t) {} + Similarly for templated classes. + 2012-05-29: wsfulton Fix #3529601 - seg fault when a protected method has the "director" feature but the parent class does not. Also fix similar problems with diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index fd7ecb1f3..db13a9fbe 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -257,6 +257,7 @@ CPP_TEST_CASES += \ namespace_class \ namespace_enum \ namespace_extend \ + namespace_forward_declaration \ namespace_nested \ namespace_spaces \ namespace_template \ @@ -443,6 +444,7 @@ CPP_TEST_CASES += \ using2 \ using_composition \ using_directive_and_declaration \ + using_directive_and_declaration_forward \ using_extend \ using_inherit \ using_namespace \ diff --git a/Examples/test-suite/java/namespace_forward_declaration_runme.java b/Examples/test-suite/java/namespace_forward_declaration_runme.java new file mode 100644 index 000000000..c603ebacf --- /dev/null +++ b/Examples/test-suite/java/namespace_forward_declaration_runme.java @@ -0,0 +1,26 @@ + +import namespace_forward_declaration.*; + +public class namespace_forward_declaration_runme { + + static { + try { + System.loadLibrary("namespace_forward_declaration"); + } 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[]) { + XXX xxx = new XXX(); + namespace_forward_declaration.testXXX1(xxx); + namespace_forward_declaration.testXXX2(xxx); + namespace_forward_declaration.testXXX3(xxx); + YYY yyy = new YYY(); + namespace_forward_declaration.testYYY1(yyy); + namespace_forward_declaration.testYYY2(yyy); + namespace_forward_declaration.testYYY3(yyy); + } +} + diff --git a/Examples/test-suite/java/using_directive_and_declaration_forward_runme.java b/Examples/test-suite/java/using_directive_and_declaration_forward_runme.java new file mode 100644 index 000000000..916aeb703 --- /dev/null +++ b/Examples/test-suite/java/using_directive_and_declaration_forward_runme.java @@ -0,0 +1,53 @@ + +import using_directive_and_declaration_forward.*; + +public class using_directive_and_declaration_forward_runme { + + static { + try { + System.loadLibrary("using_directive_and_declaration_forward"); + } 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[]) + { + using_directive_and_declaration_forward.useit1(new Thing1()); + using_directive_and_declaration_forward.useit1a(new Thing1()); + using_directive_and_declaration_forward.useit1b(new Thing1()); + using_directive_and_declaration_forward.useit1c(new Thing1()); + + using_directive_and_declaration_forward.useit2(new Thing2()); + using_directive_and_declaration_forward.useit2a(new Thing2()); + using_directive_and_declaration_forward.useit2b(new Thing2()); + using_directive_and_declaration_forward.useit2c(new Thing2()); + using_directive_and_declaration_forward.useit2d(new Thing2()); + + using_directive_and_declaration_forward.useit3(new Thing3()); + using_directive_and_declaration_forward.useit3a(new Thing3()); + using_directive_and_declaration_forward.useit3b(new Thing3()); + using_directive_and_declaration_forward.useit3c(new Thing3()); + using_directive_and_declaration_forward.useit3d(new Thing3()); + + using_directive_and_declaration_forward.useit4(new Thing4()); + using_directive_and_declaration_forward.useit4a(new Thing4()); + using_directive_and_declaration_forward.useit4b(new Thing4()); + using_directive_and_declaration_forward.useit4c(new Thing4()); + using_directive_and_declaration_forward.useit4d(new Thing4()); + + using_directive_and_declaration_forward.useit5(new Thing5()); + using_directive_and_declaration_forward.useit5a(new Thing5()); + using_directive_and_declaration_forward.useit5b(new Thing5()); + using_directive_and_declaration_forward.useit5c(new Thing5()); + using_directive_and_declaration_forward.useit5d(new Thing5()); + + + using_directive_and_declaration_forward.useit7(new Thing7()); + using_directive_and_declaration_forward.useit7a(new Thing7()); + using_directive_and_declaration_forward.useit7b(new Thing7()); + using_directive_and_declaration_forward.useit7c(new Thing7()); + using_directive_and_declaration_forward.useit7d(new Thing7()); + } +} diff --git a/Examples/test-suite/java/using_directive_and_declaration_runme.java b/Examples/test-suite/java/using_directive_and_declaration_runme.java index 2be189dd5..29e0fd2c9 100644 --- a/Examples/test-suite/java/using_directive_and_declaration_runme.java +++ b/Examples/test-suite/java/using_directive_and_declaration_runme.java @@ -24,5 +24,6 @@ public class using_directive_and_declaration_runme { Thing6 t6b = new Thing6(); t6b.b(); using_directive_and_declaration.useit6(t6a, t6b); + using_directive_and_declaration.useit7(new Thing7()); } } diff --git a/Examples/test-suite/namespace_forward_declaration.i b/Examples/test-suite/namespace_forward_declaration.i new file mode 100644 index 000000000..ad7c48d86 --- /dev/null +++ b/Examples/test-suite/namespace_forward_declaration.i @@ -0,0 +1,35 @@ +%module namespace_forward_declaration + +%inline %{ + namespace Space1 { + namespace Space2 { + struct XXX; + struct YYY; + } + + struct Space2::YYY { + int yyy(int h) { + return h; + } + }; + struct Space1::Space2::XXX { + int xxx(int h) { + return h; + } + }; + + void testXXX1(Space1::Space2::XXX xx) { + } + void testXXX2(Space2::XXX xx) { + } + void testXXX3(::Space1::Space2::XXX xx) { + } + void testYYY1(Space1::Space2::YYY yy) { + } + void testYYY2(Space2::YYY yy) { + } + void testYYY3(::Space1::Space2::YYY yy) { + } + } +%} + diff --git a/Examples/test-suite/using_directive_and_declaration.i b/Examples/test-suite/using_directive_and_declaration.i index 7196d39f1..27c7f199c 100644 --- a/Examples/test-suite/using_directive_and_declaration.i +++ b/Examples/test-suite/using_directive_and_declaration.i @@ -81,5 +81,26 @@ namespace Outer6 { } using namespace Outer6::Space6b; void useit6(Outer6::Space6a::Thing6 ta, Thing6 tb) {} + +namespace Outer7 { + namespace Space7 { + namespace Middle7 { + class Thing7; + } + } +} +using namespace Outer7::Space7; +class Middle7::Thing7 {}; +using Middle7::Thing7; +void useit7(Thing7 t) {} +void useit7a(Outer7::Space7::Middle7::Thing7 t) {} +void useit7b(::Outer7::Space7::Middle7::Thing7 t) {} +void useit7c(Middle7::Thing7 t) {} +namespace Outer7 { + namespace Space7 { + void useit7d(Middle7::Thing7 t) {} + } +} + %} diff --git a/Examples/test-suite/using_directive_and_declaration_forward.i b/Examples/test-suite/using_directive_and_declaration_forward.i new file mode 100644 index 000000000..238b3b77f --- /dev/null +++ b/Examples/test-suite/using_directive_and_declaration_forward.i @@ -0,0 +1,124 @@ +%module using_directive_and_declaration_forward +// Test using directives combined with using declarations and forward declarations + +%inline %{ +namespace Outer1 { + namespace Space1 { + class Thing1; + } +} +using namespace Outer1::Space1; +using Outer1::Space1::Thing1; +class Thing1 {}; +void useit1(Thing1 t) {} +void useit1a(Outer1::Space1::Thing1 t) {} +void useit1b(::Outer1::Space1::Thing1 t) {} +namespace Outer1 { + void useit1c(Space1::Thing1 t) {} +} + + +namespace Outer2 { + namespace Space2 { + class Thing2; + } +} +using namespace Outer2; +using Space2::Thing2; +class Thing2 {}; +void useit2(Thing2 t) {} +void useit2a(Outer2::Space2::Thing2 t) {} +void useit2b(::Outer2::Space2::Thing2 t) {} +void useit2c(Space2::Thing2 t) {} +namespace Outer2 { + void useit2d(Space2::Thing2 t) {} +} + + +namespace Outer3 { + namespace Space3 { + namespace Middle3 { + class Thing3; + } + } +} +using namespace Outer3; +using namespace Space3; +using Middle3::Thing3; +class Thing3 {}; +void useit3(Thing3 t) {} +void useit3a(Outer3::Space3::Middle3::Thing3 t) {} +void useit3b(::Outer3::Space3::Middle3::Thing3 t) {} +void useit3c(Middle3::Thing3 t) {} +namespace Outer3 { + namespace Space3 { + void useit3d(Middle3::Thing3 t) {} + } +} + + +namespace Outer4 { + namespace Space4 { + namespace Middle4 { + class Thing4; + } + } +} +using namespace Outer4::Space4; +using Middle4::Thing4; +class Thing4 {}; +void useit4(Thing4 t) {} +void useit4a(Outer4::Space4::Middle4::Thing4 t) {} +void useit4b(::Outer4::Space4::Middle4::Thing4 t) {} +void useit4c(Middle4::Thing4 t) {} +namespace Outer4 { + namespace Space4 { + void useit4d(Middle4::Thing4 t) {} + } +} + + +namespace Outer5 { + namespace Space5 { + namespace Middle5 { + namespace More5 { + class Thing5; + } + } + } +} +using namespace ::Outer5::Space5; +using namespace Middle5; +using More5::Thing5; +class Thing5 {}; +void useit5(Thing5 t) {} +void useit5a(Outer5::Space5::Middle5::More5::Thing5 t) {} +void useit5b(::Outer5::Space5::Middle5::More5::Thing5 t) {} +void useit5c(Middle5::More5::Thing5 t) {} +namespace Outer5 { + namespace Space5 { + void useit5d(Middle5::More5::Thing5 t) {} + } +} + +namespace Outer7 { + namespace Space7 { + namespace Middle7 { + class Thing7; + } + } +} +using namespace Outer7::Space7; +class Middle7::Thing7 {}; +using Middle7::Thing7; +void useit7(Thing7 t) {} +void useit7a(Outer7::Space7::Middle7::Thing7 t) {} +void useit7b(::Outer7::Space7::Middle7::Thing7 t) {} +void useit7c(Middle7::Thing7 t) {} +namespace Outer7 { + namespace Space7 { + void useit7d(Middle7::Thing7 t) {} + } +} + +%} diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 27344598a..b400efa3a 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -205,7 +205,7 @@ static String *yyrename = 0; /* Forward renaming operator */ -static String *resolve_node_scope(String *cname); +static String *resolve_create_node_scope(String *cname); Hash *Swig_cparse_features(void) { @@ -867,26 +867,86 @@ static Node *nscope = 0; static Node *nscope_inner = 0; /* Remove the scope prefix from cname and return the base name without the prefix. - * The scopes specified in the prefix are found, or created in the current namespace. - * So ultimately the scope is changed to that required for the base name. + * The scopes required for the symbol name are resolved and/or created, if required. * For example AA::BB::CC as input returns CC and creates the namespace AA then inner - * namespace BB in the current scope. If no scope separator (::) in the input, then nothing happens! */ -static String *resolve_node_scope(String *cname) { + * namespace BB in the current scope. If cname is found to already exist as a weak symbol + * (forward reference) then the scope might be changed to match, such as when a symbol match + * is made via a using reference. */ +static String *resolve_create_node_scope(String *cname) { Symtab *gscope = 0; + Node *cname_node = 0; + int skip_lookup = 0; nscope = 0; nscope_inner = 0; + + if (Swig_scopename_check(cname)) { + String *prefix = Swig_scopename_prefix(cname); + if (prefix && (Strncmp(prefix,"::",2) == 0)) + skip_lookup = 1; + } + cname_node = skip_lookup ? 0 : Swig_symbol_clookup_no_inherit(cname, 0); + + if (cname_node) { + /* The symbol has been defined already or is in another scope. + If it is a weak symbol, it needs replacing and if it was brought into the current scope + via a using declaration, the scope needs adjusting appropriately for the new symbol. */ + Symtab *symtab = Getattr(cname_node, "sym:symtab"); + Node *sym_weak = Getattr(cname_node, "sym:weak"); + if (symtab && sym_weak) { + /* Check if the scope is the current scope */ + String *current_scopename = Swig_symbol_qualifiedscopename(0); + String *found_scopename = Swig_symbol_qualifiedscopename(symtab); + int len; + if (!current_scopename) + current_scopename = NewString(""); + if (!found_scopename) + found_scopename = NewString(""); + len = Len(current_scopename); + if ((len > 0) && (Strncmp(current_scopename, found_scopename, len) == 0)) { + if (Len(found_scopename) > len + 2) { + /* A matching weak symbol was found in non-global scope, some scope adjustment may be required */ + String *new_cname = NewString(Char(found_scopename) + len + 2); /* skip over "::" prefix */ + String *base = Swig_scopename_last(cname); + Printf(new_cname, "::%s", base); + cname = new_cname; + Delete(base); + } else { + /* A matching weak symbol was found in the same non-global local scope, no scope adjustment required */ + assert(len == Len(found_scopename)); + } + } else { + String *base = Swig_scopename_last(cname); + if (Len(found_scopename) > 0) { + /* A matching weak symbol was found in a different scope to the local scope - probably via a using declaration */ + cname = NewStringf("%s::%s", found_scopename, base); + } else { + /* Either: + 1) A matching weak symbol was found in a different scope to the local scope - this is actually a + symbol with the same name in a different scope which we don't want, so no adjustment required. + 2) A matching weak symbol was found in the global scope - no adjustment required. + */ + cname = Copy(base); + } + Delete(base); + } + Delete(current_scopename); + Delete(found_scopename); + } + } + if (Swig_scopename_check(cname)) { Node *ns; String *prefix = Swig_scopename_prefix(cname); String *base = Swig_scopename_last(cname); if (prefix && (Strncmp(prefix,"::",2) == 0)) { +/* I don't think we can use :: global scope to declare classes and hence neither %template. - consider reporting error instead - wsfulton. */ /* Use the global scope */ String *nprefix = NewString(Char(prefix)+2); Delete(prefix); prefix= nprefix; gscope = set_scope_to_global(); - } - if (!prefix || (Len(prefix) == 0)) { + } + if (Len(prefix) == 0) { /* Use the global scope, but we need to add a 'global' namespace. */ if (!gscope) gscope = set_scope_to_global(); /* note that this namespace is not the "unnamed" one, @@ -904,8 +964,7 @@ static String *resolve_node_scope(String *cname) { } else { Symtab *nstab = Getattr(ns,"symtab"); if (!nstab) { - Swig_error(cparse_file,cparse_line, - "'%s' is not defined as a valid scope.\n", prefix); + Swig_error(cparse_file,cparse_line, "'%s' is not defined as a valid scope.\n", prefix); ns = 0; } else { /* Check if the node scope is the current scope */ @@ -986,6 +1045,7 @@ static String *resolve_node_scope(String *cname) { } Delete(prefix); } + return cname; } @@ -2784,7 +2844,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va /* If the class name is qualified, we need to create or lookup namespace entries */ if (!inclass) { - $5 = resolve_node_scope($5); + $5 = resolve_create_node_scope($5); } /* @@ -3406,7 +3466,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { prev_symtab = Swig_symbol_current(); /* If the class name is qualified. We need to create or lookup namespace/scope entries */ - scope = resolve_node_scope($3); + scope = resolve_create_node_scope($3); Setfile(scope,cparse_file); Setline(scope,cparse_line); $3 = scope; diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index 97b730508..a85334e55 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -227,6 +227,7 @@ extern "C" { extern void Swig_symbol_cadd(const_String_or_char_ptr symname, Node *node); extern Node *Swig_symbol_clookup(const_String_or_char_ptr symname, Symtab *tab); extern Node *Swig_symbol_clookup_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); + extern Node *Swig_symbol_clookup_no_inherit(const_String_or_char_ptr name, Symtab *n); extern Symtab *Swig_symbol_cscope(const_String_or_char_ptr symname, Symtab *tab); extern Node *Swig_symbol_clookup_local(const_String_or_char_ptr symname, Symtab *tab); extern Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr symname, Symtab *tab, int (*check) (Node *)); diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 0cf6cdb53..e9565c9da 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -176,6 +176,8 @@ static Hash *current_symtab = 0; /* Current symbol table node */ static Hash *symtabs = 0; /* Hash of all symbol tables by fully-qualified name */ static Hash *global_scope = 0; /* Global scope */ +static int use_inherit = 1; + /* common attribute keys, to avoid calling find_key all the times */ @@ -482,9 +484,9 @@ void Swig_symbol_alias(const_String_or_char_ptr aliasname, Symtab *s) { /* ----------------------------------------------------------------------------- * Swig_symbol_inherit() * - * Inherit symbols from another scope. - * Primarily for using directives, such as 'using namespace X;'. - * Not for using declarations, such as 'using A;'. + * Inherit symbols from another scope. Primarily for C++ inheritance and + * for using directives, such as 'using namespace X;' + * but not for using declarations, such as 'using A;'. * ----------------------------------------------------------------------------- */ void Swig_symbol_inherit(Symtab *s) { @@ -970,7 +972,7 @@ static Node *_symbol_lookup(const String *name, Symtab *symtab, int (*check) (No } inherit = Getattr(symtab, "inherit"); - if (inherit) { + if (inherit && use_inherit) { int i, len; len = Len(inherit); for (i = 0; i < len; i++) { @@ -1060,7 +1062,7 @@ static Node *symbol_lookup_qualified(const_String_or_char_ptr name, Symtab *symt /* Check inherited scopes */ if (!n) { List *inherit = Getattr(symtab, "inherit"); - if (inherit) { + if (inherit && use_inherit) { int i, len; len = Len(inherit); for (i = 0; i < len; i++) { @@ -1327,6 +1329,11 @@ Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, return s; } +Node *Swig_symbol_clookup_no_inherit(const_String_or_char_ptr name, Symtab *n) { + use_inherit = 0; + Swig_symbol_clookup(name, n); + use_inherit = 1; +} /* ----------------------------------------------------------------------------- * Swig_symbol_cscope() From 3e33774c8ca8f4f23e572179a45d3729fa4869aa Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:23:31 +0000 Subject: [PATCH 080/538] Show symbol type in symbol debug functions such as -debug-csymbols git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13503 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index e9565c9da..b9d6bdbdd 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -224,7 +224,7 @@ static void symbol_print_symbols(const char *symboltabletype) { Iterator it = First(symtab); while (it.key) { String *symname = it.key; - Printf(stdout, " %s\n", symname); + Printf(stdout, " %s (%s)\n", symname, nodeType(it.item)); /* Printf(stdout, " %s - %p (%s)\n", symname, it.item, Getattr(it.item, "name")); */ From 54726b9d0967d3cb7d3f2e93fa7e7400cc281307 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:24:22 +0000 Subject: [PATCH 081/538] Fix using declarations and templates. %template was putting the instantiated template into the global namespace instead of the namespace of the template definition. This fixes regression in swig-2.0.5 copying the std::pair typemaps which occurs with a 'using std::pair' declaration. This also fixes lots of other using declarations of template problems (template forward declarations. combinations using directives). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13504 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 49 +++++++ Examples/test-suite/common.mk | 3 + ...e_namespace_forward_declaration_runme.java | 26 ++++ ...rective_and_declaration_forward_runme.java | 53 +++++++ Examples/test-suite/li_std_pair_using.i | 21 +++ .../python/li_std_pair_using_runme.py | 10 ++ .../template_namespace_forward_declaration.i | 38 +++++ ..._using_directive_and_declaration_forward.i | 133 ++++++++++++++++++ Source/CParse/parser.y | 13 +- 9 files changed, 339 insertions(+), 7 deletions(-) create mode 100644 Examples/test-suite/java/template_namespace_forward_declaration_runme.java create mode 100644 Examples/test-suite/java/template_using_directive_and_declaration_forward_runme.java create mode 100644 Examples/test-suite/li_std_pair_using.i create mode 100644 Examples/test-suite/python/li_std_pair_using_runme.py create mode 100644 Examples/test-suite/template_namespace_forward_declaration.i create mode 100644 Examples/test-suite/template_using_directive_and_declaration_forward.i diff --git a/CHANGES.current b/CHANGES.current index 663f2c451..011556b57 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -16,6 +16,55 @@ Version 2.0.8 (in progress) 2012-07-20: kwwette [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit(). +2012-07-02: wsfulton + Fix Debian bug http://bugs.debian.org/672035, typemap copy failure - regression introduced + in swig-2.0.5: + %include + using std::pair; + %template(StrPair) pair; + +2012-07-02: wsfulton + Fix using declarations combined with using directives with forward class declarations so that + types are correctly found in scope for templates. Example: + + namespace Outer2 { + namespace Space2 { + template class Thing2; + } + } + using namespace Outer2; + using Space2::Thing2; + template class Thing2 {}; + // STILL BROKEN void useit2(Thing2 t) {} + void useit2a(Outer2::Space2::Thing2 t) {} + void useit2b(::Outer2::Space2::Thing2 t) {} + void useit2c(Space2::Thing2 t) {} + namespace Outer2 { + void useit2d(Space2::Thing2 t) {} + } + + %template(Thing2Int) Thing2; + + +2012-06-30: wsfulton + Fix template namespace problems for symbols declared with a forward class declarations, such as: + + namespace Space1 { + namespace Space2 { + template struct YYY; + } + template struct Space2::YYY { + T yyy(T h) { + return h; + } + }; + void testYYY1(Space1::Space2::YYY yy) {} + void testYYY2(Space2::YYY yy) {} + void testYYY3(::Space1::Space2::YYY yy) {} + } + + %template(YYYInt) Space1::Space2::YYY; + 2012-06-30: wsfulton Fix namespace problems for symbols declared with a forward class declarations, such as: diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index db13a9fbe..f6a8056e5 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -370,6 +370,8 @@ CPP_TEST_CASES += \ template_inherit_abstract \ template_int_const \ template_methods \ + template_namespace_forward_declaration \ + template_using_directive_and_declaration_forward \ template_nested \ template_nested_typemaps \ template_ns \ @@ -476,6 +478,7 @@ CPP_STD_TEST_CASES += \ li_std_except \ li_std_map \ li_std_pair \ + li_std_pair_using \ li_std_string \ li_std_vector \ li_std_vector_enum \ diff --git a/Examples/test-suite/java/template_namespace_forward_declaration_runme.java b/Examples/test-suite/java/template_namespace_forward_declaration_runme.java new file mode 100644 index 000000000..dadb4dbcb --- /dev/null +++ b/Examples/test-suite/java/template_namespace_forward_declaration_runme.java @@ -0,0 +1,26 @@ + +import template_namespace_forward_declaration.*; + +public class template_namespace_forward_declaration_runme { + + static { + try { + System.loadLibrary("template_namespace_forward_declaration"); + } 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[]) { + XXXInt xxx = new XXXInt(); + template_namespace_forward_declaration.testXXX1(xxx); + template_namespace_forward_declaration.testXXX2(xxx); + template_namespace_forward_declaration.testXXX3(xxx); + YYYInt yyy = new YYYInt(); + template_namespace_forward_declaration.testYYY1(yyy); + template_namespace_forward_declaration.testYYY2(yyy); + template_namespace_forward_declaration.testYYY3(yyy); + } +} + diff --git a/Examples/test-suite/java/template_using_directive_and_declaration_forward_runme.java b/Examples/test-suite/java/template_using_directive_and_declaration_forward_runme.java new file mode 100644 index 000000000..080945e02 --- /dev/null +++ b/Examples/test-suite/java/template_using_directive_and_declaration_forward_runme.java @@ -0,0 +1,53 @@ + +import template_using_directive_and_declaration_forward.*; + +public class template_using_directive_and_declaration_forward_runme { + + static { + try { + System.loadLibrary("template_using_directive_and_declaration_forward"); + } 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[]) + { + template_using_directive_and_declaration_forward.useit1(new Thing1Int()); + template_using_directive_and_declaration_forward.useit1a(new Thing1Int()); + template_using_directive_and_declaration_forward.useit1b(new Thing1Int()); + template_using_directive_and_declaration_forward.useit1c(new Thing1Int()); + +//BROKEN template_using_directive_and_declaration_forward.useit2(new Thing2Int()); + template_using_directive_and_declaration_forward.useit2a(new Thing2Int()); + template_using_directive_and_declaration_forward.useit2b(new Thing2Int()); + template_using_directive_and_declaration_forward.useit2c(new Thing2Int()); + template_using_directive_and_declaration_forward.useit2d(new Thing2Int()); + +//BROKEN template_using_directive_and_declaration_forward.useit3(new Thing3Int()); + template_using_directive_and_declaration_forward.useit3a(new Thing3Int()); + template_using_directive_and_declaration_forward.useit3b(new Thing3Int()); + template_using_directive_and_declaration_forward.useit3c(new Thing3Int()); + template_using_directive_and_declaration_forward.useit3d(new Thing3Int()); + +//BROKEN template_using_directive_and_declaration_forward.useit4(new Thing4Int()); + template_using_directive_and_declaration_forward.useit4a(new Thing4Int()); + template_using_directive_and_declaration_forward.useit4b(new Thing4Int()); + template_using_directive_and_declaration_forward.useit4c(new Thing4Int()); + template_using_directive_and_declaration_forward.useit4d(new Thing4Int()); + +//BROKEN template_using_directive_and_declaration_forward.useit5(new Thing5Int()); + template_using_directive_and_declaration_forward.useit5a(new Thing5Int()); + template_using_directive_and_declaration_forward.useit5b(new Thing5Int()); + template_using_directive_and_declaration_forward.useit5c(new Thing5Int()); + template_using_directive_and_declaration_forward.useit5d(new Thing5Int()); + + +//BROKEN template_using_directive_and_declaration_forward.useit7(new Thing7Int()); + template_using_directive_and_declaration_forward.useit7a(new Thing7Int()); + template_using_directive_and_declaration_forward.useit7b(new Thing7Int()); + template_using_directive_and_declaration_forward.useit7c(new Thing7Int()); + template_using_directive_and_declaration_forward.useit7d(new Thing7Int()); + } +} diff --git a/Examples/test-suite/li_std_pair_using.i b/Examples/test-suite/li_std_pair_using.i new file mode 100644 index 000000000..7f90c9c33 --- /dev/null +++ b/Examples/test-suite/li_std_pair_using.i @@ -0,0 +1,21 @@ +%module li_std_pair_using + +%include +using std::pair; + +%template(StringStringPair) pair; + +%inline %{ +typedef int Integer; +using std::string; +%} + +%template(StringIntPair) pair; + +%inline %{ +typedef std::string String; +typedef string Streeng; +std::pair bounce(std::pair p) { + return p; +} +%} diff --git a/Examples/test-suite/python/li_std_pair_using_runme.py b/Examples/test-suite/python/li_std_pair_using_runme.py new file mode 100644 index 000000000..a8b261035 --- /dev/null +++ b/Examples/test-suite/python/li_std_pair_using_runme.py @@ -0,0 +1,10 @@ +from li_std_pair_using import * + +one_tuple = ("one", "numero uno") +one = StringStringPair(one_tuple) +two_tuple = ("two", 2) +two = StringIntPair(two_tuple) + +if bounce(one) != one_tuple: + raise RuntimeError + diff --git a/Examples/test-suite/template_namespace_forward_declaration.i b/Examples/test-suite/template_namespace_forward_declaration.i new file mode 100644 index 000000000..8bc098724 --- /dev/null +++ b/Examples/test-suite/template_namespace_forward_declaration.i @@ -0,0 +1,38 @@ +%module template_namespace_forward_declaration + +%inline %{ + namespace Space1 { + namespace Space2 { + template struct XXX; + template struct YYY; + } + + template struct Space2::YYY { + T yyy(T h) { + return h; + } + }; + template struct Space1::Space2::XXX { + T xxx(T h) { + return h; + } + }; + + void testXXX1(Space1::Space2::XXX xx) { + } + void testXXX2(Space2::XXX xx) { + } + void testXXX3(::Space1::Space2::XXX xx) { + } + void testYYY1(Space1::Space2::YYY yy) { + } + void testYYY2(Space2::YYY yy) { + } + void testYYY3(::Space1::Space2::YYY yy) { + } + } +%} + +%template(XXXInt) Space1::Space2::XXX; +%template(YYYInt) Space1::Space2::YYY; + diff --git a/Examples/test-suite/template_using_directive_and_declaration_forward.i b/Examples/test-suite/template_using_directive_and_declaration_forward.i new file mode 100644 index 000000000..0137e0ad7 --- /dev/null +++ b/Examples/test-suite/template_using_directive_and_declaration_forward.i @@ -0,0 +1,133 @@ +%module template_using_directive_and_declaration_forward +// Test using directives combined with using declarations and forward declarations (templates) + +%inline %{ +namespace Outer1 { + namespace Space1 { + template class Thing1; + } +} +using namespace Outer1::Space1; +using Outer1::Space1::Thing1; +template class Thing1 {}; +void useit1(Thing1 t) {} +void useit1a(Outer1::Space1::Thing1 t) {} +void useit1b(::Outer1::Space1::Thing1 t) {} +namespace Outer1 { + void useit1c(Space1::Thing1 t) {} +} + + +namespace Outer2 { + namespace Space2 { + template class Thing2; + } +} +using namespace Outer2; +using Space2::Thing2; +template class Thing2 {}; +// BROKEN void useit2(Thing2 t) {} +void useit2a(Outer2::Space2::Thing2 t) {} +void useit2b(::Outer2::Space2::Thing2 t) {} +void useit2c(Space2::Thing2 t) {} +namespace Outer2 { + void useit2d(Space2::Thing2 t) {} +} + + +namespace Outer3 { + namespace Space3 { + namespace Middle3 { + template class Thing3; + } + } +} +using namespace Outer3; +using namespace Space3; +using Middle3::Thing3; +template class Thing3 {}; +// BROKEN void useit3(Thing3 t) {} +void useit3a(Outer3::Space3::Middle3::Thing3 t) {} +void useit3b(::Outer3::Space3::Middle3::Thing3 t) {} +void useit3c(Middle3::Thing3 t) {} +namespace Outer3 { + namespace Space3 { + void useit3d(Middle3::Thing3 t) {} + } +} + + +namespace Outer4 { + namespace Space4 { + namespace Middle4 { + template class Thing4; + } + } +} +using namespace Outer4::Space4; +using Middle4::Thing4; +template class Thing4 {}; +// BROKEN void useit4(Thing4 t) {} +void useit4a(Outer4::Space4::Middle4::Thing4 t) {} +void useit4b(::Outer4::Space4::Middle4::Thing4 t) {} +void useit4c(Middle4::Thing4 t) {} +namespace Outer4 { + namespace Space4 { + void useit4d(Middle4::Thing4 t) {} + } +} + + +namespace Outer5 { + namespace Space5 { + namespace Middle5 { + namespace More5 { + template class Thing5; + } + } + } +} +using namespace ::Outer5::Space5; +using namespace Middle5; +using More5::Thing5; +template class Thing5 {}; +// BROKEN void useit5(Thing5 t) {} +void useit5a(Outer5::Space5::Middle5::More5::Thing5 t) {} +void useit5b(::Outer5::Space5::Middle5::More5::Thing5 t) {} +void useit5c(Middle5::More5::Thing5 t) {} +namespace Outer5 { + namespace Space5 { + void useit5d(Middle5::More5::Thing5 t) {} + } +} + +namespace Outer7 { + namespace Space7 { + namespace Middle7 { + template class Thing7; + } + } +} +using namespace Outer7::Space7; +template class Middle7::Thing7 {}; +using Middle7::Thing7; +// BROKEN void useit7(Thing7 t) {} +void useit7a(Outer7::Space7::Middle7::Thing7 t) {} +void useit7b(::Outer7::Space7::Middle7::Thing7 t) {} +void useit7c(Middle7::Thing7 t) {} +namespace Outer7 { + namespace Space7 { + void useit7d(Middle7::Thing7 t) {} + } +} + +%} + +%template(Thing1Int) Thing1; +%template(Thing2Int) Thing2; +%template(Thing3Int) Thing3; +%template(Thing4Int) Thing4; +%template(Thing5Int) Thing5; +%template(Thing7Int) Thing7; + + diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index b400efa3a..724b2ef69 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -879,20 +879,19 @@ static String *resolve_create_node_scope(String *cname) { nscope = 0; nscope_inner = 0; - if (Swig_scopename_check(cname)) { - String *prefix = Swig_scopename_prefix(cname); - if (prefix && (Strncmp(prefix,"::",2) == 0)) - skip_lookup = 1; - } + if (Strncmp(cname,"::",2) == 0) + skip_lookup = 1; + cname_node = skip_lookup ? 0 : Swig_symbol_clookup_no_inherit(cname, 0); if (cname_node) { /* The symbol has been defined already or is in another scope. If it is a weak symbol, it needs replacing and if it was brought into the current scope - via a using declaration, the scope needs adjusting appropriately for the new symbol. */ + via a using declaration, the scope needs adjusting appropriately for the new symbol. + Similarly for defined templates. */ Symtab *symtab = Getattr(cname_node, "sym:symtab"); Node *sym_weak = Getattr(cname_node, "sym:weak"); - if (symtab && sym_weak) { + if ((symtab && sym_weak) || Equal(nodeType(cname_node), "template")) { /* Check if the scope is the current scope */ String *current_scopename = Swig_symbol_qualifiedscopename(0); String *found_scopename = Swig_symbol_qualifiedscopename(symtab); From 0559f1f52164e071998de6452349bd57c71e0250 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:24:47 +0000 Subject: [PATCH 082/538] Fix Swig_symbol_clookup_no_inherit return value git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13505 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/symbol.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index b9d6bdbdd..e39f826eb 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -1329,10 +1329,19 @@ Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n, return s; } +/* ----------------------------------------------------------------------------- + * Swig_symbol_clookup_no_inherit() + * + * Symbol lookup like Swig_symbol_clookup but does not follow using declarations. + * ----------------------------------------------------------------------------- */ + Node *Swig_symbol_clookup_no_inherit(const_String_or_char_ptr name, Symtab *n) { + Node *s = 0; + assert(use_inherit==1); use_inherit = 0; - Swig_symbol_clookup(name, n); + s = Swig_symbol_clookup(name, n); use_inherit = 1; + return s; } /* ----------------------------------------------------------------------------- @@ -1558,6 +1567,7 @@ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) { for (i = 0; i < len; i++) { String *e = Getitem(elements, i); if (SwigType_issimple(e)) { + /* Note: the unary scope operator (::) is being removed from the template parameters here. */ Node *n = Swig_symbol_clookup_check(e, st, symbol_no_constructor); if (n) { String *name = Getattr(n, "name"); From 32071e86909c9979d605b1190e751ac93e0229b3 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:25:16 +0000 Subject: [PATCH 083/538] Restore previously broken tests git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13506 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- .../template_using_directive_and_declaration_forward.i | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/test-suite/template_using_directive_and_declaration_forward.i b/Examples/test-suite/template_using_directive_and_declaration_forward.i index 0137e0ad7..a5a7fbf31 100644 --- a/Examples/test-suite/template_using_directive_and_declaration_forward.i +++ b/Examples/test-suite/template_using_directive_and_declaration_forward.i @@ -26,7 +26,7 @@ namespace Outer2 { using namespace Outer2; using Space2::Thing2; template class Thing2 {}; -// BROKEN void useit2(Thing2 t) {} +void useit2(Thing2 t) {} void useit2a(Outer2::Space2::Thing2 t) {} void useit2b(::Outer2::Space2::Thing2 t) {} void useit2c(Space2::Thing2 t) {} @@ -46,7 +46,7 @@ using namespace Outer3; using namespace Space3; using Middle3::Thing3; template class Thing3 {}; -// BROKEN void useit3(Thing3 t) {} +void useit3(Thing3 t) {} void useit3a(Outer3::Space3::Middle3::Thing3 t) {} void useit3b(::Outer3::Space3::Middle3::Thing3 t) {} void useit3c(Middle3::Thing3 t) {} @@ -67,7 +67,7 @@ namespace Outer4 { using namespace Outer4::Space4; using Middle4::Thing4; template class Thing4 {}; -// BROKEN void useit4(Thing4 t) {} +void useit4(Thing4 t) {} void useit4a(Outer4::Space4::Middle4::Thing4 t) {} void useit4b(::Outer4::Space4::Middle4::Thing4 t) {} void useit4c(Middle4::Thing4 t) {} @@ -91,7 +91,7 @@ using namespace ::Outer5::Space5; using namespace Middle5; using More5::Thing5; template class Thing5 {}; -// BROKEN void useit5(Thing5 t) {} +void useit5(Thing5 t) {} void useit5a(Outer5::Space5::Middle5::More5::Thing5 t) {} void useit5b(::Outer5::Space5::Middle5::More5::Thing5 t) {} void useit5c(Middle5::More5::Thing5 t) {} @@ -111,7 +111,7 @@ namespace Outer7 { using namespace Outer7::Space7; template class Middle7::Thing7 {}; using Middle7::Thing7; -// BROKEN void useit7(Thing7 t) {} +void useit7(Thing7 t) {} void useit7a(Outer7::Space7::Middle7::Thing7 t) {} void useit7b(::Outer7::Space7::Middle7::Thing7 t) {} void useit7c(Middle7::Thing7 t) {} From e21bd464204fa52a6a697651c057cb0c5560aa49 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:25:43 +0000 Subject: [PATCH 084/538] Resolve template parameters git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13507 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/typepass.cxx | 5 +++++ Source/Swig/typesys.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index d757d53a7..3284a669a 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -1159,6 +1159,11 @@ class TypePass:private Dispatcher { SwigType_typedef_using(uname); } else if (Strcmp(ntype, "enum") == 0) { SwigType_typedef_using(Getattr(n, "uname")); + } else if (Strcmp(ntype, "template") == 0) { + /* + Printf(stdout, "usingDeclaration template %s --- %s\n", Getattr(n, "name"), Getattr(n, "uname")); + SwigType_typedef_using(Getattr(n, "uname")); + */ } } } diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index ab6475b9c..4d6dea60f 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -954,7 +954,12 @@ SwigType *SwigType_typedef_qualified(const SwigType *t) { Iterator pi; Parm *p; List *parms; + /* ty = Swig_symbol_template_deftype(e, current_symtab); + */ + String *dt = Swig_symbol_template_deftype(e, current_symtab); + ty = Swig_symbol_type_qualify(dt, 0); + Printf(stdout, "extra code: %s => %s\n", dt, ty); e = ty; parms = SwigType_parmlist(e); tprefix = SwigType_templateprefix(e); @@ -1021,6 +1026,9 @@ SwigType *SwigType_typedef_qualified(const SwigType *t) { Delete(tprefix); Delete(qprefix); Delete(parms); + /* + Delete(dt); + */ } Append(result, e); Delete(ty); From 05839e646c8cc2b10a42ff57c435906b4cc76483 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 20:26:08 +0000 Subject: [PATCH 085/538] Revert resolving template parameters git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13508 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typesys.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 4d6dea60f..73c2fbd50 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -954,12 +954,11 @@ SwigType *SwigType_typedef_qualified(const SwigType *t) { Iterator pi; Parm *p; List *parms; - /* ty = Swig_symbol_template_deftype(e, current_symtab); - */ + /* String *dt = Swig_symbol_template_deftype(e, current_symtab); ty = Swig_symbol_type_qualify(dt, 0); - Printf(stdout, "extra code: %s => %s\n", dt, ty); + */ e = ty; parms = SwigType_parmlist(e); tprefix = SwigType_templateprefix(e); From 33098764b73ca8e7dcf5c168a12017350b387aaf Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 22:38:44 +0000 Subject: [PATCH 086/538] Remove unnecessary keyword warning when parsing 'using' git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13509 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 10 ++++++++-- Source/Swig/naming.c | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 011556b57..f10ab79d0 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,10 +5,16 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== -2012-06-27: wsfulton +2012-08-04: wsfulton + Remove incorrect warning (314) about target language keywords which were triggered + by using declarations and using directives. For example 'string' is a keyword in C#: + namespace std { class string; } + using std::string; + +2012-07-21: wsfulton Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown. -2012-06-27: wsfulton +2012-07-21: wsfulton Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window rather than stdout. This fixes display problems in gdbtui and the ensures the output appears where expected in other gdb based debuggers such as Eclipse CDT. diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 1be1405a3..e96dbd14e 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -883,13 +883,16 @@ List *Swig_name_rename_list() { int Swig_need_name_warning(Node *n) { int need = 1; /* - we don't use name warnings for: + We don't use name warnings for: - class forwards, no symbol is generated at the target language. - template declarations, only for real instances using %template(name). - - typedefs, they have no effect at the target language. + - typedefs, have no effect at the target language. + - using declarations and using directives, have no effect at the target language. */ if (checkAttribute(n, "nodeType", "classforward")) { need = 0; + } else if (checkAttribute(n, "nodeType", "using")) { + need = 0; } else if (checkAttribute(n, "storage", "typedef")) { need = 0; } else if (Getattr(n, "hidden")) { From 196f9b31ed278593f947ca8c6c0d42fb3bf141a7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 4 Aug 2012 23:20:07 +0000 Subject: [PATCH 087/538] Remove unused temp variable in C# intrusive_ptr wrappers git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13510 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/csharp/boost_intrusive_ptr.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/csharp/boost_intrusive_ptr.i b/Lib/csharp/boost_intrusive_ptr.i index 9884ccc44..09a164729 100644 --- a/Lib/csharp/boost_intrusive_ptr.i +++ b/Lib/csharp/boost_intrusive_ptr.i @@ -97,7 +97,7 @@ #endif %} -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ // intrusive_ptr by value smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; if (smartarg) { From 18aa801bd0bf59a7296dd0e045d70bb9c6bbbb6b Mon Sep 17 00:00:00 2001 From: Oliver Buchtala Date: Sun, 5 Aug 2012 08:37:59 +0000 Subject: [PATCH 088/538] Fix bug in emit_action. Before, it was possible that two catch(...) blocks were generated (for varargs and undefined typemap). From: Oliver Buchtala git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13511 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/emit.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index efcf9a352..7d7f66eaf 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -470,6 +470,7 @@ String *emit_action(Node *n) { if (catchlist) { int unknown_catch = 0; + int has_varargs = 0; Printf(eaction, "}\n"); for (Parm *ep = catchlist; ep; ep = nextSibling(ep)) { String *em = Swig_typemap_lookup("throws", ep, "_e", 0); @@ -480,6 +481,7 @@ String *emit_action(Node *n) { Printf(eaction, "catch(%s) {", SwigType_str(et, "_e")); } else if (SwigType_isvarargs(etr)) { Printf(eaction, "catch(...) {"); + has_varargs = 1; } else { Printf(eaction, "catch(%s) {", SwigType_str(et, "&_e")); } @@ -490,8 +492,8 @@ String *emit_action(Node *n) { unknown_catch = 1; } } - if (unknown_catch) { - Printf(eaction, "catch(...) { throw; }\n"); + if (unknown_catch && !has_varargs) { + Printf(eaction, "catch(...) { throw; }\n"); } } From db0f2d7a8e2d3be72b39fa5a1487af1615cdfabb Mon Sep 17 00:00:00 2001 From: Oliver Buchtala Date: Sun, 5 Aug 2012 08:38:16 +0000 Subject: [PATCH 089/538] Fix pedantic warnings in fio.c methods. From: Oliver Buchtala git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13512 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/fio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 2ef605c32..4e91a1b51 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -490,6 +490,7 @@ int DohCopyto(DOH *in, DOH *out) { return nbytes; } } + return nbytes; } @@ -588,4 +589,5 @@ DOH *DohReadline(DOH *in) { Putc(c, s); n++; } + return s; } From 4305a3cef9b210541c3b88ab2fd03d787c3bca66 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 5 Aug 2012 10:15:08 +0000 Subject: [PATCH 090/538] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using Perl 5.16 and later. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13513 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Lib/perl5/noembed.h | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index f10ab79d0..ada7461ac 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.8 (in progress) =========================== +2012-08-05: wsfulton + [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using + Perl 5.16 and later. + 2012-08-04: wsfulton Remove incorrect warning (314) about target language keywords which were triggered by using declarations and using directives. For example 'string' is a keyword in C#: diff --git a/Lib/perl5/noembed.h b/Lib/perl5/noembed.h index 27e510df1..936d50ba6 100644 --- a/Lib/perl5/noembed.h +++ b/Lib/perl5/noembed.h @@ -64,9 +64,6 @@ #ifdef eof #undef eof #endif -#ifdef bool - #undef bool -#endif #ifdef close #undef close #endif @@ -106,3 +103,11 @@ #ifdef stat #undef stat #endif + +#ifdef bool + /* Leave if macro is from C99 stdbool.h */ + #ifndef __bool_true_false_are_defined + #undef bool + #endif +#endif + From a358958e727d2e0507e75e309a8bcdeeceaf0eb1 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 5 Aug 2012 11:02:49 +0000 Subject: [PATCH 091/538] Update docs with missing example.c compilation - Bug 3545858 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13514 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/Java.html | 5 +++-- Doc/Manual/Lua.html | 2 +- Doc/Manual/Perl5.html | 4 ++-- Doc/Manual/Ruby.html | 3 ++- Doc/Manual/Tcl.html | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 2473e7cd1..8a081f46d 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -326,12 +326,13 @@ The exact location may vary on your machine, but the above locations are typical

    The JNI code exists in a dynamic module or shared library (DLL on Windows) and gets loaded by the JVM. -To build a shared library file, you need to compile your module in a manner similar to the following (shown for Solaris):

    +Assuming you have code you need to link to in a file called example.c, in order to build a shared library file, you need to compile your module in a manner similar to the following (shown for Solaris):

     $ swig -java example.i
 $ gcc -c example_wrap.c  -I/usr/java/include -I/usr/java/include/solaris
-$ ld -G example_wrap.o  -o libexample.so
+$ gcc -c example.c
+$ ld -G example_wrap.o example.o -o libexample.so

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index ec32c4449..1fd41f907 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -236,7 +236,7 @@ More information on building and configuring eLua can be found here: 

     $ swig -lua example.i -o example_wrap.c
diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index 0a4b61bd5..49e8965fa 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -170,8 +170,8 @@ $ perl -e 'use Config; print "$Config{archlib}\n";'
 
 
    
 The preferred approach to building an extension module is to compile it into
-a shared object file or DLL.   To do this, you will need to compile your program
-using commands like this (shown for Linux):
+a shared object file or DLL. Assuming you have code you need to link to in a file called example.c,
+you will need to compile your program using commands like this (shown for Linux):
 
    
 
 
    diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index 69005c731..969de7a3d 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -398,7 +398,8 @@ can add this: 
    
 
     to the end of the extconf.rb file. If
 for some reason you don't want to use the standard approach, you'll
 need to determine the correct compiler and linker flags for your build
-platform. For example, a typical sequence of commands for the Linux
+platform. For example, assuming you have code you need to link to in a file
+called example.c, a typical sequence of commands for the Linux
 operating system would look something like this: 
    
 
 
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index f55a7f139..e6b3b4a43 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -132,7 +132,8 @@ header file.
 
 
    
 The preferred approach to building an extension module is to compile it into
-a shared object file or DLL.   To do this, you will need to compile your program
+a shared object file or DLL. Assuming you have code you need to link to in a file
+called example.c, you will need to compile your program
 using commands like this (shown for Linux):
 
    
 

From 2d24ca37d17b1cccdf13383f32b97ce9a888f928 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 15:49:43 +0000
Subject: [PATCH 092/538] Fix invalid code sometimes being generated for C#
 director methods with many arguments

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13519 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                        |  4 ++++
 Examples/test-suite/director_classes.i | 17 +++++++++++++++++
 Source/Modules/csharp.cxx              |  1 -
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index ada7461ac..e69c7d1dc 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-05: wsfulton
+            [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
+            with many arguments.
+
 2012-08-05: wsfulton
             [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using 
             Perl 5.16 and later.
diff --git a/Examples/test-suite/director_classes.i b/Examples/test-suite/director_classes.i
index 5581c755f..7183e3d0a 100644
--- a/Examples/test-suite/director_classes.i
+++ b/Examples/test-suite/director_classes.i
@@ -108,3 +108,20 @@ public:
 
 %}
 
+
+%feature(director) BaseClass;
+%feature(director) DerivedClass;
+
+%inline %{
+class BaseClass
+{
+public:
+virtual ~BaseClass() {};
+virtual int dofoo(int& one, int& two, int& three) {return 0;}
+};
+
+class DerivedClass : public BaseClass
+{
+};
+%}
+
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 57d050cde..18b8892cf 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3728,7 +3728,6 @@ public:
       Delete(ln);
       Delete(arg);
       Delete(c_decl);
-      Delete(c_param_type);
     }
 
     /* header declaration, start wrapper definition */

From cdfa81e5726b4171035b5090317bde5bc53de729 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 15:53:56 +0000
Subject: [PATCH 093/538] Add some error checking for stale DOH object use

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13520 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/DOH/memory.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c
index fcacd6170..5197c34d8 100644
--- a/Source/DOH/memory.c
+++ b/Source/DOH/memory.c
@@ -20,6 +20,11 @@ char cvsroot_memory_c[] = "$Id$";
 #define DOH_POOL_SIZE         16384
 #endif
 
+/* Checks stale DOH object use - will use a lot more memory as pool memory is not re-used. */
+/*
+#define DEBUG_MEMORY_POOLS
+*/
+
 static int PoolSize = DOH_POOL_SIZE;
 
 DOH *DohNone = 0;		/* The DOH None object */
@@ -81,8 +86,14 @@ int DohCheck(const DOH *ptr) {
   register Pool *p = Pools;
   register char *cptr = (char *) ptr;
   while (p) {
-    if ((cptr >= p->pbeg) && (cptr < p->pend))
+    if ((cptr >= p->pbeg) && (cptr < p->pend)) {
+#ifdef DEBUG_MEMORY_POOLS
+      DohBase *b = (DohBase *) ptr;
+      int already_deleted = b->type == 0;
+      assert(!already_deleted);
+#endif
       return 1;
+    }
     /*
        pptr = (char *) p->ptr;
        if ((cptr >= pptr) && (cptr < (pptr+(p->current*sizeof(DohBase))))) return 1; */
@@ -110,16 +121,20 @@ DOH *DohObjMalloc(DohObjInfo *type, void *data) {
   DohBase *obj;
   if (!pools_initialized)
     InitPools();
+#ifndef DEBUG_MEMORY_POOLS
   if (FreeList) {
     obj = FreeList;
     FreeList = (DohBase *) obj->data;
   } else {
+#endif
     while (Pools->current == Pools->len) {
       CreatePool();
     }
     obj = Pools->ptr + Pools->current;
     ++Pools->current;
+#ifndef DEBUG_MEMORY_POOLS
   }
+#endif
   obj->type = type;
   obj->data = data;
   obj->meta = 0;
@@ -144,6 +159,7 @@ void DohObjFree(DOH *ptr) {
   b->data = (void *) FreeList;
   b->meta = 0;
   b->type = 0;
+  b->refcount = 0;
   FreeList = b;
   if (meta) {
     Delete(meta);

From 766128065f887361622a56950f2ff60551118570 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 16:16:23 +0000
Subject: [PATCH 094/538] Error checking for stale DOH object use - also with
 documentation.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13521 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Devel/internals.html | 29 +++++++++++++++++++++++++++++
 Source/DOH/memory.c      | 14 ++++++--------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/Doc/Devel/internals.html b/Doc/Devel/internals.html
index d24869d10..94a82519d 100644
--- a/Doc/Devel/internals.html
+++ b/Doc/Devel/internals.html
@@ -42,6 +42,7 @@
 
  • 7. Debugging SWIG
 
 
 
@@ -1179,6 +1180,34 @@ Either 
    
 
 
 
+
+
    7.2 Debugging DOH memory allocation problems
    
+    
+
+
    
+The DOH objects are reference counted and use pools for memory allocation.
+The implementation is in memory.c. When there are memory corruption problems,
+various memory allocator tools are normally used to diagnose problems. These can be used
+on SWIG and can be very useful. However, they won't necessarily find use of stale DOH objects,
+that is, DOH objects
+that are used after they have been deleted. This is because the DOH memory allocator
+grabs a chunk of memory from the C memory allocator and manages the usage internally.
+Stale DOH object usage can be checked for by defining DOH_DEBUG_MEMORY_POOLS in 
+memory.c. If an attempt to use an object is made after the reference count is
+zero, an assertion is triggered instead of quietly re-using the stale object...
+
    
+
+
    
+
    +swig: DOH/memory.c:91: DohCheck: Assertion `!DOH_object_already_deleted' failed.
+
    
+
    
+
+
    
+This can be memory intensive as previously used memory in the pool is not re-used so is
+only recommended for diagnosing memory corruption problems.
+
    
+
 
    
 Copyright (C) 1999-2010 SWIG Development Team.
 
diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c
index 5197c34d8..e366f88e7 100644
--- a/Source/DOH/memory.c
+++ b/Source/DOH/memory.c
@@ -21,9 +21,7 @@ char cvsroot_memory_c[] = "$Id$";
 #endif
 
 /* Checks stale DOH object use - will use a lot more memory as pool memory is not re-used. */
-/*
-#define DEBUG_MEMORY_POOLS
-*/
+#define DOH_DEBUG_MEMORY_POOLS
 
 static int PoolSize = DOH_POOL_SIZE;
 
@@ -87,10 +85,10 @@ int DohCheck(const DOH *ptr) {
   register char *cptr = (char *) ptr;
   while (p) {
     if ((cptr >= p->pbeg) && (cptr < p->pend)) {
-#ifdef DEBUG_MEMORY_POOLS
+#ifdef DOH_DEBUG_MEMORY_POOLS
       DohBase *b = (DohBase *) ptr;
-      int already_deleted = b->type == 0;
-      assert(!already_deleted);
+      int DOH_object_already_deleted = b->type == 0;
+      assert(!DOH_object_already_deleted);
 #endif
       return 1;
     }
@@ -121,7 +119,7 @@ DOH *DohObjMalloc(DohObjInfo *type, void *data) {
   DohBase *obj;
   if (!pools_initialized)
     InitPools();
-#ifndef DEBUG_MEMORY_POOLS
+#ifndef DOH_DEBUG_MEMORY_POOLS
   if (FreeList) {
     obj = FreeList;
     FreeList = (DohBase *) obj->data;
@@ -132,7 +130,7 @@ DOH *DohObjMalloc(DohObjInfo *type, void *data) {
     }
     obj = Pools->ptr + Pools->current;
     ++Pools->current;
-#ifndef DEBUG_MEMORY_POOLS
+#ifndef DOH_DEBUG_MEMORY_POOLS
   }
 #endif
   obj->type = type;

From b989e43922a0e803c9aa3f466edec5509a74d621 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 16:17:32 +0000
Subject: [PATCH 095/538] Fix incorrect object deletion in C# module

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13522 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/csharp.cxx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 18b8892cf..cc7c905ef 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3655,8 +3655,6 @@ public:
 	    if (!ignored_method)
 	      Printf(w->code, "%s\n", tm);
 
-	  Delete(tm);
-
 	  /* Add C type to callback typedef */
 	  if (i > 0)
 	    Printf(callback_typedef_parms, ", ");
@@ -3788,7 +3786,6 @@ public:
 	Printf(callback_code, "    return %s;\n", tm);
       }
 
-      Delete(tm);
       Delete(tp);
     } else
       Printf(callback_code, "    %s;\n", upcall);

From 315dc5a87979b9c961b7c3d299b5b432da20b5a4 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 22:17:32 +0000
Subject: [PATCH 096/538] Fix some memory issues - use of deleted memory
 highlighted by DOH_DEBUG_MEMORY_POOLS

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13524 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/csharp.cxx | 3 ++-
 Source/Modules/java.cxx   | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index cc7c905ef..1d6748ae3 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3493,6 +3493,7 @@ public:
 
     if (returntype) {
 
+      Delete(qualified_return);
       qualified_return = SwigType_rcaststr(returntype, "c_result");
 
       if (!is_void && !ignored_method) {
@@ -3786,6 +3787,7 @@ public:
 	Printf(callback_code, "    return %s;\n", tm);
       }
 
+      Delete(tm);
       Delete(tp);
     } else
       Printf(callback_code, "    %s;\n", upcall);
@@ -3894,7 +3896,6 @@ public:
     }
 
     Delete(qualified_return);
-    Delete(c_ret_type);
     Delete(declaration);
     Delete(callback_typedef_parms);
     Delete(delegate_parms);
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index b04812d05..ffc4d8d97 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -3565,6 +3565,7 @@ public:
 
     if (returntype) {
 
+      Delete(qualified_return);
       qualified_return = SwigType_rcaststr(returntype, "c_result");
 
       if (!is_void && (!ignored_method || pure_virtual)) {
@@ -3814,8 +3815,6 @@ public:
 	    if (!ignored_method)
 	      Printf(w->code, "%s\n", tm);
 
-	  Delete(tm);
-
 	  /* Add parameter to the intermediate class code if generating the
 	   * intermediate's upcall code */
 	  if ((tm = Getattr(p, "tmap:jtype"))) {
@@ -3890,7 +3889,6 @@ public:
 
       Delete(arg);
       Delete(c_decl);
-      Delete(c_param_type);
       Delete(ln);
     }
 

From 45a259d27443d11f9e29b3517e22a3bfe00824be Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 5 Aug 2012 22:18:39 +0000
Subject: [PATCH 097/538] Correct accidental turning on of
 DOH_DEBUG_MEMORY_POOLS

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13525 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/DOH/memory.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c
index e366f88e7..5ad11019d 100644
--- a/Source/DOH/memory.c
+++ b/Source/DOH/memory.c
@@ -21,7 +21,9 @@ char cvsroot_memory_c[] = "$Id$";
 #endif
 
 /* Checks stale DOH object use - will use a lot more memory as pool memory is not re-used. */
+/*
 #define DOH_DEBUG_MEMORY_POOLS
+*/
 
 static int PoolSize = DOH_POOL_SIZE;
 

From b6f6fcd6d82619b6744410490431b9d235f56006 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 7 Aug 2012 21:58:52 +0000
Subject: [PATCH 098/538] Memory corruption fixes highlighted by
 DOH_MEMORY_DEBUG_POOL in Python director tests.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13554 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/lang.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 75254d69f..e81ab21dd 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -2652,9 +2652,11 @@ static String *get_director_ctor_code(Node *n, String *director_ctor_code, Strin
       int is_abstract = abstract && !is_notabstract;
       if (is_protected(n) || is_abstract) {
 	director_ctor = director_prot_ctor_code;
+	abstract = Copy(abstract);
 	Delattr(pn, "abstract");
       } else {
 	if (is_notabstract) {
+	  abstract = Copy(abstract);
 	  Delattr(pn, "abstract");
 	} else {
 	  abstract = 0;

From 5f294a14049db6b41d307ed44199226e94054c56 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 Aug 2012 06:05:30 +0000
Subject: [PATCH 099/538] Fix use of deleted memory in Go - note changes
 director_enum and director_basic tests output.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13555 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/go.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 39b4d261a..91f706ad3 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -3742,9 +3742,9 @@ private:
     if (is_constructor) {
       assert(!is_upcall);
       if (!is_director) {
-	all_result = Getattr(class_node, "classtypeobj");
+	all_result = Copy(Getattr(class_node, "classtypeobj"));
       } else {
-	all_result = director_struct;
+	all_result = Copy(director_struct);
       }
       mismatch = false;
     } else {

From cad26e49fec194b3db18908b0c20f40497f0a2b6 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 Aug 2012 06:06:31 +0000
Subject: [PATCH 100/538] Fix use of deleted memory in D module

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13556 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/d.cxx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index bc51cf5ed..7fca68df7 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -1440,7 +1440,7 @@ public:
 	// The type in the out attribute of the typemap overrides the type
 	// in the dtype typemap.
 	tm = dtypeout;
-	      replaceClassname(tm, t);
+	replaceClassname(tm, t);
       }
       Printf(return_type, "%s", tm);
     } else {
@@ -2132,8 +2132,6 @@ public:
 	    if (!ignored_method)
 	      Printf(w->code, "%s\n", tm);
 
-	  Delete(tm);
-
 	  // Add parameter type to the C typedef for the D callback function.
 	  Printf(callback_typedef_parms, ", %s", c_param_type);
 
@@ -2270,7 +2268,6 @@ public:
 	Printf(callback_code, "  return %s;\n", tm);
       }
 
-      Delete(tm);
       Delete(tp);
     } else {
       Printf(callback_code, "  %s;\n", upcall);
@@ -3971,7 +3968,7 @@ private:
 
     if (attached) {
       String *attr_name = NewStringf("tmap:%s", method);
-      result = Getattr(n, attr_name);
+      result = Copy(Getattr(n, attr_name));
       Delete(attr_name);
     } else {
       // FIXME: As a workaround for a bug so far only surfacing in the

From 19a29c32128087362212b26cbcf2ae949aebaefb Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 Aug 2012 06:07:34 +0000
Subject: [PATCH 101/538] Fix use of deleted memory in R module

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13557 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/r.cxx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index c2a47ed24..f163c8b30 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -2451,7 +2451,6 @@ int R::generateCopyRoutines(Node *n) {
     }
     String *elKind = Getattr(c, "kind");
     if (Strcmp(elKind, "variable") != 0) {
-      Delete(elKind);
       continue;
     }
 

From 8a94438c7d69acae840d5abe3fe0c887a8668a21 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 Aug 2012 06:08:36 +0000
Subject: [PATCH 102/538] Fix segfault in Allegrocl - a proper fix is still
 needed

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13558 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/allegrocl.cxx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx
index b6c5385fb..41d481e9d 100644
--- a/Source/Modules/allegrocl.cxx
+++ b/Source/Modules/allegrocl.cxx
@@ -1181,13 +1181,14 @@ void emit_synonym(Node *synonym) {
   String *of_name = namespaced_name(of, of_ns);
 
   if (CPlusPlus && !Strcmp(nodeType(synonym), "cdecl")) {
-	  syn_ltype = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)",
-				 strip_namespaces(Getattr(synonym, "real-name")), synonym_ns);
-	  syn_type = NewStringf("#.(swig-insert-id \"%s\" %s :type :type)",
-				strip_namespaces(Getattr(synonym, "real-name")), synonym_ns);
+    String *real_name = Getattr(synonym, "real-name");
+    if (!real_name)
+      real_name = NewString("Unknown"); // TODO: fix
+    syn_ltype = NewStringf("#.(swig-insert-id \"%s\" %s :type :class)", strip_namespaces(real_name), synonym_ns);
+    syn_type = NewStringf("#.(swig-insert-id \"%s\" %s :type :type)", strip_namespaces(real_name), synonym_ns);
   } else {
-	  syn_ltype = lookup_defined_foreign_ltype(synonym_type);
-	  syn_type = lookup_defined_foreign_type(synonym_type);
+    syn_ltype = lookup_defined_foreign_ltype(synonym_type);
+    syn_type = lookup_defined_foreign_type(synonym_type);
   }
 
   of_ltype = lookup_defined_foreign_ltype(of_name);

From 7dac1bc5242424d8c9c5610f782aa19a6e07a934 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru 
Date: Wed, 8 Aug 2012 09:19:26 +0000
Subject: [PATCH 103/538] Fix somes typos

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13559 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES                                 | 10 +++++-----
 Doc/Manual/Android.html                 |  2 +-
 Examples/xml/example_apply.expected-xml | 12 ++++++------
 Examples/xml/example_xml.expected-xml   | 12 ++++++------
 Lib/perl5/reference.i                   | 18 +++++++++---------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7afa119ad..a63a66312 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3303,7 +3303,7 @@ Version 1.3.32 (November 15, 2007)
             [C#] Added missing support for C++ class member pointers.
 
 08/09/2007: wsfulton
-            [C#, Java] Add support for $owner in the "out" typemaps like in the the scripting
+            [C#, Java] Add support for $owner in the "out" typemaps like in the scripting
             language modules. Note that $owner has always been supported in the "javaout" / "csout"
             typemaps.
 
@@ -4003,7 +4003,7 @@ Version 1.3.30 (November 13, 2006)
 10/12/2006: wsfulton
             [Java] Remove potential race condition on the proxy class' delete() method 
             (it is now a synchronized method, but is now customisable by changing the 
-            methodmodifiers attribute in the the javadestruct or javadestruct_derived typemap)
+            methodmodifiers attribute in the javadestruct or javadestruct_derived typemap)
 
             [C#] Remove potential race condition on the proxy class' Dispose() method, 
             similar to Java's delete() above.
@@ -4811,7 +4811,7 @@ Version 1.3.28 (February 12, 2006)
 	        %naturalvar std::string;
 	        %include 
 	      
-              that will tell swig to use the the 'natural' wrapping
+              that will tell swig to use the 'natural' wrapping
               mechanism to all std::string global and member
               variables.
 
@@ -8318,7 +8318,7 @@ Version 1.3.23 (November 11, 2004)
 		b = B()
 		b.bar(1)
 	      
-	      note the the methods are emitted inside the classes,
+	      note the methods are emitted inside the classes,
 	      and hence, the %template name refers to the 'member'
 	      method name, not a global namespace name.
 
@@ -16266,7 +16266,7 @@ Version 1.3.12 (June 2, 2002)
 
             %feature, %rename, %ignore, %exception, and related directives:
 
-            Namespaces are fully integrated into the the renaming and declaration
+            Namespaces are fully integrated into the renaming and declaration
             matcher.  For example:
 
                  %rename(display) Foo::print;          // Rename in namespace Foo
diff --git a/Doc/Manual/Android.html b/Doc/Manual/Android.html
index 443d77691..85df94a99 100644
--- a/Doc/Manual/Android.html
+++ b/Doc/Manual/Android.html
@@ -45,7 +45,7 @@ This chapter contains a few Android specific notes and examples.
 
 
 
    
-The examples require the the Android SDK and Android NDK which can be installed as per instructions in the links.
+The examples require the Android SDK and Android NDK which can be installed as per instructions in the links.
 The Eclipse version is not required for these examples as just the command line tools are used (shown for Linux as the host, but Windows will be very similar, if not identical in most places).
 Add the SDK tools and NDK tools to your path and create a directory somewhere for your Android projects (adjust PATH as necessary to where you installed the tools):
 
    
diff --git a/Examples/xml/example_apply.expected-xml b/Examples/xml/example_apply.expected-xml
index 50a6509ee..6118ef1f2 100644
--- a/Examples/xml/example_apply.expected-xml
+++ b/Examples/xml/example_apply.expected-xml
@@ -1225,7 +1225,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = SvIV(tempsv);
   $target = &dvalue;
@@ -1248,7 +1248,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (short) SvIV(tempsv);
   $target = &dvalue;
@@ -1271,7 +1271,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (long) SvIV(tempsv);
   $target = &dvalue;
@@ -1294,7 +1294,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned int) SvIV(tempsv);
   $target = &dvalue;
@@ -1317,7 +1317,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned short) SvIV(tempsv);
   $target = &dvalue;
@@ -1340,7 +1340,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned long) SvIV(tempsv);
   $target = &dvalue;
diff --git a/Examples/xml/example_xml.expected-xml b/Examples/xml/example_xml.expected-xml
index 584e468f6..4d08b206a 100644
--- a/Examples/xml/example_xml.expected-xml
+++ b/Examples/xml/example_xml.expected-xml
@@ -1257,7 +1257,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = SvIV(tempsv);
   $target = &dvalue;
@@ -1280,7 +1280,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (short) SvIV(tempsv);
   $target = &dvalue;
@@ -1303,7 +1303,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (long) SvIV(tempsv);
   $target = &dvalue;
@@ -1326,7 +1326,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned int) SvIV(tempsv);
   $target = &dvalue;
@@ -1349,7 +1349,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned short) SvIV(tempsv);
   $target = &dvalue;
@@ -1372,7 +1372,7 @@ void _ptrfree(SV *_PTRVALUE) {
   }
   tempsv = SvRV($source);
   if (!SvIOK(tempsv)) {
-    croak("expected a integer reference");
+    croak("expected an integer reference");
   }
   dvalue = (unsigned long) SvIV(tempsv);
   $target = &dvalue;
diff --git a/Lib/perl5/reference.i b/Lib/perl5/reference.i
index 2836c25c4..b424c533b 100644
--- a/Lib/perl5/reference.i
+++ b/Lib/perl5/reference.i
@@ -85,7 +85,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = SvIV(tempsv);
   $1 = &dvalue;
@@ -99,7 +99,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (short) SvIV(tempsv);
   $1 = &dvalue;
@@ -112,7 +112,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (long) SvIV(tempsv);
   $1 = &dvalue;
@@ -125,7 +125,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (unsigned int) SvUV(tempsv);
   $1 = &dvalue;
@@ -138,7 +138,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (unsigned short) SvUV(tempsv);
   $1 = &dvalue;
@@ -151,7 +151,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (unsigned long) SvUV(tempsv);
   $1 = &dvalue;
@@ -165,7 +165,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (unsigned char) SvUV(tempsv);
   $1 = &dvalue;
@@ -179,7 +179,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = (signed char) SvIV(tempsv);
   $1 = &dvalue;
@@ -193,7 +193,7 @@ as follows :
   }
   tempsv = SvRV($input);
   if (!SvIOK(tempsv)) {
-    SWIG_croak("expected a integer reference");
+    SWIG_croak("expected an integer reference");
   }
   dvalue = SvIV(tempsv) ? true : false;
   $1 = &dvalue;

From ff2df5b288d2cff0953f3836d46106741f3e7bd1 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru 
Date: Wed, 8 Aug 2012 09:30:08 +0000
Subject: [PATCH 104/538] Fix some minor typos in the doc

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13560 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Go.html    | 2 +-
 Doc/Manual/Ocaml.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index cd39d1fa1..78a58df28 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -498,7 +498,7 @@ into Go types.
 
    Because of limitations in the way output arguments are processed in swig,
 a function with output arguments will not have multiple return values.
 Instead, you must pass a pointer into the C++ function to tell it where to
-store the ouput value.  In go, you supply a slice in the place of the output
+store the output value.  In go, you supply a slice in the place of the output
 argument.
    
 
 
    For example, suppose you were trying to wrap the modf() function in the
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index ba8aa5fa9..127be904d 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -126,7 +126,7 @@ the resulting .ml and .mli files as well, and do the final link with -custom
 
 
 
    
-The O'Caml SWIG module now requires you to compile a module (Swig) 
+The OCaml SWIG module now requires you to compile a module (Swig) 
 separately.  In addition to aggregating common SWIG functionality, the Swig
 module contains the data structure that represents C/C++ values.  This allows
 easier data sharing between modules if two or more are combined, because

From c8b8d4f50dbf29856a4d87f1887792b78530d643 Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Wed, 8 Aug 2012 14:13:37 +0000
Subject: [PATCH 105/538] add pair to stl.i

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13562 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/r/stl.i | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Lib/r/stl.i b/Lib/r/stl.i
index 9656ee6d4..37e2ccbf4 100644
--- a/Lib/r/stl.i
+++ b/Lib/r/stl.i
@@ -1,8 +1,10 @@
 /* initial STL definition. extended as needed in each language */
 %include std_common.i
 %include std_vector.i
+%include std_pair.i
 %include std_string.i
 
 
 
 
+

From 3b8bc08be706743746fff4f18e51d521ad5bc1e2 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 Aug 2012 22:24:46 +0000
Subject: [PATCH 106/538] Suppress -Werror=unused-but-set-variable gcc warning
 in Python wrappers

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13571 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current       | 3 +++
 Lib/python/pyinit.swg | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index e69c7d1dc..b8a80cfed 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-05: wsfulton
+            [Python] #3530021 Fix unused variable warning.
+
 2012-08-05: wsfulton
             [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
             with many arguments.
diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg
index 7a32a5046..6a6de0963 100644
--- a/Lib/python/pyinit.swg
+++ b/Lib/python/pyinit.swg
@@ -398,6 +398,7 @@ SWIG_init(void) {
   m = Py_InitModule((char *) SWIG_name, SwigMethods);
 #endif
   md = d = PyModule_GetDict(m);
+  (void)md;
 
   SWIG_InitializeModule(0);
 

From fad95da7f5b3ee609d54d4f65981fe27879bde9a Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Sun, 12 Aug 2012 15:21:39 +0000
Subject: [PATCH 107/538] change R components so that pointers are visible
 through ref

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13601 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/r/rtype.swg      | 46 +++++++++++++++++++++++++++++---------------
 Source/Modules/r.cxx |  6 +++++-
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg
index 6af45cf40..007eaf140 100644
--- a/Lib/r/rtype.swg
+++ b/Lib/r/rtype.swg
@@ -12,6 +12,8 @@
 %apply int {unsigned int}
 %apply int {short}
 %apply int {unsigned short}
+%apply int {signed char}
+%apply int {unsigned char}
 
 %typemap("rtype") long, long *, long &      "integer";
 %apply long {long long}
@@ -36,10 +38,9 @@
 %typemap("rtype") SWIGTYPE & "$R_class";
 %typemap("rtype") SWIGTYPE "$&R_class";
 
-%typemap("rtypecheck") int, int &, long, long &,
-  unsigned char, unsigned char &
+%typemap("rtypecheck") int, int &, long, long &
   %{ (is.integer($arg) || is.numeric($arg)) && length($arg) == 1 %}
-%typemap("rtypecheck") int *, long *, unsigned char *
+%typemap("rtypecheck") int *, long *
   %{ is.integer($arg) || is.numeric($arg) %}
 
 
@@ -107,9 +108,8 @@
 %typemap(scoercein) enum SWIGTYPE *const
   %{  $input = enumToInteger($input, "$R_class"); %}
 
-
 %typemap(scoercein) SWIGTYPE, SWIGTYPE *, SWIGTYPE *const, SWIGTYPE &  
-  %{ %}
+ %{ if (.hasSlot($input, "ref")) $input = slot($input,"ref") %}
 
 /*
 %typemap(scoercein) SWIGTYPE *, SWIGTYPE *const
@@ -141,7 +141,7 @@
 		    long *,
 		    long &,
 		    long[ANY]
-  "$input = as.integer($input); ";
+  "$input = as.integer($input);";
 
 %typemap(scoercein) char *, string, std::string,
 string &, std::string &
@@ -159,18 +159,30 @@ string &, std::string &
 %typemap(scoerceout) enum SWIGTYPE *const
   %{  $result = enumToInteger($result, "$R_class"); %}
 
+#%typemap(scoerceout) SWIGTYPE 
+#  %{ class($result) <- "$&R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE 
-  %{ class($result) <- "$&R_class"; %}
+#%typemap(scoerceout) SWIGTYPE & 
+#  %{ class($result) <- "$R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE & 
-  %{ class($result) <- "$R_class"; %}
+#%typemap(scoerceout) SWIGTYPE * 
+#  %{ class($result) <- "$R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE * 
-  %{ class($result) <- "$R_class"; %}
+#%typemap(scoerceout) SWIGTYPE *const
+#  %{ class($result) <- "$R_class"; %}
+
+ %typemap(scoerceout) SWIGTYPE 
+ %{ $result <- new("$&R_class", ref=$result); %}
+ 
+ %typemap(scoerceout) SWIGTYPE & 
+ %{ $result <- new("$R_class", ref=$result) ; %}
+ 
+ %typemap(scoerceout) SWIGTYPE * 
+ %{ $result <- new("$R_class", ref=$result) ; %}
+ 
+ %typemap(scoerceout) SWIGTYPE *const
+ %{ $result <- new("$R_class", ref=$result) ; %}
 
-%typemap(scoerceout) SWIGTYPE *const
-  %{ class($result) <- "$R_class"; %}
 
 /* Override the SWIGTYPE * above. */
 %typemap(scoerceout) char,
@@ -208,8 +220,10 @@ string &, std::string &
 		     signed long &,		     
 		     unsigned long,
 		     unsigned long &,
-		     unsigned char *,
-		     unsigned char &		     
+		     signed char,
+		     signed char &,
+		     unsigned char,
+		     unsigned char &
  %{    %}
 
 #if 0
diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index f163c8b30..b589bfda7 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -1891,6 +1891,9 @@ int R::functionWrapper(Node *n) {
 	if(nargs == -1)
 	  nargs = getFunctionPointerNumArgs(p, tt);
 
+	Printv(sfun->code, "if (.hasSlot(", name, ", \"ref\")) {\n",
+	       name, " = slot(", name, ", \"ref\");\n",
+	       "}\n", NIL);
 	String *snargs = NewStringf("%d", nargs);
 	Printv(sfun->code, "if(is.function(", name, ")) {", "\n",
 	       "assert('...' %in% names(formals(", name, 
@@ -2112,7 +2115,8 @@ int R::functionWrapper(Node *n) {
 	{ 
 	  String *finalizer = NewString(iname);
 	  Replace(finalizer, "new_", "", DOH_REPLACE_FIRST);
-	  Printf(sfun->code, "reg.finalizer(ans, delete_%s)\n", finalizer);
+	  Printf(sfun->code, "if (.hasSlot(ans, \"ref\")) {\n"
+		 "reg.finalizer(ans@ref, delete_%s); }\n", finalizer);
 	}                                                                      
       Printf(sfun->code, "ans\n");
     }

From 009c191430d2e87e19ce33ed1bce43f3939f8c1b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 13 Aug 2012 21:41:08 +0000
Subject: [PATCH 108/538] Add assumeoverride feature option for Java directors
 to improve performance when it can be assumed that all methods are overridden
 by the Java derived classes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13606 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  4 +++
 Doc/Manual/Java.html                          | 23 +++++++++++++-
 Examples/test-suite/common.mk                 |  1 +
 .../java_director_assumeoverride_runme.java   | 27 +++++++++++++++++
 .../test-suite/java_director_assumeoverride.i | 30 +++++++++++++++++++
 Source/Modules/java.cxx                       | 30 +++++++++++++++----
 6 files changed, 108 insertions(+), 7 deletions(-)
 create mode 100644 Examples/test-suite/java/java_director_assumeoverride_runme.java
 create mode 100644 Examples/test-suite/java_director_assumeoverride.i

diff --git a/CHANGES.current b/CHANGES.current
index b8a80cfed..78e39dbc1 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-13: wsfulton
+            [Java] Patch from David Baum to add the assumeoverride feature for Java directors to
+            improve performance when all overridden methods can be assumed to be overridden.
+
 2012-08-05: wsfulton
             [Python] #3530021 Fix unused variable warning.
 
diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index 8a081f46d..cfee64fa0 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -86,6 +86,7 @@
 
  • Overhead and code bloat
 
  • Simple directors example
 
  • Director threading issues
+
  • Director performance tuning
 
 
  • Accessing protected members
 
  • Common customization features
@@ -3525,6 +3526,27 @@ Macros can be defined on the commandline when compiling your C++ code, or altern
 
    • 
 
    
 
+
    24.5.6 Director performance tuning
    
+
+
    
+When a new instance of a director (or subclass) is created in Java, the C++ side of the director performs a runtime check per director method to determine if that particular method is overridden in Java or if it should invoke the C++ base implementation directly.  Although this makes initialization slightly more expensive, it is generally a good overall tradeoff.
+
    
+
+
    
+However, if all director methods are expected to usually be overridden by Java subclasses, then initialization can be made faster by avoiding these checks via the assumeoverride attribute.  For example:
+
    
+
+
    
+
    +%feature("director", assumeoverride=1) Foo;
+
    
+
    
+
+
    
+The disadvantage is that invocation of director methods from C++ when Java doesn't actually override the method will require an additional call up into Java and back to C++.  As such, this option is only useful when overrides are extremely common and instantiation is frequent enough that its performance is critical.
+
    
+
+
 
    24.6 Accessing protected members
    
 
 
@@ -7862,4 +7884,3 @@ Many of these have runtime tests in the java subdirectory.
 
 
 
-
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index f6a8056e5..ef65fbb1b 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -161,6 +161,7 @@ CPP_TEST_CASES += \
 	destructor_reprotected \
 	director_abstract \
 	director_alternating \
+	director_assumeoverride \
 	director_basic \
 	director_binary_string \
 	director_classes \
diff --git a/Examples/test-suite/java/java_director_assumeoverride_runme.java b/Examples/test-suite/java/java_director_assumeoverride_runme.java
new file mode 100644
index 000000000..e876a79c9
--- /dev/null
+++ b/Examples/test-suite/java/java_director_assumeoverride_runme.java
@@ -0,0 +1,27 @@
+
+import java_director_assumeoverride.*;
+
+public class java_director_assumeoverride_runme {
+
+  static {
+    try {
+      System.loadLibrary("java_director_assumeoverride");
+    } 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);
+    }
+  }
+
+  static class MyOverrideMe extends OverrideMe {
+  }
+
+  public static void main(String argv[]) {
+    OverrideMe overrideMe = new MyOverrideMe();
+
+    // MyOverrideMe doesn't actually override func(), but because assumeoverride
+    // was set to true, the C++ side will believe it was overridden.
+    if (!java_director_assumeoverride.isFuncOverridden(overrideMe)) {
+      throw new RuntimeException ( "isFuncOverridden()" );
+    }
+  }
+}
diff --git a/Examples/test-suite/java_director_assumeoverride.i b/Examples/test-suite/java_director_assumeoverride.i
new file mode 100644
index 000000000..7364a3d58
--- /dev/null
+++ b/Examples/test-suite/java_director_assumeoverride.i
@@ -0,0 +1,30 @@
+%module(directors="1") java_director_assumeoverride
+#pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR
+
+%{
+class OverrideMe {
+public:
+  virtual ~OverrideMe() {}
+  virtual void func() {};
+};
+
+#include "java_director_assumeoverride_wrap.h"
+bool isFuncOverridden(OverrideMe* f) {
+  SwigDirector_OverrideMe* director = dynamic_cast(f);
+  if (!director) {
+    return false;
+  }
+  return director->swig_overrides(0);
+}
+
+%}
+
+%feature("director", assumeoverride=1) OverrideMe;
+
+class OverrideMe {
+public:
+  virtual ~OverrideMe();
+  virtual void func();
+};
+
+bool isFuncOverridden(OverrideMe* f);
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index ffc4d8d97..1c39aec11 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4318,12 +4318,30 @@ public:
       Printf(w->code, "    methods[i].base_methid = jenv->GetMethodID(baseclass, methods[i].mname, methods[i].mdesc);\n");
       Printf(w->code, "    if (!methods[i].base_methid) return;\n");
       Printf(w->code, "  }\n");
-      Printf(w->code, "  swig_override[i] = false;\n");
-      Printf(w->code, "  if (derived) {\n");
-      Printf(w->code, "    jmethodID methid = jenv->GetMethodID(jcls, methods[i].mname, methods[i].mdesc);\n");
-      Printf(w->code, "    swig_override[i] = (methid != methods[i].base_methid);\n");
-      Printf(w->code, "    jenv->ExceptionClear();\n");
-      Printf(w->code, "  }\n");
+      // Generally, derived classes have a mix of overridden and
+      // non-overridden methods and it is worth making a GetMethodID
+      // check during initialization to determine if each method is
+      // overridden, thus avoiding unnecessary calls into Java.
+      //
+      // On the other hand, when derived classes are
+      // expected to override all director methods then the
+      // GetMethodID calls are inefficient, and it is better to let
+      // the director unconditionally call up into Java.  The resulting code
+      // will still behave correctly (though less efficiently) when Java
+      // code doesn't override a given method.
+      //
+      // The assumeoverride feature on a director controls whether or not
+      // overrides are assumed.
+      if (GetFlag(n, "feature:director:assumeoverride")) {
+        Printf(w->code, "  swig_override[i] = derived;\n");
+      } else {
+        Printf(w->code, "  swig_override[i] = false;\n");
+        Printf(w->code, "  if (derived) {\n");
+        Printf(w->code, "    jmethodID methid = jenv->GetMethodID(jcls, methods[i].mname, methods[i].mdesc);\n");
+        Printf(w->code, "    swig_override[i] = (methid != methods[i].base_methid);\n");
+        Printf(w->code, "    jenv->ExceptionClear();\n");
+        Printf(w->code, "  }\n");
+      }
       Printf(w->code, "}\n");
     } else {
       Printf(f_directors_h, "public:\n");

From 289b8bb269f29cca766b61cab12ee4c883749e7d Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 13 Aug 2012 21:59:14 +0000
Subject: [PATCH 109/538] Fix additio of assumeoverride testcase

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13607 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/common.mk        | 1 -
 Examples/test-suite/java/Makefile.in | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index ef65fbb1b..f6a8056e5 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -161,7 +161,6 @@ CPP_TEST_CASES += \
 	destructor_reprotected \
 	director_abstract \
 	director_alternating \
-	director_assumeoverride \
 	director_basic \
 	director_binary_string \
 	director_classes \
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index ef3c981a4..0b3f7babb 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -23,6 +23,7 @@ CPP_TEST_CASES = \
 	intermediary_classname \
 	java_constants \
 	java_director \
+	java_director_assumeoverride \
 	java_enums \
 	java_lib_arrays_dimensionless \
 	java_lib_various \

From 68862691e6229237301ae7af10a5c894e94353c6 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 15 Aug 2012 07:48:57 +0000
Subject: [PATCH 110/538] Fix #3541744 - Missing PyInt_FromSize_t calls for
 Python 3

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13608 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current       | 3 +++
 Lib/python/pyhead.swg | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 78e39dbc1..eb109a6b0 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-15: wsfulton
+            [Python] Fix #3541744 - Missing PyInt_FromSize_t calls for Python 3.
+
 2012-08-13: wsfulton
             [Java] Patch from David Baum to add the assumeoverride feature for Java directors to
             improve performance when all overridden methods can be assumed to be overridden.
diff --git a/Lib/python/pyhead.swg b/Lib/python/pyhead.swg
index 803cd0745..c333e9d89 100644
--- a/Lib/python/pyhead.swg
+++ b/Lib/python/pyhead.swg
@@ -5,6 +5,7 @@
 #define PyInt_Check(x) PyLong_Check(x)
 #define PyInt_AsLong(x) PyLong_AsLong(x)
 #define PyInt_FromLong(x) PyLong_FromLong(x)
+#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
 #define PyString_Check(name) PyBytes_Check(name)
 #define PyString_FromString(x) PyUnicode_FromString(x)
 #define PyString_Format(fmt, args)  PyUnicode_Format(fmt, args)

From 81b755dadcdd8fdfa8b6ff99ce98d141bf518f53 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 15 Aug 2012 22:35:24 +0000
Subject: [PATCH 111/538] Better error handling in
 SWIG_Python_NewShadowInstance and SWIG_Python_NewPointerObj to fix seg fault
 as mentioned on swig-devel mailing list email thread - 'Fix python3 abc set'

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13618 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/python/pyrun.swg | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index e1924a1a4..d621f4dee 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -1331,23 +1331,29 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this)
   } else {
 #if PY_VERSION_HEX >= 0x03000000
     inst = PyBaseObject_Type.tp_new((PyTypeObject*) data->newargs, Py_None, Py_None);
-    PyObject_SetAttr(inst, SWIG_This(), swig_this);
-    Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    if (inst) {
+      PyObject_SetAttr(inst, SWIG_This(), swig_this);
+      Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    }
 #else
     PyObject *dict = PyDict_New();
-    PyDict_SetItem(dict, SWIG_This(), swig_this);
-    inst = PyInstance_NewRaw(data->newargs, dict);
-    Py_DECREF(dict);
+    if (dict) {
+      PyDict_SetItem(dict, SWIG_This(), swig_this);
+      inst = PyInstance_NewRaw(data->newargs, dict);
+      Py_DECREF(dict);
+    }
 #endif
   }
   return inst;
 #else
 #if (PY_VERSION_HEX >= 0x02010000)
-  PyObject *inst;
+  PyObject *inst = 0;
   PyObject *dict = PyDict_New();
-  PyDict_SetItem(dict, SWIG_This(), swig_this);
-  inst = PyInstance_NewRaw(data->newargs, dict);
-  Py_DECREF(dict);
+  if (dict) {
+    PyDict_SetItem(dict, SWIG_This(), swig_this);
+    inst = PyInstance_NewRaw(data->newargs, dict);
+    Py_DECREF(dict);
+  }
   return (PyObject *) inst;
 #else
   PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
@@ -1454,12 +1460,10 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f
   assert(!(flags & SWIG_BUILTIN_TP_INIT));
 
   robj = SwigPyObject_New(ptr, type, own);
-  if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+  if (robj && clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
     PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
-    if (inst) {
-      Py_DECREF(robj);
-      robj = inst;
-    }
+    Py_DECREF(robj);
+    robj = inst;
   }
   return robj;
 }

From 049035ff3ec8152b74ebad640f6127b432434090 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 15 Aug 2012 22:36:15 +0000
Subject: [PATCH 112/538] Add discard and add methods to std::set and
 std::multiset wrappers so that pyabc.i can be used ensuring MutableSet is a
 valid abstract base class

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13619 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                                          | 5 +++++
 Examples/test-suite/python/python_abstractbase_runme3.py | 8 ++++++++
 Lib/python/std_set.i                                     | 8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index eb109a6b0..651df4e2e 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-15: wsfulton
+            [Python] Add discard and add methods to std::set wrappers so that pyabc.i can be used ensuring
+            MutableSet is a valid abstract base class for std::set. As reported by Alexey Sokolov.
+            Similarly for std::multiset.
+
 2012-08-15: wsfulton
             [Python] Fix #3541744 - Missing PyInt_FromSize_t calls for Python 3.
 
diff --git a/Examples/test-suite/python/python_abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py
index b7593f109..94dee3ff7 100644
--- a/Examples/test-suite/python/python_abstractbase_runme3.py
+++ b/Examples/test-suite/python/python_abstractbase_runme3.py
@@ -10,3 +10,11 @@ assert issubclass(IntSet, MutableSet)
 assert issubclass(IntMultiset, MutableSet)
 assert issubclass(IntVector, MutableSequence)
 assert issubclass(IntList, MutableSequence)
+
+mapii = Mapii()
+multimapii = Multimapii()
+intset = IntSet()
+intmultiset = IntMultiset()
+intvector = IntVector()
+intlist = IntList()
+
diff --git a/Lib/python/std_set.i b/Lib/python/std_set.i
index 59f69cdc9..53f97e475 100644
--- a/Lib/python/std_set.i
+++ b/Lib/python/std_set.i
@@ -49,6 +49,14 @@
        return *(swig::cgetpos(self, i));
      }
 
+     void add(value_type x) {
+       self->insert(x);
+     }
+
+     void discard(value_type x) {
+       self->erase(x);
+     }
+
   };
 %enddef
 

From c20cacad8731454b2125ba224b48d606e915d966 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 15 Aug 2012 23:04:26 +0000
Subject: [PATCH 113/538] Add some missing STL container typedefs for Perl

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13620 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current        | 3 +++
 Lib/perl5/std_list.i   | 8 ++++++++
 Lib/perl5/std_vector.i | 9 +++++++++
 Lib/std/_std_deque.i   | 9 +++++++--
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 651df4e2e..a6fe5815d 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.8 (in progress)
 ===========================
 
+2012-08-15: wsfulton
+            [Perl] Add size_type, value_type, const_reference to the STL containers.
+
 2012-08-15: wsfulton
             [Python] Add discard and add methods to std::set wrappers so that pyabc.i can be used ensuring
             MutableSet is a valid abstract base class for std::set. As reported by Alexey Sokolov.
diff --git a/Lib/perl5/std_list.i b/Lib/perl5/std_list.i
index c6bca18f6..ea264d6a1 100644
--- a/Lib/perl5/std_list.i
+++ b/Lib/perl5/std_list.i
@@ -188,6 +188,10 @@ namespace std {
             }
         }
       public:
+        typedef size_t size_type;
+        typedef T value_type;
+        typedef const value_type& const_reference;
+
         list();
         list(const list &);
 
@@ -337,6 +341,10 @@ namespace std {
             }
         }
       public:
+        typedef size_t size_type;
+        typedef T value_type;
+        typedef const value_type& const_reference;
+
         list();
         list(const list &);
 
diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i
index 0a61c31e0..a3998ff92 100644
--- a/Lib/perl5/std_vector.i
+++ b/Lib/perl5/std_vector.i
@@ -180,6 +180,9 @@ namespace std {
             }
         }
       public:
+        typedef size_t size_type;
+        typedef T value_type;
+        typedef const value_type& const_reference;
         vector(unsigned int size = 0);
         vector(unsigned int size, const T& value);
         vector(const vector &);
@@ -349,6 +352,9 @@ namespace std {
             }
         }
       public:
+        typedef size_t size_type;
+        typedef T value_type;
+        typedef const value_type& const_reference;
         vector(unsigned int size = 0);
         vector(unsigned int size, T *value);
         vector(const vector &);
@@ -517,6 +523,9 @@ namespace std {
             }
         }
       public:
+        typedef size_t size_type;
+        typedef T value_type;
+        typedef const value_type& const_reference;
         vector(unsigned int size = 0);
         vector(unsigned int size, T value);
         vector(const vector &);
diff --git a/Lib/std/_std_deque.i b/Lib/std/_std_deque.i
index 4234789a8..7dd3552db 100644
--- a/Lib/std/_std_deque.i
+++ b/Lib/std/_std_deque.i
@@ -25,8 +25,13 @@
 */
 
 %define %std_deque_methods_noempty(T)
-       typedef T &reference;
-       typedef const T& const_reference;
+       typedef size_t size_type;
+       typedef ptrdiff_t difference_type;
+       typedef T value_type;
+       typedef value_type* pointer;
+       typedef const value_type* const_pointer;
+       typedef value_type& reference;
+       typedef const value_type& const_reference;
 
        deque();
        deque(unsigned int size, const T& value=T());

From a0d15a7e03c29d9138f90eb0e5c4fc7f460183df Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 15 Aug 2012 23:36:28 +0000
Subject: [PATCH 114/538] Better fix than r6987 to silence warning

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13621 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/swiginit.swg | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Lib/swiginit.swg b/Lib/swiginit.swg
index 903ac548f..42c160483 100644
--- a/Lib/swiginit.swg
+++ b/Lib/swiginit.swg
@@ -52,13 +52,11 @@ extern "C" {
 
 
 SWIGRUNTIME void
-SWIG_InitializeModule(void *clientdata) {
+SWIG_InitializeModule(void *SWIGUNUSEDPARM(clientdata)) {
   size_t i;
   swig_module_info *module_head, *iter;
   int found, init;
 
-  clientdata = clientdata;
-
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
     /* Initialize the swig_module */

From 11323af905a3ff8d6fadc4f2fe017d54a2ea964e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 16 Aug 2012 22:35:36 +0000
Subject: [PATCH 115/538] A working fix to silence unused warnings - fixes
 r13621

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13637 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/swiginit.swg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/swiginit.swg b/Lib/swiginit.swg
index 42c160483..d160cfaf1 100644
--- a/Lib/swiginit.swg
+++ b/Lib/swiginit.swg
@@ -52,10 +52,11 @@ extern "C" {
 
 
 SWIGRUNTIME void
-SWIG_InitializeModule(void *SWIGUNUSEDPARM(clientdata)) {
+SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
   int found, init;
+  (void *)clientdata;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {

From a6764a156cca21300cc4ae6ed756114af4728e3e Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Sat, 18 Aug 2012 13:53:47 +0000
Subject: [PATCH 116/538] use print to output sprintf

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13650 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/r/class/runme.R | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/r/class/runme.R b/Examples/r/class/runme.R
index 4a2028553..f4f8f35de 100644
--- a/Examples/r/class/runme.R
+++ b/Examples/r/class/runme.R
@@ -28,8 +28,8 @@ square$x <- -10
 square$y <- 5
 
 print("Here is their current position:")
-sprintf("    Circle = (%f, %f)", circle$x,circle$y)
-sprintf("    Square = (%f, %f)", square$x,square$y)
+print(sprintf("    Circle = (%f, %f)", circle$x,circle$y))
+print(sprintf("    Square = (%f, %f)", square$x,square$y))
 
 # ----- Call some methods -----
 
@@ -37,7 +37,7 @@ print ("Here are some properties of the shapes:")
 
 sapply(c(circle, square), 
 		 function(o) {
-sprintf("       area = %f perimeter = %f", o$area(),  o$perimeter())
+print(sprintf("       area = %f perimeter = %f", o$area(),  o$perimeter()))
 })
 
 print("Guess I'll clean up now")

From e216963630221c568f9ef933f190826c09d85539 Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Mon, 20 Aug 2012 15:54:36 +0000
Subject: [PATCH 117/538] back out of previous change.  There seem to be
 version dependent changes in what gets printed out and previous change causes
 double printing in earlier versions of R

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13685 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/r/class/runme.R | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/r/class/runme.R b/Examples/r/class/runme.R
index f4f8f35de..4a2028553 100644
--- a/Examples/r/class/runme.R
+++ b/Examples/r/class/runme.R
@@ -28,8 +28,8 @@ square$x <- -10
 square$y <- 5
 
 print("Here is their current position:")
-print(sprintf("    Circle = (%f, %f)", circle$x,circle$y))
-print(sprintf("    Square = (%f, %f)", square$x,square$y))
+sprintf("    Circle = (%f, %f)", circle$x,circle$y)
+sprintf("    Square = (%f, %f)", square$x,square$y)
 
 # ----- Call some methods -----
 
@@ -37,7 +37,7 @@ print ("Here are some properties of the shapes:")
 
 sapply(c(circle, square), 
 		 function(o) {
-print(sprintf("       area = %f perimeter = %f", o$area(),  o$perimeter()))
+sprintf("       area = %f perimeter = %f", o$area(),  o$perimeter())
 })
 
 print("Guess I'll clean up now")

From 9ceb42ea6821a37e65edfea24789ce1b943fabda Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 20 Aug 2012 21:12:42 +0000
Subject: [PATCH 118/538] Section numbering update

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13711 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Contents.html | 1 +
 Doc/Manual/Java.html     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 4af66298c..bdb3aa9f5 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -912,6 +912,7 @@
 
  • Overhead and code bloat
 
  • Simple directors example
 
  • Director threading issues
+
  • Director performance tuning
 
 
  • Accessing protected members
 
  • Common customization features
diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index cfee64fa0..ed99549b0 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -3528,6 +3528,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern
 
 
    24.5.6 Director performance tuning
    
 
+
 
    
 When a new instance of a director (or subclass) is created in Java, the C++ side of the director performs a runtime check per director method to determine if that particular method is overridden in Java or if it should invoke the C++ base implementation directly.  Although this makes initialization slightly more expensive, it is generally a good overall tradeoff.
 
    

From 9da9df9ee8b01bc5cefc6739b0186ecaec50b6d3 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 20 Aug 2012 21:14:24 +0000
Subject: [PATCH 119/538] Release notes for 2.0.8

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13712 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 RELEASENOTES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASENOTES b/RELEASENOTES
index a69631a85..e09e2cad0 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -4,6 +4,11 @@ and CHANGES files.
 
 Release Notes
 =============
+SWIG-2.0.8 summary:
+- Fix a couple of regressions introduced in 2.0.5 and 2.0.7.
+- Improved using declarations and using directives support.
+- Minor fixes/enhancements for C#, Java, Octave, Perl and Python.
+
 SWIG-2.0.7 summary:
 - Important regression fixes since 2.0.5 for typemaps in general and
   in Python.

From be1c4d2e68ccdef00648e745db432114b4614d91 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 20 Aug 2012 21:20:19 +0000
Subject: [PATCH 120/538] Revert r13601 as it breaks older versions of R

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13713 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/r/rtype.swg      | 46 +++++++++++++++-----------------------------
 Source/Modules/r.cxx |  6 +-----
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg
index 007eaf140..6af45cf40 100644
--- a/Lib/r/rtype.swg
+++ b/Lib/r/rtype.swg
@@ -12,8 +12,6 @@
 %apply int {unsigned int}
 %apply int {short}
 %apply int {unsigned short}
-%apply int {signed char}
-%apply int {unsigned char}
 
 %typemap("rtype") long, long *, long &      "integer";
 %apply long {long long}
@@ -38,9 +36,10 @@
 %typemap("rtype") SWIGTYPE & "$R_class";
 %typemap("rtype") SWIGTYPE "$&R_class";
 
-%typemap("rtypecheck") int, int &, long, long &
+%typemap("rtypecheck") int, int &, long, long &,
+  unsigned char, unsigned char &
   %{ (is.integer($arg) || is.numeric($arg)) && length($arg) == 1 %}
-%typemap("rtypecheck") int *, long *
+%typemap("rtypecheck") int *, long *, unsigned char *
   %{ is.integer($arg) || is.numeric($arg) %}
 
 
@@ -108,8 +107,9 @@
 %typemap(scoercein) enum SWIGTYPE *const
   %{  $input = enumToInteger($input, "$R_class"); %}
 
+
 %typemap(scoercein) SWIGTYPE, SWIGTYPE *, SWIGTYPE *const, SWIGTYPE &  
- %{ if (.hasSlot($input, "ref")) $input = slot($input,"ref") %}
+  %{ %}
 
 /*
 %typemap(scoercein) SWIGTYPE *, SWIGTYPE *const
@@ -141,7 +141,7 @@
 		    long *,
 		    long &,
 		    long[ANY]
-  "$input = as.integer($input);";
+  "$input = as.integer($input); ";
 
 %typemap(scoercein) char *, string, std::string,
 string &, std::string &
@@ -159,30 +159,18 @@ string &, std::string &
 %typemap(scoerceout) enum SWIGTYPE *const
   %{  $result = enumToInteger($result, "$R_class"); %}
 
-#%typemap(scoerceout) SWIGTYPE 
-#  %{ class($result) <- "$&R_class"; %}
 
-#%typemap(scoerceout) SWIGTYPE & 
-#  %{ class($result) <- "$R_class"; %}
+%typemap(scoerceout) SWIGTYPE 
+  %{ class($result) <- "$&R_class"; %}
 
-#%typemap(scoerceout) SWIGTYPE * 
-#  %{ class($result) <- "$R_class"; %}
+%typemap(scoerceout) SWIGTYPE & 
+  %{ class($result) <- "$R_class"; %}
 
-#%typemap(scoerceout) SWIGTYPE *const
-#  %{ class($result) <- "$R_class"; %}
-
- %typemap(scoerceout) SWIGTYPE 
- %{ $result <- new("$&R_class", ref=$result); %}
- 
- %typemap(scoerceout) SWIGTYPE & 
- %{ $result <- new("$R_class", ref=$result) ; %}
- 
- %typemap(scoerceout) SWIGTYPE * 
- %{ $result <- new("$R_class", ref=$result) ; %}
- 
- %typemap(scoerceout) SWIGTYPE *const
- %{ $result <- new("$R_class", ref=$result) ; %}
+%typemap(scoerceout) SWIGTYPE * 
+  %{ class($result) <- "$R_class"; %}
 
+%typemap(scoerceout) SWIGTYPE *const
+  %{ class($result) <- "$R_class"; %}
 
 /* Override the SWIGTYPE * above. */
 %typemap(scoerceout) char,
@@ -220,10 +208,8 @@ string &, std::string &
 		     signed long &,		     
 		     unsigned long,
 		     unsigned long &,
-		     signed char,
-		     signed char &,
-		     unsigned char,
-		     unsigned char &
+		     unsigned char *,
+		     unsigned char &		     
  %{    %}
 
 #if 0
diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index b589bfda7..f163c8b30 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -1891,9 +1891,6 @@ int R::functionWrapper(Node *n) {
 	if(nargs == -1)
 	  nargs = getFunctionPointerNumArgs(p, tt);
 
-	Printv(sfun->code, "if (.hasSlot(", name, ", \"ref\")) {\n",
-	       name, " = slot(", name, ", \"ref\");\n",
-	       "}\n", NIL);
 	String *snargs = NewStringf("%d", nargs);
 	Printv(sfun->code, "if(is.function(", name, ")) {", "\n",
 	       "assert('...' %in% names(formals(", name, 
@@ -2115,8 +2112,7 @@ int R::functionWrapper(Node *n) {
 	{ 
 	  String *finalizer = NewString(iname);
 	  Replace(finalizer, "new_", "", DOH_REPLACE_FIRST);
-	  Printf(sfun->code, "if (.hasSlot(ans, \"ref\")) {\n"
-		 "reg.finalizer(ans@ref, delete_%s); }\n", finalizer);
+	  Printf(sfun->code, "reg.finalizer(ans, delete_%s)\n", finalizer);
 	}                                                                      
       Printf(sfun->code, "ans\n");
     }

From 8f16b81a4fb03bb66fb96e030559afdc852629c1 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 20 Aug 2012 21:21:24 +0000
Subject: [PATCH 121/538] 2.0.8 release date added

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13714 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE                 | 2 +-
 CHANGES.current          | 4 ++--
 Doc/Manual/Sections.html | 2 +-
 README                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 4fa6694f4..b3a6e48fc 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 2.0.8 (in progress) ***
+*** ANNOUNCE: SWIG 2.0.8 (20 August 2012) ***
 
 http://www.swig.org
 
diff --git a/CHANGES.current b/CHANGES.current
index a6fe5815d..3c610d0b9 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,8 +2,8 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.8 (in progress)
-===========================
+Version 2.0.8 (20 August 2012)
+==============================
 
 2012-08-15: wsfulton
             [Perl] Add size_type, value_type, const_reference to the STL containers.
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 0e78de84a..6dd4d3683 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
    SWIG-2.0 Documentation
    
 
-Last update : SWIG-2.0.8 (in progress)
+Last update : SWIG-2.0.8 (20 August 2012)
 
 
    Sections
    
 
diff --git a/README b/README
index 154efc013..45a9b047f 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.8 (in progress)
+Version: 2.0.8 (20 August 2012)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua,

From 0e4e0672e09be1caa20102f11115c250266a2785 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 21 Aug 2012 22:11:07 +0000
Subject: [PATCH 122/538] Bump version to 2.0.9

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13718 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE                 |   8 +-
 CHANGES                  | 157 ++++++++++++++++++++++++++++++++++++++
 CHANGES.current          | 158 +--------------------------------------
 Doc/Manual/Sections.html |   2 +-
 README                   |   2 +-
 configure.in             |   2 +-
 6 files changed, 166 insertions(+), 163 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index b3a6e48fc..f6a24967a 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 2.0.8 (20 August 2012) ***
+*** ANNOUNCE: SWIG 2.0.9 (in progress) ***
 
 http://www.swig.org
 
-We're pleased to announce SWIG-2.0.8, the latest SWIG release.
+We're pleased to announce SWIG-2.0.9, the latest SWIG release.
 
 What is SWIG?
 =============
@@ -21,11 +21,11 @@ Availability
 ============
 The release is available for download on Sourceforge at
 
-     http://prdownloads.sourceforge.net/swig/swig-2.0.8.tar.gz
+     http://prdownloads.sourceforge.net/swig/swig-2.0.9.tar.gz
 
 A Windows version is also available at
 
-     http://prdownloads.sourceforge.net/swig/swigwin-2.0.8.zip
+     http://prdownloads.sourceforge.net/swig/swigwin-2.0.9.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at http://www.swig.org/mail.html.
diff --git a/CHANGES b/CHANGES
index a63a66312..b485badd9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,163 @@ SWIG (Simplified Wrapper and Interface Generator)
 See the CHANGES.current file for changes in the current version.
 See the RELEASENOTES file for a summary of changes in each release.
 
+Version 2.0.8 (20 August 2012)
+==============================
+
+2012-08-15: wsfulton
+            [Perl] Add size_type, value_type, const_reference to the STL containers.
+
+2012-08-15: wsfulton
+            [Python] Add discard and add methods to std::set wrappers so that pyabc.i can be used ensuring
+            MutableSet is a valid abstract base class for std::set. As reported by Alexey Sokolov.
+            Similarly for std::multiset.
+
+2012-08-15: wsfulton
+            [Python] Fix #3541744 - Missing PyInt_FromSize_t calls for Python 3.
+
+2012-08-13: wsfulton
+            [Java] Patch from David Baum to add the assumeoverride feature for Java directors to
+            improve performance when all overridden methods can be assumed to be overridden.
+
+2012-08-05: wsfulton
+            [Python] #3530021 Fix unused variable warning.
+
+2012-08-05: wsfulton
+            [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
+            with many arguments.
+
+2012-08-05: wsfulton
+            [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using 
+            Perl 5.16 and later.
+
+2012-08-04: wsfulton
+            Remove incorrect warning (314) about target language keywords which were triggered
+            by using declarations and using directives. For example 'string' is a keyword in C#:
+              namespace std { class string; }
+              using std::string;
+
+2012-07-21: wsfulton
+            Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown.
+
+2012-07-21: wsfulton
+            Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window
+            rather than stdout. This fixes display problems in gdbtui and the ensures the output
+            appears where expected in other gdb based debuggers such as Eclipse CDT.
+
+2012-07-20: kwwette
+            [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit().
+
+2012-07-02: wsfulton
+            Fix Debian bug http://bugs.debian.org/672035, typemap copy failure - regression introduced 
+            in swig-2.0.5:
+              %include
+              using std::pair;
+              %template(StrPair) pair;
+
+2012-07-02: wsfulton
+            Fix using declarations combined with using directives with forward class declarations so that
+            types are correctly found in scope for templates. Example:
+
+              namespace Outer2 {
+                namespace Space2 {
+                  template class Thing2;
+                }
+              }
+              using namespace Outer2;
+              using Space2::Thing2;
+              template class Thing2 {};
+              // STILL BROKEN void useit2(Thing2 t) {}
+              void useit2a(Outer2::Space2::Thing2 t) {}
+              void useit2b(::Outer2::Space2::Thing2 t) {}
+              void useit2c(Space2::Thing2 t) {}
+              namespace Outer2 {
+                void useit2d(Space2::Thing2 t) {}
+              }
+
+              %template(Thing2Int) Thing2;
+
+
+2012-06-30: wsfulton
+            Fix template namespace problems for symbols declared with a forward class declarations, such as:
+
+              namespace Space1 {
+                namespace Space2 {
+                  template struct YYY;
+                }
+                template struct Space2::YYY {
+                  T yyy(T h) {
+                    return h;
+                  }    
+                };
+                void testYYY1(Space1::Space2::YYY yy) {}
+                void testYYY2(Space2::YYY yy) {}
+                void testYYY3(::Space1::Space2::YYY yy) {}
+              }
+
+              %template(YYYInt) Space1::Space2::YYY;
+
+2012-06-30: wsfulton
+            Fix namespace problems for symbols declared with a forward class declarations, such as:
+
+              namespace Space1 {
+                namespace Space2 {
+                  struct XXX;
+                  struct YYY;
+                }
+
+                struct Space2::YYY {};
+                struct Space1::Space2::XXX {};
+
+                void testXXX2(Space2::XXX xx) {}
+                void testYYY2(Space2::YYY yy) {}
+              }
+
+            where xx and yy were not recognised as the proxy classes XXX and YYY.
+
+2012-06-30: wsfulton
+            Fix using declarations combined with using directives with forward class declarations so that
+            types are correctly found in scope. 
+
+              namespace Outer2 {
+                namespace Space2 {
+                  class Thing2;
+                }
+              }
+              using namespace Outer2;
+              using Space2::Thing2;
+              class Thing2 {};
+              // None of the methods below correctly used the Thing2 proxy class
+              void useit2(Thing2 t) {}
+              void useit2a(Outer2::Space2::Thing2 t) {}
+              void useit2b(::Outer2::Space2::Thing2 t) {}
+              void useit2c(Space2::Thing2 t) {}
+              namespace Outer2 {
+                void useit2d(Space2::Thing2 t) {}
+              }
+
+2012-06-25: wsfulton
+            Fix using declarations combined with using directives so that types are correctly found in scope.
+            Example:
+
+              namespace Outer2 {
+                namespace Space2 {
+                  class Thing2 {};
+                }
+              }
+              using namespace Outer2; // using directive
+              using Space2::Thing2; // using declaration
+              void useit2(Thing2 t) {}
+
+            Similarly for templated classes.
+
+2012-05-29: wsfulton
+            Fix #3529601 - seg fault when a protected method has the "director"
+            feature but the parent class does not. Also fix similar problems with
+            the allprotected feature.
+
+2012-05-28: wsfulton
+            Fix seg fault when attempting to warn about an illegal destructor - #3530055, 3530078 and #3530118.
+
 Version 2.0.7 (26 May 2012)
 ===========================
 2012-05-26: wsfulton
diff --git a/CHANGES.current b/CHANGES.current
index 3c610d0b9..05b7f1a0d 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,160 +2,6 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.8 (20 August 2012)
-==============================
-
-2012-08-15: wsfulton
-            [Perl] Add size_type, value_type, const_reference to the STL containers.
-
-2012-08-15: wsfulton
-            [Python] Add discard and add methods to std::set wrappers so that pyabc.i can be used ensuring
-            MutableSet is a valid abstract base class for std::set. As reported by Alexey Sokolov.
-            Similarly for std::multiset.
-
-2012-08-15: wsfulton
-            [Python] Fix #3541744 - Missing PyInt_FromSize_t calls for Python 3.
-
-2012-08-13: wsfulton
-            [Java] Patch from David Baum to add the assumeoverride feature for Java directors to
-            improve performance when all overridden methods can be assumed to be overridden.
-
-2012-08-05: wsfulton
-            [Python] #3530021 Fix unused variable warning.
-
-2012-08-05: wsfulton
-            [C#] Fix #3536360 - Invalid code sometimes being generated for director methods
-            with many arguments.
-
-2012-08-05: wsfulton
-            [Perl] #3545877 - Don't undefine bool if defined by C99 stdbool.h - problem using 
-            Perl 5.16 and later.
-
-2012-08-04: wsfulton
-            Remove incorrect warning (314) about target language keywords which were triggered
-            by using declarations and using directives. For example 'string' is a keyword in C#:
-              namespace std { class string; }
-              using std::string;
-
-2012-07-21: wsfulton
-            Fix display of pointers in various places on 64 bit systems - only 32 bits were being shown.
-
-2012-07-21: wsfulton
-            Fix gdb debugger functions 'swigprint' and 'locswigprint' to display to the gdb output window
-            rather than stdout. This fixes display problems in gdbtui and the ensures the output
-            appears where expected in other gdb based debuggers such as Eclipse CDT.
-
-2012-07-20: kwwette
-            [Octave] segfault-on-exit prevention hack now preserves exit status, and uses C99 _Exit().
-
-2012-07-02: wsfulton
-            Fix Debian bug http://bugs.debian.org/672035, typemap copy failure - regression introduced 
-            in swig-2.0.5:
-              %include
-              using std::pair;
-              %template(StrPair) pair;
-
-2012-07-02: wsfulton
-            Fix using declarations combined with using directives with forward class declarations so that
-            types are correctly found in scope for templates. Example:
-
-              namespace Outer2 {
-                namespace Space2 {
-                  template class Thing2;
-                }
-              }
-              using namespace Outer2;
-              using Space2::Thing2;
-              template class Thing2 {};
-              // STILL BROKEN void useit2(Thing2 t) {}
-              void useit2a(Outer2::Space2::Thing2 t) {}
-              void useit2b(::Outer2::Space2::Thing2 t) {}
-              void useit2c(Space2::Thing2 t) {}
-              namespace Outer2 {
-                void useit2d(Space2::Thing2 t) {}
-              }
-
-              %template(Thing2Int) Thing2;
-
-
-2012-06-30: wsfulton
-            Fix template namespace problems for symbols declared with a forward class declarations, such as:
-
-              namespace Space1 {
-                namespace Space2 {
-                  template struct YYY;
-                }
-                template struct Space2::YYY {
-                  T yyy(T h) {
-                    return h;
-                  }    
-                };
-                void testYYY1(Space1::Space2::YYY yy) {}
-                void testYYY2(Space2::YYY yy) {}
-                void testYYY3(::Space1::Space2::YYY yy) {}
-              }
-
-              %template(YYYInt) Space1::Space2::YYY;
-
-2012-06-30: wsfulton
-            Fix namespace problems for symbols declared with a forward class declarations, such as:
-
-              namespace Space1 {
-                namespace Space2 {
-                  struct XXX;
-                  struct YYY;
-                }
-
-                struct Space2::YYY {};
-                struct Space1::Space2::XXX {};
-
-                void testXXX2(Space2::XXX xx) {}
-                void testYYY2(Space2::YYY yy) {}
-              }
-
-            where xx and yy were not recognised as the proxy classes XXX and YYY.
-
-2012-06-30: wsfulton
-            Fix using declarations combined with using directives with forward class declarations so that
-            types are correctly found in scope. 
-
-              namespace Outer2 {
-                namespace Space2 {
-                  class Thing2;
-                }
-              }
-              using namespace Outer2;
-              using Space2::Thing2;
-              class Thing2 {};
-              // None of the methods below correctly used the Thing2 proxy class
-              void useit2(Thing2 t) {}
-              void useit2a(Outer2::Space2::Thing2 t) {}
-              void useit2b(::Outer2::Space2::Thing2 t) {}
-              void useit2c(Space2::Thing2 t) {}
-              namespace Outer2 {
-                void useit2d(Space2::Thing2 t) {}
-              }
-
-2012-06-25: wsfulton
-            Fix using declarations combined with using directives so that types are correctly found in scope.
-            Example:
-
-              namespace Outer2 {
-                namespace Space2 {
-                  class Thing2 {};
-                }
-              }
-              using namespace Outer2; // using directive
-              using Space2::Thing2; // using declaration
-              void useit2(Thing2 t) {}
-
-            Similarly for templated classes.
-
-2012-05-29: wsfulton
-            Fix #3529601 - seg fault when a protected method has the "director"
-            feature but the parent class does not. Also fix similar problems with
-            the allprotected feature.
-
-2012-05-28: wsfulton
-            Fix seg fault when attempting to warn about an illegal destructor - #3530055, 3530078 and #3530118.
+Version 2.0.9 (in progress)
+===========================
 
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 6dd4d3683..483d64463 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
    SWIG-2.0 Documentation
    
 
-Last update : SWIG-2.0.8 (20 August 2012)
+Last update : SWIG-2.0.9 (in progress)
 
 
    Sections
    
 
diff --git a/README b/README
index 45a9b047f..c9abef486 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.8 (20 August 2012)
+Version: 2.0.9 (in progress)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua,
diff --git a/configure.in b/configure.in
index d04c76f6f..1ef54d8d1 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl The macros which aren't shipped with the autotools are stored in the
 dnl Tools/config directory in .m4 files.
 
-AC_INIT([swig],[2.0.8],[http://www.swig.org])
+AC_INIT([swig],[2.0.9],[http://www.swig.org])
 
 dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
 dnl     definition below can be removed

From b9570501aa6c2e05aa1e97371fbed8575a4c41ee Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Sun, 26 Aug 2012 02:09:53 +0000
Subject: [PATCH 123/538] Call gcc for C in R

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13720 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 04f794f61..bd31bff1f 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1144,7 +1144,7 @@ R_CFLAGS=-fPIC
 r: $(SRCS)
 	$(SWIG) -r $(SWIGOPT) $(INTERFACEPATH)
 ifneq ($(SRCS),)
-	$(CXX) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES) 
+	$(CC) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES) 
 endif
 	+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) $(OBJS) > /dev/null )
 

From 33bb317b61126f3c0f377d735044d391b87b715f Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Sun, 26 Aug 2012 03:35:04 +0000
Subject: [PATCH 124/538] make ExternalReference slot ref to contain reference

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13721 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current      |   4 ++
 Lib/r/rtype.swg      | 162 ++++++++++++++++++++++++++++++++-----------
 Source/Modules/r.cxx |   2 +
 3 files changed, 126 insertions(+), 42 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 05b7f1a0d..503abf732 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,4 +4,8 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.9 (in progress)
 ===========================
+2012-08-26: drjoe
+	    [R] make ExternalReference slot ref to contain reference
 
+2012-08-26: drjoe
+	    [R] fix Examples/Makefile to use C in $(CC) rather than $(CXX)
diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg
index 6af45cf40..92f9b4f3d 100644
--- a/Lib/r/rtype.swg
+++ b/Lib/r/rtype.swg
@@ -4,24 +4,9 @@
  */
 
 %typemap("rtype") int, int *, int &      "integer";
-%apply int {size_t}
-%apply int {std::size_t}
-%apply int {ptrdiff_t}
-%apply int {std::ptrdiff_t}
-%apply int {signed int}
-%apply int {unsigned int}
-%apply int {short}
-%apply int {unsigned short}
-
 %typemap("rtype") long, long *, long &      "integer";
-%apply long {long long}
-%apply long {signed long long}
-%apply long {unsigned long long}
-%apply long {signed long}
-%apply long {unsigned long}
-
+%typemap("rtype") float, float*, float & "numeric";
 %typemap("rtype") double, double*, double & "numeric";
-%typemap("rtype") float, float *, float &  "numeric";
 %typemap("rtype") char *, char ** "character";
 %typemap("rtype") char            "character";
 %typemap("rtype") string, string *, string & "character";
@@ -36,16 +21,15 @@
 %typemap("rtype") SWIGTYPE & "$R_class";
 %typemap("rtype") SWIGTYPE "$&R_class";
 
-%typemap("rtypecheck") int, int &, long, long &,
-  unsigned char, unsigned char &
+%typemap("rtypecheck") int, int &, long, long &
   %{ (is.integer($arg) || is.numeric($arg)) && length($arg) == 1 %}
-%typemap("rtypecheck") int *, long *, unsigned char *
+%typemap("rtypecheck") int *, long *
   %{ is.integer($arg) || is.numeric($arg) %}
 
 
-%typemap("rtypecheck") double, double &, float, float &
+%typemap("rtypecheck") float, double
   %{ is.numeric($arg) && length($arg) == 1 %}
-%typemap("rtypecheck") double*, float *
+%typemap("rtypecheck") float *, double *
   %{ is.numeric($arg) %}
 
 %typemap("rtypecheck") bool, bool &
@@ -88,9 +72,8 @@
   %{  $input = as.integer($input);     %}
 %typemap(scoercein) long, long *, long &
   %{  $input = as.integer($input);     %}
-%typemap(scoercein) double, double *, double &
-  %{ %}
-%typemap(scoercein) float, float *, float &
+%typemap(scoercein) float, float*, float &,
+  double, double *, double &
   %{ %}
 %typemap(scoercein) char, char *, char &
   %{  $input = as($input, "character");     %}
@@ -107,9 +90,8 @@
 %typemap(scoercein) enum SWIGTYPE *const
   %{  $input = enumToInteger($input, "$R_class"); %}
 
-
 %typemap(scoercein) SWIGTYPE, SWIGTYPE *, SWIGTYPE *const, SWIGTYPE &  
-  %{ %}
+ %{ $input = slot($input,"ref") %}
 
 /*
 %typemap(scoercein) SWIGTYPE *, SWIGTYPE *const
@@ -136,12 +118,10 @@
 %typemap(scoercein) int, 
                     int *, 
 		    int &,
-                    int[ANY],
 		    long,
 		    long *,
-		    long &,
-		    long[ANY]
-  "$input = as.integer($input); ";
+		    long &
+  "$input = as.integer($input);";
 
 %typemap(scoercein) char *, string, std::string,
 string &, std::string &
@@ -159,27 +139,41 @@ string &, std::string &
 %typemap(scoerceout) enum SWIGTYPE *const
   %{  $result = enumToInteger($result, "$R_class"); %}
 
+#%typemap(scoerceout) SWIGTYPE 
+#  %{ class($result) <- "$&R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE 
-  %{ class($result) <- "$&R_class"; %}
+#%typemap(scoerceout) SWIGTYPE & 
+#  %{ class($result) <- "$R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE & 
-  %{ class($result) <- "$R_class"; %}
+#%typemap(scoerceout) SWIGTYPE * 
+#  %{ class($result) <- "$R_class"; %}
 
-%typemap(scoerceout) SWIGTYPE * 
-  %{ class($result) <- "$R_class"; %}
+#%typemap(scoerceout) SWIGTYPE *const
+#  %{ class($result) <- "$R_class"; %}
+
+ %typemap(scoerceout) SWIGTYPE 
+ %{ $result <- new("$&R_class", ref=$result); %}
+ 
+ %typemap(scoerceout) SWIGTYPE & 
+ %{ $result <- new("$R_class", ref=$result) ; %}
+ 
+ %typemap(scoerceout) SWIGTYPE * 
+ %{ $result <- new("$R_class", ref=$result) ; %}
+ 
+ %typemap(scoerceout) SWIGTYPE *const
+ %{ $result <- new("$R_class", ref=$result) ; %}
 
-%typemap(scoerceout) SWIGTYPE *const
-  %{ class($result) <- "$R_class"; %}
 
 /* Override the SWIGTYPE * above. */
 %typemap(scoerceout) char,
 		     char *,
 		     char &,
-		     double, 
-		     double &,
                      float,
+		     double,
+		     float*,
+		     double*,
 		     float &,
+		     double &,
                      int,
 		     int &,
 		     long,
@@ -208,10 +202,94 @@ string &, std::string &
 		     signed long &,		     
 		     unsigned long,
 		     unsigned long &,
-		     unsigned char *,
-		     unsigned char &		     
+		     signed char,
+		     signed char &,
+		     unsigned char,
+		     unsigned char &
  %{    %}
 
+%apply int {size_t,
+std::size_t,
+ptrdiff_t,
+std::ptrdiff_t,
+signed int,
+unsigned int,
+short,
+unsigned short,
+signed char,
+unsigned char}
+
+%apply int* {size_t[],
+std::size_t[],
+ptrdiff_t[],
+std::ptrdiff_t[],
+signed int[],
+unsigned int[],
+short[],
+unsigned short[],
+signed char[],
+unsigned char[]}
+
+%apply int* {size_t[ANY],
+std::size_t[ANY],
+ptrdiff_t[ANY],
+std::ptrdiff_t[ANY],
+signed int[ANY],
+unsigned int[ANY],
+short[ANY],
+unsigned short[ANY],
+signed char[ANY],
+unsigned char[ANY]}
+
+%apply int* {size_t*,
+std::size_t*,
+ptrdiff_t*,
+std::ptrdiff_t*,
+signed int*,
+unsigned int*,
+short*,
+unsigned short*,
+signed char*,
+unsigned char*}
+
+%apply long {
+       long long,
+       signed long long,
+       unsigned long long,
+       signed long,
+       unsigned long}
+
+%apply long* {
+       long long*,
+       signed long long*,
+       unsigned long long*,
+       signed long*,
+       unsigned long*,
+       long long[],
+       signed long long[],
+       unsigned long long[],
+       signed long[],
+       unsigned long[],
+       long long[ANY],
+       signed long long[ANY],
+       unsigned long long[ANY],
+       signed long[ANY],
+       unsigned long[ANY]}
+
+%apply float* {
+       float[],
+       float[ANY]
+}
+%apply double * {
+       double[],
+       double[ANY]
+}
+
+%apply bool* {
+       bool[],
+       bool[ANY]
+}
+
 #if 0
  Just examining the values for a SWIGTYPE.
 
diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index f163c8b30..14da3a975 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -1903,6 +1903,8 @@ int R::functionWrapper(Node *n) {
 	       "\n};\n",
 	       "if(is(", name, ", \"NativeSymbolInfo\")) {\n",
 	       name, " = ", name, "$address", ";\n}\n",
+	       "if(is(", name, ", \"ExternalReference\")) {\n",
+	       name, " = ", name, "@ref;\n}\n",
 	       "}; \n",
 	       NIL);
       } else {

From 2a28514b2702e527d5a55bb4fa93e9f5f0153500 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 4 Sep 2012 17:54:19 +0000
Subject: [PATCH 125/538] Improve javafinalize docs, patch from Marvin
 Greenberg

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13732 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Java.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index ed99549b0..858342c43 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -5489,6 +5489,22 @@ interfaces (implements) for Java class: empty default
 
    %typemap(javafinalize)
    
 
    
 the finalize() method (proxy classes only): default calls the delete() method
+
+
    
+Note that the default javafinalize typemap must contain the full implementation of the finalize method.
+Any customization to this typemap must still declare a java finalize method with the correct signature.
+Note also that the name of the generated "delete" method may be affected by javadestruct and javadestruct_derived typemaps.
+Below shows an example modifying the finalizer, assuming the delete method has been renamed to swig_delete.
+
    
+
+
    +%typemap(javafinalize) SWIGTYPE %{
+   protected void finalize() {
+     swig_delete();  // renamed to prevent conflict with existing delete method
+   }
+]%
+
    
+
 
    
 
 
    

From d496352805b806a103c4de1bce367c99f9814f2a Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 7 Sep 2012 06:03:20 +0000
Subject: [PATCH 126/538] Move contributors to COPYRIGHT file.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13734 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 COPYRIGHT              | 2 +-
 Lib/chicken/typemaps.i | 1 -
 Lib/mzscheme/mzrun.swg | 9 ---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index d2b87770a..3f4711a47 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -65,7 +65,7 @@ Past contributors include:
  James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran
  Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn,
  Edward Zimmermann, David Ascher, Dominique Dumont, Pier Giorgio Esposito, Hasan Baran Kovuk,
- Klaus Wiederänders, Richard Beare
+ Klaus Wiederänders, Richard Beare, Hans Oesterholt.
  (See CHANGES and CHANGES.current and the bug tracker for a more complete list).
 
 Past students:
diff --git a/Lib/chicken/typemaps.i b/Lib/chicken/typemaps.i
index 56cd18a5d..fd587fd68 100644
--- a/Lib/chicken/typemaps.i
+++ b/Lib/chicken/typemaps.i
@@ -93,7 +93,6 @@ or you can use the %apply directive :
 
 */
 
-// These typemaps contributed by Robin Dunn
 //----------------------------------------------------------------------
 //
 // T_OUTPUT typemap (and helper function) to return multiple argouts as
diff --git a/Lib/mzscheme/mzrun.swg b/Lib/mzscheme/mzrun.swg
index a5128da56..06447d78d 100644
--- a/Lib/mzscheme/mzrun.swg
+++ b/Lib/mzscheme/mzrun.swg
@@ -91,7 +91,6 @@ SWIG_is_unsigned_integer(Scheme_Object *o)
   
 /* ----------------------------------------------------------------------- 
  * mzscheme 30X support code
- * Contributed by Hans Oesterholt
  * ----------------------------------------------------------------------- */
 
 #ifndef SCHEME_STR_VAL
@@ -252,10 +251,6 @@ SWIG_MzScheme_new_scheme_struct (Scheme_Env* env, const char* basename,
     return new_type;
 }
 
-/*** DLOPEN PATCH ******************************************************
- * Contributed by Hans Oesterholt-Dijkema (jan. 2006)
- ***********************************************************************/
-
 #if defined(_WIN32) || defined(__WIN32__)
 #define __OS_WIN32
 #endif
@@ -442,10 +437,6 @@ SWIG_MzScheme_new_scheme_struct (Scheme_Env* env, const char* basename,
     }
   }
 
-/*** DLOPEN PATCH ******************************************************
- * Contributed by Hans Oesterholt-Dijkema (jan. 2006)
- ***********************************************************************/
-
 /* The interpreter will store a pointer to this structure in a global
    variable called swig-runtime-data-type-pointer.  The instance of this
    struct is only used if no other module has yet been loaded */

From 2c74c90430fe83529c68de84daacf01c949e5f36 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 7 Sep 2012 06:06:00 +0000
Subject: [PATCH 127/538] Fix for gcc warning -Wunused-value without triggering
 -Wunused-parameter

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13735 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Lib/chicken/chickenrun.swg  | 4 ++--
 Lib/guile/guile_gh_run.swg  | 6 +++---
 Lib/guile/guile_scm_run.swg | 8 ++++----
 Lib/ocaml/ocaml.swg         | 2 +-
 Lib/ocaml/ocamldec.swg      | 2 +-
 Lib/perl5/perlrun.swg       | 4 ++--
 Lib/php/phprun.swg          | 4 ++--
 Lib/pike/pikerun.swg        | 4 ++--
 Lib/python/pyrun.swg        | 6 +++---
 Lib/r/rrun.swg              | 2 +-
 Lib/ruby/rubyrun.swg        | 4 ++--
 Lib/swiginit.swg            | 1 -
 12 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Lib/chicken/chickenrun.swg b/Lib/chicken/chickenrun.swg
index f4e94d6f6..07db41945 100644
--- a/Lib/chicken/chickenrun.swg
+++ b/Lib/chicken/chickenrun.swg
@@ -36,7 +36,7 @@ extern "C" {
                                               SWIG_Chicken_Barf(SWIG_BARF1_CONTRACT_ASSERT, C_text(message)); } else
 
 /* Runtime API */
-#define SWIG_GetModule(clientdata) SWIG_Chicken_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Chicken_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Chicken_SetModule(pointer)
 
 #define C_swig_is_bool(x) C_truep (C_booleanp (x))
@@ -309,7 +309,7 @@ SWIG_Chicken_MustGetPtr (C_word s, swig_type_info *type, int argnum, int flags)
 static char *chicken_runtimevar_name = "type_pointer" SWIG_TYPE_TABLE_NAME;
 
 static swig_module_info *
-SWIG_Chicken_GetModule() {
+SWIG_Chicken_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
     swig_module_info *ret = 0;
     C_word sym;
 
diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg
index 0eba1f97e..d8cc56b91 100644
--- a/Lib/guile/guile_gh_run.swg
+++ b/Lib/guile/guile_gh_run.swg
@@ -27,7 +27,7 @@ typedef SCM (*swig_guile_proc)();
   SWIG_Guile_MustGetPtr(&swig_module, s, type, argnum, flags, FUNC_NAME)
 #define SWIG_NewPointerObj(ptr, type, owner) \
   SWIG_Guile_NewPointerObj(&swig_module, (void*)ptr, type, owner)
-#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
 
 /* Ignore object-ownership changes in gh mode */
@@ -114,14 +114,14 @@ SWIG_Guile_LookupType(swig_module_info *module, SCM s, int normal)
 
 #ifdef SWIG_GUILE_MODULE_STATIC
 static swig_module_info *swig_guile_module = 0;
-SWIG_GUILE_MODULE_STATIC swig_module_info *SWIG_Guile_GetModule(void) {
+SWIG_GUILE_MODULE_STATIC swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return swig_guile_module;
 }
 SWIG_GUILE_MODULE_STATIC void SWIG_Guile_SetModule(swig_module_info *pointer) {
   swig_guile_module = pointer;
 }
 #else
-SWIGEXPORT swig_module_info * SWIG_Guile_GetModule(void);
+SWIGEXPORT swig_module_info * SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata));
 SWIGEXPORT void SWIG_Guile_SetModule(swig_module_info *pointer);
 #endif
 
diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg
index 91b74095d..925aaadb4 100644
--- a/Lib/guile/guile_scm_run.swg
+++ b/Lib/guile/guile_scm_run.swg
@@ -53,8 +53,8 @@ typedef struct swig_guile_clientdata {
   SWIG_Guile_NewMemberObj(ptr, sz, type, FUNC_NAME)
   
 /* Runtime API */
-static swig_module_info *SWIG_Guile_GetModule(void);
-#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule()
+static swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata));
+#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer)
   
 SWIGINTERN char *
@@ -204,7 +204,7 @@ SWIGINTERNINLINE int
 SWIG_Guile_IsPointer (SCM s)
 {
   /* module might not be initialized yet, so initialize it */
-  SWIG_Guile_GetModule();
+  SWIG_GetModule(0);
   return SWIG_Guile_IsPointerOfType (s, NULL);
 }
 
@@ -419,7 +419,7 @@ SWIG_Guile_Init ()
 }
 
 SWIGINTERN swig_module_info *
-SWIG_Guile_GetModule(void)
+SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   SCM module;
   SCM variable;
diff --git a/Lib/ocaml/ocaml.swg b/Lib/ocaml/ocaml.swg
index 5f8f929e2..a00252b28 100644
--- a/Lib/ocaml/ocaml.swg
+++ b/Lib/ocaml/ocaml.swg
@@ -578,7 +578,7 @@ extern "C" {
 	}	
     }
 
-    static swig_module_info *SWIG_Ocaml_GetModule() {
+    static swig_module_info *SWIG_Ocaml_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
       CAML_VALUE pointer;
 
       pointer = callback(*caml_named_value("swig_find_type_info"), caml_val_int(0));
diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg
index 8e452d3f9..e6b8939fb 100644
--- a/Lib/ocaml/ocamldec.swg
+++ b/Lib/ocaml/ocamldec.swg
@@ -108,7 +108,7 @@ CAMLextern int64 Int64_val(caml_value_t v);
 #endif
 
 #define SWIG_NewPointerObj(p,type,flags) caml_val_ptr(p,type)
-#define SWIG_GetModule(clientdata) SWIG_Ocaml_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Ocaml_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Ocaml_SetModule(pointer)
 
 #define SWIG_contract_assert(expr, msg) if(!(expr)) {failwith(msg);} else
diff --git a/Lib/perl5/perlrun.swg b/Lib/perl5/perlrun.swg
index 5c1b586b4..ebc4fecd5 100644
--- a/Lib/perl5/perlrun.swg
+++ b/Lib/perl5/perlrun.swg
@@ -40,7 +40,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Perl_GetModule()
+#define SWIG_GetModule(clientdata)                      SWIG_Perl_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Perl_SetModule(pointer)
 
 
@@ -477,7 +477,7 @@ SWIGRUNTIME void _swig_create_magic(CPerlObj *pPerl, SV *sv, const char *name, i
 
 
 SWIGRUNTIME swig_module_info *
-SWIG_Perl_GetModule(void) {
+SWIG_Perl_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   SV *pointer;
 
diff --git a/Lib/php/phprun.swg b/Lib/php/phprun.swg
index 1404955e0..92f2f3fe5 100644
--- a/Lib/php/phprun.swg
+++ b/Lib/php/phprun.swg
@@ -79,7 +79,7 @@ static int default_error_code = E_ERROR;
   if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else
 
 /* Standard SWIG API */
-#define SWIG_GetModule(clientdata) SWIG_Php_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Php_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer)
 
 /* used to wrap returned objects in so we know whether they are newobject
@@ -252,7 +252,7 @@ SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC
 }
 
 static char const_name[] = "swig_runtime_data_type_pointer";
-static swig_module_info *SWIG_Php_GetModule() {
+static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   zval *pointer;
   swig_module_info *ret = 0;
 
diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg
index 451a4e092..70d40fac9 100644
--- a/Lib/pike/pikerun.swg
+++ b/Lib/pike/pikerun.swg
@@ -28,11 +28,11 @@ typedef struct swig_object_wrapper {
 
 #define SWIG_ConvertPtr SWIG_Pike_ConvertPtr
 #define SWIG_NewPointerObj SWIG_Pike_NewPointerObj
-#define SWIG_GetModule(clientdata) SWIG_Pike_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Pike_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Pike_SetModule(pointer)
 
 /* These need to be filled in before type sharing between modules will work */
-static swig_module_info *SWIG_Pike_GetModule() {
+static swig_module_info *SWIG_Pike_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   return 0;
 }
 
diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index d621f4dee..3585e7a3f 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -45,7 +45,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
 #define SWIG_NewClientData(obj)                         SwigPyClientData_New(obj)
 
@@ -1484,7 +1484,7 @@ void *SWIG_ReturnGlobalTypeList(void *);
 #endif
 
 SWIGRUNTIME swig_module_info *
-SWIG_Python_GetModule(void) {
+SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   /* first check if module already created */
   if (!type_pointer) {
@@ -1610,7 +1610,7 @@ SWIG_Python_TypeQuery(const char *type)
     descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
 #endif
   } else {
-    swig_module_info *swig_module = SWIG_Python_GetModule();
+    swig_module_info *swig_module = SWIG_GetModule(0);
     descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
     if (descriptor) {
 #ifdef SWIGPY_USE_CAPSULE
diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg
index 1c9a22d4c..c441a5222 100644
--- a/Lib/r/rrun.swg
+++ b/Lib/r/rrun.swg
@@ -293,7 +293,7 @@ SWIG_R_ConvertPtr(SEXP obj, void **ptr, swig_type_info *ty, int flags) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_GetModule(void *v) {
+SWIG_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
   static void *type_pointer = (void *)0;
   return (swig_module_info *) type_pointer;
 }
diff --git a/Lib/ruby/rubyrun.swg b/Lib/ruby/rubyrun.swg
index a2d246e97..00fb11f39 100644
--- a/Lib/ruby/rubyrun.swg
+++ b/Lib/ruby/rubyrun.swg
@@ -35,7 +35,7 @@
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -371,7 +371,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
diff --git a/Lib/swiginit.swg b/Lib/swiginit.swg
index d160cfaf1..f747bccdf 100644
--- a/Lib/swiginit.swg
+++ b/Lib/swiginit.swg
@@ -56,7 +56,6 @@ SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
   int found, init;
-  (void *)clientdata;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {

From 593c708a78230bdb2fdfe2bd0ed59e39aa14423b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 7 Sep 2012 06:07:20 +0000
Subject: [PATCH 128/538] Fix (char *STRING, size_t LENGTH) typemaps to accept
 NULL string

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13736 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                                   |  3 +++
 Examples/test-suite/director_binary_string.i      |  9 +++++++--
 .../java/director_binary_string_runme.java        | 15 +++++++++++----
 Lib/java/java.swg                                 |  9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 503abf732..7295ec8e5 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.9 (in progress)
 ===========================
+2012-09-06: wsfulton
+	    [Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string.
+
 2012-08-26: drjoe
 	    [R] make ExternalReference slot ref to contain reference
 
diff --git a/Examples/test-suite/director_binary_string.i b/Examples/test-suite/director_binary_string.i
index 96c835959..f842dc2c7 100644
--- a/Examples/test-suite/director_binary_string.i
+++ b/Examples/test-suite/director_binary_string.i
@@ -15,8 +15,10 @@ class Callback {
 public:
   virtual ~Callback() {}
   virtual void run(char* dataBufferAA, int sizeAA, char* dataBufferBB, int sizeBB) {
-    memset(dataBufferAA, -1, sizeAA);
-    memset(dataBufferBB, -1, sizeBB);
+    if (dataBufferAA)
+      memset(dataBufferAA, -1, sizeAA);
+    if (dataBufferBB)
+      memset(dataBufferBB, -1, sizeBB);
   }
 };
 
@@ -45,6 +47,9 @@ public:
     }
     return sum;
   }
+  void call_null() {
+    _callback->run(NULL, 0, NULL, 0);
+  }
 };
 
 %}
diff --git a/Examples/test-suite/java/director_binary_string_runme.java b/Examples/test-suite/java/director_binary_string_runme.java
index e2bf4da40..962073367 100644
--- a/Examples/test-suite/java/director_binary_string_runme.java
+++ b/Examples/test-suite/java/director_binary_string_runme.java
@@ -21,6 +21,11 @@ public class director_binary_string_runme {
 
     if (sum != 9*2*8 + 13*3*5)
       throw new RuntimeException("Unexpected sum: " + sum);
+
+    new Callback().run(null, null);
+    callback = new DirectorBinaryStringCallback();
+    caller.setCallback(callback);
+    caller.call_null();
   }
 }
 
@@ -32,11 +37,13 @@ class DirectorBinaryStringCallback extends Callback {
   @Override
   public void run(byte[] dataBufferAA, byte[] dataBufferBB)
   {
-    for (int i = 0; i < dataBufferAA.length; i++)
-      dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
+    if (dataBufferAA != null)
+      for (int i = 0; i < dataBufferAA.length; i++)
+        dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
 
-    for (int i = 0; i < dataBufferBB.length; i++)
-      dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
+    if (dataBufferBB != null)
+      for (int i = 0; i < dataBufferBB.length; i++)
+        dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
   }
 }
 
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index 794b58d88..6126a55e5 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -1301,11 +1301,16 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
 %typemap(javain)  (char *STRING, size_t LENGTH) "$javainput"
 %typemap(freearg) (char *STRING, size_t LENGTH) ""
 %typemap(in)      (char *STRING, size_t LENGTH) {
+  if ($input) {
     $1 = (char *) JCALL2(GetByteArrayElements, jenv, $input, 0);
-    $2 = (size_t) JCALL1(GetArrayLength,       jenv, $input);
+    $2 = (size_t) JCALL1(GetArrayLength, jenv, $input);
+  } else {
+    $1 = 0;
+    $2 = 0;
+  }
 }
 %typemap(argout)  (char *STRING, size_t LENGTH) {
-    JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
+  if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
 }
 %typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) {
   jbyteArray jb = (jenv)->NewByteArray($2);

From 72fc742f88ef0ddac592be527172ae5a52f6e445 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 13 Sep 2012 18:52:56 +0000
Subject: [PATCH 129/538] Add extend example for Android

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13831 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/android/extend/AndroidManifest.xml   |  15 +++
 Examples/android/extend/Makefile              |  29 +++++
 Examples/android/extend/ant.properties        |  17 +++
 Examples/android/extend/build.xml             |  85 ++++++++++++++
 Examples/android/extend/jni/Android.mk        |  10 ++
 Examples/android/extend/jni/Application.mk    |   1 +
 Examples/android/extend/jni/example.cpp       |   4 +
 Examples/android/extend/jni/example.h         |  56 +++++++++
 Examples/android/extend/jni/example.i         |  15 +++
 Examples/android/extend/local.properties      |  10 ++
 Examples/android/extend/proguard.cfg          |  40 +++++++
 Examples/android/extend/project.properties    |  11 ++
 Examples/android/extend/res/layout/main.xml   |  25 ++++
 .../android/extend/res/values/strings.xml     |   4 +
 .../org/swig/extendexample/SwigExtend.java    | 108 ++++++++++++++++++
 15 files changed, 430 insertions(+)
 create mode 100644 Examples/android/extend/AndroidManifest.xml
 create mode 100644 Examples/android/extend/Makefile
 create mode 100644 Examples/android/extend/ant.properties
 create mode 100644 Examples/android/extend/build.xml
 create mode 100644 Examples/android/extend/jni/Android.mk
 create mode 100644 Examples/android/extend/jni/Application.mk
 create mode 100644 Examples/android/extend/jni/example.cpp
 create mode 100644 Examples/android/extend/jni/example.h
 create mode 100644 Examples/android/extend/jni/example.i
 create mode 100644 Examples/android/extend/local.properties
 create mode 100644 Examples/android/extend/proguard.cfg
 create mode 100644 Examples/android/extend/project.properties
 create mode 100644 Examples/android/extend/res/layout/main.xml
 create mode 100644 Examples/android/extend/res/values/strings.xml
 create mode 100644 Examples/android/extend/src/org/swig/extendexample/SwigExtend.java

diff --git a/Examples/android/extend/AndroidManifest.xml b/Examples/android/extend/AndroidManifest.xml
new file mode 100644
index 000000000..66d2469fa
--- /dev/null
+++ b/Examples/android/extend/AndroidManifest.xml
@@ -0,0 +1,15 @@
+
+
+    
+        
+            
+                
+                
+            
+        
+    
+ 
diff --git a/Examples/android/extend/Makefile b/Examples/android/extend/Makefile
new file mode 100644
index 000000000..98a0372dd
--- /dev/null
+++ b/Examples/android/extend/Makefile
@@ -0,0 +1,29 @@
+TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+TARGET     = example
+INTERFACE  = example.i
+PACKAGEDIR = src/org/swig
+PACKAGENAME= org.swig.extendexample
+SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample 
+PROJECTNAME= SwigExtend
+TARGETID  = 1
+
+all::	android
+
+android::
+	android update project --target $(TARGETID) --name $(PROJECTNAME) --path .
+	$(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE)
+	ndk-build
+	ant debug
+
+install::
+	-adb uninstall $(PACKAGENAME)
+	adb install bin/$(PROJECTNAME)-debug.apk
+
+clean::
+	ant clean
+	rm -f jni/$(TARGET)_wrap.cpp
+	rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java`
+	
+
+check: all
diff --git a/Examples/android/extend/ant.properties b/Examples/android/extend/ant.properties
new file mode 100644
index 000000000..ee52d86d9
--- /dev/null
+++ b/Examples/android/extend/ant.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
diff --git a/Examples/android/extend/build.xml b/Examples/android/extend/build.xml
new file mode 100644
index 000000000..94fe847b7
--- /dev/null
+++ b/Examples/android/extend/build.xml
@@ -0,0 +1,85 @@
+
+
+
+    
+    
+
+    
+    
+
+    
+    
+
+    
+    
+
+
+
+
+
+    
+    
+    
+
+
diff --git a/Examples/android/extend/jni/Android.mk b/Examples/android/extend/jni/Android.mk
new file mode 100644
index 000000000..25d42b541
--- /dev/null
+++ b/Examples/android/extend/jni/Android.mk
@@ -0,0 +1,10 @@
+# File: Android.mk
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := example
+LOCAL_SRC_FILES := example_wrap.cpp example.cpp
+LOCAL_CFLAGS    := -frtti
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/Examples/android/extend/jni/Application.mk b/Examples/android/extend/jni/Application.mk
new file mode 100644
index 000000000..87124dd88
--- /dev/null
+++ b/Examples/android/extend/jni/Application.mk
@@ -0,0 +1 @@
+APP_STL := gnustl_static
diff --git a/Examples/android/extend/jni/example.cpp b/Examples/android/extend/jni/example.cpp
new file mode 100644
index 000000000..450d75608
--- /dev/null
+++ b/Examples/android/extend/jni/example.cpp
@@ -0,0 +1,4 @@
+/* File : example.cxx */
+
+#include "example.h"
+
diff --git a/Examples/android/extend/jni/example.h b/Examples/android/extend/jni/example.h
new file mode 100644
index 000000000..b27ab9711
--- /dev/null
+++ b/Examples/android/extend/jni/example.h
@@ -0,0 +1,56 @@
+/* File : example.h */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+class Employee {
+private:
+	std::string name;
+public:
+	Employee(const char* n): name(n) {}
+	virtual std::string getTitle() { return getPosition() + " " + getName(); }
+	virtual std::string getName() { return name; }
+	virtual std::string getPosition() const { return "Employee"; }
+	virtual ~Employee() { printf("~Employee() @ %p\n", this); }
+};
+
+
+class Manager: public Employee {
+public:
+	Manager(const char* n): Employee(n) {}
+	virtual std::string getPosition() const { return "Manager"; }
+};
+
+
+class EmployeeList {
+	std::vector list;
+public:
+	EmployeeList() {
+		list.push_back(new Employee("Bob"));
+		list.push_back(new Employee("Jane"));
+		list.push_back(new Manager("Ted"));
+	}
+	void addEmployee(Employee *p) {
+		list.push_back(p);
+		std::cout << "New employee added.   Current employees are:" << std::endl;
+		std::vector::iterator i;
+		for (i=list.begin(); i!=list.end(); i++) {
+			std::cout << "  " << (*i)->getTitle() << std::endl;
+		}
+	}
+	const Employee *get_item(int i) {
+		return list[i];
+	}
+	~EmployeeList() { 
+		std::vector::iterator i;
+		std::cout << "~EmployeeList, deleting " << list.size() << " employees." << std::endl;
+		for (i=list.begin(); i!=list.end(); i++) {
+			delete *i;
+		}
+		std::cout << "~EmployeeList empty." << std::endl;
+	}
+};
+
diff --git a/Examples/android/extend/jni/example.i b/Examples/android/extend/jni/example.i
new file mode 100644
index 000000000..c8ec32e09
--- /dev/null
+++ b/Examples/android/extend/jni/example.i
@@ -0,0 +1,15 @@
+/* File : example.i */
+%module(directors="1") example
+%{
+#include "example.h"
+%}
+
+%include "std_vector.i"
+%include "std_string.i"
+
+/* turn on director wrapping for Manager */
+%feature("director") Employee;
+%feature("director") Manager;
+
+%include "example.h"
+
diff --git a/Examples/android/extend/local.properties b/Examples/android/extend/local.properties
new file mode 100644
index 000000000..14b8d63b4
--- /dev/null
+++ b/Examples/android/extend/local.properties
@@ -0,0 +1,10 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=/home/william/android/android-sdk-linux_x86
diff --git a/Examples/android/extend/proguard.cfg b/Examples/android/extend/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/Examples/android/extend/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native ;
+}
+
+-keepclasseswithmembers class * {
+    public (android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+    public (android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
diff --git a/Examples/android/extend/project.properties b/Examples/android/extend/project.properties
new file mode 100644
index 000000000..ea89160e0
--- /dev/null
+++ b/Examples/android/extend/project.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-8
diff --git a/Examples/android/extend/res/layout/main.xml b/Examples/android/extend/res/layout/main.xml
new file mode 100644
index 000000000..d4e5d7fe8
--- /dev/null
+++ b/Examples/android/extend/res/layout/main.xml
@@ -0,0 +1,25 @@
+
+
+
    • +

    +The following special variables are expanded if used within a %extend block: +$name, $symname, $overname, $decl, $fulldecl, $parentname and $parentsymname. +The Special variables section provides more information each of these special variables. +

    +

    The %extend directive follows all of the same conventions as its use with C structures. Please refer to the Adding member functions to C structures diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index eaef4980b..bf318d304 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -204,6 +204,7 @@ CPP_TEST_CASES += \ extend_constructor_destructor \ extend_default \ extend_placement \ + extend_special_variables \ extend_template \ extend_template_ns \ extend_typedef_class \ diff --git a/Examples/test-suite/extend_special_variables.i b/Examples/test-suite/extend_special_variables.i new file mode 100644 index 000000000..dd68e7531 --- /dev/null +++ b/Examples/test-suite/extend_special_variables.i @@ -0,0 +1,21 @@ +%module extend_special_variables + +%rename(ForExtensionNewName) ForExtension; +%rename(extended_renamed) ForExtension::extended; + +%extend ForExtension { + ForExtension() { + return new ForExtension(); + } + const char* extended() { + return "name:$name symname:$symname wrapname:$wrapname overname:$overname decl:$decl fulldecl:$fulldecl parentclasssymname:$parentclasssymname parentclassname:$parentclassname"; + } + const char* extended(int) { + return "name:$name symname:$symname wrapname:$wrapname overname:$overname decl:$decl fulldecl:$fulldecl parentclasssymname:$parentclasssymname parentclassname:$parentclassname"; + } +} + +%inline %{ +struct ForExtension { +}; +%} diff --git a/Examples/test-suite/java/extend_special_variables_runme.java b/Examples/test-suite/java/extend_special_variables_runme.java new file mode 100644 index 000000000..cf2304e6a --- /dev/null +++ b/Examples/test-suite/java/extend_special_variables_runme.java @@ -0,0 +1,25 @@ + +import extend_special_variables.*; + +public class extend_special_variables_runme { + + static { + try { + System.loadLibrary("extend_special_variables"); + } 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[]) + { + ForExtensionNewName f = new ForExtensionNewName(); + verify(f.extended_renamed(), "name:extended symname:extended_renamed wrapname: overname:__SWIG_0 decl:ForExtension::extended() fulldecl:char const * ForExtension::extended() parentclasssymname:ForExtensionNewName parentclassname:ForExtension"); + verify(f.extended_renamed(10), "name:extended symname:extended_renamed wrapname: overname:__SWIG_1 decl:ForExtension::extended(int) fulldecl:char const * ForExtension::extended(int) parentclasssymname:ForExtensionNewName parentclassname:ForExtension"); + } + static void verify(String received, String expected) { + if (!received.equals(expected)) + throw new RuntimeException("Incorrect, received: " + received); + } +} diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index 5c81a17cd..c16eaac0f 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -363,39 +363,9 @@ int emit_action_code(Node *n, String *wrappercode, String *eaction) { tm = Copy(tm); if ((tm) && Len(tm) && (Strcmp(tm, "1") != 0)) { if (Strstr(tm, "$")) { - Replaceall(tm, "$name", Getattr(n, "name")); - Replaceall(tm, "$symname", Getattr(n, "sym:name")); + Swig_replace_special_variables(n, parentNode(n), tm); Replaceall(tm, "$function", eaction); // deprecated Replaceall(tm, "$action", eaction); - Replaceall(tm, "$wrapname", Getattr(n, "wrap:name")); - String *overloaded = Getattr(n, "sym:overloaded"); - Replaceall(tm, "$overname", overloaded ? Char(Getattr(n, "sym:overname")) : ""); - - if (Strstr(tm, "$decl")) { - String *decl = Swig_name_decl(n); - Replaceall(tm, "$decl", decl); - Delete(decl); - } - if (Strstr(tm, "$fulldecl")) { - String *fulldecl = Swig_name_fulldecl(n); - Replaceall(tm, "$fulldecl", fulldecl); - Delete(fulldecl); - } - - Node *parentnode = parentNode(n); - Node *parentclass = (parentnode && Equal(nodeType(parentnode), "class")) ? parentnode : 0; - if (Strstr(tm, "$parentclasssymname")) { - String *parentclasssymname = 0; - if (parentclass) - parentclasssymname = Getattr(parentclass, "sym:name"); - Replaceall(tm, "$parentclasssymname", parentclasssymname ? parentclasssymname : ""); - } - if (Strstr(tm, "$parentclassname")) { - String *parentclassname = 0; - if (parentclass) - parentclassname = Getattr(parentclass, "name"); - Replaceall(tm, "$parentclassname", parentclassname ? parentclassname : ""); - } } Printv(wrappercode, tm, "\n", NIL); Delete(tm); diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 5e2e6367d..a032de746 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -759,6 +759,46 @@ String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String return func; } +/* ----------------------------------------------------------------------------- + * Swig_replace_special_variables() + * + * Replaces special variables with a value from the supplied node + * ----------------------------------------------------------------------------- */ +void Swig_replace_special_variables(Node *n, Node *parentnode, String *code) { + Node *parentclass = parentnode; + String *overloaded = Getattr(n, "sym:overloaded"); + Replaceall(code, "$name", Getattr(n, "name")); + Replaceall(code, "$symname", Getattr(n, "sym:name")); + Replaceall(code, "$wrapname", Getattr(n, "wrap:name")); + Replaceall(code, "$overname", overloaded ? Char(Getattr(n, "sym:overname")) : ""); + + if (Strstr(code, "$decl")) { + String *decl = Swig_name_decl(n); + Replaceall(code, "$decl", decl); + Delete(decl); + } + if (Strstr(code, "$fulldecl")) { + String *fulldecl = Swig_name_fulldecl(n); + Replaceall(code, "$fulldecl", fulldecl); + Delete(fulldecl); + } + + if (parentclass && !Equal(nodeType(parentclass), "class")) + parentclass = 0; + if (Strstr(code, "$parentclasssymname")) { + String *parentclasssymname = 0; + if (parentclass) + parentclasssymname = Getattr(parentclass, "sym:name"); + Replaceall(code, "$parentclasssymname", parentclasssymname ? parentclasssymname : ""); + } + if (Strstr(code, "$parentclassname")) { + String *parentclassname = 0; + if (parentclass) + parentclassname = Getattr(parentclass, "name"); + Replaceall(code, "$parentclassname", parentclassname ? parentclassname : ""); + } +} + /* ----------------------------------------------------------------------------- * extension_code() * @@ -767,14 +807,17 @@ String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String * return_type function_name(parms) code * * ----------------------------------------------------------------------------- */ -static String *extension_code(const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) { +static String *extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) { String *parms_str = cplusplus ? ParmList_str_defaultargs(parms) : ParmList_str(parms); String *sig = NewStringf("%s(%s)", function_name, parms_str); String *rt_sig = SwigType_str(return_type, sig); String *body = NewStringf("SWIGINTERN %s", rt_sig); Printv(body, code, "\n", NIL); - if (self) - Replaceall(body, "$self", self); + if (Strstr(body, "$")) { + Swig_replace_special_variables(n, parentNode(parentNode(n)), body); + if (self) + Replaceall(body, "$self", self); + } Delete(parms_str); Delete(sig); Delete(rt_sig); @@ -791,7 +834,7 @@ static String *extension_code(const String *function_name, ParmList *parms, Swig * * ----------------------------------------------------------------------------- */ int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) { - String *body = extension_code(function_name, parms, return_type, code, cplusplus, self); + String *body = extension_code(n, function_name, parms, return_type, code, cplusplus, self); Setattr(n, "wrap:code", body); Delete(body); return SWIG_OK; diff --git a/Source/Swig/swig.h b/Source/Swig/swig.h index a85334e55..42fd9238e 100644 --- a/Source/Swig/swig.h +++ b/Source/Swig/swig.h @@ -354,6 +354,7 @@ extern int ParmList_is_compactdefargs(ParmList *p); extern String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref); extern int Swig_add_extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self); + extern void Swig_replace_special_variables(Node *n, Node *parentnode, String *code); /* --- Transformations --- */ From c4e4b4b6100f49028f5791073f74a49895b409f4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 26 Oct 2012 19:32:19 +0000 Subject: [PATCH 147/538] New director test highlighting a proble in Go git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13872 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/common.mk | 1 + Examples/test-suite/director_overload2.i | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 Examples/test-suite/director_overload2.i diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index bf318d304..7f3cd771a 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -180,6 +180,7 @@ CPP_TEST_CASES += \ director_nspace \ director_nested \ director_overload \ + director_overload2 \ director_primitives \ director_protected \ director_protected_overloaded \ diff --git a/Examples/test-suite/director_overload2.i b/Examples/test-suite/director_overload2.i new file mode 100644 index 000000000..0f3238149 --- /dev/null +++ b/Examples/test-suite/director_overload2.i @@ -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() {} +}; +%} + From f6229d4b731986746488724f022b75469f41aba2 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 27 Oct 2012 17:37:34 +0000 Subject: [PATCH 148/538] Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously the name was ignored during the typemap search. Implemented by ensuring the 'type' attribute in the Node is set up correctly and using the usual Swig_typemap_lookup on the Node. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13873 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 5 + Examples/test-suite/typemap_directorout.i | 48 ++++++++ Source/Modules/csharp.cxx | 30 ++--- Source/Modules/d.cxx | 36 ++---- Source/Modules/go.cxx | 143 ++++++++++------------ Source/Modules/java.cxx | 38 ++---- Source/Modules/lang.cxx | 9 +- Source/Modules/ocaml.cxx | 54 ++------ Source/Modules/octave.cxx | 42 ++----- Source/Modules/php.cxx | 48 ++------ Source/Modules/python.cxx | 49 ++------ Source/Modules/ruby.cxx | 47 ++----- 12 files changed, 201 insertions(+), 348 deletions(-) create mode 100644 Examples/test-suite/typemap_directorout.i diff --git a/CHANGES.current b/CHANGES.current index fac0897cb..d36e76d62 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-10-26: wsfulton + Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously + the name was ignored during the typemap search. Applies to the following list of typemaps: + directorout, csdirectorout, cstype, imtype, ctype, ddirectorout, dtype, gotype, jtype, jni, javadirectorout. + 2012-10-11: wsfulton Most of the special variables available for use in %exception are now also available for expansion in %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentname $parentsymname, see docs diff --git a/Examples/test-suite/typemap_directorout.i b/Examples/test-suite/typemap_directorout.i new file mode 100644 index 000000000..4a85bd47c --- /dev/null +++ b/Examples/test-suite/typemap_directorout.i @@ -0,0 +1,48 @@ +// Test named output typemaps used in directors are found during the typematch search +%module(directors="1") typemap_directorout + +%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) Class1; + +%feature("director"); + +%typemap(out) MyType & %{ WILL_NOT_COMPILE %} +%typemap(out) MyType &USEME = SWIGTYPE &; +%typemap(out) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $typemap(out, MyType &USEME) /* special end */ %} + +%typemap(directorout) MyType & %{ WILL_NOT_COMPILE %} +// Can't use the %typemap(directorout) MyType & = SWIGTYPE & approach as non-director languages don't define any directorout typemaps +%typemap(directorout) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $input = 0; /* special end */ %} + + +#ifdef SWIGCSHARP +%typemap(csdirectorout) MyType & %{ WILL_NOT_COMPILE %} +%typemap(csdirectorout) MyType &USEME = SWIGTYPE &; +%typemap(csdirectorout) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $typemap(csdirectorout, MyType &USEME) /* special end */ %} +#endif + +#ifdef SWIGD +%typemap(ddirectorout) MyType & %{ WILL_NOT_COMPILE %} +%typemap(ddirectorout) MyType &USEME = SWIGTYPE &; +%typemap(ddirectorout) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $typemap(ddirectorout, MyType &USEME) /* special end */ %} +#endif + +#ifdef SWIGJAVA +%typemap(javadirectorout) MyType & %{ WILL_NOT_COMPILE %} +%typemap(javadirectorout) MyType &USEME = SWIGTYPE &; +%typemap(javadirectorout) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $typemap(javadirectorout, MyType &USEME) /* special end */ %} +#endif + +%inline %{ +typedef int MyType; +class Class1 +{ + MyType mt; +public: + Class1() : mt() {} + virtual MyType & foo1() { return mt; } + virtual MyType & foo2(int parm1) { return mt; } + virtual MyType & foo2() { return mt; } + virtual ~Class1() {} +}; +%} + diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 1d6748ae3..db8a65a27 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -3449,13 +3449,11 @@ public: * --------------------------------------------------------------- */ int classDirectorMethod(Node *n, Node *parent, String *super) { - String *empty_str = NewString(""); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); - SwigType *type = Getattr(n, "type"); - SwigType *returntype = Getattr(n, "returntype"); + SwigType *returntype = Getattr(n, "type"); String *overloaded_name = getOverloadedName(n); String *storage = Getattr(n, "storage"); String *value = Getattr(n, "value"); @@ -3544,14 +3542,12 @@ public: } /* Create the intermediate class wrapper */ - Parm *tp = NewParm(returntype, empty_str, n); - - tm = Swig_typemap_lookup("imtype", tp, "", 0); + tm = Swig_typemap_lookup("imtype", n, "", 0); if (tm) { - String *imtypeout = Getattr(tp, "tmap:imtype:out"); // the type in the imtype typemap's out attribute overrides the type in the typemap + String *imtypeout = Getattr(n, "tmap:imtype:out"); // the type in the imtype typemap's out attribute overrides the type in the typemap if (imtypeout) tm = imtypeout; - const String *im_directoroutattributes = Getattr(tp, "tmap:imtype:directoroutattributes"); + const String *im_directoroutattributes = Getattr(n, "tmap:imtype:directoroutattributes"); if (im_directoroutattributes) { Printf(callback_def, " %s\n", im_directoroutattributes); Printf(director_delegate_definitions, " %s\n", im_directoroutattributes); @@ -3564,10 +3560,7 @@ public: Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); } - Parm *retpm = NewParm(returntype, empty_str, n); - - if ((c_ret_type = Swig_typemap_lookup("ctype", retpm, "", 0))) { - + if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { if (!is_void && !ignored_method) { String *jretval_decl = NewStringf("%s jresult", c_ret_type); Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); @@ -3578,8 +3571,6 @@ public: SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); output_director = false; } - - Delete(retpm); } Swig_director_parms_fixup(l); @@ -3731,7 +3722,7 @@ public: /* header declaration, start wrapper definition */ String *target; - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -3778,9 +3769,7 @@ public: String *upcall = NewStringf("%s(%s)", symname, imcall_args); if (!is_void) { - Parm *tp = NewParm(returntype, empty_str, n); - - if ((tm = Swig_typemap_lookup("csdirectorout", tp, "", 0))) { + if ((tm = Swig_typemap_lookup("csdirectorout", n, "", 0))) { substituteClassname(returntype, tm); Replaceall(tm, "$cscall", upcall); @@ -3788,7 +3777,6 @@ public: } Delete(tm); - Delete(tp); } else Printf(callback_code, " %s;\n", upcall); @@ -3804,10 +3792,9 @@ public: if (!is_void) { String *jresult_str = NewString("jresult"); String *result_str = NewString("c_result"); - Parm *tp = NewParm(returntype, result_str, n); /* Copy jresult into c_result... */ - if ((tm = Swig_typemap_lookup("directorout", tp, result_str, w))) { + if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) { Replaceall(tm, "$input", jresult_str); Replaceall(tm, "$result", result_str); Printf(w->code, "%s\n", tm); @@ -3818,7 +3805,6 @@ public: output_director = false; } - Delete(tp); Delete(jresult_str); Delete(result_str); } diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 7fca68df7..879a4acd8 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1927,13 +1927,11 @@ public: * underlying D object. * --------------------------------------------------------------------------- */ virtual int classDirectorMethod(Node *n, Node *parent, String *super) { - String *empty_str = NewString(""); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); - SwigType *type = Getattr(n, "type"); - SwigType *returntype = Getattr(n, "returntype"); + SwigType *returntype = Getattr(n, "type"); String *overloaded_name = getOverloadedName(n); String *storage = Getattr(n, "storage"); String *value = Getattr(n, "value"); @@ -2022,11 +2020,9 @@ public: } /* Create the intermediate class wrapper */ - Parm *tp = NewParm(returntype, empty_str, n); - - tm = lookupDTypemap(tp, "imtype"); + tm = lookupDTypemap(n, "imtype"); if (tm) { - String *imtypeout = Getattr(tp, "tmap:imtype:out"); + String *imtypeout = Getattr(n, "tmap:imtype:out"); if (imtypeout) { // The type in the imtype typemap's out attribute overrides the type // in the typemap. @@ -2039,9 +2035,7 @@ public: "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); } - Parm *retpm = NewParm(returntype, empty_str, n); - - if ((c_ret_type = Swig_typemap_lookup("ctype", retpm, "", 0))) { + if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { if (!is_void && !ignored_method) { String *jretval_decl = NewStringf("%s jresult", c_ret_type); Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); @@ -2053,8 +2047,6 @@ public: SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); output_director = false; } - - Delete(retpm); } Swig_director_parms_fixup(l); @@ -2213,7 +2205,7 @@ public: /* header declaration, start wrapper definition */ String *target; - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -2259,16 +2251,10 @@ public: String *upcall = NewStringf("(cast(%s)dObject).%s(%s)", classname, symname, imcall_args); if (!is_void) { - Parm *tp = NewParm(returntype, empty_str, n); - - // RESEARCH: What happens if there is no ddirectorout typemap? - if ((tm = lookupDTypemap(tp, "ddirectorout"))) { + if ((tm = lookupDTypemap(n, "ddirectorout"))) { Replaceall(tm, "$dcall", upcall); - Printf(callback_code, " return %s;\n", tm); } - - Delete(tp); } else { Printf(callback_code, " %s;\n", upcall); } @@ -2285,11 +2271,9 @@ public: if (!is_void) { String *jresult_str = NewString("jresult"); String *result_str = NewString("c_result"); - Parm *tp = NewParm(returntype, result_str, n); /* Copy jresult into c_result... */ - // FIXME: lookupDTypemap? - if ((tm = Swig_typemap_lookup("directorout", tp, result_str, w))) { + if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) { Replaceall(tm, "$input", jresult_str); Replaceall(tm, "$result", result_str); Printf(w->code, "%s\n", tm); @@ -2300,7 +2284,6 @@ public: output_director = false; } - Delete(tp); Delete(jresult_str); Delete(result_str); } @@ -2365,8 +2348,7 @@ public: // We cannot directly use n here because its »type« attribute does not // the full return type any longer after Language::functionHandler has // returned. - Parm *tp = NewParm(returntype, empty_str, n); - String *dp_return_type = lookupDTypemap(tp, "dtype"); + String *dp_return_type = lookupDTypemap(n, "dtype"); if (dp_return_type) { String *dtypeout = Getattr(n, "tmap:dtype:out"); if (dtypeout) { @@ -2377,7 +2359,7 @@ public: } } else { Swig_warning(WARN_D_TYPEMAP_DTYPE_UNDEF, input_file, line_number, - "No dtype typemap defined for %s\n", SwigType_str(type, 0)); + "No dtype typemap defined for %s\n", SwigType_str(returntype, 0)); dp_return_type = NewString(""); } diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 0b5622dcd..2b67283f6 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -2853,7 +2853,6 @@ private: int classDirectorMethod(Node *n, Node *parent, String *super) { bool is_ignored = GetFlag(n, "feature:ignore") ? true : false; - bool is_pure_virtual = (Cmp(Getattr(n, "storage"), "virtual") == 0 && Cmp(Getattr(n, "value"), "0") == 0); // We don't need explicit calls. if (GetFlag(n, "explicitcall")) { @@ -2866,18 +2865,8 @@ private: name = Getattr(n, "name"); } - if (Getattr(class_methods, name)) { - // We need to emit a pure virtual function, even if it is - // overloaded. Otherwise we won't be able to create an instance - // of the director class. The function doesn't need to actually - // do anything. - if (!is_pure_virtual || Getattr(n, "sym:overloaded")) { - return SWIG_OK; - } - } - Setattr(class_methods, name, NewString("")); - - if (!Getattr(n, "sym:overloaded")) { + bool overloaded = Getattr(n, "sym:overloaded") && !Getattr(n, "explicitcallnode"); + if (!overloaded) { int r = oneClassDirectorMethod(n, parent, super); if (r != SWIG_OK) { return r; @@ -2888,47 +2877,54 @@ private: // class_methods so that we correctly handle cases where a // function in one class hides a function of the same name in a // parent class. - for (Node *on = Getattr(n, "sym:overloaded"); on; on = Getattr(on, "sym:nextSibling")) { - int r = oneClassDirectorMethod(on, parent, super); + if (!Getattr(class_methods, name)) { + for (Node *on = Getattr(n, "sym:overloaded"); on; on = Getattr(on, "sym:nextSibling")) { + // Swig_overload_rank expects wrap:name and wrap:parms to be + // set. + String *wn = Swig_name_wrapper(Getattr(on, "sym:name")); + Append(wn, Getattr(on, "sym:overname")); + Setattr(on, "wrap:name", wn); + Delete(wn); + Setattr(on, "wrap:parms", Getattr(on, "parms")); + } + } + + int r = oneClassDirectorMethod(n, parent, super); + if (r != SWIG_OK) { + return r; + } + + if (!Getattr(n, "sym:nextSibling")) + { + // Last overloaded function + Node *on = Getattr(n, "sym:overloaded"); + bool is_static = isStatic(on); + + String *cn = exportedName(Getattr(parent, "sym:name")); + String *go_name = buildGoName(name, is_static, false); + + String *director_struct_name = NewString("_swig_Director"); + Append(director_struct_name, cn); + + int r = makeDispatchFunction(on, go_name, director_struct_name, is_static, director_struct_name, false); if (r != SWIG_OK) { return r; } - // Swig_overload_rank expects wrap:name and wrap:parms to be - // set. - String *wn = Swig_name_wrapper(Getattr(on, "sym:name")); - Append(wn, Getattr(on, "sym:overname")); - Setattr(on, "wrap:name", wn); - Delete(wn); - Setattr(on, "wrap:parms", Getattr(on, "parms")); + String *go_upcall = NewString("Director"); + Append(go_upcall, cn); + Append(go_upcall, go_name); + r = makeDispatchFunction(on, go_upcall, director_struct_name, is_static, director_struct_name, true); + if (r != SWIG_OK) { + return r; + } + Delete(cn); + Delete(go_name); + Delete(director_struct_name); + Delete(go_upcall); } - - bool is_static = isStatic(n); - - String *cn = exportedName(Getattr(parent, "sym:name")); - String *go_name = buildGoName(name, is_static, false); - - String *director_struct_name = NewString("_swig_Director"); - Append(director_struct_name, cn); - - int r = makeDispatchFunction(n, go_name, director_struct_name, is_static, director_struct_name, false); - if (r != SWIG_OK) { - return r; - } - - String *go_upcall = NewString("Director"); - Append(go_upcall, cn); - Append(go_upcall, go_name); - r = makeDispatchFunction(n, go_upcall, director_struct_name, is_static, director_struct_name, true); - if (r != SWIG_OK) { - return r; - } - - Delete(cn); - Delete(go_name); - Delete(director_struct_name); - Delete(go_upcall); } + Setattr(class_methods, name, NewString("")); return SWIG_OK; } @@ -2980,17 +2976,8 @@ private: Swig_typemap_attach_parms("gotype", parms, NULL); int parm_count = emit_num_arguments(parms); - SwigType *result = Getattr(n, "returntype"); - if (!result) { - // This can happen when following overloads. - result = NewString(Getattr(n, "type")); - SwigType_push(result, Getattr(n, "decl")); - if (SwigType_isqualifier(result)) { - Delete(SwigType_pop(result)); - } - Delete(SwigType_pop_function(result)); - Setattr(n, "returntype", result); - } + SwigType *result = Getattr(n, "type"); + SwigType *returntype = result; // Save the type for overload processing. Setattr(n, "go:type", result); @@ -3177,7 +3164,8 @@ private: if (overname) { Append(upcall_method_name, overname); } - String *upcall_decl = Swig_method_decl(Getattr(n, "type"), Getattr(n, "decl"), upcall_method_name, parms, 0, 0); + SwigType *rtype = Getattr(n, "classDirectorMethods:type"); + String *upcall_decl = Swig_method_decl(rtype, Getattr(n, "decl"), upcall_method_name, parms, 0, 0); Printv(f_c_directors_h, " ", upcall_decl, " {\n", NULL); Delete(upcall_decl); @@ -3450,7 +3438,7 @@ private: if (!is_ignored || is_pure_virtual) { // Declare the method for the director class. - SwigType *rtype = (Getattr(n, "conversion_operator") ? NULL : Getattr(n, "type")); + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); String *decl = Swig_method_decl(rtype, Getattr(n, "decl"), Getattr(n, "name"), parms, 0, 0); Printv(f_c_directors_h, " virtual ", decl, NULL); Delete(decl); @@ -3474,7 +3462,7 @@ private: Printv(w->def, " {\n", NULL); if (SwigType_type(result) != T_VOID) { - Wrapper_add_local(w, "c_result", SwigType_lstr(Getattr(n, "returntype"), "c_result")); + Wrapper_add_local(w, "c_result", SwigType_lstr(returntype, "c_result")); } if (!is_ignored) { @@ -3530,9 +3518,8 @@ private: Printv(w->code, " crosscall2(", callback_wname, ", &swig_a, (int) sizeof swig_a);\n", NULL); if (SwigType_type(result) != T_VOID) { - String *rname = NewString("c_result"); - Parm *rp = NewParm(Getattr(n, "returntype"), rname, n); - String *tm = Swig_typemap_lookup("directorout", rp, rname, NULL); + String *result_str = NewString("c_result"); + String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL); if (!tm) { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, "Unable to use type %s as director method result\n", SwigType_str(result, 0)); @@ -3541,13 +3528,12 @@ private: Replaceall(tm, "$input", swig_a_result); Replaceall(tm, "$result", "c_result"); Printv(w->code, " ", tm, "\n", NULL); - String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); + String *retstr = SwigType_rcaststr(returntype, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); Delete(tm); } - Delete(rp); - Delete(rname); + Delete(result_str); } // The C wrapper code which calls the Go function. @@ -3605,9 +3591,8 @@ private: Printv(w->code, callback_wname, "(go_val", args, ");\n", NULL); if (SwigType_type(result) != T_VOID) { - String *rname = NewString("c_result"); - Parm *rp = NewParm(Getattr(n, "returntype"), rname, n); - String *tm = Swig_typemap_lookup("directorout", rp, rname, NULL); + String *result_str = NewString("c_result"); + String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL); if (!tm) { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, "Unable to use type %s as director method result\n", SwigType_str(result, 0)); @@ -3615,13 +3600,12 @@ private: Replaceall(tm, "$input", Swig_cresult_name()); Replaceall(tm, "$result", "c_result"); Printv(w->code, " ", tm, "\n", NULL); - String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); + String *retstr = SwigType_rcaststr(returntype, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); Delete(tm); } - Delete(rp); - Delete(rname); + Delete(result_str); } } @@ -3641,7 +3625,7 @@ private: assert(is_pure_virtual); Printv(w->code, " _swig_gopanic(\"call to pure virtual function ", Getattr(parent, "sym:name"), name, "\");\n", NULL); if (SwigType_type(result) != T_VOID) { - String *retstr = SwigType_rcaststr(Getattr(n, "returntype"), "c_result"); + String *retstr = SwigType_rcaststr(returntype, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); } @@ -3783,7 +3767,8 @@ private: mismatch = false; bool any_void = false; for (int i = 0; i < nfunc; ++i) { - Node *ni = Getitem(dispatch, i); + Node *nn = Getitem(dispatch, i); + Node *ni = Getattr(nn, "directorNode") ? Getattr(nn, "directorNode") : nn; SwigType *result = Getattr(ni, "go:type"); assert(result); @@ -3862,7 +3847,8 @@ private: for (int i = 0; i < nfunc; ++i) { int fn = 0; - Node *ni = Getitem(dispatch, i); + Node *nn = Getitem(dispatch, i); + Node *ni = Getattr(nn, "directorNode") ? Getattr(nn, "directorNode") : nn; Parm *pi = Getattr(ni, "wrap:parms"); // If we are using a receiver, we want to ignore a leading self @@ -3892,7 +3878,8 @@ private: // Build list of collisions with the same number of arguments. List *coll = NewList(); for (int k = i + 1; k < nfunc; ++k) { - Node *nk = Getitem(dispatch, k); + Node *nnk = Getitem(dispatch, k); + Node *nk = Getattr(nnk, "directorNode") ? Getattr(nnk, "directorNode") : nnk; Parm *pk = Getattr(nk, "wrap:parms"); if (use_receiver && pk && Getattr(pk, "self")) { pk = getParm(pk); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 1c39aec11..b089a779d 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3519,7 +3519,6 @@ public: String *c_classname = Getattr(parent, "name"); String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); - SwigType *type = Getattr(n, "type"); SwigType *returntype = Getattr(n, "returntype"); String *overloaded_name = getOverloadedName(n); String *storage = Getattr(n, "storage"); @@ -3616,9 +3615,7 @@ public: } /* Create the intermediate class wrapper */ - Parm *tp = NewParm(returntype, empty_str, n); - - tm = Swig_typemap_lookup("jtype", tp, "", 0); + tm = Swig_typemap_lookup("jtype", n, "", 0); if (tm) { Printf(callback_def, " public static %s %s(%s self", tm, imclass_dmethod, qualified_classname); } else { @@ -3628,7 +3625,8 @@ public: String *cdesc = NULL; SwigType *covariant = Getattr(n, "covariant"); SwigType *adjustedreturntype = covariant ? covariant : returntype; - Parm *adjustedreturntypeparm = NewParm(adjustedreturntype, empty_str, n); + Parm *adjustedreturntypeparm = NewParm(adjustedreturntype, name, n); +// Setattr(adjustedreturntypeparm, "sym:symtab", Getattr(n, "sym:symtab")); if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { @@ -3647,11 +3645,8 @@ public: /* Get the JNI field descriptor for this return type, add the JNI field descriptor to jniret_desc */ - - Parm *retpm = NewParm(returntype, empty_str, n); - - if ((c_ret_type = Swig_typemap_lookup("jni", retpm, "", 0))) { - Parm *tp = NewParm(c_ret_type, empty_str, n); + if ((c_ret_type = Swig_typemap_lookup("jni", n, "", 0))) { + Parm *tp = NewParm(c_ret_type, name, n); if (!is_void && !ignored_method) { String *jretval_decl = NewStringf("%s jresult", c_ret_type); @@ -3685,7 +3680,6 @@ public: } Delete(adjustedreturntypeparm); - Delete(retpm); Delete(qualified_classname); } @@ -3755,7 +3749,7 @@ public: } else { Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, "No or improper directorin typemap for type %s for use in %s::%s (skipping director method)\n", - SwigType_str(type, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); output_director = false; } @@ -3879,7 +3873,6 @@ public: output_director = false; } - Delete(tp); } else { Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s for use in %s::%s (skipping director method)\n", SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); @@ -3894,7 +3887,7 @@ public: /* header declaration, start wrapper definition */ String *target; - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -3944,21 +3937,18 @@ public: addThrows(n, "feature:except", n); if (!is_void) { - Parm *tp = NewParm(returntype, empty_str, n); - - if ((tm = Swig_typemap_lookup("javadirectorout", tp, "", 0))) { - addThrows(n, "tmap:javadirectorout", tp); + if ((tm = Swig_typemap_lookup("javadirectorout", n, "", 0))) { + addThrows(n, "tmap:javadirectorout", n); substituteClassname(returntype, tm); Replaceall(tm, "$javacall", upcall); Printf(callback_code, " return %s;\n", tm); } - if ((tm = Swig_typemap_lookup("out", tp, "", 0))) - addThrows(n, "tmap:out", tp); + if ((tm = Swig_typemap_lookup("out", n, "", 0))) + addThrows(n, "tmap:out", n); Delete(tm); - Delete(tp); } else Printf(callback_code, " %s;\n", upcall); @@ -3988,11 +3978,10 @@ public: if (!is_void) { String *jresult_str = NewString("jresult"); String *result_str = NewString("c_result"); - Parm *tp = NewParm(returntype, result_str, n); /* Copy jresult into c_result... */ - if ((tm = Swig_typemap_lookup("directorout", tp, result_str, w))) { - addThrows(n, "tmap:directorout", tp); + if ((tm = Swig_typemap_lookup("directorout", n, result_str, w))) { + addThrows(n, "tmap:directorout", n); Replaceall(tm, "$input", jresult_str); Replaceall(tm, "$result", result_str); Printf(w->code, "%s\n", tm); @@ -4003,7 +3992,6 @@ public: output_director = false; } - Delete(tp); Delete(jresult_str); Delete(result_str); } diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 6fa9defd9..ff1dc08d0 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2041,9 +2041,12 @@ int Language::classDirectorMethods(Node *n) { if (!Cmp(type, "destructor")) { classDirectorDestructor(method); } else { - if (classDirectorMethod(method, n, fqdname) == SWIG_OK) { - Setattr(item, "director", "1"); - } + Swig_require("classDirectorMethods", method, "*type", NIL); + assert(Getattr(method, "returntype")); + Setattr(method, "type", Getattr(method, "returntype")); + if (classDirectorMethod(method, n, fqdname) == SWIG_OK) + SetFlag(item, "director"); + Swig_restore(method); } } diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 8f314c964..0ced94e83 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1380,63 +1380,41 @@ public: int classDirectorMethod(Node *n, Node *parent, String *super) { int is_void = 0; int is_pointer = 0; - String *storage; - String *value; - String *decl; - String *type; - String *name; - String *classname; + String *storage = Getattr(n, "storage"); + String *value = Getattr(n, "value"); + String *decl = Getattr(n, "decl"); + String *return_type = Getattr(n, "type"); + String *name = Getattr(n, "name"); + String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *symname = Getattr(n, "sym:name"); - String *declaration; - ParmList *l; - Wrapper *w; + String *declaration = NewString(""); + ParmList *l = Getattr(n, "parms"); + Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type; int status = SWIG_OK; int idx; bool pure_virtual = false; bool ignored_method = GetFlag(n, "feature:ignore") ? true : false; - storage = Getattr(n, "storage"); - value = Getattr(n, "value"); - classname = Getattr(parent, "sym:name"); - type = Getattr(n, "type"); - name = Getattr(n, "name"); - if (Cmp(storage, "virtual") == 0) { if (Cmp(value, "0") == 0) { pure_virtual = true; } } - w = NewWrapper(); - declaration = NewString(""); Wrapper_add_local(w, "swig_result", "CAMLparam0();\n" "SWIG_CAMLlocal2(swig_result,args)"); /* determine if the method returns a pointer */ - decl = Getattr(n, "decl"); is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(type, "void") && !is_pointer); - - /* form complete return type */ - return_type = Copy(type); - { - SwigType *t = Copy(decl); - SwigType *f = 0; - f = SwigType_pop_function(t); - SwigType_push(return_type, t); - Delete(f); - Delete(t); - } + is_void = (!Cmp(return_type, "void") && !is_pointer); /* virtual method definition */ - l = Getattr(n, "parms"); String *target; String *pclassname = NewStringf("SwigDirector_%s", classname); String *qualified_name = NewStringf("%s::%s", pclassname, name); - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s {", target); Delete(qualified_name); @@ -1616,16 +1594,7 @@ public: idx = 0; - /* this seems really silly. the node's type excludes - * qualifier/pointer/reference markers, which have to be retrieved - * from the decl field to construct return_type. but the typemap - * lookup routine uses the node's type, so we have to swap in and - * out the correct type. it's not just me, similar silliness also - * occurs in Language::cDeclaration(). - */ - Setattr(n, "type", return_type); tm = Swig_typemap_lookup("directorout", n, "c_result", w); - Setattr(n, "type", type); if (tm != 0) { Replaceall(tm, "$input", "swig_result"); /* TODO check this */ @@ -1704,7 +1673,6 @@ public: /* clean up */ Delete(wrap_args); - Delete(return_type); Delete(pclassname); DelWrapper(w); return status; diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 1b8156b33..2b4d16db2 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1247,18 +1247,17 @@ public: int classDirectorMethod(Node *n, Node *parent, String *super) { int is_void = 0; int is_pointer = 0; - String *decl; - String *type; - String *name; - String *classname; + String *decl = Getattr(n, "decl"); + String *return_type = Getattr(n, "type"); + String *name = Getattr(n, "name"); + String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *symname = Getattr(n, "sym:name"); - String *declaration; - ParmList *l; - Wrapper *w; + String *declaration = NewString(""); + ParmList *l = Getattr(n, "parms"); + Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type; String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); bool pure_virtual = false; @@ -1272,35 +1271,15 @@ public: } } - classname = Getattr(parent, "sym:name"); - type = Getattr(n, "type"); - name = Getattr(n, "name"); - - w = NewWrapper(); - declaration = NewString(""); - // determine if the method returns a pointer - decl = Getattr(n, "decl"); is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(type, "void") && !is_pointer); - - // form complete return type - return_type = Copy(type); - { - SwigType *t = Copy(decl); - SwigType *f = 0; - f = SwigType_pop_function(t); - SwigType_push(return_type, t); - Delete(f); - Delete(t); - } + is_void = (!Cmp(return_type, "void") && !is_pointer); // virtual method definition - l = Getattr(n, "parms"); String *target; String *pclassname = NewStringf("SwigDirector_%s", classname); String *qualified_name = NewStringf("%s::%s", pclassname, name); - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -1449,9 +1428,7 @@ public: "method %s.%s failed to return the required number " "of arguments.\");\n", classname, method_name); Printf(w->code, "}\n"); - Setattr(n, "type", return_type); tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w); - Setattr(n, "type", type); if (tm != 0) { char temp[24]; sprintf(temp, "out(%d)", idx); @@ -1531,7 +1508,6 @@ public: } // clean up Delete(wrap_args); - Delete(return_type); Delete(pclassname); DelWrapper(w); return status; diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 70b6e41ef..f47c878af 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2415,18 +2415,17 @@ done: int classDirectorMethod(Node *n, Node *parent, String *super) { int is_void = 0; int is_pointer = 0; - String *decl; - String *type; - String *name; - String *classname; + String *decl = Getattr(n, "decl"); + String *return_type = Getattr(n, "type"); + String *name = Getattr(n, "name"); + String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *symname = Getattr(n, "sym:name"); - String *declaration; - ParmList *l; - Wrapper *w; + String *declaration = NewStringEmpty(); + ParmList *l = Getattr(n, "parms"); + Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewStringEmpty(); - String *return_type; String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); bool pure_virtual = false; @@ -2440,34 +2439,15 @@ done: } } - classname = Getattr(parent, "sym:name"); - type = Getattr(n, "type"); - name = Getattr(n, "name"); - - w = NewWrapper(); - declaration = NewStringEmpty(); - /* determine if the method returns a pointer */ - decl = Getattr(n, "decl"); is_pointer = SwigType_ispointer_return(decl); - is_void = (Cmp(type, "void") == 0 && !is_pointer); - - /* form complete return type */ - return_type = Copy(type); - { - SwigType *t = Copy(decl); - SwigType *f = SwigType_pop_function(t); - SwigType_push(return_type, t); - Delete(f); - Delete(t); - } + is_void = (Cmp(return_type, "void") == 0 && !is_pointer); /* virtual method definition */ - l = Getattr(n, "parms"); String *target; String *pclassname = NewStringf("SwigDirector_%s", classname); String *qualified_name = NewStringf("%s::%s", pclassname, name); - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -2651,16 +2631,7 @@ done: /* marshal return value */ if (!is_void) { - /* this seems really silly. the node's type excludes - * qualifier/pointer/reference markers, which have to be retrieved - * from the decl field to construct return_type. but the typemap - * lookup routine uses the node's type, so we have to swap in and - * out the correct type. it's not just me, similar silliness also - * occurs in Language::cDeclaration(). - */ - Setattr(n, "type", return_type); tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w); - Setattr(n, "type", type); if (tm != 0) { static const String *amp_result = NewStringf("&%s", Swig_cresult_name()); Replaceall(tm, "$input", amp_result); @@ -2749,7 +2720,6 @@ done: /* clean up */ Delete(wrap_args); - Delete(return_type); Delete(pclassname); DelWrapper(w); return status; diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index c180b4a79..0cc843c74 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -4528,18 +4528,17 @@ int PYTHON::classDirectorMethods(Node *n) { int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { int is_void = 0; int is_pointer = 0; - String *decl; - String *type; - String *name; - String *classname; + String *decl = Getattr(n, "decl"); + String *name = Getattr(n, "name"); + String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *symname = Getattr(n, "sym:name"); - String *declaration; - ParmList *l; - Wrapper *w; + String *declaration = NewString(""); + ParmList *l = Getattr(n, "parms"); + Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type; + String *return_type = Getattr(n, "type"); String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); bool pure_virtual = false; @@ -4553,35 +4552,15 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { } } - classname = Getattr(parent, "sym:name"); - type = Getattr(n, "type"); - name = Getattr(n, "name"); - - w = NewWrapper(); - declaration = NewString(""); - /* determine if the method returns a pointer */ - decl = Getattr(n, "decl"); is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(type, "void") && !is_pointer); - - /* form complete return type */ - return_type = Copy(type); - { - SwigType *t = Copy(decl); - SwigType *f = 0; - f = SwigType_pop_function(t); - SwigType_push(return_type, t); - Delete(f); - Delete(t); - } + is_void = (!Cmp(return_type, "void") && !is_pointer); /* virtual method definition */ - l = Getattr(n, "parms"); String *target; String *pclassname = NewStringf("SwigDirector_%s", classname); String *qualified_name = NewStringf("%s::%s", pclassname, name); - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -4898,16 +4877,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { /* marshal return value */ if (!is_void) { - /* this seems really silly. the node's type excludes - * qualifier/pointer/reference markers, which have to be retrieved - * from the decl field to construct return_type. but the typemap - * lookup routine uses the node's type, so we have to swap in and - * out the correct type. it's not just me, similar silliness also - * occurs in Language::cDeclaration(). - */ - Setattr(n, "type", return_type); tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w); - Setattr(n, "type", type); if (tm != 0) { if (outputs > 1) { Printf(w->code, "output = PyTuple_GetItem(%s, %d);\n", Swig_cresult_name(), idx++); @@ -5009,7 +4979,6 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { /* clean up */ Delete(wrap_args); - Delete(return_type); Delete(pclassname); DelWrapper(w); return status; diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index f778b0af5..bc4e785e6 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -3017,18 +3017,17 @@ public: virtual int classDirectorMethod(Node *n, Node *parent, String *super) { int is_void = 0; int is_pointer = 0; - String *decl; - String *type; - String *name; - String *classname; + String *decl = Getattr(n, "decl"); + String *name = Getattr(n, "name"); + String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *symname = Getattr(n, "sym:name"); - String *declaration; - ParmList *l; - Wrapper *w; + String *declaration = NewString(""); + ParmList *l = Getattr(n, "parms"); + Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type; + String *return_type = Getattr(n, "type"); Parm *p; String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); @@ -3049,35 +3048,15 @@ public: Printf(overnametmp, "::%s", Getattr(n, "sym:overname")); } - classname = Getattr(parent, "sym:name"); - type = Getattr(n, "type"); - name = Getattr(n, "name"); - - w = NewWrapper(); - declaration = NewString(""); - /* determine if the method returns a pointer */ - decl = Getattr(n, "decl"); is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(type, "void") && !is_pointer); - - /* form complete return type */ - return_type = Copy(type); - { - SwigType *t = Copy(decl); - SwigType *f = 0; - f = SwigType_pop_function(t); - SwigType_push(return_type, t); - Delete(f); - Delete(t); - } + is_void = (!Cmp(return_type, "void") && !is_pointer); /* virtual method definition */ - l = Getattr(n, "parms"); String *target; String *pclassname = NewStringf("SwigDirector_%s", classname); String *qualified_name = NewStringf("%s::%s", pclassname, name); - SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : type; + SwigType *rtype = Getattr(n, "conversion_operator") ? 0 : Getattr(n, "classDirectorMethods:type"); target = Swig_method_decl(rtype, decl, qualified_name, l, 0, 0); Printf(w->def, "%s", target); Delete(qualified_name); @@ -3295,14 +3274,7 @@ public: /* Marshal return value */ if (!is_void) { - /* This seems really silly. The node's type excludes qualifier/pointer/reference markers, - * which have to be retrieved from the decl field to construct return_type. But the typemap - * lookup routine uses the node's type, so we have to swap in and out the correct type. - * It's not just me, similar silliness also occurs in Language::cDeclaration(). - */ - Setattr(n, "type", return_type); tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w); - Setattr(n, "type", type); if (tm != 0) { if (outputs > 1 && !asvoid ) { Printf(w->code, "output = rb_ary_entry(%s, %d);\n", Swig_cresult_name(), idx++); @@ -3390,7 +3362,6 @@ public: /* clean up */ Delete(wrap_args); - Delete(return_type); Delete(pclassname); DelWrapper(w); return status; From b1ee062d2a62e29a5d71ea1cb6bf2371f4c8656e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 27 Oct 2012 17:38:05 +0000 Subject: [PATCH 149/538] Cosmetic variable renaming for consistency across language modules git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13874 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/directors.cxx | 8 ++++---- Source/Modules/go.cxx | 9 ++++----- Source/Modules/java.cxx | 2 +- Source/Modules/ocaml.cxx | 12 ++++++------ Source/Modules/octave.cxx | 12 ++++++------ Source/Modules/php.cxx | 12 ++++++------ Source/Modules/python.cxx | 12 ++++++------ Source/Modules/ruby.cxx | 12 ++++++------ 8 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index af1798b8b..7f4c8d9d1 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -132,7 +132,7 @@ String *Swig_method_call(const_String_or_char_ptr name, ParmList *parms) { * */ -String *Swig_method_decl(SwigType *returntype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values) { +String *Swig_method_decl(SwigType *rettype, SwigType *decl, const_String_or_char_ptr id, List *args, int strip, int values) { String *result; List *elements; String *element = 0, *nextelement; @@ -203,7 +203,7 @@ String *Swig_method_decl(SwigType *returntype, SwigType *decl, const_String_or_c Append(result, ", "); } Append(result, ")"); - } else if (returntype) { // This check is intended for conversion operators to a pointer/reference which needs the pointer/reference ignoring in the declaration + } else if (rettype) { // This check is intended for conversion operators to a pointer/reference which needs the pointer/reference ignoring in the declaration if (SwigType_ispointer(element)) { Insert(result, 0, "*"); if ((nextelement) && ((SwigType_isfunction(nextelement) || (SwigType_isarray(nextelement))))) { @@ -256,9 +256,9 @@ String *Swig_method_decl(SwigType *returntype, SwigType *decl, const_String_or_c Chop(result); - if (returntype) { + if (rettype) { Insert(result, 0, " "); - String *rtype = SwigType_str(returntype, 0); + String *rtype = SwigType_str(rettype, 0); Insert(result, 0, rtype); Delete(rtype); } diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 2b67283f6..23fd6f560 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -2977,7 +2977,6 @@ private: int parm_count = emit_num_arguments(parms); SwigType *result = Getattr(n, "type"); - SwigType *returntype = result; // Save the type for overload processing. Setattr(n, "go:type", result); @@ -3462,7 +3461,7 @@ private: Printv(w->def, " {\n", NULL); if (SwigType_type(result) != T_VOID) { - Wrapper_add_local(w, "c_result", SwigType_lstr(returntype, "c_result")); + Wrapper_add_local(w, "c_result", SwigType_lstr(result, "c_result")); } if (!is_ignored) { @@ -3528,7 +3527,7 @@ private: Replaceall(tm, "$input", swig_a_result); Replaceall(tm, "$result", "c_result"); Printv(w->code, " ", tm, "\n", NULL); - String *retstr = SwigType_rcaststr(returntype, "c_result"); + String *retstr = SwigType_rcaststr(result, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); Delete(tm); @@ -3600,7 +3599,7 @@ private: Replaceall(tm, "$input", Swig_cresult_name()); Replaceall(tm, "$result", "c_result"); Printv(w->code, " ", tm, "\n", NULL); - String *retstr = SwigType_rcaststr(returntype, "c_result"); + String *retstr = SwigType_rcaststr(result, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); Delete(tm); @@ -3625,7 +3624,7 @@ private: assert(is_pure_virtual); Printv(w->code, " _swig_gopanic(\"call to pure virtual function ", Getattr(parent, "sym:name"), name, "\");\n", NULL); if (SwigType_type(result) != T_VOID) { - String *retstr = SwigType_rcaststr(returntype, "c_result"); + String *retstr = SwigType_rcaststr(result, "c_result"); Printv(w->code, " return ", retstr, ";\n", NULL); Delete(retstr); } diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b089a779d..d9964edd8 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3519,7 +3519,7 @@ public: String *c_classname = Getattr(parent, "name"); String *name = Getattr(n, "name"); String *symname = Getattr(n, "sym:name"); - SwigType *returntype = Getattr(n, "returntype"); + SwigType *returntype = Getattr(n, "type"); String *overloaded_name = getOverloadedName(n); String *storage = Getattr(n, "storage"); String *value = Getattr(n, "value"); diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 0ced94e83..4a2071e32 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1383,7 +1383,7 @@ public: String *storage = Getattr(n, "storage"); String *value = Getattr(n, "value"); String *decl = Getattr(n, "decl"); - String *return_type = Getattr(n, "type"); + String *returntype = Getattr(n, "type"); String *name = Getattr(n, "name"); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); @@ -1408,7 +1408,7 @@ public: /* determine if the method returns a pointer */ is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(return_type, "void") && !is_pointer); + is_void = (!Cmp(returntype, "void") && !is_pointer); /* virtual method definition */ String *target; @@ -1430,7 +1430,7 @@ public: */ if (!is_void) { if (!(ignored_method && !pure_virtual)) { - Wrapper_add_localv(w, "c_result", SwigType_lstr(return_type, "c_result"), NIL); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); } } @@ -1629,15 +1629,15 @@ public: if (!(ignored_method && !pure_virtual)) { /* A little explanation: * The director_enum test case makes a method whose return type - * is an enum type. return_type here is "int". gcc complains + * is an enum type. returntype here is "int". gcc complains * about an implicit enum conversion, and although i don't strictly * agree with it, I'm working on fixing the error: * * Below is what I came up with. It's not great but it should * always essentially work. */ - if (!SwigType_isreference(return_type)) { - Printf(w->code, "CAMLreturn_type((%s)c_result);\n", SwigType_lstr(return_type, "")); + if (!SwigType_isreference(returntype)) { + Printf(w->code, "CAMLreturn_type((%s)c_result);\n", SwigType_lstr(returntype, "")); } else { Printf(w->code, "CAMLreturn_type(*c_result);\n"); } diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 2b4d16db2..ef1629324 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1248,7 +1248,7 @@ public: int is_void = 0; int is_pointer = 0; String *decl = Getattr(n, "decl"); - String *return_type = Getattr(n, "type"); + String *returntype = Getattr(n, "type"); String *name = Getattr(n, "name"); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); @@ -1273,7 +1273,7 @@ public: // determine if the method returns a pointer is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(return_type, "void") && !is_pointer); + is_void = (!Cmp(returntype, "void") && !is_pointer); // virtual method definition String *target; @@ -1327,7 +1327,7 @@ public: // handle it, including declaration of c_result ($result). if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *cres = SwigType_lstr(return_type, "c_result"); + String *cres = SwigType_lstr(returntype, "c_result"); Printf(w->code, "%s;\n", cres); Delete(cres); } @@ -1444,7 +1444,7 @@ public: } else { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, "Unable to use return type %s in director method %s::%s (skipping method).\n", - SwigType_str(return_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); status = SWIG_ERROR; } } @@ -1471,8 +1471,8 @@ public: if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *rettype = SwigType_str(return_type, 0); - if (!SwigType_isreference(return_type)) { + String *rettype = SwigType_str(returntype, 0); + if (!SwigType_isreference(returntype)) { Printf(w->code, "return (%s) c_result;\n", rettype); } else { Printf(w->code, "return (%s) *c_result;\n", rettype); diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index f47c878af..d89d61da4 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2416,7 +2416,7 @@ done: int is_void = 0; int is_pointer = 0; String *decl = Getattr(n, "decl"); - String *return_type = Getattr(n, "type"); + String *returntype = Getattr(n, "type"); String *name = Getattr(n, "name"); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); @@ -2441,7 +2441,7 @@ done: /* determine if the method returns a pointer */ is_pointer = SwigType_ispointer_return(decl); - is_void = (Cmp(return_type, "void") == 0 && !is_pointer); + is_void = (Cmp(returntype, "void") == 0 && !is_pointer); /* virtual method definition */ String *target; @@ -2497,7 +2497,7 @@ done: */ if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *cres = SwigType_lstr(return_type, "c_result"); + String *cres = SwigType_lstr(returntype, "c_result"); Printf(w->code, "%s;\n", cres); Delete(cres); } @@ -2650,7 +2650,7 @@ done: Delete(tm); } else { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, - "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(return_type, 0), SwigType_namestr(c_classname), + "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); status = SWIG_ERROR; } @@ -2677,8 +2677,8 @@ done: if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *rettype = SwigType_str(return_type, 0); - if (!SwigType_isreference(return_type)) { + String *rettype = SwigType_str(returntype, 0); + if (!SwigType_isreference(returntype)) { Printf(w->code, "return (%s) c_result;\n", rettype); } else { Printf(w->code, "return (%s) *c_result;\n", rettype); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 0cc843c74..97b0c4f8d 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -4538,7 +4538,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type = Getattr(n, "type"); + String *returntype = Getattr(n, "type"); String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); bool pure_virtual = false; @@ -4554,7 +4554,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { /* determine if the method returns a pointer */ is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(return_type, "void") && !is_pointer); + is_void = (!Cmp(returntype, "void") && !is_pointer); /* virtual method definition */ String *target; @@ -4608,7 +4608,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { */ if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *cres = SwigType_lstr(return_type, "c_result"); + String *cres = SwigType_lstr(returntype, "c_result"); Printf(w->code, "%s;\n", cres); Delete(cres); } @@ -4903,7 +4903,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { Delete(tm); } else { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, - "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(return_type, 0), SwigType_namestr(c_classname), + "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); status = SWIG_ERROR; } @@ -4940,8 +4940,8 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *rettype = SwigType_str(return_type, 0); - if (!SwigType_isreference(return_type)) { + String *rettype = SwigType_str(returntype, 0); + if (!SwigType_isreference(returntype)) { Printf(w->code, "return (%s) c_result;\n", rettype); } else { Printf(w->code, "return (%s) *c_result;\n", rettype); diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index bc4e785e6..276b967f3 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -3027,7 +3027,7 @@ public: Wrapper *w = NewWrapper(); String *tm; String *wrap_args = NewString(""); - String *return_type = Getattr(n, "type"); + String *returntype = Getattr(n, "type"); Parm *p; String *value = Getattr(n, "value"); String *storage = Getattr(n, "storage"); @@ -3050,7 +3050,7 @@ public: /* determine if the method returns a pointer */ is_pointer = SwigType_ispointer_return(decl); - is_void = (!Cmp(return_type, "void") && !is_pointer); + is_void = (!Cmp(returntype, "void") && !is_pointer); /* virtual method definition */ String *target; @@ -3107,7 +3107,7 @@ public: */ if (!is_void) { if (!(ignored_method && !pure_virtual)) { - Wrapper_add_localv(w, "c_result", SwigType_lstr(return_type, "c_result"), NIL); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); } } @@ -3292,7 +3292,7 @@ public: Printv(w->code, tm, "\n", NIL); } else { Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number, - "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(return_type, 0), + "Unable to use return type %s in director method %s::%s (skipping method).\n", SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); status = SWIG_ERROR; } @@ -3323,8 +3323,8 @@ public: /* any existing helper functions to handle this? */ if (!is_void) { if (!(ignored_method && !pure_virtual)) { - String *rettype = SwigType_str(return_type, 0); - if (!SwigType_isreference(return_type)) { + String *rettype = SwigType_str(returntype, 0); + if (!SwigType_isreference(returntype)) { Printf(w->code, "return (%s) c_result;\n", rettype); } else { Printf(w->code, "return (%s) *c_result;\n", rettype); From 786d883d45c68a3feb2f3d69cce0845069533c7f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 30 Oct 2012 23:38:57 +0000 Subject: [PATCH 150/538] Fix Go support for enums to work correctly when Go int type is 64 bits. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13875 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/go/go.swg | 14 +++++++++++++- Source/Modules/go.cxx | 5 +++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Lib/go/go.swg b/Lib/go/go.swg index 82f0b91f6..cc3beef7d 100644 --- a/Lib/go/go.swg +++ b/Lib/go/go.swg @@ -366,7 +366,7 @@ %{ $1 = ($1_ltype)$input; %} %typemap(out) enum SWIGTYPE -%{ $result = $1; %} +%{ $result = (intgo)$1; %} %typemap(directorin) enum SWIGTYPE %{ $input = ($1_ltype)$1; %} @@ -374,6 +374,18 @@ %typemap(directorout) enum SWIGTYPE %{ $result = ($1_ltype)$input; %} +%typemap(directorin) enum SWIGTYPE & (intgo e) +%{ + e = (intgo)$1; + $input = &e; +%} + +%typemap(directorout) enum SWIGTYPE & +%{ + $*1_ltype f = ($*1_ltype)*$input; + $result = ($1_ltype)&f; +%} + /* Arbitrary type. This is a type passed by value in the C/C++ code. We convert it to a pointer for the Go code. Note that all basic types are explicitly handled above. */ diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 23fd6f560..127e7c239 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -4709,6 +4709,11 @@ private: Delete(q); } } + + if (Language::enumLookup(t) != NULL || Strcmp(t, "enum ") == 0) { + is_int = true; + } + Delete(t); if (is_int8) { ret = NewString("char "); From ab7da898ef4fead8e6914c786a48223fe145f764 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 31 Oct 2012 03:41:10 +0000 Subject: [PATCH 151/538] Define uintgo for the benefit of Go .swig files. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13876 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Lib/go/goruntime.swg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg index f27bbae5e..4b7daf41f 100644 --- a/Lib/go/goruntime.swg +++ b/Lib/go/goruntime.swg @@ -16,14 +16,17 @@ #if SWIGGO_INTGO_SIZE == 32 %insert(runtime) %{ typedef int intgo; +typedef unsigned int uintgo; %} #elif SWIGGO_INTGO_SIZE == 64 %insert(runtime) %{ typedef long long intgo; +typedef unsigned long long uintgo; %} #else %insert(runtime) %{ typedef ptrdiff_t intgo; +typedef size_t uintgo; %} #endif From 0ca11c8b6fce3d974a53b2e4aa86b84157ff0ef5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 9 Nov 2012 17:57:42 +0000 Subject: [PATCH 152/538] Fix overflow with parameters > LONG_MAX with Python 3. The typemap incorrectly called PyInt_AsLong() if PyInt_Check() passed, but this check is the same as PyLong_Check() for Python 3 and so the correct PyLong_AsUnsignedLong() function was never called. As a consequence, passing any value greater than LONG_MAX (e.g. 0x87654321 on 32 bit architectures) to a function taking unsigned int, unsigned long or size_t parameter failed with an overflow error being generated. Fix this by simply disabling the part of the code dealing with PyInts for Python 3 as there is no distinction between PyInt and PyLong there any more. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13877 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Lib/python/pyprimtypes.swg | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index d36e76d62..913951fec 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -4,6 +4,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== + +2012-11-09: vzeitlin + [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. + 2012-10-26: wsfulton Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously the name was ignored during the typemap search. Applies to the following list of typemaps: diff --git a/Lib/python/pyprimtypes.swg b/Lib/python/pyprimtypes.swg index 290f9312f..3fbd86a21 100644 --- a/Lib/python/pyprimtypes.swg +++ b/Lib/python/pyprimtypes.swg @@ -109,6 +109,7 @@ SWIG_From_dec(unsigned long)(unsigned long value) SWIGINTERN int SWIG_AsVal_dec(unsigned long)(PyObject *obj, unsigned long *val) { +%#if PY_VERSION_HEX < 0x03000000 if (PyInt_Check(obj)) { long v = PyInt_AsLong(obj); if (v >= 0) { @@ -117,7 +118,9 @@ SWIG_AsVal_dec(unsigned long)(PyObject *obj, unsigned long *val) } else { return SWIG_OverflowError; } - } else if (PyLong_Check(obj)) { + } else +%#endif + if (PyLong_Check(obj)) { unsigned long v = PyLong_AsUnsignedLong(obj); if (!PyErr_Occurred()) { if (val) *val = v; From 421139a5feb500e6d74a457801df55a67fe96802 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:16:28 +0000 Subject: [PATCH 153/538] Fix some subtle named output typemap lookup misses, the fully qualified name was not always being in all cases such as member variables git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13878 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 21 +++++++++++++++++++++ Source/Modules/java.cxx | 10 ++++------ Source/Modules/lang.cxx | 7 ++++++- Source/Modules/r.cxx | 2 +- Source/Swig/parms.c | 22 ++++++++++++++++++---- Source/Swig/swigparm.h | 3 ++- Source/Swig/typemap.c | 10 ++++++++++ 7 files changed, 62 insertions(+), 13 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 913951fec..17e4f76e4 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -8,6 +8,27 @@ Version 2.0.9 (in progress) 2012-11-09: vzeitlin [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. +2012-11-02: wsfulton + Fix some subtle named output typemap lookup misses, the fully qualified name was not always being + used for variables, for example: + + struct Glob { + int MyVar; + }; + + Previously the search rules (as shown by -debug-tmsearch) for the getter wrapper were: + + example.i:44: Searching for a suitable 'out' typemap for: int MyVar + Looking for: int MyVar + Looking for: int + + Now the scope is named correctly: + + example.i:44: Searching for a suitable 'out' typemap for: int Glob::MyVar + Looking for: int Glob::MyVar + Looking for: int MyVar + Looking for: int + 2012-10-26: wsfulton Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously the name was ignored during the typemap search. Applies to the following list of typemaps: diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index d9964edd8..6e9ee54b2 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3514,7 +3514,6 @@ public: * --------------------------------------------------------------- */ int classDirectorMethod(Node *n, Node *parent, String *super) { - String *empty_str = NewString(""); String *classname = Getattr(parent, "sym:name"); String *c_classname = Getattr(parent, "name"); String *name = Getattr(n, "name"); @@ -3625,8 +3624,7 @@ public: String *cdesc = NULL; SwigType *covariant = Getattr(n, "covariant"); SwigType *adjustedreturntype = covariant ? covariant : returntype; - Parm *adjustedreturntypeparm = NewParm(adjustedreturntype, name, n); -// Setattr(adjustedreturntypeparm, "sym:symtab", Getattr(n, "sym:symtab")); + Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n); if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { @@ -3646,7 +3644,7 @@ public: /* Get the JNI field descriptor for this return type, add the JNI field descriptor to jniret_desc */ if ((c_ret_type = Swig_typemap_lookup("jni", n, "", 0))) { - Parm *tp = NewParm(c_ret_type, name, n); + Parm *tp = NewParmNode(c_ret_type, n); if (!is_void && !ignored_method) { String *jretval_decl = NewStringf("%s jresult", c_ret_type); @@ -3737,7 +3735,7 @@ public: } /* Start the Java field descriptor for the intermediate class's upcall (insert self object) */ - Parm *tp = NewParm(c_classname, empty_str, n); + Parm *tp = NewParmNode(c_classname, n); String *jdesc; if ((tm = Swig_typemap_lookup("directorin", tp, "", 0)) @@ -3779,7 +3777,7 @@ public: /* Get parameter's intermediary C type */ if ((c_param_type = Getattr(p, "tmap:jni"))) { - Parm *tp = NewParm(c_param_type, empty_str, n); + Parm *tp = NewParm(c_param_type, Getattr(p, "name"), n); String *desc_tm = NULL, *jdesc = NULL, *cdesc = NULL; /* Add to local variables */ diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index ff1dc08d0..297e245f3 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1419,7 +1419,12 @@ int Language::membervariableHandler(Node *n) { target = NewStringf("%s->%s", pname, name); Delete(pname); } - tm = Swig_typemap_lookup("memberin", n, target, 0); + + // This is an input type typemap lookup and so it should not use Node n + // otherwise qualification is done on the parameter name for the setter function + Parm *nin = NewParm(type, name, n); + tm = Swig_typemap_lookup("memberin", nin, target, 0); + Delete(nin); } int flags = Extend | SmartPointer | use_naturalvar_mode(n); if (isNonVirtualProtectedAccess(n)) diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 14da3a975..94e6ed4bd 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -682,7 +682,7 @@ String * R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) { XXX Have to be a little more clever so that we can deal with struct A * - the * is getting lost. Is this still true? If so, will a SwigType_push() solve things? */ - Parm *bbase = NewParm(rettype, Swig_cresult_name(), n); + Parm *bbase = NewParmNode(rettype, n); String *returnTM = Swig_typemap_lookup("in", bbase, Swig_cresult_name(), f); if(returnTM) { String *tm = returnTM; diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index 283a2f5c2..0f4d17b73 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -19,13 +19,13 @@ char cvsroot_parms_c[] = "$Id$"; * NewParm() * * Create a new parameter from datatype 'type' and name 'name' copying - * the file and line number from the Node file_line_node. + * the file and line number from the Node from_node. * ------------------------------------------------------------------------ */ -Parm *NewParm(SwigType *type, const_String_or_char_ptr name, Node *file_line_node) { +Parm *NewParm(SwigType *type, const_String_or_char_ptr name, Node *from_node) { Parm *p = NewParmWithoutFileLineInfo(type, name); - Setfile(p, Getfile(file_line_node)); - Setline(p, Getline(file_line_node)); + Setfile(p, Getfile(from_node)); + Setline(p, Getline(from_node)); return p; } @@ -48,6 +48,20 @@ Parm *NewParmWithoutFileLineInfo(SwigType *type, const_String_or_char_ptr name) return p; } +/* ------------------------------------------------------------------------ + * NewParmNode() + * + * Create a new parameter from datatype 'type' and name and symbol table as + * well as file and line number from the 'from_node'. + * The resulting Parm will be similar to a Node used for typemap lookups. + * ------------------------------------------------------------------------ */ + +Parm *NewParmNode(SwigType *type, Node *from_node) { + Parm *p = NewParm(type, Getattr(from_node, "name"), from_node); + Setattr(p, "sym:symtab", Getattr(from_node, "sym:symtab")); + return p; +} + /* ------------------------------------------------------------------------ * CopyParm() * ------------------------------------------------------------------------ */ diff --git a/Source/Swig/swigparm.h b/Source/Swig/swigparm.h index 70a39390e..368b4d26b 100644 --- a/Source/Swig/swigparm.h +++ b/Source/Swig/swigparm.h @@ -13,8 +13,9 @@ * ----------------------------------------------------------------------------- */ /* Individual parameters */ -extern Parm *NewParm(SwigType *type, const_String_or_char_ptr name, Node *file_line_node); +extern Parm *NewParm(SwigType *type, const_String_or_char_ptr name, Node *from_node); extern Parm *NewParmWithoutFileLineInfo(SwigType *type, const_String_or_char_ptr name); +extern Parm *NewParmNode(SwigType *type, Node *from_node); extern Parm *CopyParm(Parm *p); /* Parameter lists */ diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 0488b1b62..fc7728084 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1339,7 +1339,17 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No pname = Getattr(node, "name"); +/* + if (pname && node && Getattr(node, "sym:symtab")) { + if (!checkAttribute(node, "kind", "function")) { + Printf(stdout, "New check: %s %s %s\n", Getattr(node, "name"), nodeType(node), Getattr(node, "kind")); + } + } +*/ + if (pname && node && Getattr(node, "sym:symtab")) { + /* if (pname && node && checkAttribute(node, "kind", "function")) { + */ /* For functions, add on a qualified name search, for example struct Foo { From 7aa339cb3f975ed5bc8ddae81224a7febe24a83f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:17:10 +0000 Subject: [PATCH 154/538] Swig_symbol_string_qualify for destructors - bug exposed after last commit when fully qualifying destructor names during typemap searches git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13879 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/symbol.c | 2 +- Source/Swig/typemap.c | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index e39f826eb..0c589f027 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -1800,7 +1800,7 @@ String *Swig_symbol_string_qualify(String *s, Symtab *st) { char *c = Char(s); int first_char = 1; while (*c) { - if (isalpha((int) *c) || (*c == '_') || (*c == ':') || (isdigit((int) *c) && !first_char)) { + if (isalpha((int) *c) || (*c == '_') || (*c == ':') || (*c == '~' && first_char) || (isdigit((int) *c) && !first_char)) { Putc(*c, id); have_id = 1; } else { diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index fc7728084..b7208737a 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1339,22 +1339,11 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No pname = Getattr(node, "name"); -/* if (pname && node && Getattr(node, "sym:symtab")) { - if (!checkAttribute(node, "kind", "function")) { - Printf(stdout, "New check: %s %s %s\n", Getattr(node, "name"), nodeType(node), Getattr(node, "kind")); - } - } -*/ - if (pname && node && Getattr(node, "sym:symtab")) { - /* - if (pname && node && checkAttribute(node, "kind", "function")) { - */ - /* - For functions, add on a qualified name search, for example - struct Foo { - int *foo(int bar) -> Foo::foo - }; + /* Add on a qualified name search for any symbol, for example: + * struct Foo { + * int *foo(int bar) -> Foo::foo + * }; */ Symtab *st = Getattr(node, "sym:symtab"); String *qsn = st ? Swig_symbol_string_qualify(pname, st) : 0; From b40f6781158958352c33c1e0044777470026d359 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:17:55 +0000 Subject: [PATCH 155/538] Tweak test so it works if test-suite is run using -copyctor git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13880 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/java/java_prepost_runme.java | 2 +- Examples/test-suite/java_prepost.i | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/java/java_prepost_runme.java b/Examples/test-suite/java/java_prepost_runme.java index 6eeb60393..3bfec8fad 100644 --- a/Examples/test-suite/java/java_prepost_runme.java +++ b/Examples/test-suite/java/java_prepost_runme.java @@ -16,7 +16,7 @@ public class java_prepost_runme { { // ensure checked exception is generated try { - PrePostThrows ppt = new PrePostThrows(null); + PrePostThrows ppt = new PrePostThrows(null, true); } catch (InstantiationException e) { } } diff --git a/Examples/test-suite/java_prepost.i b/Examples/test-suite/java_prepost.i index 3e3839248..e8e4a9d43 100644 --- a/Examples/test-suite/java_prepost.i +++ b/Examples/test-suite/java_prepost.i @@ -83,7 +83,7 @@ struct PrePost2 { %inline %{ struct PrePostThrows { - PrePostThrows(PrePostTest *ppt) { + PrePostThrows(PrePostTest *ppt, bool) { } }; %} From d4b7275f511dd79e530417e63a75e57580199602 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:18:52 +0000 Subject: [PATCH 156/538] Fix Swig_scopename_last. It was truncating the first two letters of a symbol if the symbol did not contain any qualifiers. Does not seem to change much currently except some generated error messages in overloaded templated methods in classes. However the fix is needed for some commits shortly forthcoming. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13881 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 6d0297b05..a9aacc02e 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -880,8 +880,8 @@ String *Swig_scopename_last(const String *s) { while (*c) { if ((*c == ':') && (*(c + 1) == ':')) { - cc = c; c += 2; + cc = c; } else { if (*c == '<') { int level = 1; @@ -898,7 +898,7 @@ String *Swig_scopename_last(const String *s) { } } } - return NewString(cc + 2); + return NewString(cc); } /* ----------------------------------------------------------------------------- From aeebd394f335234d6ca1b8845fb9dd9dd580c027 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:19:47 +0000 Subject: [PATCH 157/538] Fix incorrect implicit constructor and destructor names in the symbol tables. Fix some feature matching issues for implicit destructors and implicit constructors and impliciti copy constructors added with %copyctor. Also improves consistency in named typemap lookup rules. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13882 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 24 ++++++++++++++++++++++++ Source/Modules/lang.cxx | 27 ++++++++++----------------- Source/Swig/symbol.c | 1 + Source/Swig/typemap.c | 27 +++++++++++++++++++++------ 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 17e4f76e4..15337ca00 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -8,6 +8,30 @@ Version 2.0.9 (in progress) 2012-11-09: vzeitlin [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. +2012-11-09: wsfulton + Fix some feature matching issues for implicit destructors and implicit constructors and implicit + copy constructors added with %copyctor. Previously a feature for these had to be fully qualified + in order to match. Now the following will also match: + + %feature("xyz") ~XXX(); + struct XXX {}; + +2012-11-09: wsfulton + Further consistency in named output typemap lookups for implicit constructors and destructors and + implicit copy constructors added with %copyctor. Previously only the fully qualified name was being + used, now the unqualified name will also be used. For example, previously: + + example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More + Looking for: void Space::More::~More + Looking for: void + + Now the unqualified name is also used: + + example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More + Looking for: void Space::More::~More + Looking for: void ~More + Looking for: void + 2012-11-02: wsfulton Fix some subtle named output typemap lookup misses, the fully qualified name was not always being used for variables, for example: diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 297e245f3..47dbdeb2b 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2170,8 +2170,7 @@ static void addCopyConstructor(Node *n) { String *cname = Getattr(n, "name"); SwigType *type = Copy(cname); - String *last = Swig_scopename_last(cname); - String *name = NewStringf("%s::%s", cname, last); + String *name = Swig_scopename_last(cname); String *cc = NewStringf("r.q(const).%s", type); String *decl = NewStringf("f(%s).", cc); String *csymname = Getattr(n, "sym:name"); @@ -2196,7 +2195,7 @@ static void addCopyConstructor(Node *n) { } } - String *symname = Swig_name_make(cn, cname, last, decl, oldname); + String *symname = Swig_name_make(cn, cname, name, decl, oldname); if (Strcmp(symname, "$ignore") != 0) { if (!symname) { symname = Copy(csymname); @@ -2213,8 +2212,8 @@ static void addCopyConstructor(Node *n) { Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab")); Node *on = Swig_symbol_add(symname, cn); + Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn); Swig_symbol_setscope(oldscope); - Swig_features_get(Swig_cparse_features(), 0, name, decl, cn); if (on == cn) { Node *access = NewHash(); @@ -2229,7 +2228,6 @@ static void addCopyConstructor(Node *n) { } } Delete(cn); - Delete(last); Delete(name); Delete(decl); Delete(symname); @@ -2243,12 +2241,11 @@ static void addDefaultConstructor(Node *n) { Setline(cn, Getline(n)); String *cname = Getattr(n, "name"); - String *last = Swig_scopename_last(cname); - String *name = NewStringf("%s::%s", cname, last); + String *name = Swig_scopename_last(cname); String *decl = NewString("f()."); String *csymname = Getattr(n, "sym:name"); String *oldname = csymname; - String *symname = Swig_name_make(cn, cname, last, decl, oldname); + String *symname = Swig_name_make(cn, cname, name, decl, oldname); if (Strcmp(symname, "$ignore") != 0) { if (!symname) { symname = Copy(csymname); @@ -2260,11 +2257,10 @@ static void addDefaultConstructor(Node *n) { Setattr(cn, "decl", decl); Setattr(cn, "parentNode", n); Setattr(cn, "default_constructor", "1"); - Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab")); Node *on = Swig_symbol_add(symname, cn); + Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn); Swig_symbol_setscope(oldscope); - Swig_features_get(Swig_cparse_features(), 0, name, decl, cn); if (on == cn) { Node *access = NewHash(); @@ -2278,7 +2274,6 @@ static void addDefaultConstructor(Node *n) { } } Delete(cn); - Delete(last); Delete(name); Delete(decl); Delete(symname); @@ -2292,11 +2287,10 @@ static void addDestructor(Node *n) { Setline(cn, Getline(n)); String *cname = Getattr(n, "name"); - String *last = Swig_scopename_last(cname); - Insert(last, 0, "~"); - String *name = NewStringf("%s::%s", cname, last); + String *name = Swig_scopename_last(cname); + Insert(name, 0, "~"); String *decl = NewString("f()."); - String *symname = Swig_name_make(cn, cname, last, decl, 0); + String *symname = Swig_name_make(cn, cname, name, decl, 0); if (Strcmp(symname, "$ignore") != 0) { String *possible_nonstandard_symname = NewStringf("~%s", Getattr(n, "sym:name")); @@ -2308,8 +2302,8 @@ static void addDestructor(Node *n) { Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab")); Node *nonstandard_destructor = Equal(possible_nonstandard_symname, symname) ? 0 : Swig_symbol_clookup(possible_nonstandard_symname, 0); Node *on = Swig_symbol_add(symname, cn); + Swig_features_get(Swig_cparse_features(), Swig_symbol_qualifiedscopename(0), name, decl, cn); Swig_symbol_setscope(oldscope); - Swig_features_get(Swig_cparse_features(), 0, name, decl, cn); if (on == cn) { // SWIG accepts a non-standard named destructor in %extend that uses a typedef for the destructor name @@ -2329,7 +2323,6 @@ static void addDestructor(Node *n) { Delete(possible_nonstandard_symname); } Delete(cn); - Delete(last); Delete(name); Delete(decl); Delete(symname); diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 0c589f027..6b54eac08 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -1549,6 +1549,7 @@ static int symbol_no_constructor(Node *n) { * Swig_symbol_type_qualify() * * Create a fully qualified type name + * Note: Does not resolve a constructor if passed in as the 'type'. * ----------------------------------------------------------------------------- */ SwigType *Swig_symbol_type_qualify(const SwigType *t, Symtab *st) { diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index b7208737a..5007d76a8 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1306,6 +1306,7 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No SwigType *mtype = 0; String *pname; String *qpname = 0; + String *noscope_pname = 0; Hash *tm = 0; String *s = 0; String *sdef = 0; @@ -1338,20 +1339,32 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No } pname = Getattr(node, "name"); + noscope_pname = Copy(pname); if (pname && node && Getattr(node, "sym:symtab")) { - /* Add on a qualified name search for any symbol, for example: + /* Add on a qualified name search for any symbol in the symbol table, for example: * struct Foo { * int *foo(int bar) -> Foo::foo * }; + * Note that if node is a parameter (Parm *) then there will be no symbol table attached to the Parm *. */ - Symtab *st = Getattr(node, "sym:symtab"); - String *qsn = st ? Swig_symbol_string_qualify(pname, st) : 0; - if (qsn && Len(qsn) && !Equal(qsn, pname)) - qpname = qsn; + String *qsn; + if (Swig_scopename_check(pname)) { + /* sometimes pname is qualified, so we remove all the scope for the lookup */ + Delete(noscope_pname); + noscope_pname = Swig_scopename_last(pname); + /* + Printf(stdout, "Removed scope: %s => %s\n", pname, noscope_pname); + */ + } + qsn = Swig_symbol_qualified(node); + if (qsn && Len(qsn)) { + qpname = NewStringf("%s::%s", qsn, noscope_pname); + Delete(qsn); + } } - tm = typemap_search(tmap_method, type, pname, qpname, &mtype, node); + tm = typemap_search(tmap_method, type, noscope_pname, qpname, &mtype, node); if (typemap_search_debug) debug_search_result_display(tm); if (typemaps_used_debug && tm) { @@ -1364,6 +1377,8 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No Delete(qpname); qpname = 0; + Delete(noscope_pname); + noscope_pname = 0; if (!tm) return sdef; From 4e8d81750db964c1b49f4f82a2153ad750db4a5c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:20:47 +0000 Subject: [PATCH 158/538] Add test added a short while back git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13883 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 7f3cd771a..0c790caf6 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -431,6 +431,7 @@ CPP_TEST_CASES += \ typedef_struct \ typemap_arrays \ typemap_delete \ + typemap_directorout \ typemap_global_scope \ typemap_manyargs \ typemap_namespace \ From 61b4c1cbcd386ef7854f9b32494f2a804d7ddc17 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 13 Nov 2012 22:21:51 +0000 Subject: [PATCH 159/538] Fix 'name' attribute for explicitly defined constructors and destructors if the associated class was in a namespace, eg a correct fully qualified name might be Space::Klass::~Klass, but it was Space::~Klass, now it is simply ~Klass (names are now consistent with implicitly added constructors/destructors). git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13884 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 20 +++++++++++--------- Source/Modules/typepass.cxx | 10 ---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 47dbdeb2b..0a8415120 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2613,11 +2613,14 @@ int Language::constructorDeclaration(Node *n) { } } else { String *expected_name = ClassName; - if (name && (!Equal(Swig_scopename_last(name), Swig_scopename_last(expected_name))) && !(Getattr(n, "template"))) { + String *scope = Swig_scopename_check(ClassName) ? Swig_scopename_prefix(ClassName) : 0; + String *actual_name = scope ? NewStringf("%s::%s", scope, name) : NewString(name); + Delete(scope); + if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) { bool illegal_name = true; if (Extend) { - // SWIG extension - allow typedef names as constructor name in %extend - an unnamed struct declared with a typedef can thus be given a 'constructor'. - SwigType *name_resolved = SwigType_typedef_resolve_all(name); + // SWIG extension - allow typedef names as destructor name in %extend - an unnamed struct declared with a typedef can thus be given a 'destructor'. + SwigType *name_resolved = SwigType_typedef_resolve_all(actual_name); SwigType *expected_name_resolved = SwigType_typedef_resolve_all(expected_name); illegal_name = !Equal(name_resolved, expected_name_resolved); Delete(name_resolved); @@ -2747,11 +2750,12 @@ int Language::destructorDeclaration(Node *n) { Setattr(n, "sym:name", ClassPrefix); } - String *expected_name = NewString(ClassName); - Replace(expected_name, "~", "", DOH_REPLACE_FIRST); - String *actual_name = NewString(name); + String *expected_name = ClassName; + String *scope = Swig_scopename_check(ClassName) ? Swig_scopename_prefix(ClassName) : 0; + String *actual_name = scope ? NewStringf("%s::%s", scope, name) : NewString(name); + Delete(scope); Replace(actual_name, "~", "", DOH_REPLACE_FIRST); - if (name && (!Equal(Swig_scopename_last(actual_name), Swig_scopename_last(expected_name))) && !(Getattr(n, "template"))) { + if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) { bool illegal_name = true; if (Extend) { // SWIG extension - allow typedef names as destructor name in %extend - an unnamed struct declared with a typedef can thus be given a 'destructor'. @@ -2765,7 +2769,6 @@ int Language::destructorDeclaration(Node *n) { if (illegal_name) { Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n)); Swig_restore(n); - Delete(expected_name); return SWIG_NOWRAP; } } @@ -2773,7 +2776,6 @@ int Language::destructorDeclaration(Node *n) { Setattr(CurrentClass, "has_destructor", "1"); Swig_restore(n); - Delete(expected_name); return SWIG_OK; } diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index a134e0ac6..a6012c0bf 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -702,11 +702,6 @@ class TypePass:private Dispatcher { normalize_parms(Getattr(n, "parms")); normalize_parms(Getattr(n, "throws")); - /* If in a namespace, patch the class name */ - if (nsname) { - String *nname = NewStringf("%s::%s", nsname, Getattr(n, "name")); - Setattr(n, "name", nname); - } clean_overloaded(n); return SWIG_OK; } @@ -716,11 +711,6 @@ class TypePass:private Dispatcher { * ------------------------------------------------------------ */ virtual int destructorDeclaration(Node *n) { - /* If in a namespace, patch the class name */ - if (nsname) { - String *nname = NewStringf("%s::%s", nsname, Getattr(n, "name")); - Setattr(n, "name", nname); - } return SWIG_OK; } From 5a1e82a2f407566f78e9d5f1acd32d1ee9eb7f73 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:16:07 +0000 Subject: [PATCH 160/538] Remove DohClose (Close) and replace with calls to DohDelete (Delete) to fix some minor memory leaks in most uses of NewFile. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13885 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/base.c | 2 ++ Source/DOH/doh.h | 3 +++ Source/Modules/allegrocl.cxx | 5 +---- Source/Modules/cffi.cxx | 6 +----- Source/Modules/chicken.cxx | 3 --- Source/Modules/clisp.cxx | 3 +-- Source/Modules/csharp.cxx | 12 +++++------- Source/Modules/d.cxx | 11 +++-------- Source/Modules/go.cxx | 5 ----- Source/Modules/guile.cxx | 1 - Source/Modules/java.cxx | 14 ++++++-------- Source/Modules/lua.cxx | 1 - Source/Modules/main.cxx | 15 +++++++-------- Source/Modules/modula3.cxx | 21 ++++++++++----------- Source/Modules/mzscheme.cxx | 1 - Source/Modules/ocaml.cxx | 3 --- Source/Modules/octave.cxx | 1 - Source/Modules/perl5.cxx | 2 -- Source/Modules/php.cxx | 7 +++---- Source/Modules/pike.cxx | 2 -- Source/Modules/python.cxx | 5 +---- Source/Modules/r.cxx | 6 +----- Source/Modules/ruby.cxx | 3 +-- Source/Modules/tcl8.cxx | 2 -- Source/Modules/uffi.cxx | 2 -- 25 files changed, 45 insertions(+), 91 deletions(-) diff --git a/Source/DOH/base.c b/Source/DOH/base.c index db37e147b..e64b0f561 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -761,6 +761,7 @@ int DohUngetc(int ch, DOH *obj) { * DohClose() * ----------------------------------------------------------------------------- */ +/* int DohClose(DOH *obj) { DohBase *b = (DohBase *) obj; DohObjInfo *objinfo; @@ -773,6 +774,7 @@ int DohClose(DOH *obj) { } return fclose((FILE *) obj); } +*/ /* ----------------------------------------------------------------------------- * DohIsString() diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index 621d0957c..a0bd1817c 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -307,7 +307,10 @@ extern DOHFile *DohNewFile(DOH *filename, const char *mode, DOHList *outfiles); extern DOHFile *DohNewFileFromFile(FILE *f); extern DOHFile *DohNewFileFromFd(int fd); extern void DohFileErrorDisplay(DOHString * filename); +/* + Deprecated, just use DohDelete extern int DohClose(DOH *file); +*/ extern int DohCopyto(DOHFile * input, DOHFile * output); diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 41d481e9d..56a3116fe 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -1654,7 +1654,6 @@ int ALLEGROCL::top(Node *n) { if (Generate_Wrapper) { f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); if (!f_begin) { - Close(f_cl); Delete(f_cl); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); SWIG_exit(EXIT_FAILURE); @@ -1711,15 +1710,13 @@ int ALLEGROCL::top(Node *n) { Printf(f_cl, "%s\n", f_clhead); Printf(f_cl, "%s\n", f_clwrap); - Close(f_cl); - Delete(f_cl); // Delete the handle, not the file + Delete(f_cl); Delete(f_clhead); Delete(f_clwrap); Dump(f_runtime, f_begin); Printf(f_begin, "%s\n", f_cxx_wrapper); - Close(f_begin); Delete(f_runtime); Delete(f_begin); Delete(f_cxx_wrapper); diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 2bb95188b..6fd915bf5 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -137,7 +137,6 @@ int CFFI::top(Node *n) { if (CPlusPlus || CWrap) { f_begin = NewFile(cxx_filename, "w", SWIG_output_files()); if (!f_begin) { - Close(f_lisp); Delete(f_lisp); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); SWIG_exit(EXIT_FAILURE); @@ -147,7 +146,6 @@ int CFFI::top(Node *n) { Printf(clos_filename, "%s%s-clos.lisp", SWIG_output_directory(), module); f_clos = NewFile(clos_filename, "w", SWIG_output_files()); if (!f_clos) { - Close(f_lisp); Delete(f_lisp); Printf(stderr, "Unable to open %s for writing\n", cxx_filename); SWIG_exit(EXIT_FAILURE); @@ -184,13 +182,11 @@ int CFFI::top(Node *n) { Printf(f_lisp, "%s\n", f_cl); Printf(f_lisp, "%s\n", f_clwrap); - Close(f_lisp); - Delete(f_lisp); // Deletes the handle, not the file + Delete(f_lisp); Delete(f_cl); Delete(f_clhead); Delete(f_clwrap); Dump(f_runtime, f_begin); - Close(f_begin); Delete(f_runtime); Delete(f_begin); Delete(f_cxx_wrapper); diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index a807d1487..8ff154f82 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -290,8 +290,6 @@ int CHICKEN::top(Node *n) { Printf(f_scm, "%s\n", chickentext); - - Close(f_scm); Delete(f_scm); char buftmp[20]; @@ -324,7 +322,6 @@ int CHICKEN::top(Node *n) { Delete(f_wrappers); Delete(f_sym_size); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index 05363a54d..a322cb2de 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -141,8 +141,7 @@ int CLISP::top(Node *n) { Seek(f_cl, 0, SEEK_SET); Write(f_cl, Char(header), Len(header)); - Close(f_cl); - Delete(f_cl); // Deletes the handle, not the file + Delete(f_cl); return SWIG_OK; } diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index db8a65a27..41c0da516 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -467,7 +467,7 @@ public: Printf(f_im, "}\n"); addCloseNamespace(0, f_im); - Close(f_im); + Delete(f_im); } // Generate the C# module class @@ -519,7 +519,7 @@ public: Printf(f_module, "}\n"); addCloseNamespace(0, f_module); - Close(f_module); + Delete(f_module); } if (upcasts_code) @@ -610,7 +610,6 @@ public: Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - Close(f_runtime_h); Delete(f_runtime_h); f_runtime_h = NULL; Delete(f_directors); @@ -624,7 +623,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; @@ -1225,7 +1223,7 @@ public: "\n", enum_code, "\n", NIL); addCloseNamespace(nspace, f_enum); - Close(f_enum); + Delete(f_enum); Delete(output_directory); } } else { @@ -1955,7 +1953,7 @@ public: Printf(f_proxy, "}\n"); addCloseNamespace(nspace, f_proxy); - Close(f_proxy); + Delete(f_proxy); f_proxy = NULL; /* Output the downcast method, if necessary. Note: There's no other really @@ -3227,7 +3225,7 @@ public: addCloseNamespace(0, f_swigtype); - Close(f_swigtype); + Delete(f_swigtype); Delete(swigtype); Delete(n); } diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 879a4acd8..fc8e579b4 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -538,7 +538,7 @@ public: replaceModuleVariables(im_dmodule_code); Printv(im_d_file, im_dmodule_code, NIL); - Close(im_d_file); + Delete(im_d_file); } // Generate the main D proxy module. @@ -571,7 +571,7 @@ public: replaceModuleVariables(proxy_dmodule_code); Printv(proxy_d_file, proxy_dmodule_code, NIL); - Close(proxy_d_file); + Delete(proxy_d_file); } // Generate the additional proxy modules for nspace support. @@ -598,7 +598,7 @@ public: replaceModuleVariables(code); Printv(file, code, NIL); - Close(file); + Delete(file); Delete(module_name); } @@ -693,7 +693,6 @@ public: Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - Close(f_runtime_h); Delete(f_runtime_h); f_runtime_h = NULL; Delete(f_directors); @@ -707,7 +706,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); @@ -868,7 +866,6 @@ public: Printv(class_file, proxy_enum_code, NIL); - Close(class_file); Delete(class_file); } else { String *nspace = Getattr(n, "sym:nspace"); @@ -1363,7 +1360,6 @@ public: replaceModuleVariables(proxy_class_code); Printv(class_file, proxy_class_code, NIL); - Close(class_file); Delete(class_file); } else { Printv(proxyImportsBuffer(getNSpace()), proxy_class_imports, NIL); @@ -3469,7 +3465,6 @@ private: Printv(class_file, code_target, NIL); Delete(code_target); - Close(class_file); Delete(class_file); } diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 127e7c239..9f086f01c 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -437,12 +437,10 @@ private: if (directorsEnabled()) { Printf(f_c_directors_h, "#endif\n"); - Close(f_c_directors_h); Delete(f_c_directors_h); f_c_directors_h = NULL; Dump(f_c_directors, f_c_runtime); - Close(f_c_directors); Delete(f_c_directors); f_c_directors = NULL; } @@ -475,12 +473,9 @@ private: Delete(f_gc_wrappers); } - Close(f_c_begin); Delete(f_c_begin); - Close(f_go_begin); Delete(f_go_begin); if (!gccgo_flag) { - Close(f_gc_begin); Delete(f_gc_begin); } diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 90feb366b..50c9e7e0d 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -409,7 +409,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 6e9ee54b2..b64626087 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -502,7 +502,7 @@ public: } // Finish off the class Printf(f_im, "}\n"); - Close(f_im); + Delete(f_im); } // Generate the Java module class @@ -554,7 +554,7 @@ public: // Finish off the class Printf(f_module, "}\n"); - Close(f_module); + Delete(f_module); } // Generate the Java constants interface @@ -585,7 +585,7 @@ public: // Finish off the Java interface Printf(f_module, "}\n"); - Close(f_module); + Delete(f_module); } if (upcasts_code) @@ -685,7 +685,6 @@ public: Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - Close(f_runtime_h); Delete(f_runtime_h); f_runtime_h = NULL; Delete(f_directors); @@ -701,7 +700,6 @@ public: Delete(f_init); Dump(f_runtime, f_begin); Delete(f_runtime); - Close(f_begin); Delete(f_begin); return SWIG_OK; } @@ -1300,7 +1298,7 @@ public: "\n", enum_code, "\n", NIL); Printf(f_enum, "\n"); - Close(f_enum); + Delete(f_enum); Delete(output_directory); } } else { @@ -1977,7 +1975,7 @@ public: Printv(f_proxy, proxy_class_constants_code, NIL); Printf(f_proxy, "}\n"); - Close(f_proxy); + Delete(f_proxy); f_proxy = NULL; /* Output the downcast method, if necessary. Note: There's no other really @@ -3069,7 +3067,7 @@ public: Replaceall(swigtype, "$imclassname", imclass_name); Printv(f_swigtype, swigtype, NIL); - Close(f_swigtype); + Delete(f_swigtype); Delete(swigtype); Delete(n); } diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index a6076a230..66ba8ea6f 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -396,7 +396,6 @@ public: Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_begin); Delete(f_runtime); Delete(f_begin); Delete(s_dot_get); diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index d2f5d3bc0..8e2b428f4 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -403,7 +403,7 @@ static void SWIG_dump_runtime() { s = Swig_include_sys("swiglabels.swg"); if (!s) { Printf(stderr, "*** Unable to open 'swiglabels.swg'\n"); - Close(runtime); + Delete(runtime); SWIG_exit(EXIT_FAILURE); } Printf(runtime, "%s", s); @@ -412,7 +412,7 @@ static void SWIG_dump_runtime() { s = Swig_include_sys("swigerrors.swg"); if (!s) { Printf(stderr, "*** Unable to open 'swigerrors.swg'\n"); - Close(runtime); + Delete(runtime); SWIG_exit(EXIT_FAILURE); } Printf(runtime, "%s", s); @@ -421,7 +421,7 @@ static void SWIG_dump_runtime() { s = Swig_include_sys("swigrun.swg"); if (!s) { Printf(stderr, "*** Unable to open 'swigrun.swg'\n"); - Close(runtime); + Delete(runtime); SWIG_exit(EXIT_FAILURE); } Printf(runtime, "%s", s); @@ -434,13 +434,12 @@ static void SWIG_dump_runtime() { s = Swig_include_sys("runtime.swg"); if (!s) { Printf(stderr, "*** Unable to open 'runtime.swg'\n"); - Close(runtime); + Delete(runtime); SWIG_exit(EXIT_FAILURE); } Printf(runtime, "%s", s); Delete(s); - Close(runtime); Delete(runtime); SWIG_exit(EXIT_SUCCESS); } @@ -1009,7 +1008,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { if (Verbose) Printf(stdout, "'%s' checked out from the SWIG library.\n", outfile); Printv(f_outfile, s, NIL); - Close(f_outfile); + Delete(f_outfile); } } } @@ -1111,7 +1110,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { } Printf(f_dependencies_file, "\n"); if (f_dependencies_file != stdout) - Close(f_dependencies_file); + Delete(f_dependencies_file); if (depend_only) SWIG_exit(EXIT_SUCCESS); } else { @@ -1285,7 +1284,7 @@ int SWIG_main(int argc, char *argv[], Language *l) { int i; for (i = 0; i < Len(all_output_files); i++) Printf(f_outfiles, "%s\n", Getitem(all_output_files, i)); - Close(f_outfiles); + Delete(f_outfiles); } } diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index bcb99e46a..78af35506 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -835,7 +835,7 @@ MODULA3(): scanConstant(file, n); Printf(file, " return 0;\n"); Printf(file, "}\n"); - Close(file); + Delete(file); return SWIG_OK; } @@ -870,7 +870,7 @@ MODULA3(): by SWIG with option -generaterename. */\n\ \n", input_file); scanRename(file, n); - Close(file); + Delete(file); return SWIG_OK; } @@ -900,7 +900,7 @@ MODULA3(): by SWIG with option -generatetypemap. */\n\ \n", input_file); scanTypemap(file, n); - Close(file); + Delete(file); return SWIG_OK; } @@ -1009,7 +1009,7 @@ MODULA3(): } else { Printf(file, "library(\"m3%s\")\n", name); } - Close(file); + Delete(file); } // Generate the raw interface @@ -1027,7 +1027,7 @@ MODULA3(): Printv(file, m3raw_intf.f, NIL); Printf(file, "\nEND %s.\n", m3raw_name); - Close(file); + Delete(file); } // Generate the raw module @@ -1045,7 +1045,7 @@ MODULA3(): Printv(file, m3raw_impl.f, NIL); Printf(file, "BEGIN\nEND %s.\n", m3raw_name); - Close(file); + Delete(file); } // Generate the interface for the comfort wrappers @@ -1075,7 +1075,7 @@ MODULA3(): // Finish off the class Printf(file, "\nEND %s.\n", m3wrap_name); - Close(file); + Delete(file); } // Generate the wrapper routines implemented in Modula 3 @@ -1096,7 +1096,7 @@ MODULA3(): Printv(file, m3wrap_impl.f, NIL); Printf(file, "\nBEGIN\nEND %s.\n", m3wrap_name); - Close(file); + Delete(file); } if (upcasts_code) @@ -1162,7 +1162,6 @@ MODULA3(): Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; @@ -2555,7 +2554,7 @@ MODULA3(): Printv(f_proxy, proxy_class_def, proxy_class_code, NIL); Printf(f_proxy, "}\n"); - Close(f_proxy); + Delete(f_proxy); f_proxy = NULL; Delete(proxy_class_name); @@ -3811,7 +3810,7 @@ MODULA3(): Replaceall(swigtype, "$m3classname", classname); Printv(f_swigtype, swigtype, NIL); - Close(f_swigtype); + Delete(f_swigtype); Delete(filen); Delete(swigtype); } diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index c8d758bb9..99513dae3 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -203,7 +203,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 4a2071e32..6204fd2ec 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -343,7 +343,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); @@ -357,14 +356,12 @@ public: Dump(f_class_ctors, f_mlout); Dump(f_class_ctors_end, f_mlout); Dump(f_mltail, f_mlout); - Close(f_mlout); Delete(f_mlout); Dump(f_enumtypes_type, f_mliout); Dump(f_enumtypes_value, f_mliout); Dump(f_mlibody, f_mliout); Dump(f_mlitail, f_mliout); - Close(f_mliout); Delete(f_mliout); return SWIG_OK; diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index ef1629324..4b42abae5 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -232,7 +232,6 @@ public: Delete(f_header); Delete(f_directors); Delete(f_directors_h); - Close(f_begin); Delete(f_runtime); Delete(f_begin); diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 077b5fe83..cd91a807c 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -520,7 +520,6 @@ public: Printf(f_pm, "%s", additional_perl_code); Printf(f_pm, "1;\n"); - Close(f_pm); Delete(f_pm); Delete(base); Delete(dest_package); @@ -534,7 +533,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index d89d61da4..a0e8b3223 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -615,7 +615,7 @@ public: Printf(f_h, "#endif /* PHP_%s_H */\n", cap_module); - Close(f_h); + Delete(f_h); String *type_table = NewStringEmpty(); SwigType_emit_type_table(f_runtime, type_table); @@ -630,7 +630,7 @@ public: Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - Close(f_runtime_h); + Delete(f_runtime_h); } Printf(s_header, "/* end header section */\n"); @@ -654,7 +654,6 @@ public: Delete(s_vdecl); Delete(all_cs_entry); Delete(s_entry); - Close(f_begin); Delete(f_runtime); Delete(f_begin); @@ -667,7 +666,7 @@ public: s_fakeoowrappers = NULL; } Printf(f_phpcode, "%s\n?>\n", s_phpclasses); - Close(f_phpcode); + Delete(f_phpcode); return SWIG_OK; } diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index 9fba5d5b0..6749989f2 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -182,8 +182,6 @@ public: Delete(f_wrappers); Delete(f_init); Delete(f_classInit); - - Close(f_begin); Delete(f_runtime); Delete(f_begin); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 97b0c4f8d..9d1b3a772 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -979,7 +979,6 @@ public: Printv(f_shadow_py, "\n", f_shadow_builtin_imports, "\n", NIL); Printv(f_shadow_py, f_shadow, "\n", NIL); Printv(f_shadow_py, f_shadow_stubs, "\n", NIL); - Close(f_shadow_py); Delete(f_shadow_py); } @@ -992,7 +991,7 @@ public: Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); if (f_runtime_h != f_begin) - Close(f_runtime_h); + Delete(f_runtime_h); Dump(f_directors, f_begin); } @@ -1007,8 +1006,6 @@ public: Delete(f_init); Delete(f_directors); Delete(f_directors_h); - - Close(f_begin); Delete(f_runtime); Delete(f_begin); diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 94e6ed4bd..a8cdc1cc8 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -837,7 +837,6 @@ int R::top(Node *n) { Delete(f_init); Delete(s_header); - Close(f_begin); Delete(f_runtime); Delete(f_begin); @@ -871,8 +870,7 @@ int R::DumpCode(Node *n) { Printf(scode, "%s\n\n", s_classes); Printf(scode, "%s\n", sfile); - Close(scode); - // Delete(scode); + Delete(scode); String *outfile = Getattr(n,"outfile"); File *runtime = NewFile(outfile,"w", SWIG_output_files()); if (!runtime) { @@ -886,7 +884,6 @@ int R::DumpCode(Node *n) { Printf(runtime, "%s\n", f_wrapper); Printf(runtime, "%s\n", f_init); - Close(runtime); Delete(runtime); if(outputNamespaceInfo) { @@ -907,7 +904,6 @@ int R::DumpCode(Node *n) { Printf(ns, "\nexportMethods(\n"); writeListByLine(namespaceFunctions, ns, 1); Printf(ns, ")\n"); - Close(ns); Delete(ns); Delete(s_namespace); } diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 276b967f3..a1523a7ad 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -1185,7 +1185,7 @@ public: Dump(f_directors_h, f_runtime_h); Printf(f_runtime_h, "\n"); Printf(f_runtime_h, "#endif\n"); - Close(f_runtime_h); + Delete(f_runtime_h); } Dump(f_wrappers, f_begin); @@ -1196,7 +1196,6 @@ public: Delete(f_wrappers); Delete(f_init); Delete(f_initbeforefunc); - Close(f_begin); Delete(f_runtime); Delete(f_begin); diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 3913392c4..4f4bdd1b2 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -248,7 +248,6 @@ public: if (itcl) { Printv(f_shadow, f_shadow_stubs, "\n", NIL); - Close(f_shadow); Delete(f_shadow); } @@ -259,7 +258,6 @@ public: Delete(f_header); Delete(f_wrappers); Delete(f_init); - Close(f_begin); Delete(f_runtime); Delete(f_begin); return SWIG_OK; diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index 3fcb4dcd1..9e317f8bc 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -266,9 +266,7 @@ int UFFI::top(Node *n) { Language::top(n); - Close(f_cl); Delete(f_cl); // Delete the handle, not the file - Close(f_null); Delete(f_null); return SWIG_OK; From 46d24861153b5afffcecebfda822da8d2603c4ec Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:16:54 +0000 Subject: [PATCH 161/538] Resource leak fixes (or hiding them from Coverity static analysis tool by using String instead of char *) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13886 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/allegrocl.cxx | 13 +++++------ Source/Modules/csharp.cxx | 4 +++- Source/Modules/d.cxx | 4 +++- Source/Modules/go.cxx | 1 + Source/Modules/guile.cxx | 22 +++++++++---------- Source/Modules/java.cxx | 4 +++- Source/Modules/mzscheme.cxx | 42 ++++++++++++++---------------------- Source/Modules/ocaml.cxx | 16 ++++++-------- Source/Modules/octave.cxx | 4 +++- Source/Modules/php.cxx | 1 + Source/Modules/r.cxx | 1 + Source/Modules/uffi.cxx | 13 +++++------ 12 files changed, 62 insertions(+), 63 deletions(-) diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 56a3116fe..ffd96ca9c 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -48,7 +48,7 @@ static File *f_cxx_wrapper = 0; static String *module_name = 0; static String *swig_package = 0; -const char *identifier_converter = "identifier-convert-null"; +static String *identifier_converter = NewString("identifier-convert-null"); static bool CWrap = true; // generate wrapper file for C code by default. most correct. static bool Generate_Wrapper = false; @@ -1605,14 +1605,15 @@ void ALLEGROCL::main(int argc, char *argv[]) { /* check for built-ins */ if (!strcmp(conv, "lispify")) { - identifier_converter = "identifier-convert-lispify"; + Delete(identifier_converter); + identifier_converter = NewString("identifier-convert-lispify"); } else if (!strcmp(conv, "null")) { - identifier_converter = "identifier-convert-null"; + Delete(identifier_converter); + identifier_converter = NewString("identifier-convert-null"); } else { /* Must be user defined */ - char *idconv = new char[strlen(conv) + 1]; - strcpy(idconv, conv); - identifier_converter = idconv; + Delete(identifier_converter); + identifier_converter = NewString(conv); } } else if (!strcmp(argv[i], "-cwrap")) { CWrap = true; diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 41c0da516..13c132a76 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -792,8 +792,10 @@ public: if (Getattr(n, "sym:overloaded")) { // Emit warnings for the few cases that can't be overloaded in C# and give up on generating wrapper Swig_overload_check(n); - if (Getattr(n, "overload:ignore")) + if (Getattr(n, "overload:ignore")) { + DelWrapper(f); return SWIG_OK; + } } Printv(imclass_class_code, "\n [DllImport(\"", dllimport, "\", EntryPoint=\"", wname, "\")]\n", NIL); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index fc8e579b4..b21562c1d 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1579,8 +1579,10 @@ public: if (Getattr(n, "sym:overloaded")) { // Emit warnings for the few cases that can't be overloaded in D and give up on generating wrapper Swig_overload_check(n); - if (Getattr(n, "overload:ignore")) + if (Getattr(n, "overload:ignore")) { + DelWrapper(f); return SWIG_OK; + } } // Collect the parameter list for the intermediary D module declaration of diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 9f086f01c..7c34f8b9a 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -3640,6 +3640,7 @@ private: Delete(upcall_name); Delete(callback_wname); Delete(go_name); + DelWrapper(w); return SWIG_OK; } diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 50c9e7e0d..c7e8fe7e4 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -59,9 +59,9 @@ static File *f_wrappers = 0; static File *f_init = 0; -static char *prefix = (char *) "gswig_"; +static String *prefix = NewString("gswig_"); static char *module = 0; -static char *package = 0; +static String *package = 0; static enum { GUILE_LSTYLE_SIMPLE, // call `SWIG_init()' GUILE_LSTYLE_PASSIVE, // passive linking (no module code) @@ -127,7 +127,7 @@ public: * ------------------------------------------------------------ */ virtual void main(int argc, char *argv[]) { - int i, orig_len; + int i; SWIG_library_directory("guile"); SWIG_typemap_lang("guile"); @@ -140,8 +140,7 @@ public: SWIG_exit(EXIT_SUCCESS); } else if (strcmp(argv[i], "-prefix") == 0) { if (argv[i + 1]) { - prefix = new char[strlen(argv[i + 1]) + 2]; - strcpy(prefix, argv[i + 1]); + prefix = NewString(argv[i + 1]); Swig_mark_arg(i); Swig_mark_arg(i + 1); i++; @@ -150,8 +149,7 @@ public: } } else if (strcmp(argv[i], "-package") == 0) { if (argv[i + 1]) { - package = new char[strlen(argv[i + 1]) + 2]; - strcpy(package, argv[i + 1]); + package = NewString(argv[i + 1]); Swig_mark_arg(i); Swig_mark_arg(i + 1); i++; @@ -278,12 +276,12 @@ public: // should use Swig_warning() ? Printf(stderr, "guile: Warning: -exportprimitive only makes sense with passive linkage without a scmstub.\n"); } - // Make sure `prefix' ends in an underscore - orig_len = strlen(prefix); - if (prefix[orig_len - 1] != '_') { - prefix[1 + orig_len] = 0; - prefix[orig_len] = '_'; + // Make sure `prefix' ends in an underscore + if (prefix) { + const char *px = Char(prefix); + if (px[Len(prefix)] != '_') + Printf(prefix, "_"); } /* Add a symbol for this module */ diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b64626087..472740d48 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -876,8 +876,10 @@ public: if (Getattr(n, "sym:overloaded")) { // Emit warnings for the few cases that can't be overloaded in Java and give up on generating wrapper Swig_overload_check(n); - if (Getattr(n, "overload:ignore")) + if (Getattr(n, "overload:ignore")) { + DelWrapper(f); return SWIG_OK; + } } Printf(imclass_class_code, " public final static native %s %s(", im_return_type, overloaded_name); diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index 99513dae3..c2abd7ec4 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -33,12 +33,10 @@ static String *convert_proto_tab = 0; static String *struct_name = 0; static String *mangled_struct_name = 0; -static char *prefix = 0; +static String *prefix = 0; static bool declaremodule = false; static bool noinit = false; -//DLOPEN PATCH -static char *load_libraries = NULL; -//DLOPEN PATCH +static String *load_libraries = NULL; static String *module = 0; static char *mzscheme_path = (char *) "mzscheme"; static String *init_func_def = 0; @@ -75,8 +73,7 @@ public: SWIG_exit(0); } else if (strcmp(argv[i], "-prefix") == 0) { if (argv[i + 1]) { - prefix = new char[strlen(argv[i + 1]) + 2]; - strcpy(prefix, argv[i + 1]); + prefix = NewString(argv[i + 1]); Swig_mark_arg(i); Swig_mark_arg(i + 1); i++; @@ -90,26 +87,27 @@ public: noinit = true; Swig_mark_arg(i); } -// DLOPEN PATCH else if (strcmp(argv[i], "-dynamic-load") == 0) { - load_libraries = new char[strlen(argv[i + 1]) + 2]; - strcpy(load_libraries, argv[i + 1]); - Swig_mark_arg(i++); - Swig_mark_arg(i); + if (argv[i + 1]) { + Delete(load_libraries); + load_libraries = NewString(argv[i + 1]); + Swig_mark_arg(i++); + Swig_mark_arg(i); + } else { + Swig_arg_error(); + } } -// DLOPEN PATCH } } - // If a prefix has been specified make sure it ends in a '_' + // If a prefix has been specified make sure it ends in a '_' (not actually used!) if (prefix) { - if (prefix[strlen(prefix)] != '_') { - prefix[strlen(prefix) + 1] = 0; - prefix[strlen(prefix)] = '_'; - } + const char *px = Char(prefix); + if (px[Len(prefix)] != '_') + Printf(prefix, "_"); } else - prefix = (char *) "swig_"; + prefix = NewString("swig_"); // Add a symbol for this module @@ -177,11 +175,9 @@ public: Printf(f_init, "\treturn scheme_void;\n}\n"); Printf(f_init, "Scheme_Object *scheme_initialize(Scheme_Env *env) {\n"); - // DLOPEN PATCH if (load_libraries) { Printf(f_init, "mz_set_dlopen_libraries(\"%s\");\n", load_libraries); } - // DLOPEN PATCH Printf(f_init, "\treturn scheme_reload(env);\n"); Printf(f_init, "}\n"); @@ -244,14 +240,12 @@ public: int numreq; String *overname = 0; - // PATCH DLOPEN if (load_libraries) { ParmList *parms = Getattr(n, "parms"); SwigType *type = Getattr(n, "type"); String *name = NewString("caller"); Setattr(n, "wrap:action", Swig_cresult(type, Swig_cresult_name(), Swig_cfunction_call(name, parms))); } - // PATCH DLOPEN // Make a wrapper name for this String *wname = Swig_name_wrapper(iname); @@ -291,7 +285,6 @@ public: numargs = emit_num_arguments(l); numreq = emit_num_required(l); - // DLOPEN PATCH /* Add the holder for the pointer to the function to be opened */ if (load_libraries) { Wrapper_add_local(f, "_function_loaded", "static int _function_loaded=(1==0)"); @@ -302,19 +295,16 @@ public: Wrapper_add_local(f, "caller", SwigType_lstr(d, func)); /*"(*caller)()")); */ } } - // DLOPEN PATCH // adds local variables Wrapper_add_local(f, "lenv", "int lenv = 1"); Wrapper_add_local(f, "values", "Scheme_Object *values[MAXVALUES]"); - // DLOPEN PATCH if (load_libraries) { Printf(f->code, "if (!_function_loaded) { _the_function=mz_load_function(\"%s\");_function_loaded=(1==1); }\n", iname); Printf(f->code, "if (!_the_function) { scheme_signal_error(\"Cannot load C function '%s'\"); }\n", iname); Printf(f->code, "caller=_the_function;\n"); } - // DLOPEN PATCH // Now write code to extract the parameters (this is super ugly) diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 6204fd2ec..135cc89dc 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -30,7 +30,7 @@ static int in_constructor = 0, in_destructor = 0, in_copyconst = 0; static int const_enum = 0; static int static_member_function = 0; static int generate_sizeof = 0; -static char *prefix = 0; +static String *prefix = 0; static char *ocaml_path = (char *) "ocaml"; static bool old_variable_names = false; static String *classname = 0; @@ -107,8 +107,7 @@ public: SWIG_exit(0); } else if (strcmp(argv[i], "-prefix") == 0) { if (argv[i + 1]) { - prefix = new char[strlen(argv[i + 1]) + 2]; - strcpy(prefix, argv[i + 1]); + prefix = NewString(argv[i + 1]); Swig_mark_arg(i); Swig_mark_arg(i + 1); i++; @@ -130,15 +129,14 @@ public: } } - // If a prefix has been specified make sure it ends in a '_' + // If a prefix has been specified make sure it ends in a '_' (not actually used!) if (prefix) { - if (prefix[strlen(prefix)] != '_') { - prefix[strlen(prefix) + 1] = 0; - prefix[strlen(prefix)] = '_'; - } + const char *px = Char(prefix); + if (px[Len(prefix)] != '_') + Printf(prefix, "_"); } else - prefix = (char *) "swig_"; + prefix = NewString("swig_"); // Add a symbol for this module diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 4b42abae5..8a2ba7627 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -524,7 +524,6 @@ public: } virtual int functionWrapper(Node *n) { - Wrapper *f = NewWrapper(); Parm *p; String *tm; int j; @@ -551,6 +550,7 @@ public: if (!overloaded || last_overload) process_autodoc(n); + Wrapper *f = NewWrapper(); Octave_begin_function(n, f->def, iname, overname, !overloaded); emit_parameter_variables(l, f); @@ -859,6 +859,8 @@ public: Delete(getwname); Delete(setwname); + DelWrapper(setf); + DelWrapper(getf); return SWIG_OK; } diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index a0e8b3223..ab0d0e6b3 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2330,6 +2330,7 @@ done: Printf(f->code, "}\n"); Wrapper_print(f, s_wrappers); + DelWrapper(f); return SWIG_OK; } diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index a8cdc1cc8..9e931a38d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -726,6 +726,7 @@ String * R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) { Delete(rtype); Delete(rettype); Delete(funcparams); + DelWrapper(f); return funName; } diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index 9e317f8bc..3b9a0abaa 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -47,7 +47,7 @@ static struct { String **entries; } defined_foreign_types; -static const char *identifier_converter = "identifier-convert-null"; +static String *identifier_converter = NewString("identifier-convert-null"); static int any_varargs(ParmList *pl) { Parm *p; @@ -221,14 +221,15 @@ void UFFI::main(int argc, char *argv[]) { /* check for built-ins */ if (!strcmp(conv, "lispify")) { - identifier_converter = "identifier-convert-lispify"; + Delete(identifier_converter); + identifier_converter = NewString("identifier-convert-lispify"); } else if (!strcmp(conv, "null")) { - identifier_converter = "identifier-convert-null"; + Delete(identifier_converter); + identifier_converter = NewString("identifier-convert-null"); } else { /* Must be user defined */ - char *idconv = new char[strlen(conv) + 1]; - strcpy(idconv, conv); - identifier_converter = idconv; + Delete(identifier_converter); + identifier_converter = NewString(conv); } } From fd24b188e24cdc9446413edf1d34635ab33f6ff7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:17:28 +0000 Subject: [PATCH 162/538] Fix Coverity 'Uninitialized pointer fields' - member variables are now initialized git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13887 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 4 ++- Source/Modules/d.cxx | 5 ++-- Source/Modules/java.cxx | 5 +++- Source/Modules/lua.cxx | 34 +++++++++++++++------- Source/Modules/octave.cxx | 21 ++++++++++++-- Source/Modules/ruby.cxx | 58 ++++++++++++++++++++----------------- Source/Modules/s-exp.cxx | 22 +++++++++----- Source/Modules/typepass.cxx | 9 +++++- 8 files changed, 104 insertions(+), 54 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 13c132a76..b8133b74a 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -156,7 +156,9 @@ public: dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), - n_directors(0) { + n_directors(0), + first_class_dmethod(0), + curr_class_dmethod(0) { /* for now, multiple inheritance in directors is disabled, this should be easy to implement though */ director_multiple_inheritance = 0; diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index b21562c1d..17cb8babd 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -25,7 +25,6 @@ class D : public Language { const String *empty_string; const String *public_string; const String *protected_string; - const String *static_string; /* * Files and file sections containing C/C++ code. @@ -274,7 +273,9 @@ public: dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), - unknown_types(NULL) { + unknown_types(NULL), + first_class_dmethod(0), + curr_class_dmethod(0) { // For now, multiple inheritance with directors is not possible. It should be // easy to implement though. diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 472740d48..1ee7a97e3 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -132,6 +132,7 @@ public: variable_name(NULL), proxy_class_constants_code(NULL), module_class_constants_code(NULL), + enum_code(NULL), package(NULL), jnipackage(NULL), package_path(NULL), @@ -151,7 +152,9 @@ public: dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), - n_directors(0) { + n_directors(0), + first_class_dmethod(0), + curr_class_dmethod(0) { /* for now, multiple inheritance in directors is disabled, this should be easy to implement though */ director_multiple_inheritance = 0; diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 66ba8ea6f..3d1530331 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -145,17 +145,29 @@ public: * Initialize member data * --------------------------------------------------------------------- */ - LUA() { - f_begin = 0; - f_runtime = 0; - f_header = 0; - f_wrappers = 0; - f_init = 0; - f_initbeforefunc = 0; - PrefixPlusUnderscore = 0; - - s_cmd_tab = s_var_tab = s_const_tab = s_luacode = 0; - current=NO_CPP; + LUA() : + f_begin(0), + f_runtime(0), + f_header(0), + f_wrappers(0), + f_init(0), + f_initbeforefunc(0), + PrefixPlusUnderscore(0), + s_cmd_tab(0), + s_var_tab(0), + s_const_tab(0), + s_methods_tab(0), + s_attr_tab(0), + s_luacode(0), + s_dot_get(0), + s_dot_set(0), + s_vars_meta_tab(0), + have_constructor(0), + have_destructor(0), + destructor_action(0), + class_name(0), + constructor_name(0), + current(NO_CPP) { } /* NEW LANGUAGE NOTE:*********************************************** diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 8a2ba7627..f78c71fd3 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -58,9 +58,24 @@ private: } public: - OCTAVE():f_begin(0), f_runtime(0), f_header(0), f_doc(0), f_wrappers(0), - f_init(0), f_initbeforefunc(0), f_directors(0), f_directors_h(0), - s_global_tab(0), s_members_tab(0), class_name(0) { + OCTAVE(): + f_begin(0), + f_runtime(0), + f_header(0), + f_doc(0), + f_wrappers(0), + f_init(0), + f_initbeforefunc(0), + f_directors(0), + f_directors_h(0), + s_global_tab(0), + s_members_tab(0), + class_name(0), + have_constructor(0), + have_destructor(0), + constructor_name(0), + docs(0) + { /* Add code to manage protected constructors and directors */ director_prot_ctor_code = NewString(""); Printv(director_prot_ctor_code, diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index a1523a7ad..053143899 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -810,33 +810,37 @@ public: * * Initialize member data * --------------------------------------------------------------------- */ - - RUBY() { - module = 0; - modvar = 0; - feature = 0; - prefix = 0; - last_autodoc = NewString(""); - current = NO_CPP; - classes = 0; - klass = 0; - special_methods = 0; - f_begin = 0; - f_runtime = 0; - f_header = 0; - f_wrappers = 0; - f_init = 0; - f_initbeforefunc = 0; - useGlobalModule = false; - multipleInheritance = false; - director_prot_ctor_code = NewString(""); - Printv(director_prot_ctor_code, - "if ( $comparison ) { /* subclassed */\n", - " $director_new \n", - "} else {\n", " rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n", " return Qnil;\n", "}\n", NIL); - director_multiple_inheritance = 0; - director_language = 1; - } + RUBY() : + module(0), + modvar(0), + feature(0), + prefix(0), + current(0), + classes(0), + klass(0), + special_methods(0), + f_directors(0), + f_directors_h(0), + f_directors_helpers(0), + f_begin(0), + f_runtime(0), + f_runtime_h(0), + f_header(0), + f_wrappers(0), + f_init(0), + f_initbeforefunc(0), + useGlobalModule(false), + multipleInheritance(false) { + last_autodoc = NewString(""); + current = NO_CPP; + director_prot_ctor_code = NewString(""); + Printv(director_prot_ctor_code, + "if ( $comparison ) { /* subclassed */\n", + " $director_new \n", + "} else {\n", " rb_raise(rb_eRuntimeError,\"accessing abstract class or protected constructor\"); \n", " return Qnil;\n", "}\n", NIL); + director_multiple_inheritance = 0; + director_language = 1; + } /* --------------------------------------------------------------------- * main() diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 9f2cda2f2..3c50f3076 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -24,9 +24,21 @@ S-Exp Options (available with -sexp)\n\ static File *out = 0; class Sexp:public Language { -public: int indent_level; - Sexp():indent_level(0) { + DOHHash *print_circle_hash; + int print_circle_count; + int hanging_parens; + bool need_whitespace; + bool need_newline; + +public: + Sexp(): + indent_level(0), + print_circle_hash(0), + print_circle_count(0), + hanging_parens(0), + need_whitespace(0), + need_newline(0) { } virtual ~ Sexp() { @@ -51,12 +63,6 @@ public: } } - DOHHash *print_circle_hash; - int print_circle_count; - int hanging_parens; - bool need_whitespace; - bool need_newline; - /* Top of the parse tree */ virtual int top(Node *n) { if (out == 0) { diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index a6012c0bf..90318b122 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -40,7 +40,14 @@ class TypePass:private Dispatcher { Hash *classhash; List *normalize; - TypePass() { + TypePass() : + inclass(0), + module(0), + importmode(0), + nsname(0), + nssymname(0), + classhash(0), + normalize(0) { } /* Normalize a type. Replaces type with fully qualified version */ From bee563e788b534e9eb3a3575112a578aaf05a052 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:17:52 +0000 Subject: [PATCH 163/538] ccache-swig: apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using memory after it has been deleted git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13888 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CCache/ccache.c | 3 ++- CHANGES.current | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CCache/ccache.c b/CCache/ccache.c index d1696da88..e7dd1d30a 100644 --- a/CCache/ccache.c +++ b/CCache/ccache.c @@ -712,12 +712,13 @@ static void from_cache(int first) passfail = retrieve_from_cache(hashname, output_file, hardlink); } - free(stderr_file); if (passfail == -1) { close(fd_stderr); unlink(stderr_file); + free(stderr_file); return; } + free(stderr_file); } /* get rid of the intermediate preprocessor file */ diff --git a/CHANGES.current b/CHANGES.current index 15337ca00..2932b5003 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-11-14: [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using + memory after it has been deleted. + 2012-11-09: vzeitlin [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. From 684bd8e472ab2b045d153a584eac9345363a4e7a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:48:09 +0000 Subject: [PATCH 164/538] Minor warning fixes git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13889 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/d.cxx | 4 ++-- Source/Modules/typepass.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 17cb8babd..4f110fb8d 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -273,9 +273,9 @@ public: dmethods_seq(NULL), dmethods_table(NULL), n_dmethods(0), - unknown_types(NULL), first_class_dmethod(0), - curr_class_dmethod(0) { + curr_class_dmethod(0), + unknown_types(NULL) { // For now, multiple inheritance with directors is not possible. It should be // easy to implement though. diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index 90318b122..192c85ba6 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -717,7 +717,7 @@ class TypePass:private Dispatcher { * destructorDeclaration() * ------------------------------------------------------------ */ - virtual int destructorDeclaration(Node *n) { + virtual int destructorDeclaration(Node *) { return SWIG_OK; } From 51a1aa5b1aad1985e10b35a57127944f665d24f9 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 14 Nov 2012 22:51:39 +0000 Subject: [PATCH 165/538] Add coverity target to build coverity analysis and upload to coverity server for online analysis git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13890 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Makefile.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile.in b/Makefile.in index 644275773..0e79a77da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -523,4 +523,18 @@ $(srcdir)/configure: $(srcdir)/configure.in cd $(srcdir) && ./autogen.sh $(SHELL) ./config.status --recheck +############################################################################ +# Tools +############################################################################ + +# Coverity static code analyser build and submit - EMAIL and PASSWORD need specifying +# See http://scan.coverity.com/start/ +EMAIL=wsf@fultondesigns.co.uk +PASSWORD= +coverity: + $(MAKE) clean-source + cov-build --dir cov-int $(MAKE) + tar czvf swig-coverity.tgz cov-int + curl --form file=@swig-coverity.tgz --form project=swig --form password=$(PASSWORD) --form email=$(EMAIL) http://scan5.coverity.com/cgi-bin/upload.py + # Makefile ends here From e475ce1d6be882219e335865c825f14c76c8de22 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:32:40 +0000 Subject: [PATCH 166/538] Fix race condition 'time of check time of use' - TOCTOU - when creating subdirectories. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13891 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/misc.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index a9aacc02e..9881717ee 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -172,7 +172,6 @@ static int is_directory(String *directory) { String *Swig_new_subdirectory(String *basedirectory, String *subdirectory) { String *error = 0; - struct stat st; int current_directory = basedirectory ? (Len(basedirectory) == 0 ? 1 : 0) : 0; if (current_directory || is_directory(basedirectory)) { @@ -181,30 +180,23 @@ String *Swig_new_subdirectory(String *basedirectory, String *subdirectory) { List *subdirs = Split(subdirectory, SWIG_FILE_DELIMITER[0], INT_MAX); for (it = First(subdirs); it.item; it = Next(it)) { - int statdir; + int result; String *subdirectory = it.item; Printf(dir, "%s", subdirectory); - statdir = stat(Char(dir), &st); - if (statdir == 0) { - Printf(dir, SWIG_FILE_DELIMITER); - if (S_ISDIR(st.st_mode)) { - continue; - } else { - error = NewStringf("Cannot create directory %s", dir); - break; - } - } else { #ifdef _WIN32 - int result = _mkdir(Char(dir)); + result = _mkdir(Char(dir)); #else - int result = mkdir(Char(dir), 0777); + result = mkdir(Char(dir), 0777); #endif - Printf(dir, SWIG_FILE_DELIMITER); - if (result != 0 && errno != EEXIST) { - error = NewStringf("Cannot create directory %s", dir); - break; - } + if (result != 0 && errno != EEXIST) { + error = NewStringf("Cannot create directory %s: %s", dir, strerror(errno)); + break; } + if (!is_directory(dir)) { + error = NewStringf("Cannot create directory %s: it may already exist but not be a directory", dir); + break; + } + Printf(dir, SWIG_FILE_DELIMITER); } } else { error = NewStringf("Cannot create subdirectory %s under the base directory %s. Either the base does not exist as a directory or it is not readable.", subdirectory, basedirectory); From e87e94572e71ea4f307858dd6f5c3c24546cda35 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:33:43 +0000 Subject: [PATCH 167/538] Fix unused variables found by Coverity checker git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13892 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 1 - Source/Preprocessor/cpp.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 724b2ef69..2774014ab 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1004,7 +1004,6 @@ static String *resolve_create_node_scope(String *cname) { } else { /* now this last part is a class */ si = Next(si); - ns1 = Swig_symbol_clookup(sname,0); /* or a nested class tree, which is unrolled here */ for (; si.item; si = Next(si)) { if (si.item) { diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index b3e0549f5..d68658eb6 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1213,13 +1213,10 @@ static DOH *Preprocessor_replace(DOH *s) { Replaceall(fn, "\\", "\\\\"); Printf(ns, "\"%s\"", fn); Delete(fn); - } else if ((m = Getattr(symbols, id))) { + } else if (Getattr(symbols, id)) { DOH *e; /* Yes. There is a macro here */ /* See if the macro expects arguments */ - /* if (Getattr(m,"args")) { - Swig_error(Getfile(id),Getline(id),"Macro arguments expected.\n"); - } */ e = expand_macro(id, 0, s); if (e) Append(ns, e); From ec08824561398fe41033e2970147507a3b6ba741 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:35:33 +0000 Subject: [PATCH 168/538] Remove pointless null pointer check - Coverity REVERSE_INULL. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13893 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 5007d76a8..c36eef679 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1330,7 +1330,7 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No /* Special hook (hack!). Check for the 'ref' feature and add code it contains to any 'newfree' typemap code. * We could choose to put this hook into a number of different typemaps, not necessarily 'newfree'... * Rather confusingly 'newfree' is used to release memory and the 'ref' feature is used to add in memory references - yuck! */ - if (node && Cmp(tmap_method, "newfree") == 0) { + if (Cmp(tmap_method, "newfree") == 0) { String *base = SwigType_base(type); Node *typenode = Swig_symbol_clookup(base, 0); if (typenode) From 5e13cd3475b71433e8bf954a38d33096cc0e5f50 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:36:46 +0000 Subject: [PATCH 169/538] Consider strchr failing in a few places git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13894 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typeobj.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index b8ecf6e6a..07234f3b4 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -627,8 +627,8 @@ int SwigType_prefix_is_simple_1D_array(const SwigType *t) { if (c && (strncmp(c, "a(", 2) == 0)) { c = strchr(c, '.'); - c++; - return (*c == 0); + if (c) + return (*(++c) == 0); } return 0; } @@ -654,8 +654,10 @@ int SwigType_array_ndim(const SwigType *t) { while (c && (strncmp(c, "a(", 2) == 0)) { c = strchr(c, '.'); - c++; - ndim++; + if (c) { + c++; + ndim++; + } } return ndim; } @@ -665,8 +667,10 @@ String *SwigType_array_getdim(const SwigType *t, int n) { char *c = Char(t); while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) { c = strchr(c, '.'); - c++; - n--; + if (c) { + c++; + n--; + } } if (n == 0) { String *dim = SwigType_parm(c); @@ -695,8 +699,10 @@ void SwigType_array_setdim(SwigType *t, int n, const_String_or_char_ptr rep) { while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) { c = strchr(c, '.'); - c++; - n--; + if (c) { + c++; + n--; + } } if (n == 0) { temp = *c; From c0919870f84a4666677c7f4e760f13bbcac7c579 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:37:40 +0000 Subject: [PATCH 170/538] Add assertion for possible failure displaying warning git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13895 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/templ.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index 503f725cb..b14cd1e4d 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -766,6 +766,7 @@ static Node *template_locate(String *name, Parm *tparms, Symtab *tscope) { for (i = 1; i < posslen; i++) { String *templcsymname = Getattr(Getitem(possiblepartials, i), "templcsymname"); Node *ignored_node = Swig_symbol_clookup_local(templcsymname, primary_scope); + assert(ignored_node); Swig_warning(WARN_PARSE_TEMPLATE_AMBIG, Getfile(ignored_node), Getline(ignored_node), " instantiation '%s' ignored.\n", SwigType_namestr(Getattr(ignored_node, "name"))); } } From 3d6b068b8c7db307dda236b8bd1ebec5ffdcce50 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:38:48 +0000 Subject: [PATCH 171/538] Add some assertions around use of Tell git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13896 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/fio.c | 1 + Source/Preprocessor/cpp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 4e91a1b51..43f6dc3cf 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -76,6 +76,7 @@ static DOH *encode(char *name, DOH *s) { Seek(s, 0, SEEK_SET); fn = (DOH *(*)(DOH *)) Data(handle); ns = (*fn) (s); + assert(pos != -1); Seek(s, pos, SEEK_SET); if (tmp) Delete(tmp); diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index d68658eb6..5a7634f91 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -583,6 +583,7 @@ static List *find_args(String *s, int ismacro, String *macro_name) { c = Getc(s); if (c != '(') { /* Not a macro, bail out now! */ + assert(pos != -1); Seek(s, pos, SEEK_SET); Delete(args); return 0; From b107f57e591147f262f613f61730827e3c7d71fd Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 16 Nov 2012 19:39:50 +0000 Subject: [PATCH 172/538] NULL pointer clarification in Swig_new_subdirectory git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13897 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 9881717ee..ca471b72a 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -167,16 +167,16 @@ static int is_directory(String *directory) { * Swig_new_subdirectory() * * Create the subdirectory only if the basedirectory already exists as a directory. - * basedirectory can be NULL or empty to indicate current directory. + * basedirectory can be empty to indicate current directory but not NULL. * ----------------------------------------------------------------------------- */ String *Swig_new_subdirectory(String *basedirectory, String *subdirectory) { String *error = 0; - int current_directory = basedirectory ? (Len(basedirectory) == 0 ? 1 : 0) : 0; + int current_directory = Len(basedirectory) == 0; if (current_directory || is_directory(basedirectory)) { Iterator it; - String *dir = basedirectory ? NewString(basedirectory) : NewString(""); + String *dir = NewString(basedirectory); List *subdirs = Split(subdirectory, SWIG_FILE_DELIMITER[0], INT_MAX); for (it = First(subdirs); it.item; it = Next(it)) { From 69b32d921f9a2a257c5efb4a1694ff0e8526e0c5 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:43:09 +0000 Subject: [PATCH 173/538] Remove pointless null check git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13899 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index c36eef679..2570e8090 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -1341,7 +1341,7 @@ static String *Swig_typemap_lookup_impl(const_String_or_char_ptr tmap_method, No pname = Getattr(node, "name"); noscope_pname = Copy(pname); - if (pname && node && Getattr(node, "sym:symtab")) { + if (pname && Getattr(node, "sym:symtab")) { /* Add on a qualified name search for any symbol in the symbol table, for example: * struct Foo { * int *foo(int bar) -> Foo::foo From 111b517372e840979e78064b22888c1539bb5ec7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:43:31 +0000 Subject: [PATCH 174/538] Fix possible null dereferences git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13900 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typesys.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 73c2fbd50..76d84c960 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -668,7 +668,7 @@ SwigType *SwigType_typedef_resolve(const SwigType *t) { Printf(stdout, "namebase = '%s'\n", namebase); #endif type = typedef_resolve(s, namebase); - if (type) { + if (type && resolved_scope) { /* we need to look for the resolved type, this will also fix the resolved_scope if 'type' and 'namebase' are declared in different scopes */ @@ -680,7 +680,7 @@ SwigType *SwigType_typedef_resolve(const SwigType *t) { #ifdef SWIG_DEBUG Printf(stdout, "%s type = '%s'\n", Getattr(s, "name"), type); #endif - if ((type) && (!Swig_scopename_check(type)) && resolved_scope) { + if (type && (!Swig_scopename_check(type)) && resolved_scope) { Typetab *rtab = resolved_scope; String *qname = Getattr(resolved_scope, "qname"); /* If qualified *and* the typename is defined from the resolved scope, we qualify */ @@ -898,7 +898,7 @@ SwigType *SwigType_typedef_qualified(const SwigType *t) { e = ty; } resolved_scope = 0; - if (typedef_resolve(current_scope, e)) { + if (typedef_resolve(current_scope, e) && resolved_scope) { /* resolved_scope contains the scope that actually resolved the symbol */ String *qname = Getattr(resolved_scope, "qname"); if (qname) { From 0baa87809febb1e7a751507bbce88cc47bbc90c0 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:43:53 +0000 Subject: [PATCH 175/538] Remove unnecessary non-null check git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13901 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/scanner.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 31dc7522f..eec2201a1 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -209,10 +209,8 @@ static char nextchar(Scanner * s) { if (Len(s->scanobjs) == 0) return 0; s->str = Getitem(s->scanobjs, 0); - if (s->str) { - s->line = Getline(s->str); - DohIncref(s->str); - } + s->line = Getline(s->str); + DohIncref(s->str); } if ((nc == '\n') && (!s->freeze_line)) s->line++; From 475c6c6ce0146406d70d36dfe92deb42b8fa10e4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:44:19 +0000 Subject: [PATCH 176/538] Suppress some unchecked return value warnings for Coverity git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13902 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/fio.c | 2 +- Source/Preprocessor/cpp.c | 2 +- Source/Swig/scanner.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 43f6dc3cf..3557b3c37 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -77,7 +77,7 @@ static DOH *encode(char *name, DOH *s) { fn = (DOH *(*)(DOH *)) Data(handle); ns = (*fn) (s); assert(pos != -1); - Seek(s, pos, SEEK_SET); + (void)Seek(s, pos, SEEK_SET); if (tmp) Delete(tmp); return ns; diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 5a7634f91..b6426f5ab 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -584,7 +584,7 @@ static List *find_args(String *s, int ismacro, String *macro_name) { if (c != '(') { /* Not a macro, bail out now! */ assert(pos != -1); - Seek(s, pos, SEEK_SET); + (void)Seek(s, pos, SEEK_SET); Delete(args); return 0; } diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index eec2201a1..8b1c6183e 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -271,7 +271,7 @@ static void retract(Scanner * s, int n) { if (str[l - 1] == '\n') { if (!s->freeze_line) s->line--; } - Seek(s->str, -1, SEEK_CUR); + (void)Seek(s->str, -1, SEEK_CUR); Delitem(s->text, DOH_END); } } @@ -1317,7 +1317,7 @@ void Scanner_locator(Scanner *s, String *loc) { } else { int c; Locator *l; - Seek(loc, 7, SEEK_SET); + (void)Seek(loc, 7, SEEK_SET); c = Getc(loc); if (c == '@') { /* Empty locator. We pop the last location off */ From e450d4ebaca658c752dc8e5c9dd02e726cd064c5 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:44:39 +0000 Subject: [PATCH 177/538] Remove some possible buffer overflows git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13903 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/typeobj.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 07234f3b4..2e8d08f10 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -430,7 +430,7 @@ int SwigType_isreference(const SwigType *t) { * ----------------------------------------------------------------------------- */ SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { - char temp[256], newq[256]; + String *newq; int sz, added = 0; char *q, *cqual; @@ -438,8 +438,9 @@ SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { cqual = Char(qual); if (!(strncmp(c, "q(", 2) == 0)) { - sprintf(temp, "q(%s).", cqual); + String *temp = NewStringf("q(%s).", cqual); Insert(t, 0, temp); + Delete(temp); return t; } @@ -449,40 +450,40 @@ SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { order */ sz = element_size(c); - strncpy(temp, c, (sz < 256) ? sz : 256); - if (strstr(temp, cqual)) { + if (strstr(c, cqual)) { /* Qualifier already added */ return t; } /* Add the qualifier to the existing list. */ - strcpy(newq, "q("); - q = temp + 2; + newq = NewString("q("); + q = c + 2; q = strtok(q, " )."); while (q) { if (strcmp(cqual, q) < 0) { /* New qualifier is less that current qualifier. We need to insert it */ - strcat(newq, cqual); - strcat(newq, " "); - strcat(newq, q); + Append(newq, cqual); + Append(newq, " "); + Append(newq, q); added = 1; } else { - strcat(newq, q); + Append(newq, q); } q = strtok(NULL, " )."); if (q) { - strcat(newq, " "); + Append(newq, " "); } } if (!added) { - strcat(newq, " "); - strcat(newq, cqual); + Append(newq, " "); + Append(newq, cqual); } - strcat(newq, ")."); + Append(newq, ")."); Delslice(t, 0, sz); Insert(t, 0, newq); + Delete(newq); return t; } @@ -590,11 +591,11 @@ int SwigType_ismemberpointer(const SwigType *t) { * ----------------------------------------------------------------------------- */ SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size) { - char temp[512]; - strcpy(temp, "a("); - strcat(temp, Char(size)); - strcat(temp, ")."); + String *temp = NewString("a("); + Append(temp, size); + Append(temp, ")."); Insert(t, 0, temp); + Delete(temp); return t; } From d918bddfc09c8f59fa45b1772cba106b663003b3 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:45:18 +0000 Subject: [PATCH 178/538] Fix segfaults when using filename paths greater than 1024 characters in length - use String * and heap instead of fixed size static char array buffers. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13904 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 6 +++- Source/Modules/csharp.cxx | 7 +++-- Source/Modules/d.cxx | 7 +++-- Source/Modules/go.cxx | 4 ++- Source/Modules/java.cxx | 7 +++-- Source/Modules/main.cxx | 41 +++++++++++++++----------- Source/Modules/php.cxx | 4 ++- Source/Modules/python.cxx | 7 +++-- Source/Modules/ruby.cxx | 7 +++-- Source/Preprocessor/cpp.c | 20 +++++++++---- Source/Swig/include.c | 60 ++++++++++++++------------------------- Source/Swig/swigfile.h | 8 +++--- 12 files changed, 100 insertions(+), 78 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 2932b5003..39da2bb4f 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,7 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== -2012-11-14: [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using +2012-11-17: wsfulton + Fix segfaults when using filename paths greater than 1024 characters in length. + +2012-11-14: wsfulton + [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using memory after it has been deleted. 2012-11-09: vzeitlin diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index b8133b74a..9f902b76d 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -405,8 +405,11 @@ public: Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, " * C++ director class methods\n"); Printf(f_directors, " * --------------------------------------------------- */\n\n"); - if (outfile_h) - Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + if (outfile_h) { + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "#include \"%s\"\n\n", filename); + Delete(filename); + } } Printf(f_runtime, "\n"); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 4f110fb8d..503f90069 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -490,8 +490,11 @@ public: Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, " * C++ director class methods\n"); Printf(f_directors, " * --------------------------------------------------- */\n\n"); - if (outfile_h) - Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + if (outfile_h) { + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "#include \"%s\"\n\n", filename); + Delete(filename); + } } Printf(f_runtime, "\n"); diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 7c34f8b9a..347cf33a4 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -371,7 +371,9 @@ private: Printf(f_c_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module); Printf(f_c_directors, "\n// C++ director class methods.\n"); - Printf(f_c_directors, "#include \"%s\"\n\n", Swig_file_filename(c_filename_h)); + String *filename = Swig_file_filename(c_filename_h); + Printf(f_c_directors, "#include \"%s\"\n\n", filename); + Delete(filename); } Swig_banner(f_go_begin); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 1ee7a97e3..14cfeaf20 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -417,8 +417,11 @@ public: Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, " * C++ director class methods\n"); Printf(f_directors, " * --------------------------------------------------- */\n\n"); - if (outfile_h) - Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + if (outfile_h) { + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "#include \"%s\"\n\n", filename); + Delete(filename); + } } Printf(f_runtime, "\n"); diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index 8e2b428f4..d2876c16f 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -199,22 +199,24 @@ static List *libfiles = 0; static List *all_output_files = 0; /* ----------------------------------------------------------------------------- - * check_suffix() + * check_extension() * - * Checks the suffix of a file to see if we should emit extern declarations. + * Checks the extension of a file to see if we should emit extern declarations. * ----------------------------------------------------------------------------- */ -static int check_suffix(String *filename) { +static bool check_extension(String *filename) { + bool wanted = false; const char *name = Char(filename); - const char *c; if (!name) return 0; - c = Swig_file_suffix(name); + String *extension = Swig_file_extension(name); + const char *c = Char(extension); if ((strcmp(c, ".c") == 0) || (strcmp(c, ".C") == 0) || (strcmp(c, ".cc") == 0) || (strcmp(c, ".cxx") == 0) || (strcmp(c, ".c++") == 0) || (strcmp(c, ".cpp") == 0)) { - return 1; + wanted = true; } - return 0; + Delete(extension); + return wanted; } /* ----------------------------------------------------------------------------- @@ -283,15 +285,16 @@ static unsigned int decode_numbers_list(String *numlist) { } /* ----------------------------------------------------------------------------- - * Sets the output directory for language specific (proxy) files if not set and - * corrects the directory name and adds trailing file separator if necessary. + * Sets the output directory for language specific (proxy) files from the + * C wrapper file if not set and corrects the directory name and adds a trailing + * file separator if necessary. * ----------------------------------------------------------------------------- */ -static void configure_outdir(const String *c_wrapper_file_dir) { +static void configure_outdir(const String *c_wrapper_outfile) { // Use the C wrapper file's directory if the output directory has not been set by user if (!outdir || Len(outdir) == 0) - outdir = NewString(c_wrapper_file_dir); + outdir = Swig_file_dirname(c_wrapper_outfile); Swig_filename_correct(outdir); @@ -1068,7 +1071,8 @@ int SWIG_main(int argc, char *argv[], Language *l) { String *outfile; File *f_dependencies_file = 0; - char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(input_file): Char(input_file)); + String *inputfile_filename = outcurrentdir ? Swig_file_filename(input_file): Copy(input_file); + String *basename = Swig_file_basename(inputfile_filename); if (!outfile_name) { if (CPlusPlus || lang->cplus_runtime_mode()) { outfile = NewStringf("%s_wrap.%s", basename, cpp_extension); @@ -1113,6 +1117,8 @@ int SWIG_main(int argc, char *argv[], Language *l) { Delete(f_dependencies_file); if (depend_only) SWIG_exit(EXIT_SUCCESS); + Delete(inputfile_filename); + Delete(basename); } else { Printf(stderr, "Cannot generate dependencies with -nopreprocess\n"); // Actually we could but it would be inefficient when just generating dependencies, as it would be done after Swig_cparse @@ -1220,7 +1226,8 @@ int SWIG_main(int argc, char *argv[], Language *l) { Setattr(top, "infile", infile); // Note: if nopreprocess then infile is the original input file, otherwise input_file Setattr(top, "inputfile", input_file); - char *basename = Swig_file_basename(outcurrentdir ? Swig_file_filename(infile): Char(infile)); + String *infile_filename = outcurrentdir ? Swig_file_filename(infile): Copy(infile); + String *basename = Swig_file_basename(infile_filename); if (!outfile_name) { if (CPlusPlus || lang->cplus_runtime_mode()) { Setattr(top, "outfile", NewStringf("%s_wrap.%s", basename, cpp_extension)); @@ -1235,19 +1242,21 @@ int SWIG_main(int argc, char *argv[], Language *l) { } else { Setattr(top, "outfile_h", outfile_name_h); } - configure_outdir(Swig_file_dirname(Getattr(top, "outfile"))); + configure_outdir(Getattr(top, "outfile")); if (Swig_contract_mode_get()) { Swig_contracts(top); } - // Check the suffix for a c/c++ file. If so, we're going to declare everything we see as "extern" - ForceExtern = check_suffix(input_file); + // Check the extension for a c/c++ file. If so, we're going to declare everything we see as "extern" + ForceExtern = check_extension(input_file); lang->top(top); if (browse) { Swig_browser(top, 0); } + Delete(infile_filename); + Delete(basename); } } if (dump_lang_symbols) { diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index ab0d0e6b3..1f2078a1e 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -354,7 +354,9 @@ public: Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", cap_module); Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", cap_module); - Printf(f_directors, "\n#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "\n#include \"%s\"\n\n", filename); + Delete(filename); } /* PHP module file */ diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 9d1b3a772..dcf6699b1 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -763,8 +763,11 @@ public: Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, " * C++ director class methods\n"); Printf(f_directors, " * --------------------------------------------------- */\n\n"); - if (outfile_h) - Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + if (outfile_h) { + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "#include \"%s\"\n\n", filename); + Delete(filename); + } } /* If shadow classing is enabled, we're going to change the module name to "_module" */ diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 053143899..e31d3b72c 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -1142,8 +1142,11 @@ public: Printf(f_directors, "/* ---------------------------------------------------\n"); Printf(f_directors, " * C++ director class methods\n"); Printf(f_directors, " * --------------------------------------------------- */\n\n"); - if (outfile_h) - Printf(f_directors, "#include \"%s\"\n\n", Swig_file_filename(outfile_h)); + if (outfile_h) { + String *filename = Swig_file_filename(outfile_h); + Printf(f_directors, "#include \"%s\"\n\n", filename); + Delete(filename); + } Delete(module_macro); } diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index b6426f5ab..4366a8434 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1706,7 +1706,7 @@ String *Preprocessor_parse(String *s) { } else if (Equal(id, kpp_include)) { if (((include_all) || (import_all)) && (allow)) { String *s1, *s2, *fn; - char *dirname; + String *dirname; int sysfile = 0; if (include_all && import_all) { Swig_warning(WARN_PP_INCLUDEALL_IMPORTALL, Getfile(s), Getline(id), "Both includeall and importall are defined: using includeall.\n"); @@ -1725,10 +1725,13 @@ String *Preprocessor_parse(String *s) { /* See if the filename has a directory component */ dirname = Swig_file_dirname(Swig_last_file()); - if (sysfile || !strlen(dirname)) + if (sysfile || !Len(dirname)) { + Delete(dirname); dirname = 0; + } if (dirname) { - dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimiter */ + int len = Len(dirname); + Delslice(dirname, len - 1, len); /* Kill trailing directory delimiter */ Swig_push_directory(dirname); } s2 = Preprocessor_parse(s1); @@ -1741,6 +1744,7 @@ String *Preprocessor_parse(String *s) { pop_imported(); } Delete(s2); + Delete(dirname); Delete(s1); } Delete(fn); @@ -1858,7 +1862,7 @@ String *Preprocessor_parse(String *s) { fn = get_filename(s, &sysfile); s1 = cpp_include(fn, sysfile); if (s1) { - char *dirname; + String *dirname; copy_location(s, chunk); add_chunk(ns, chunk, allow); Printf(ns, "%sfile%s%s%s\"%s\" %%beginfile\n", decl, options_whitespace, opt, filename_whitespace, Swig_filename_escape(Swig_last_file())); @@ -1866,10 +1870,13 @@ String *Preprocessor_parse(String *s) { push_imported(); } dirname = Swig_file_dirname(Swig_last_file()); - if (sysfile || !strlen(dirname)) + if (sysfile || !strlen(dirname)) { + Delete(dirname); dirname = 0; + } if (dirname) { - dirname[strlen(dirname) - 1] = 0; /* Kill trailing directory delimiter */ + int len = Len(dirname); + Delslice(dirname, len - 1, len); /* Kill trailing directory delimiter */ Swig_push_directory(dirname); } s2 = Preprocessor_parse(s1); @@ -1882,6 +1889,7 @@ String *Preprocessor_parse(String *s) { addline(ns, s2, allow); Append(ns, "%endoffile"); Delete(s2); + Delete(dirname); Delete(s1); } Delete(fn); diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 3766894ae..6e76f86ba 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -317,58 +317,49 @@ File *Swig_filebyname(const_String_or_char_ptr filename) { } /* ----------------------------------------------------------------------------- - * Swig_file_suffix() + * Swig_file_extension() * - * Returns the suffix of a file + * Returns the extension of a file * ----------------------------------------------------------------------------- */ -char *Swig_file_suffix(const_String_or_char_ptr filename) { - char *d; - char *c = Char(filename); +String *Swig_file_extension(const_String_or_char_ptr filename) { + const char *d; + const char *c = Char(filename); int len = Len(filename); if (strlen(c)) { d = c + len - 1; while (d != c) { if (*d == '.') - return d; + return NewString(d); d--; } - return c + len; + return NewString(c + len); } - return c; + return NewString(c); } /* ----------------------------------------------------------------------------- * Swig_file_basename() * - * Returns the filename with no suffix attached. + * Returns the filename with the extension removed. * ----------------------------------------------------------------------------- */ -char *Swig_file_basename(const_String_or_char_ptr filename) { - static char tmp[1024]; - char *c; - strcpy(tmp, Char(filename)); - c = Swig_file_suffix(tmp); - *c = 0; - return tmp; +String *Swig_file_basename(const_String_or_char_ptr filename) { + String *extension = Swig_file_extension(filename); + String *basename = DohNewStringWithSize(filename, Len(filename) - Len(extension)); + Delete(extension); + return basename; } /* ----------------------------------------------------------------------------- * Swig_file_filename() * - * Return the file with any leading path stripped off + * Return the file name with any leading path stripped off * ----------------------------------------------------------------------------- */ -char *Swig_file_filename(const_String_or_char_ptr filename) { - static char tmp[1024]; +String *Swig_file_filename(const_String_or_char_ptr filename) { const char *delim = SWIG_FILE_DELIMITER; - char *c; - - strcpy(tmp, Char(filename)); - c = strrchr(tmp, *delim); - if (c) - return c + 1; - else - return tmp; + const char *c = strrchr(Char(filename), *delim); + return c ? NewString(c + 1) : NewString(filename); } /* ----------------------------------------------------------------------------- @@ -376,19 +367,10 @@ char *Swig_file_filename(const_String_or_char_ptr filename) { * * Return the name of the directory associated with a file * ----------------------------------------------------------------------------- */ -char *Swig_file_dirname(const_String_or_char_ptr filename) { - static char tmp[1024]; +String *Swig_file_dirname(const_String_or_char_ptr filename) { const char *delim = SWIG_FILE_DELIMITER; - char *c; - strcpy(tmp, Char(filename)); - if (!strstr(tmp, delim)) { - return ""; - } - c = tmp + strlen(tmp) - 1; - while (*c != *delim) - c--; - *(++c) = 0; - return tmp; + const char *c = strrchr(Char(filename), *delim); + return c ? NewStringWithSize(filename, c - Char(filename) + 1) : NewString(""); } /* diff --git a/Source/Swig/swigfile.h b/Source/Swig/swigfile.h index 158243c04..f12b33081 100644 --- a/Source/Swig/swigfile.h +++ b/Source/Swig/swigfile.h @@ -26,10 +26,10 @@ extern void Swig_set_push_dir(int dopush); extern int Swig_get_push_dir(void); extern void Swig_register_filebyname(const_String_or_char_ptr filename, File *outfile); extern File *Swig_filebyname(const_String_or_char_ptr filename); -extern char *Swig_file_suffix(const_String_or_char_ptr filename); -extern char *Swig_file_basename(const_String_or_char_ptr filename); -extern char *Swig_file_filename(const_String_or_char_ptr filename); -extern char *Swig_file_dirname(const_String_or_char_ptr filename); +extern String *Swig_file_extension(const_String_or_char_ptr filename); +extern String *Swig_file_basename(const_String_or_char_ptr filename); +extern String *Swig_file_filename(const_String_or_char_ptr filename); +extern String *Swig_file_dirname(const_String_or_char_ptr filename); extern void Swig_file_debug_set(); /* Delimiter used in accessing files and directories */ From 41fed461fa1c04e501cbda49a368751d93b73195 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:45:39 +0000 Subject: [PATCH 179/538] Fix Swig_file_extension when the path has a . and there is no extension in the filename git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13905 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Swig/include.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 6e76f86ba..5d37dad7e 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -323,19 +323,11 @@ File *Swig_filebyname(const_String_or_char_ptr filename) { * ----------------------------------------------------------------------------- */ String *Swig_file_extension(const_String_or_char_ptr filename) { - const char *d; - const char *c = Char(filename); - int len = Len(filename); - if (strlen(c)) { - d = c + len - 1; - while (d != c) { - if (*d == '.') - return NewString(d); - d--; - } - return NewString(c + len); - } - return NewString(c); + String *name = Swig_file_filename(filename); + const char *c = strrchr(Char(name), '.'); + String *extension = c ? NewString(c) : NewString(""); + Delete(name); + return extension; } /* ----------------------------------------------------------------------------- From 138af71cfdea5020d96a3b10972d8a20353118d7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 18 Nov 2012 00:46:07 +0000 Subject: [PATCH 180/538] Add missing support for -outdir for -tcl -itcl and -modula3 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13906 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Source/Modules/modula3.cxx | 14 +++++++------- Source/Modules/tcl8.cxx | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 39da2bb4f..19912fde6 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-11-17: wsfulton + [Tcl, Modula3] Add missing support for -outdir. + 2012-11-17: wsfulton Fix segfaults when using filename paths greater than 1024 characters in length. diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index 78af35506..ede2f39db 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -991,7 +991,7 @@ MODULA3(): // Generate m3makefile // This will be unnecessary if SWIG is invoked from Quake. { - File *file = openWriteFile(NewStringf("%sm3makefile", Swig_file_dirname(outfile))); + File *file = openWriteFile(NewStringf("%sm3makefile", SWIG_output_directory())); Printf(file, "%% automatically generated quake file for %s\n\n", name); @@ -1014,7 +1014,7 @@ MODULA3(): // Generate the raw interface { - File *file = openWriteFile(NewStringf("%s%s.i3", Swig_file_dirname(outfile), m3raw_name)); + File *file = openWriteFile(NewStringf("%s%s.i3", SWIG_output_directory(), m3raw_name)); emitBanner(file); @@ -1032,7 +1032,7 @@ MODULA3(): // Generate the raw module { - File *file = openWriteFile(NewStringf("%s%s.m3", Swig_file_dirname(outfile), m3raw_name)); + File *file = openWriteFile(NewStringf("%s%s.m3", SWIG_output_directory(), m3raw_name)); emitBanner(file); @@ -1050,7 +1050,7 @@ MODULA3(): // Generate the interface for the comfort wrappers { - File *file = openWriteFile(NewStringf("%s%s.i3", Swig_file_dirname(outfile), m3wrap_name)); + File *file = openWriteFile(NewStringf("%s%s.i3", SWIG_output_directory(), m3wrap_name)); emitBanner(file); @@ -1080,7 +1080,7 @@ MODULA3(): // Generate the wrapper routines implemented in Modula 3 { - File *file = openWriteFile(NewStringf("%s%s.m3", Swig_file_dirname(outfile), m3wrap_name)); + File *file = openWriteFile(NewStringf("%s%s.m3", SWIG_output_directory(), m3wrap_name)); emitBanner(file); @@ -2387,7 +2387,7 @@ MODULA3(): SWIG_exit(EXIT_FAILURE); } - String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), proxy_class_name); + String *filen = NewStringf("%s%s.m3", SWIG_output_directory(), proxy_class_name); f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { FileErrorDisplay(filen); @@ -3780,7 +3780,7 @@ MODULA3(): Setfile(n, input_file); Setline(n, line_number); - String *filen = NewStringf("%s%s.m3", Swig_file_dirname(outfile), classname); + String *filen = NewStringf("%s%s.m3", SWIG_output_directory(), classname); File *f_swigtype = NewFile(filen, "w", SWIG_output_files()); if (!f_swigtype) { FileErrorDisplay(filen); diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 4f4bdd1b2..a4f29183c 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -185,7 +185,7 @@ public: /* If shadow classing is enabled, we're going to change the module name to "_module" */ if (itcl) { String *filen; - filen = NewStringf("%s%s.itcl", Swig_file_dirname(outfile), module); + filen = NewStringf("%s%s.itcl", SWIG_output_directory(), module); Insert(module, 0, "_"); From 032f477d7f8a03ca88fe02b6b1284dc1522bc636 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:39:20 +0000 Subject: [PATCH 181/538] Fix double delete git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13907 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/go.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 347cf33a4..0a8798444 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -3631,8 +3631,6 @@ private: Replaceall(w->code, "$symname", symname); Wrapper_print(w, f_c_directors); - - DelWrapper(w); } Delete(cn); From d14a88a6bd78ef9b39a1cdf1b04f4481037d912c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:40:31 +0000 Subject: [PATCH 182/538] Fix memory leak git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13908 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/perl5.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index cd91a807c..242db1df1 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -868,6 +868,8 @@ public: emit_action_code(n, setf->code, tm); } else { Swig_warning(WARN_TYPEMAP_VARIN_UNDEF, input_file, line_number, "Unable to set variable of type %s.\n", SwigType_str(t, 0)); + DelWrapper(setf); + DelWrapper(getf); return SWIG_NOWRAP; } Printf(setf->code, "fail:\n"); From 0b0d5b1124762f25c272076857b1f5a2596f3574 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:41:12 +0000 Subject: [PATCH 183/538] Fix uninitialised member var git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13909 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/ruby.cxx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index e31d3b72c..0d7de537c 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -128,7 +128,8 @@ enum autodoc_t { AUTODOC_FUNC, AUTODOC_METHOD, AUTODOC_GETTER, - AUTODOC_SETTER + AUTODOC_SETTER, + AUTODOC_NONE }; static const char *usage = (char *) "\ @@ -203,8 +204,6 @@ private: autodoc_t last_mode; String* last_autodoc; - - autodoc_l autodoc_level(String *autodoc) { autodoc_l dlevel = NO_AUTODOC; if (autodoc) { @@ -602,6 +601,8 @@ private: case AUTODOC_SETTER: Printf(doc, " Document-method: %s.%s=\n\n", full_name, symname); break; + case AUTODOC_NONE: + break; } } @@ -689,6 +690,8 @@ private: Printf(doc, " -> %s", type_str); break; } + case AUTODOC_NONE: + break; } } @@ -723,6 +726,8 @@ private: case AUTODOC_SETTER: Printf(doc, "Set new value for attribute.\n"); break; + case AUTODOC_NONE: + break; } } @@ -830,8 +835,9 @@ public: f_init(0), f_initbeforefunc(0), useGlobalModule(false), - multipleInheritance(false) { - last_autodoc = NewString(""); + multipleInheritance(false), + last_mode(AUTODOC_NONE), + last_autodoc(NewString("")) { current = NO_CPP; director_prot_ctor_code = NewString(""); Printv(director_prot_ctor_code, From 288e45cb15764253d07ea30214e191da803b4430 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:42:17 +0000 Subject: [PATCH 184/538] Add some assertions to ensure NULL pointer is not used git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13910 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 9f902b76d..43831348b 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -2328,6 +2328,7 @@ public: // Get the C# variable type - obtained differently depending on whether a setter is required. String *variable_type = return_type; if (setter_flag) { + assert(last_parm); p = last_parm; // (last parameter is the only parameter for properties) SwigType *pt = Getattr(p, "type"); if ((tm = Getattr(p, "tmap:cstype"))) { @@ -2350,6 +2351,7 @@ public: if (setter_flag) { // Setter method + assert(last_parm); p = last_parm; // (last parameter is the only parameter for properties) SwigType *pt = Getattr(p, "type"); if ((tm = Getattr(p, "tmap:csvarin"))) { From 7299392ebbc31dba92b0ea37df647b63c0418e06 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:43:24 +0000 Subject: [PATCH 185/538] Possible fix for global variable setters in modula3 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13911 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/modula3.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index ede2f39db..b473e3087 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -3527,6 +3527,7 @@ MODULA3(): m3wrap_impl.enterBlock(no_block); if (proxy_flag && global_variable_flag) { + setter_flag = (Cmp(Getattr(n, "sym:name"), Swig_name_set(NSPACE_TODO, variable_name)) == 0); // Properties if (setter_flag) { // Setter method From e0967f3e134d5174b5d87253703e4bcf01f63dc8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:44:48 +0000 Subject: [PATCH 186/538] Fix unnecessary and inconsistent null pointer checks git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13912 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 144 +++++++++++++-------------- Source/Modules/d.cxx | 141 +++++++++++++------------- Source/Modules/java.cxx | 202 +++++++++++++++++++------------------- 3 files changed, 238 insertions(+), 249 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 43831348b..24bc48f0a 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -3472,7 +3472,7 @@ public: Wrapper *w = NewWrapper(); ParmList *l = Getattr(n, "parms"); bool is_void = !(Cmp(returntype, "void")); - String *qualified_return = NewString(""); + String *qualified_return = 0; bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0"))); int status = SWIG_OK; bool output_director = true; @@ -3496,90 +3496,86 @@ public: imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name)); - if (returntype) { + qualified_return = SwigType_rcaststr(returntype, "c_result"); - Delete(qualified_return); - qualified_return = SwigType_rcaststr(returntype, "c_result"); - - if (!is_void && !ignored_method) { - if (!SwigType_isclass(returntype)) { - if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { - String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); - Delete(construct_result); - } else { - String *base_typename = SwigType_base(returntype); - String *resolved_typename = SwigType_typedef_resolve_all(base_typename); - Symtab *symtab = Getattr(n, "sym:symtab"); - Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { - /* initialize pointers to something sane. Same for abstract - classes when a reference is returned. */ - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); - } else { - /* If returning a reference, initialize the pointer to a sane - default - if a C# exception occurs, then the pointer returns - something other than a NULL-initialized reference. */ - String *non_ref_type = Copy(returntype); - - /* Remove reference and const qualifiers */ - Replaceall(non_ref_type, "r.", ""); - Replaceall(non_ref_type, "q(const).", ""); - Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); - - Delete(non_ref_type); - } - - Delete(base_typename); - Delete(resolved_typename); - } + if (!is_void && !ignored_method) { + if (!SwigType_isclass(returntype)) { + if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { + String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); + Delete(construct_result); } else { - SwigType *vt; + String *base_typename = SwigType_base(returntype); + String *resolved_typename = SwigType_typedef_resolve_all(base_typename); + Symtab *symtab = Getattr(n, "sym:symtab"); + Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - vt = cplus_value_type(returntype); - if (!vt) { - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + /* initialize pointers to something sane. Same for abstract + classes when a reference is returned. */ + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); } else { - Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); - Delete(vt); + /* If returning a reference, initialize the pointer to a sane + default - if a C# exception occurs, then the pointer returns + something other than a NULL-initialized reference. */ + String *non_ref_type = Copy(returntype); + + /* Remove reference and const qualifiers */ + Replaceall(non_ref_type, "r.", ""); + Replaceall(non_ref_type, "q(const).", ""); + Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); + + Delete(non_ref_type); } - } - } - /* Create the intermediate class wrapper */ - tm = Swig_typemap_lookup("imtype", n, "", 0); - if (tm) { - String *imtypeout = Getattr(n, "tmap:imtype:out"); // the type in the imtype typemap's out attribute overrides the type in the typemap - if (imtypeout) - tm = imtypeout; - const String *im_directoroutattributes = Getattr(n, "tmap:imtype:directoroutattributes"); - if (im_directoroutattributes) { - Printf(callback_def, " %s\n", im_directoroutattributes); - Printf(director_delegate_definitions, " %s\n", im_directoroutattributes); - } - - Printf(callback_def, " private %s SwigDirector%s(", tm, overloaded_name); - if (!ignored_method) - Printf(director_delegate_definitions, " public delegate %s", tm); - } else { - Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); - } - - if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { - if (!is_void && !ignored_method) { - String *jretval_decl = NewStringf("%s jresult", c_ret_type); - Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); - Delete(jretval_decl); + Delete(base_typename); + Delete(resolved_typename); } } else { - Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", - SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); - output_director = false; + SwigType *vt; + + vt = cplus_value_type(returntype); + if (!vt) { + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + } else { + Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); + Delete(vt); + } } } + /* Create the intermediate class wrapper */ + tm = Swig_typemap_lookup("imtype", n, "", 0); + if (tm) { + String *imtypeout = Getattr(n, "tmap:imtype:out"); // the type in the imtype typemap's out attribute overrides the type in the typemap + if (imtypeout) + tm = imtypeout; + const String *im_directoroutattributes = Getattr(n, "tmap:imtype:directoroutattributes"); + if (im_directoroutattributes) { + Printf(callback_def, " %s\n", im_directoroutattributes); + Printf(director_delegate_definitions, " %s\n", im_directoroutattributes); + } + + Printf(callback_def, " private %s SwigDirector%s(", tm, overloaded_name); + if (!ignored_method) + Printf(director_delegate_definitions, " public delegate %s", tm); + } else { + Swig_warning(WARN_CSHARP_TYPEMAP_CSTYPE_UNDEF, input_file, line_number, "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); + } + + if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { + if (!is_void && !ignored_method) { + String *jretval_decl = NewStringf("%s jresult", c_ret_type); + Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); + Delete(jretval_decl); + } + } else { + Swig_warning(WARN_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + output_director = false; + } + Swig_director_parms_fixup(l); /* Attach the standard typemaps */ diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 503f90069..5ce60016f 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1945,7 +1945,7 @@ public: Wrapper *w = NewWrapper(); ParmList *l = Getattr(n, "parms"); bool is_void = !(Cmp(returntype, "void")); - String *qualified_return = NewString(""); + String *qualified_return = 0; bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0"))); int status = SWIG_OK; bool output_director = true; @@ -1968,89 +1968,86 @@ public: // we're consistent with the sym:overload name in functionWrapper. (?? when // does the overloaded method name get set?) - imclass_dmethod = NewStringf("SwigDirector_%s", - Swig_name_member(getNSpace(), classname, overloaded_name)); + imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name)); - if (returntype) { - qualified_return = SwigType_rcaststr(returntype, "c_result"); + qualified_return = SwigType_rcaststr(returntype, "c_result"); - if (!is_void && !ignored_method) { - if (!SwigType_isclass(returntype)) { - if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { - String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); - Delete(construct_result); - } else { - String *base_typename = SwigType_base(returntype); - String *resolved_typename = SwigType_typedef_resolve_all(base_typename); - Symtab *symtab = Getattr(n, "sym:symtab"); - Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { - /* initialize pointers to something sane. Same for abstract - classes when a reference is returned. */ - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); - } else { - /* If returning a reference, initialize the pointer to a sane - default - if a D exception occurs, then the pointer returns - something other than a NULL-initialized reference. */ - String *non_ref_type = Copy(returntype); - - /* Remove reference and const qualifiers */ - Replaceall(non_ref_type, "r.", ""); - Replaceall(non_ref_type, "q(const).", ""); - Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); - - Delete(non_ref_type); - } - - Delete(base_typename); - Delete(resolved_typename); - } + if (!is_void && !ignored_method) { + if (!SwigType_isclass(returntype)) { + if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { + String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); + Delete(construct_result); } else { - SwigType *vt; + String *base_typename = SwigType_base(returntype); + String *resolved_typename = SwigType_typedef_resolve_all(base_typename); + Symtab *symtab = Getattr(n, "sym:symtab"); + Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - vt = cplus_value_type(returntype); - if (!vt) { - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + /* initialize pointers to something sane. Same for abstract + classes when a reference is returned. */ + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); } else { - Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); - Delete(vt); + /* If returning a reference, initialize the pointer to a sane + default - if a D exception occurs, then the pointer returns + something other than a NULL-initialized reference. */ + String *non_ref_type = Copy(returntype); + + /* Remove reference and const qualifiers */ + Replaceall(non_ref_type, "r.", ""); + Replaceall(non_ref_type, "q(const).", ""); + Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); + + Delete(non_ref_type); } - } - } - /* Create the intermediate class wrapper */ - tm = lookupDTypemap(n, "imtype"); - if (tm) { - String *imtypeout = Getattr(n, "tmap:imtype:out"); - if (imtypeout) { - // The type in the imtype typemap's out attribute overrides the type - // in the typemap. - tm = imtypeout; - } - Printf(callback_def, "\nprivate extern(C) %s swigDirectorCallback_%s_%s(void* dObject", tm, classname, overloaded_name); - Printv(proxy_callback_return_type, tm, NIL); - } else { - Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number, - "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); - } - - if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { - if (!is_void && !ignored_method) { - String *jretval_decl = NewStringf("%s jresult", c_ret_type); - Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); - Delete(jretval_decl); + Delete(base_typename); + Delete(resolved_typename); } } else { - Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number, - "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", - SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); - output_director = false; + SwigType *vt; + + vt = cplus_value_type(returntype); + if (!vt) { + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + } else { + Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); + Delete(vt); + } } } + /* Create the intermediate class wrapper */ + tm = lookupDTypemap(n, "imtype"); + if (tm) { + String *imtypeout = Getattr(n, "tmap:imtype:out"); + if (imtypeout) { + // The type in the imtype typemap's out attribute overrides the type + // in the typemap. + tm = imtypeout; + } + Printf(callback_def, "\nprivate extern(C) %s swigDirectorCallback_%s_%s(void* dObject", tm, classname, overloaded_name); + Printv(proxy_callback_return_type, tm, NIL); + } else { + Swig_warning(WARN_D_TYPEMAP_IMTYPE_UNDEF, input_file, line_number, + "No imtype typemap defined for %s\n", SwigType_str(returntype, 0)); + } + + if ((c_ret_type = Swig_typemap_lookup("ctype", n, "", 0))) { + if (!is_void && !ignored_method) { + String *jretval_decl = NewStringf("%s jresult", c_ret_type); + Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); + Delete(jretval_decl); + } + } else { + Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number, + "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + output_director = false; + } + Swig_director_parms_fixup(l); // Attach the standard typemaps. diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 14cfeaf20..591ed2e84 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3536,7 +3536,7 @@ public: Wrapper *w = NewWrapper(); ParmList *l = Getattr(n, "parms"); bool is_void = !(Cmp(returntype, "void")); - String *qualified_return = NewString(""); + String *qualified_return = 0; bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0"))); int status = SWIG_OK; bool output_director = true; @@ -3567,126 +3567,122 @@ public: imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name)); - if (returntype) { + qualified_return = SwigType_rcaststr(returntype, "c_result"); - Delete(qualified_return); - qualified_return = SwigType_rcaststr(returntype, "c_result"); - - if (!is_void && (!ignored_method || pure_virtual)) { - if (!SwigType_isclass(returntype)) { - if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { - String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); - Delete(construct_result); - } else { - String *base_typename = SwigType_base(returntype); - String *resolved_typename = SwigType_typedef_resolve_all(base_typename); - Symtab *symtab = Getattr(n, "sym:symtab"); - Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { - /* initialize pointers to something sane. Same for abstract - classes when a reference is returned. */ - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); - } else { - /* If returning a reference, initialize the pointer to a sane - default - if a Java exception occurs, then the pointer returns - something other than a NULL-initialized reference. */ - String *non_ref_type = Copy(returntype); - - /* Remove reference and const qualifiers */ - Replaceall(non_ref_type, "r.", ""); - Replaceall(non_ref_type, "q(const).", ""); - Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); - - Delete(non_ref_type); - } - - Delete(base_typename); - Delete(resolved_typename); - } + if (!is_void && (!ignored_method || pure_virtual)) { + if (!SwigType_isclass(returntype)) { + if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { + String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0)); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); + Delete(construct_result); } else { - SwigType *vt; + String *base_typename = SwigType_base(returntype); + String *resolved_typename = SwigType_typedef_resolve_all(base_typename); + Symtab *symtab = Getattr(n, "sym:symtab"); + Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - vt = cplus_value_type(returntype); - if (!vt) { - Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + /* initialize pointers to something sane. Same for abstract + classes when a reference is returned. */ + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); } else { - Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); - Delete(vt); + /* If returning a reference, initialize the pointer to a sane + default - if a Java exception occurs, then the pointer returns + something other than a NULL-initialized reference. */ + String *non_ref_type = Copy(returntype); + + /* Remove reference and const qualifiers */ + Replaceall(non_ref_type, "r.", ""); + Replaceall(non_ref_type, "q(const).", ""); + Wrapper_add_localv(w, "result_default", "static", SwigType_str(non_ref_type, "result_default"), "=", SwigType_str(non_ref_type, "()"), NIL); + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= &result_default", NIL); + + Delete(non_ref_type); } + + Delete(base_typename); + Delete(resolved_typename); + } + } else { + SwigType *vt; + + vt = cplus_value_type(returntype); + if (!vt) { + Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), NIL); + } else { + Wrapper_add_localv(w, "c_result", SwigType_lstr(vt, "c_result"), NIL); + Delete(vt); } } + } - /* Create the intermediate class wrapper */ - tm = Swig_typemap_lookup("jtype", n, "", 0); - if (tm) { - Printf(callback_def, " public static %s %s(%s self", tm, imclass_dmethod, qualified_classname); - } else { - Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s\n", SwigType_str(returntype, 0)); + /* Create the intermediate class wrapper */ + tm = Swig_typemap_lookup("jtype", n, "", 0); + if (tm) { + Printf(callback_def, " public static %s %s(%s self", tm, imclass_dmethod, qualified_classname); + } else { + Swig_warning(WARN_JAVA_TYPEMAP_JTYPE_UNDEF, input_file, line_number, "No jtype typemap defined for %s\n", SwigType_str(returntype, 0)); + } + + String *cdesc = NULL; + SwigType *covariant = Getattr(n, "covariant"); + SwigType *adjustedreturntype = covariant ? covariant : returntype; + Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n); + + if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) + && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { + + // Note that in the case of polymorphic (covariant) return types, the + // method's return type is changed to be the base of the C++ return + // type + String *jnidesc_canon = canonicalizeJNIDescriptor(cdesc, adjustedreturntypeparm); + Append(classret_desc, jnidesc_canon); + Delete(jnidesc_canon); + } else { + Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + output_director = false; + } + + /* Get the JNI field descriptor for this return type, add the JNI field descriptor + to jniret_desc */ + if ((c_ret_type = Swig_typemap_lookup("jni", n, "", 0))) { + Parm *tp = NewParmNode(c_ret_type, n); + + if (!is_void && !ignored_method) { + String *jretval_decl = NewStringf("%s jresult", c_ret_type); + Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); + Delete(jretval_decl); } - String *cdesc = NULL; - SwigType *covariant = Getattr(n, "covariant"); - SwigType *adjustedreturntype = covariant ? covariant : returntype; - Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n); + String *jdesc = NULL; + if ((tm = Swig_typemap_lookup("directorin", tp, "", 0)) + && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) { - if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) - && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { - - // Note that in the case of polymorphic (covariant) return types, the - // method's return type is changed to be the base of the C++ return - // type - String *jnidesc_canon = canonicalizeJNIDescriptor(cdesc, adjustedreturntypeparm); - Append(classret_desc, jnidesc_canon); + // Objects marshalled passing a Java class across JNI boundary use jobject - the nouse flag indicates this + // We need the specific Java class name instead of the generic 'Ljava/lang/Object;' + if (GetFlag(tp, "tmap:directorin:nouse")) + jdesc = cdesc; + String *jnidesc_canon = canonicalizeJNIDescriptor(jdesc, tp); + Append(jniret_desc, jnidesc_canon); Delete(jnidesc_canon); } else { - Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", - SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, + "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", + SwigType_str(c_ret_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); output_director = false; } - /* Get the JNI field descriptor for this return type, add the JNI field descriptor - to jniret_desc */ - if ((c_ret_type = Swig_typemap_lookup("jni", n, "", 0))) { - Parm *tp = NewParmNode(c_ret_type, n); - - if (!is_void && !ignored_method) { - String *jretval_decl = NewStringf("%s jresult", c_ret_type); - Wrapper_add_localv(w, "jresult", jretval_decl, "= 0", NIL); - Delete(jretval_decl); - } - - String *jdesc = NULL; - if ((tm = Swig_typemap_lookup("directorin", tp, "", 0)) - && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) { - - // Objects marshalled passing a Java class across JNI boundary use jobject - the nouse flag indicates this - // We need the specific Java class name instead of the generic 'Ljava/lang/Object;' - if (GetFlag(tp, "tmap:directorin:nouse")) - jdesc = cdesc; - String *jnidesc_canon = canonicalizeJNIDescriptor(jdesc, tp); - Append(jniret_desc, jnidesc_canon); - Delete(jnidesc_canon); - } else { - Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file, line_number, - "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n", - SwigType_str(c_ret_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); - output_director = false; - } - - Delete(tp); - } else { - Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s for use in %s::%s (skipping director method)\n", - SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); - output_director = false; - } - - Delete(adjustedreturntypeparm); - Delete(qualified_classname); + Delete(tp); + } else { + Swig_warning(WARN_JAVA_TYPEMAP_JNI_UNDEF, input_file, line_number, "No jni typemap defined for %s for use in %s::%s (skipping director method)\n", + SwigType_str(returntype, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); + output_director = false; } + Delete(adjustedreturntypeparm); + Delete(qualified_classname); + Swig_director_parms_fixup(l); /* Attach the standard typemaps */ From 660b15ea5ac434f9a66b6d501c2702c185c59deb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:46:21 +0000 Subject: [PATCH 187/538] Correctly handle errors if language symbol already exists git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13913 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 6 ++++-- Source/Modules/java.cxx | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 24bc48f0a..6b0ad6edc 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -361,8 +361,10 @@ public: } // module class and intermediary classes are always created - addSymbol(imclass_name, n); - addSymbol(module_class_name, n); + if (!addSymbol(imclass_name, n)) + return SWIG_ERROR; + if (!addSymbol(module_class_name, n)) + return SWIG_ERROR; imclass_class_code = NewString(""); proxy_class_def = NewString(""); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 591ed2e84..bfa02d7e2 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -374,8 +374,10 @@ public: constants_interface_name = NewStringf("%sConstants", module_class_name); // module class and intermediary classes are always created - addSymbol(imclass_name, n); - addSymbol(module_class_name, n); + if (!addSymbol(imclass_name, n)) + return SWIG_ERROR; + if (!addSymbol(module_class_name, n)) + return SWIG_ERROR; imclass_class_code = NewString(""); proxy_class_def = NewString(""); From 0c7bc3612232db036cf8b099eebf7007fd377c21 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:47:48 +0000 Subject: [PATCH 188/538] Fix obvious copy/paste errors in some director code git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13914 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 2 +- Source/Modules/d.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 6b0ad6edc..d715aadb2 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -4070,7 +4070,7 @@ public: Printf(w->def, ") {"); - if (Len(director_callback_typedefs) > 0) { + if (Len(director_callbacks) > 0) { Printf(f_directors_h, "\nprivate:\n%s", director_callbacks); } Printf(f_directors_h, " void swig_init_callbacks();\n"); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 5ce60016f..0f6a75255 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -2528,7 +2528,7 @@ public: Printf(f_directors_h, "\nprivate:\n"); Printf(f_directors_h, " void swig_init_callbacks();\n"); Printf(f_directors_h, " void *d_object;\n"); - if (Len(director_callback_typedefs) > 0) { + if (Len(director_callback_pointers) > 0) { Printf(f_directors_h, "%s", director_callback_pointers); } Printf(f_directors_h, "};\n\n"); From 0f0172bc0d5a789cc9dd6a5bf0f9a44298fe53e8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:48:50 +0000 Subject: [PATCH 189/538] Fix possible NULL dereference git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13915 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/d.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 0f6a75255..2c8524dfe 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -3669,7 +3669,9 @@ private: bool inProxyModule(const String *type_name) const { if (!split_proxy_dmodule) { String *nspace = createOuterNamespaceNames(type_name); - bool result = (getNSpace() || !nspace) && (Strcmp(nspace, getNSpace()) == 0); + bool result = false; + if (getNSpace() && nspace) + result = (Strcmp(nspace, getNSpace()) == 0); Delete(nspace); return result; } From 558ee74967131871fd24e7c55c05539fc494d3b1 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:49:43 +0000 Subject: [PATCH 190/538] Fix missing out typemap warning git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13916 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/allegrocl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index ffd96ca9c..6b501dfd4 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -2748,7 +2748,7 @@ int ALLEGROCL::functionWrapper(Node *n) { String *actioncode = emit_action(n); String *tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode); - if (!is_void_return && tm) { + if (!is_void_return) { if (tm) { Replaceall(tm, "$result", "lresult"); Printf(f->code, "%s\n", tm); From 8162f3c0a59f8229156860d8f1e8dbf7e4ec27f2 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:51:13 +0000 Subject: [PATCH 191/538] Fix buggy namespace_of and strip_namespaces functions replacing with equivalents from misc.c git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13917 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/allegrocl.cxx | 43 ++---------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 6b501dfd4..d67053ab9 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -162,46 +162,7 @@ String *namespaced_name(Node *n, String *ns = current_namespace) { // "Namespace::Nested::Class2::Baz" -> "Baz" static String *strip_namespaces(String *str) { - SwigType *new_type = Copy(str); - SwigType *leading_type = SwigType_pop(new_type); - char *result = Char(leading_type); - - if(SwigType_istemplate(leading_type)) { - result = Char(SwigType_templateprefix(leading_type)); - } else { - if (!SwigType_issimple(leading_type)) - return NewString(str); - } - - String *stripped_one; - while ((stripped_one = Strstr(result, "::"))) - result = Char(stripped_one) + 2; - - if(SwigType_istemplate(leading_type)) { - SwigType_push(new_type, NewStringf("%s%s%s", result, SwigType_templateargs(leading_type), - SwigType_templatesuffix(leading_type))); - return new_type; - } - - return NewString(result); -} - -static String *namespace_of(String *str) { - char *p = Char(str); - char *start = Char(str); - char *result = 0; - String *stripped_one; - - while ((stripped_one = Strstr(p, "::"))) { - p = Char(stripped_one) + 2; - } - if (p > start) { - int len = p - start - 1; - result = (char *) malloc(len); - strncpy(result, start, len - 1); - result[len - 1] = 0; - } - return Char(result); + return Swig_scopename_last(str); } void add_linked_type(Node *n) { @@ -663,7 +624,7 @@ void note_implicit_template_instantiation(SwigType *t) { #endif SwigType *type = Copy(t); SwigType *tok = SwigType_pop(type); - String *implicit_ns = SwigType_istemplate(tok) ? namespace_of(SwigType_templateprefix(tok)) : 0; + String *implicit_ns = SwigType_istemplate(tok) ? Swig_scopename_prefix(SwigType_templateprefix(tok)) : 0; add_defined_foreign_type(0, 0, t, t, implicit_ns ? implicit_ns : current_namespace); Delete(type); From 4a25c4695d4bcf0673fd52a0bb7fe0722fe3815c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:52:44 +0000 Subject: [PATCH 192/538] Fix possible null dereference git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13918 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/allegrocl.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index d67053ab9..95022752f 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -421,7 +421,8 @@ void add_defined_foreign_type(Node *n, int overwrite = 0, String *k = 0, #endif if (is_fwd_ref) { // Printf(stderr,"*** 1\n"); - add_linked_type(n); + if (n) + add_linked_type(n); } else { // Printf(stderr,"*** 1-a\n"); if (SwigType_istemplate(k)) { From c8620e478245db235a5d1e11750f07a92e4e10a9 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 19 Nov 2012 19:53:29 +0000 Subject: [PATCH 193/538] Fix some Coverity submission failures git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13919 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.in b/Makefile.in index 0e79a77da..eb3ec02b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -533,6 +533,7 @@ EMAIL=wsf@fultondesigns.co.uk PASSWORD= coverity: $(MAKE) clean-source + rm -rf cov-int cov-build --dir cov-int $(MAKE) tar czvf swig-coverity.tgz cov-int curl --form file=@swig-coverity.tgz --form project=swig --form password=$(PASSWORD) --form email=$(EMAIL) http://scan5.coverity.com/cgi-bin/upload.py From 1752b62156ce7de8f3bc636ba81854d7a7a21997 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Tue, 20 Nov 2012 20:06:21 +0000 Subject: [PATCH 194/538] [D] Fixed namespace handling bug introduced in r13915. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13920 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/d.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 2c8524dfe..29f96e548 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -3669,9 +3669,15 @@ private: bool inProxyModule(const String *type_name) const { if (!split_proxy_dmodule) { String *nspace = createOuterNamespaceNames(type_name); - bool result = false; - if (getNSpace() && nspace) + + // Check if strings are either both null (no namespace) or are both + // non-null and have the same contents. Cannot use Strcmp for this + // directly because of its strange way of handling the case where only + // one argument is 0 ("<"). + bool result = !nspace && !getNSpace(); + if (nspace && getNSpace()) result = (Strcmp(nspace, getNSpace()) == 0); + Delete(nspace); return result; } From 681c6c6231c87878065b58bce0887fe295abb53c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:27:54 +0000 Subject: [PATCH 195/538] Fix possible null dereferences in CFFI git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13921 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/cffi.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 6fd915bf5..ceb1bad67 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -322,7 +322,7 @@ void CFFI::emit_initialize_instance(Node *n) { else Printf(args_placeholder, " %s", argname); - if (Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0) + if (ffitype && Strcmp(ffitype, lispify_name(parent, lispy_name(Char(Getattr(parent, "sym:name"))), "'classname")) == 0) Printf(args_call, " (ff-pointer %s)", argname); else Printf(args_call, " %s", argname); @@ -458,10 +458,12 @@ int CFFI::functionWrapper(Node *n) { String *actioncode = emit_action(n); String *result_convert = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode); - Replaceall(result_convert, "$result", "lresult"); - Printf(f->code, "%s\n", result_convert); - if(!is_void_return) Printf(f->code, " return lresult;\n"); - Delete(result_convert); + if (result_convert) { + Replaceall(result_convert, "$result", "lresult"); + Printf(f->code, "%s\n", result_convert); + if(!is_void_return) Printf(f->code, " return lresult;\n"); + Delete(result_convert); + } emit_return_variable(n, Getattr(n, "type"), f); Printf(f->code, " } catch (...) {\n"); From 158a00b591156184d2fe5fcf3b0f442077ae1b8b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:28:43 +0000 Subject: [PATCH 196/538] Fix potential crash in clisp git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13922 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/clisp.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index a322cb2de..3a4a5648c 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -78,13 +78,13 @@ int CLISP::top(Node *n) { /* Get the output file name */ String *outfile = Getattr(n, "outfile"); - if (!outfile) - output_filename = outfile; - else { - output_filename = NewString(""); - Printf(output_filename, "%s%s.lisp", SWIG_output_directory(), module); + if (!outfile) { + Printf(stderr, "Unable to determine outfile\n"); + SWIG_exit(EXIT_FAILURE); } + output_filename = NewStringf("%s%s.lisp", SWIG_output_directory(), module); + f_cl = NewFile(output_filename, "w+", SWIG_output_files()); if (!f_cl) { FileErrorDisplay(output_filename); From f267e08b5b454190d268be7f42a32a2998eafc09 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:29:07 +0000 Subject: [PATCH 197/538] Fix potential null pointer dereferences git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13923 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/go.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 0a8798444..86171d28b 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -2375,14 +2375,14 @@ private: Iterator b = First(baselist); if (is_base_first) { + if (!b.item) { + return; + } if (!GetFlag(b.item, "feature:ignore")) { addParentExtraBaseInterfaces(n, parents, b.item, true, sf); } b = Next(b); - if (!b.item) { - return; - } } String *go_name = buildGoName(Getattr(n, "sym:name"), false, false); @@ -4384,7 +4384,7 @@ private: Delete(p); } - if (Strstr(ret, "$gotypename") != 0) { + if (ret && Strstr(ret, "$gotypename") != 0) { ret = NULL; } From 2b8bfe410e52ce06378cafcb7c2842dc7cd7c284 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:29:35 +0000 Subject: [PATCH 198/538] Remove unnecessary null checks or fix potential null dereferences git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13924 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/modula3.cxx | 38 ++++++++++++----------- Source/Modules/ocaml.cxx | 5 ++- Source/Modules/perl5.cxx | 2 +- Source/Modules/python.cxx | 6 ++-- Source/Modules/r.cxx | 62 ++++++++++++++++++++------------------ 5 files changed, 60 insertions(+), 53 deletions(-) diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index b473e3087..f7b60825d 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -2096,7 +2096,7 @@ MODULA3(): stem += Len(pat.prefix); } String *newname; - if (Strcmp(srcstyle, "underscore") == 0) { + if (srcstyle && Strcmp(srcstyle, "underscore") == 0) { if (newprefix != NIL) { String *newstem = nameToModula3(stem, true); newname = NewStringf("%s%s", newprefix, newstem); @@ -2214,16 +2214,18 @@ MODULA3(): List *baselist = Getattr(n, "bases"); if (baselist != NIL) { Iterator base = First(baselist); - c_baseclassname = Getattr(base.item, "name"); - baseclass = Copy(getProxyName(c_baseclassname)); - if (baseclass) { - c_baseclass = SwigType_namestr(Getattr(base.item, "name")); - } - base = Next(base); - if (base.item != NIL) { - Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n), - "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n", - name, Getattr(base.item, "name")); + if (base.item) { + c_baseclassname = Getattr(base.item, "name"); + baseclass = Copy(getProxyName(c_baseclassname)); + if (baseclass) { + c_baseclass = SwigType_namestr(Getattr(base.item, "name")); + } + base = Next(base); + if (base.item != NIL) { + Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n), + "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n", + name, Getattr(base.item, "name")); + } } } @@ -2460,12 +2462,14 @@ MODULA3(): /* Look for the first (principal?) base class - Modula 3 does not support multiple inheritance */ Iterator base = First(baselist); - Append(baseclassname, Getattr(base.item, "sym:name")); - base = Next(base); - if (base.item != NIL) { - Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n), - "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n", - proxy_class_name, Getattr(base.item, "name")); + if (base.item) { + Append(baseclassname, Getattr(base.item, "sym:name")); + base = Next(base); + if (base.item) { + Swig_warning(WARN_MODULA3_MULTIPLE_INHERITANCE, Getfile(n), Getline(n), + "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Modula 3.\n", + proxy_class_name, Getattr(base.item, "name")); + } } } } diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 135cc89dc..9fc5e9c71 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1256,13 +1256,12 @@ public: Printv(qtype, name, NIL); } - if (const_enum && name && !Getattr(seen_enumvalues, name)) { + if (const_enum && qtype && name && !Getattr(seen_enumvalues, name)) { Setattr(seen_enumvalues, name, "true"); SetFlag(n, "feature:immutable"); Setattr(n, "feature:enumvalue", "1"); // this does not appear to be used - if (qtype) - Setattr(n, "qualified:name", SwigType_namestr(qtype)); + Setattr(n, "qualified:name", SwigType_namestr(qtype)); String *evname = SwigType_manglestr(qtype); Insert(evname, 0, "SWIG_ENUM_"); diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 242db1df1..1662f3b55 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -1638,8 +1638,8 @@ public: while (fgets(buffer, 4095, f)) { Printf(pragma_include, "%s", buffer); } + fclose(f); } - fclose(f); } } else { Swig_error(input_file, line_number, "Unrecognized pragma.\n"); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index dcf6699b1..56107e0c0 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1163,9 +1163,9 @@ public: autodoc_l autodoc_level(String *autodoc) { autodoc_l dlevel = NO_AUTODOC; - if (autodoc) { - char *c = Char(autodoc); - if (c && isdigit(c[0])) { + char *c = Char(autodoc); + if (c) { + if (isdigit(c[0])) { dlevel = (autodoc_l) atoi(c); } else { if (strcmp(c, "extended") == 0) { diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 9e931a38d..ab13cb7fc 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -1609,7 +1609,6 @@ void R::dispatchFunction(Node *n) { String *tmcheck = Swig_typemap_lookup("rtypecheck", p, "", 0); if (tmcheck) { - String *tmp = NewString(""); Printf(tmp, "argv[[%d]]", j+1); Replaceall(tmcheck, "$arg", tmp); @@ -1626,32 +1625,34 @@ void R::dispatchFunction(Node *n) { tmcheck); p = Getattr(p, "tmap:in:next"); continue; - } - if (DohStrcmp(tm,"numeric")==0) { + } + if (tm) { + if (Strcmp(tm,"numeric")==0) { Printf(f->code, "%sis.numeric(argv[[%d]])", - j == 0 ? "" : " && ", - j+1); + j == 0 ? "" : " && ", + j+1); } - else if (DohStrcmp(tm,"integer")==0) { + else if (Strcmp(tm,"integer")==0) { Printf(f->code, "%s(is.integer(argv[[%d]]) || is.numeric(argv[[%d]]))", - j == 0 ? "" : " && ", - j+1, j+1); + j == 0 ? "" : " && ", + j+1, j+1); } - else if (DohStrcmp(tm,"character")==0) { + else if (Strcmp(tm,"character")==0) { Printf(f->code, "%sis.character(argv[[%d]])", - j == 0 ? "" : " && ", - j+1); + j == 0 ? "" : " && ", + j+1); } else { Printf(f->code, "%sextends(argtypes[%d], '%s')", - j == 0 ? "" : " && ", - j+1, - tm); - } - if (!SwigType_ispointer(Getattr(p, "type"))) { - Printf(f->code, " && length(argv[[%d]]) == 1", - j+1); + j == 0 ? "" : " && ", + j+1, + tm); } + } + if (!SwigType_ispointer(Getattr(p, "type"))) { + Printf(f->code, " && length(argv[[%d]]) == 1", + j+1); + } p = Getattr(p, "tmap:in:next"); } Printf(f->code, ") { f <- %s%s; }\n", sfname, overname); @@ -1845,18 +1846,21 @@ int R::functionWrapper(Node *n) { String *lname = Getattr(p,"lname"); // R keyword renaming - if (name && Swig_name_warning(p, 0, name, 0)) - name = 0; - - /* If we have a :: in the parameter name because we are accessing a static member of a class, say, then - we need to remove that prefix. */ - while (Strstr(name, "::")) { - //XXX need to free. - name = NewStringf("%s", Strchr(name, ':') + 2); - if (debugMode) - Printf(stdout, "+++ parameter name with :: in it %s\n", name); + if (name) { + if (Swig_name_warning(p, 0, name, 0)) { + name = 0; + } else { + /* If we have a :: in the parameter name because we are accessing a static member of a class, say, then + we need to remove that prefix. */ + while (Strstr(name, "::")) { + //XXX need to free. + name = NewStringf("%s", Strchr(name, ':') + 2); + if (debugMode) + Printf(stdout, "+++ parameter name with :: in it %s\n", name); + } + } } - if (Len(name) == 0) + if (!name || Len(name) == 0) name = NewStringf("s_arg%d", i+1); name = replaceInitialDash(name); From 5b4ba0b0d692b85d02eeee161cd585dbc0df2caf Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 20 Nov 2012 23:29:57 +0000 Subject: [PATCH 199/538] Remove unnecessary null checks or fix potential null dereferences git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13925 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/ruby.cxx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index 0d7de537c..e16bbc9ba 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -206,9 +206,9 @@ private: autodoc_l autodoc_level(String *autodoc) { autodoc_l dlevel = NO_AUTODOC; - if (autodoc) { - char *c = Char(autodoc); - if (c && isdigit(c[0])) { + char *c = Char(autodoc); + if (c) { + if (isdigit(c[0])) { dlevel = (autodoc_l) atoi(c); } else { if (strcmp(c, "extended") == 0) { @@ -495,7 +495,7 @@ private: String* full_name; if ( module ) { full_name = NewString(module); - if (class_name && Len(class_name) > 0) + if (Len(class_name) > 0) Append(full_name, "::"); } else @@ -1283,13 +1283,15 @@ public: } m = Next(m); } - if (feature == 0) { - feature = Copy(last); + if (last) { + if (feature == 0) { + feature = Copy(last); + } + (Char(last))[0] = (char)toupper((Char(last))[0]); + modvar = NewStringf("m%s", last); } - (Char(last))[0] = (char)toupper((Char(last))[0]); - modvar = NewStringf("m%s", last); - Delete(modules); } + Delete(modules); } Delete(mod_name); } From 7d610dbd62750bdb2a427ec73f29355252e0f99f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2012 23:20:57 +0000 Subject: [PATCH 200/538] Remove unnecessary null check git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13926 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/typepass.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index 192c85ba6..cda56aecf 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -572,12 +572,9 @@ class TypePass:private Dispatcher { if (alias) { Typetab *ts = Getattr(n, "typescope"); if (!ts) { - Node *ns; - /* Create a empty scope for the alias */ - ns = Getattr(n, "namespace"); - if (ns) { - SwigType_scope_alias(name, Getattr(ns, "typescope")); - } + /* Create an empty scope for the alias */ + Node *ns = Getattr(n, "namespace"); + SwigType_scope_alias(name, Getattr(ns, "typescope")); ts = Getattr(ns, "typescope"); Setattr(n, "typescope", ts); } From be3236cb678b9e00e42ae2579455f2c5a068019e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2012 23:21:19 +0000 Subject: [PATCH 201/538] Better handling of null sym:name git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13927 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 0a8415120..6e9afbad3 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -834,10 +834,25 @@ int Language::cDeclaration(Node *n) { File *f_header = 0; SwigType *ty, *fullty; + if (Getattr(n, "feature:onlychildren")) { + if (GetFlag(n, "feature:ignore")) { + return SWIG_NOWRAP; + } else { + // Found an unignored templated method that has an empty template instantiation (%template()) + // Ignore it unless it has been %rename'd + if (Strncmp(symname, "__dummy_", 8) == 0) { + SetFlag(n, "feature:ignore"); + Swig_warning(WARN_LANG_TEMPLATE_METHOD_IGNORE, input_file, line_number, + "%%template() contains no name. Template method ignored: %s\n", Swig_name_decl(n)); + return SWIG_NOWRAP; + } + } + } + /* discards nodes following the access control rules */ if (cplus_mode != PUBLIC || !is_public(n)) { /* except for friends, they are not affected by access control */ - int isfriend = storage && (Cmp(storage, "friend") == 0); + int isfriend = Cmp(storage, "friend") == 0; if (!isfriend) { /* Check what the director needs. If the method is pure virtual, it is always needed. * Also wrap non-virtual protected members if asked for (allprotected mode). */ @@ -894,7 +909,7 @@ int Language::cDeclaration(Node *n) { } } - if (symname && !validIdentifier(symname)) { + if (!validIdentifier(symname)) { Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap '%s' unless renamed to a valid identifier.\n", symname); return SWIG_NOWRAP; } @@ -964,17 +979,9 @@ int Language::cDeclaration(Node *n) { Delete(SwigType_pop_function(ty)); DohIncref(type); Setattr(n, "type", ty); - if (GetFlag(n, "feature:onlychildren") && !GetFlag(n, "feature:ignore")) { - // Found an unignored templated method that has an empty template instantiation (%template()) - // Ignore it unless it has been %rename'd - if (Strncmp(symname, "__dummy_", 8) == 0) { - SetFlag(n, "feature:ignore"); - Swig_warning(WARN_LANG_TEMPLATE_METHOD_IGNORE, input_file, line_number, - "%%template() contains no name. Template method ignored: %s\n", Swig_name_decl(n)); - } - } - if (!GetFlag(n, "feature:ignore")) - functionHandler(n); + + functionHandler(n); + Setattr(n, "type", type); Delete(ty); Delete(type); @@ -2790,7 +2797,7 @@ int Language::destructorHandler(Node *n) { String *symname = Getattr(n, "sym:name"); String *mrename; char *csymname = Char(symname); - if (csymname && (*csymname == '~')) + if (*csymname == '~') csymname += 1; mrename = Swig_name_destroy(NSpace, csymname); From dad24760917fc186e06aac764414c844947a608f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2012 23:21:54 +0000 Subject: [PATCH 202/538] Minor logic fix. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13928 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 6e9afbad3..ff6226efc 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -3503,7 +3503,7 @@ int Language::abstractClassTest(Node *n) { } else { return 1; } - return dirabstract ? 1 : 0; + return 0; } void Language::setSubclassInstanceCheck(String *nc) { From afec99c64fdbcda407fee49a2a21cd048e61eea7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2012 23:22:34 +0000 Subject: [PATCH 203/538] Remove some useless code git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13929 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index ff6226efc..144638366 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1138,18 +1138,12 @@ int Language::callbackfunctionHandler(Node *n) { String *type = Getattr(n, "type"); String *name = Getattr(n, "name"); String *parms = Getattr(n, "parms"); - String *cb = GetFlagAttr(n, "feature:callback"); String *cbname = Getattr(n, "feature:callback:name"); String *calltype = NewStringf("(%s (*)(%s))(%s)", SwigType_str(type, 0), ParmList_str(parms), SwigType_namestr(name)); SwigType *cbty = Copy(type); SwigType_add_function(cbty, parms); SwigType_add_pointer(cbty); - if (!cbname) { - cbname = NewStringf(cb, symname); - Setattr(n, "feature:callback:name", cbname); - } - Setattr(n, "sym:name", cbname); Setattr(n, "type", cbty); Setattr(n, "value", calltype); @@ -1158,7 +1152,6 @@ int Language::callbackfunctionHandler(Node *n) { if (!ns) constantWrapper(n); - Delete(cbname); Delete(cbty); Swig_restore(n); From 14446c365b031147e1a6606218a4e2cb853d219e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 22 Nov 2012 23:23:15 +0000 Subject: [PATCH 204/538] Minor logic and memory leak fix. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13930 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 144638366..b701d9354 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -3470,6 +3470,7 @@ int Language::abstractClassTest(Node *n) { String *check_item = Getattr(item, "vmid"); if (Strcmp(method_id, check_item) == 0) { exists_item = true; + Delete(method_id); break; } } From f3e253771c57b2dea0bdb96c32a08772218b5b5d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 23 Nov 2012 07:36:10 +0000 Subject: [PATCH 205/538] Remove incorrect Delete git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13931 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index b701d9354..144638366 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -3470,7 +3470,6 @@ int Language::abstractClassTest(Node *n) { String *check_item = Getattr(item, "vmid"); if (Strcmp(method_id, check_item) == 0) { exists_item = true; - Delete(method_id); break; } } From 0d2c4590462d222ccd6481fcf0db85f97eedb769 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 23 Nov 2012 07:38:00 +0000 Subject: [PATCH 206/538] Remove some unused code and pointless variable assignments git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13932 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/csharp.cxx | 4 ++-- Source/Modules/d.cxx | 4 ++-- Source/Modules/java.cxx | 8 ++++---- Source/Modules/lang.cxx | 1 - Source/Modules/octave.cxx | 2 +- Source/Modules/php.cxx | 7 +------ Source/Modules/python.cxx | 2 +- Source/Modules/r.cxx | 2 +- Source/Modules/ruby.cxx | 6 +----- 9 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index d715aadb2..619fb7ebd 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -925,7 +925,7 @@ public: if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { canThrow(n, "throws", p); } } @@ -3747,7 +3747,7 @@ public: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 29f96e548..a1a454bd0 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1695,7 +1695,7 @@ public: if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { canThrow(n, "throws", p); } } @@ -2224,7 +2224,7 @@ public: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index bfa02d7e2..d59ca8bd6 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1016,7 +1016,7 @@ public: if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { addThrows(n, "tmap:throws", p); } } @@ -3631,7 +3631,7 @@ public: SwigType *adjustedreturntype = covariant ? covariant : returntype; Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n); - if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) + if (Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0) && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { // Note that in the case of polymorphic (covariant) return types, the @@ -3658,7 +3658,7 @@ public: } String *jdesc = NULL; - if ((tm = Swig_typemap_lookup("directorin", tp, "", 0)) + if (Swig_typemap_lookup("directorin", tp, "", 0) && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) { // Objects marshalled passing a Java class across JNI boundary use jobject - the nouse flag indicates this @@ -3911,7 +3911,7 @@ public: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { addThrows(n, "tmap:throws", p); if (gencomma++) { diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 144638366..002a1fdd7 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1134,7 +1134,6 @@ int Language::globalfunctionHandler(Node *n) { int Language::callbackfunctionHandler(Node *n) { Swig_require("callbackfunctionHandler", n, "name", "*sym:name", "*type", "?value", NIL); - String *symname = Getattr(n, "sym:name"); String *type = Getattr(n, "type"); String *name = Getattr(n, "name"); String *parms = Getattr(n, "parms"); diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index f78c71fd3..7d27c1095 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1319,7 +1319,7 @@ public: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 1f2078a1e..986911a12 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1177,11 +1177,6 @@ public: if (!o) { // This "overloaded method" is really just one with default args. really_overloaded = false; - if (l != full_parmlist) { - l = full_parmlist; - if (wrapperType == memberfn) - l = nextSibling(l); - } } } @@ -2472,7 +2467,7 @@ done: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 56107e0c0..5dc2cb8be 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -4583,7 +4583,7 @@ int PYTHON::classDirectorMethod(Node *n, Node *parent, String *super) { if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index ab13cb7fc..078b2576c 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -572,7 +572,7 @@ String * R::createFunctionPointerHandler(SwigType *t, Node *n, int *numArgs) { Parm *p = parms; for (i = 0; p; p = nextSibling(p), ++i) { String *arg = Getattr(p, "name"); - String *lname = NewString(""); + String *lname; if (!arg && Cmp(Getattr(p, "type"), "void")) { lname = NewStringf("s_arg%d", i+1); diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index e16bbc9ba..ff8d70d46 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -737,10 +737,6 @@ private: String *autodoc = Getattr(n, "feature:autodoc"); autodoc_l dlevel = autodoc_level(autodoc); - symname = Getattr(n, "sym:name"); - if ( Getattr( special_methods, symname ) ) - symname = Getattr( special_methods, symname ); - switch (dlevel) { case NO_AUTODOC: case NAMES_AUTODOC: @@ -3093,7 +3089,7 @@ public: if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); From 7a89f71f3632512bb2de90b0e263dfacbdc0c05b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 24 Nov 2012 14:12:25 +0000 Subject: [PATCH 207/538] Coverity defect suppression git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13933 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/clisp.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index 3a4a5648c..7bfb6298c 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -132,9 +132,9 @@ int CLISP::top(Node *n) { for (len--; len >= 0; len--) { end--; - Seek(f_cl, len, SEEK_SET); + (void)Seek(f_cl, len, SEEK_SET); int ch = Getc(f_cl); - Seek(f_cl, end, SEEK_SET); + (void)Seek(f_cl, end, SEEK_SET); Putc(ch, f_cl); } From 709d683926f8446c79eadfcd23fa677bd715b1de Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 24 Nov 2012 14:12:57 +0000 Subject: [PATCH 208/538] Minor code optimisation git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13934 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/allocate.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index 81a732638..8c8450312 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -336,15 +336,13 @@ class Allocate:public Dispatcher { String *name = Getattr(nn, "name"); if (!name) continue; + if (Strchr(name, '~')) + continue; /* Don't care about destructors */ String *base_decl = Getattr(nn, "decl"); if (base_decl) base_decl = SwigType_typedef_resolve_all(base_decl); - if (Strchr(name, '~')) - continue; /* Don't care about destructors */ - - if (SwigType_isfunction(base_decl)) { + if (SwigType_isfunction(base_decl)) search_decl = SwigType_pop_function(base_decl); - } Node *dn = Swig_symbol_clookup_local_check(name, 0, check_implemented); Delete(search_decl); Delete(base_decl); @@ -415,7 +413,7 @@ class Allocate:public Dispatcher { match = 1; break; } - if ((!symname || (!Getattr(e, "sym:name"))) && (Cmp(name, Getattr(e, "name")) == 0)) { + if (!Getattr(e, "sym:name") && (Cmp(name, Getattr(e, "name")) == 0)) { match = 1; break; } From d93dc0f8e23eb9fb18841bf50b2b505e61ff5a94 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 24 Nov 2012 14:13:58 +0000 Subject: [PATCH 209/538] Distinguish between an "abstract" attribute on a class containing a list of abstract members and an "abstract" flag on pure virtual methods - renamed former to "abstracts" git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13935 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 10 +++++----- Source/Modules/allocate.cxx | 24 ++++++++++++------------ Source/Modules/csharp.cxx | 2 +- Source/Modules/d.cxx | 2 +- Source/Modules/java.cxx | 2 +- Source/Modules/lang.cxx | 12 ++++++------ Source/Modules/php.cxx | 6 +++--- Source/Modules/python.cxx | 2 +- Source/Modules/tcl8.cxx | 2 +- Source/Swig/cwrap.c | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 2774014ab..cd3d73eca 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -740,7 +740,7 @@ static List *pure_abstract(Node *n) { abs = NewList(); } Append(abs,n); - Setattr(n,"abstract","1"); + SetFlag(n,"abstract"); } } } else if (Cmp(nodeType(n),"destructor") == 0) { @@ -749,7 +749,7 @@ static List *pure_abstract(Node *n) { abs = NewList(); } Append(abs,n); - Setattr(n,"abstract","1"); + SetFlag(n,"abstract"); } } n = nextSibling(n); @@ -3002,7 +3002,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va if (Strcmp(nodeType(templnode),"class") == 0) { /* Identify pure abstract methods */ - Setattr(templnode,"abstract", pure_abstract(firstChild(templnode))); + Setattr(templnode,"abstracts", pure_abstract(firstChild(templnode))); /* Set up inheritance in symbol table */ { @@ -3574,7 +3574,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { inclass = 0; /* Check for pure-abstract class */ - Setattr($$,"abstract", pure_abstract($7)); + Setattr($$,"abstracts", pure_abstract($7)); /* This bit of code merges in a previously defined %extend directive (if any) */ @@ -3737,7 +3737,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { unnamed = Getattr($$,"unnamed"); /* Check for pure-abstract class */ - Setattr($$,"abstract", pure_abstract($5)); + Setattr($$,"abstracts", pure_abstract($5)); n = new_node("cdecl"); Setattr(n,"name",$7.id); diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index 8c8450312..91fad132f 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -43,7 +43,7 @@ extern "C" { SwigType *decl1 = SwigType_typedef_resolve_all(decl); SwigType *decl2 = SwigType_pop_function(decl1); if (Strcmp(decl2, search_decl) == 0) { - if (!Getattr(n, "abstract")) { + if (!GetFlag(n, "abstract")) { Delete(decl1); Delete(decl2); return 1; @@ -327,7 +327,7 @@ class Allocate:public Dispatcher { Swig_symbol_setscope(oldtab); return ret; } - List *abstract = Getattr(base, "abstract"); + List *abstract = Getattr(base, "abstracts"); if (abstract) { int dabstract = 0; int len = Len(abstract); @@ -348,15 +348,15 @@ class Allocate:public Dispatcher { Delete(base_decl); if (!dn) { - List *nabstract = Getattr(n, "abstract"); + List *nabstract = Getattr(n, "abstracts"); if (!nabstract) { nabstract = NewList(); - Setattr(n, "abstract", nabstract); + Setattr(n, "abstracts", nabstract); Delete(nabstract); } Append(nabstract, nn); - if (!Getattr(n, "abstract:firstnode")) { - Setattr(n, "abstract:firstnode", nn); + if (!Getattr(n, "abstracts:firstnode")) { + Setattr(n, "abstracts:firstnode", nn); } dabstract = base != n; } @@ -596,18 +596,18 @@ Allocate(): /* Check if the class is abstract via inheritance. This might occur if a class didn't have any pure virtual methods of its own, but it didn't implement all of the pure methods in a base class */ - if (!Getattr(n, "abstract") && is_abstract_inherit(n)) { + if (!Getattr(n, "abstracts") && is_abstract_inherit(n)) { if (((Getattr(n, "allocate:public_constructor") || (!GetFlag(n, "feature:nodefault") && !Getattr(n, "allocate:has_constructor"))))) { if (!GetFlag(n, "feature:notabstract")) { - Node *na = Getattr(n, "abstract:firstnode"); + Node *na = Getattr(n, "abstracts:firstnode"); if (na) { Swig_warning(WARN_TYPE_ABSTRACT, Getfile(n), Getline(n), "Class '%s' might be abstract, " "no constructors generated,\n", SwigType_namestr(Getattr(n, "name"))); Swig_warning(WARN_TYPE_ABSTRACT, Getfile(na), Getline(na), "Method %s might not be implemented.\n", Swig_name_decl(na)); - if (!Getattr(n, "abstract")) { + if (!Getattr(n, "abstracts")) { List *abstract = NewList(); Append(abstract, na); - Setattr(n, "abstract", abstract); + Setattr(n, "abstracts", abstract); Delete(abstract); } } @@ -618,7 +618,7 @@ Allocate(): if (!Getattr(n, "allocate:has_constructor")) { /* No constructor is defined. We need to check a few things */ /* If class is abstract. No default constructor. Sorry */ - if (Getattr(n, "abstract")) { + if (Getattr(n, "abstracts")) { Delattr(n, "allocate:default_constructor"); } if (!Getattr(n, "allocate:default_constructor")) { @@ -639,7 +639,7 @@ Allocate(): } } if (!Getattr(n, "allocate:has_copy_constructor")) { - if (Getattr(n, "abstract")) { + if (Getattr(n, "abstracts")) { Delattr(n, "allocate:copy_constructor"); } if (!Getattr(n, "allocate:copy_constructor")) { diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 619fb7ebd..c54475029 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -3512,7 +3512,7 @@ public: Symtab *symtab = Getattr(n, "sym:symtab"); Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) { /* initialize pointers to something sane. Same for abstract classes when a reference is returned. */ Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index a1a454bd0..1ea74eb6b 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1984,7 +1984,7 @@ public: Symtab *symtab = Getattr(n, "sym:symtab"); Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) { /* initialize pointers to something sane. Same for abstract classes when a reference is returned. */ Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index d59ca8bd6..cd8cfe543 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3583,7 +3583,7 @@ public: Symtab *symtab = Getattr(n, "sym:symtab"); Node *typenode = Swig_symbol_clookup(resolved_typename, symtab); - if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstract"))) { + if (SwigType_ispointer(returntype) || (typenode && Getattr(typenode, "abstracts"))) { /* initialize pointers to something sane. Same for abstract classes when a reference is returned. */ Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), "= 0", NIL); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 002a1fdd7..043473bc6 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2649,18 +2649,18 @@ static String *get_director_ctor_code(Node *n, String *director_ctor_code, Strin int use_director = Swig_directorclass(n); if (use_director) { Node *pn = Swig_methodclass(n); - abstract = Getattr(pn, "abstract"); + abstract = Getattr(pn, "abstracts"); if (director_prot_ctor_code) { int is_notabstract = GetFlag(pn, "feature:notabstract"); int is_abstract = abstract && !is_notabstract; if (is_protected(n) || is_abstract) { director_ctor = director_prot_ctor_code; abstract = Copy(abstract); - Delattr(pn, "abstract"); + Delattr(pn, "abstracts"); } else { if (is_notabstract) { abstract = Copy(abstract); - Delattr(pn, "abstract"); + Delattr(pn, "abstracts"); } else { abstract = 0; } @@ -2696,7 +2696,7 @@ int Language::constructorHandler(Node *n) { Delete(mrename); Swig_restore(n); if (abstract) - Setattr(Swig_methodclass(n), "abstract", abstract); + Setattr(Swig_methodclass(n), "abstracts", abstract); return SWIG_OK; } @@ -2718,7 +2718,7 @@ int Language::copyconstructorHandler(Node *n) { Delete(mrename); Swig_restore(n); if (abstract) - Setattr(Swig_methodclass(n), "abstract", abstract); + Setattr(Swig_methodclass(n), "abstracts", abstract); return SWIG_OK; } @@ -3436,7 +3436,7 @@ int Language::abstractClassTest(Node *n) { if (Getattr(n, "allocate:nonew")) return 1; /* now check for the rest */ - List *abstract = Getattr(n, "abstract"); + List *abstract = Getattr(n, "abstracts"); if (!abstract) return 0; int labs = Len(abstract); diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 986911a12..149b3cd83 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1698,9 +1698,9 @@ public: Printf(output, "\t\t$r=%s;\n", invoke); if (Len(ret_types) == 1) { /* If d is abstract we can't create a new wrapper type d. */ - Node * d_class = classLookup(d); + Node *d_class = classLookup(d); int is_abstract = 0; - if (Getattr(d_class, "abstract")) { + if (Getattr(d_class, "abstracts")) { is_abstract = 1; } if (newobject || !is_abstract) { @@ -2020,7 +2020,7 @@ done: base.item = NULL; } - if (Getattr(n, "abstract") && !GetFlag(n, "feature:notabstract")) { + if (Getattr(n, "abstracts") && !GetFlag(n, "feature:notabstract")) { Printf(s_phpclasses, "abstract "); } diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 5dc2cb8be..43d306b09 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -3794,7 +3794,7 @@ public: if (!have_constructor) { if (!builtin) Printv(f_shadow_file, tab4, "def __init__(self, *args, **kwargs): raise AttributeError(\"", "No constructor defined", - (Getattr(n, "abstract") ? " - class is abstract" : ""), "\")\n", NIL); + (Getattr(n, "abstracts") ? " - class is abstract" : ""), "\")\n", NIL); } else if (fastinit && !builtin) { Printv(f_wrappers, "SWIGINTERN PyObject *", class_name, "_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {\n", NIL); diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index a4f29183c..91e74f4ca 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -942,7 +942,7 @@ public: Printv(f_shadow, " constructor { } {\n", NIL); Printv(f_shadow, " # This constructor will fail if called directly\n", NIL); Printv(f_shadow, " if { [info class] == \"::", class_name, "\" } {\n", NIL); - Printv(f_shadow, " error \"No constructor for class ", class_name, (Getattr(n, "abstract") ? " - class is abstract" : ""), "\"\n", NIL); + Printv(f_shadow, " error \"No constructor for class ", class_name, (Getattr(n, "abstracts") ? " - class is abstract" : ""), "\"\n", NIL); Printv(f_shadow, " }\n", NIL); Printv(f_shadow, " }\n", NIL); } diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index a032de746..063ab9858 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -1165,7 +1165,7 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String /* if a C++ director class exists, create it rather than the original class */ if (use_director) { Node *parent = Swig_methodclass(n); - int abstract = Getattr(parent, "abstract") != 0; + int abstract = Getattr(parent, "abstracts") != 0; String *name = Getattr(parent, "sym:name"); String *directorname = NewStringf("SwigDirector_%s", name); String *action = NewStringEmpty(); From 9b40eb58e3c7c50f1f9012aa03f7f97630e3340b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 24 Nov 2012 14:15:20 +0000 Subject: [PATCH 210/538] cosmetic variable name changes for abstracts to match previous commit git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13936 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 24 +++++++++++------------ Source/Modules/allocate.cxx | 28 +++++++++++++-------------- Source/Modules/lang.cxx | 38 ++++++++++++++++++------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index cd3d73eca..b758316e4 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -728,33 +728,33 @@ static void check_extensions() { /* Check a set of declarations to see if any are pure-abstract */ -static List *pure_abstract(Node *n) { - List *abs = 0; +static List *pure_abstracts(Node *n) { + List *abstracts = 0; while (n) { if (Cmp(nodeType(n),"cdecl") == 0) { String *decl = Getattr(n,"decl"); if (SwigType_isfunction(decl)) { String *init = Getattr(n,"value"); if (Cmp(init,"0") == 0) { - if (!abs) { - abs = NewList(); + if (!abstracts) { + abstracts = NewList(); } - Append(abs,n); + Append(abstracts,n); SetFlag(n,"abstract"); } } } else if (Cmp(nodeType(n),"destructor") == 0) { if (Cmp(Getattr(n,"value"),"0") == 0) { - if (!abs) { - abs = NewList(); + if (!abstracts) { + abstracts = NewList(); } - Append(abs,n); + Append(abstracts,n); SetFlag(n,"abstract"); } } n = nextSibling(n); } - return abs; + return abstracts; } /* Make a classname */ @@ -3002,7 +3002,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va if (Strcmp(nodeType(templnode),"class") == 0) { /* Identify pure abstract methods */ - Setattr(templnode,"abstracts", pure_abstract(firstChild(templnode))); + Setattr(templnode,"abstracts", pure_abstracts(firstChild(templnode))); /* Set up inheritance in symbol table */ { @@ -3574,7 +3574,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { inclass = 0; /* Check for pure-abstract class */ - Setattr($$,"abstracts", pure_abstract($7)); + Setattr($$,"abstracts", pure_abstracts($7)); /* This bit of code merges in a previously defined %extend directive (if any) */ @@ -3737,7 +3737,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { unnamed = Getattr($$,"unnamed"); /* Check for pure-abstract class */ - Setattr($$,"abstracts", pure_abstract($5)); + Setattr($$,"abstracts", pure_abstracts($5)); n = new_node("cdecl"); Setattr(n,"name",$7.id); diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index 91fad132f..4c884caca 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -327,12 +327,12 @@ class Allocate:public Dispatcher { Swig_symbol_setscope(oldtab); return ret; } - List *abstract = Getattr(base, "abstracts"); - if (abstract) { + List *abstracts = Getattr(base, "abstracts"); + if (abstracts) { int dabstract = 0; - int len = Len(abstract); + int len = Len(abstracts); for (int i = 0; i < len; i++) { - Node *nn = Getitem(abstract, i); + Node *nn = Getitem(abstracts, i); String *name = Getattr(nn, "name"); if (!name) continue; @@ -348,13 +348,13 @@ class Allocate:public Dispatcher { Delete(base_decl); if (!dn) { - List *nabstract = Getattr(n, "abstracts"); - if (!nabstract) { - nabstract = NewList(); - Setattr(n, "abstracts", nabstract); - Delete(nabstract); + List *nabstracts = Getattr(n, "abstracts"); + if (!nabstracts) { + nabstracts = NewList(); + Setattr(n, "abstracts", nabstracts); + Delete(nabstracts); } - Append(nabstract, nn); + Append(nabstracts, nn); if (!Getattr(n, "abstracts:firstnode")) { Setattr(n, "abstracts:firstnode", nn); } @@ -605,10 +605,10 @@ Allocate(): "Class '%s' might be abstract, " "no constructors generated,\n", SwigType_namestr(Getattr(n, "name"))); Swig_warning(WARN_TYPE_ABSTRACT, Getfile(na), Getline(na), "Method %s might not be implemented.\n", Swig_name_decl(na)); if (!Getattr(n, "abstracts")) { - List *abstract = NewList(); - Append(abstract, na); - Setattr(n, "abstracts", abstract); - Delete(abstract); + List *abstracts = NewList(); + Append(abstracts, na); + Setattr(n, "abstracts", abstracts); + Delete(abstracts); } } } diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 043473bc6..ad2a0d6b8 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2644,25 +2644,25 @@ int Language::constructorDeclaration(Node *n) { * get_director_ctor_code() * ---------------------------------------------------------------------- */ -static String *get_director_ctor_code(Node *n, String *director_ctor_code, String *director_prot_ctor_code, List *&abstract) { +static String *get_director_ctor_code(Node *n, String *director_ctor_code, String *director_prot_ctor_code, List *&abstracts) { String *director_ctor = director_ctor_code; int use_director = Swig_directorclass(n); if (use_director) { Node *pn = Swig_methodclass(n); - abstract = Getattr(pn, "abstracts"); + abstracts = Getattr(pn, "abstracts"); if (director_prot_ctor_code) { int is_notabstract = GetFlag(pn, "feature:notabstract"); - int is_abstract = abstract && !is_notabstract; + int is_abstract = abstracts && !is_notabstract; if (is_protected(n) || is_abstract) { director_ctor = director_prot_ctor_code; - abstract = Copy(abstract); + abstracts = Copy(abstracts); Delattr(pn, "abstracts"); } else { if (is_notabstract) { - abstract = Copy(abstract); + abstracts = Copy(abstracts); Delattr(pn, "abstracts"); } else { - abstract = 0; + abstracts = 0; } } } @@ -2681,10 +2681,10 @@ int Language::constructorHandler(Node *n) { String *mrename = Swig_name_construct(NSpace, symname); String *nodeType = Getattr(n, "nodeType"); int constructor = (!Cmp(nodeType, "constructor")); - List *abstract = 0; + List *abstracts = 0; String *director_ctor = get_director_ctor_code(n, director_ctor_code, director_prot_ctor_code, - abstract); + abstracts); if (!constructor) { /* if not originally a constructor, still handle it as one */ Setattr(n, "handled_as_constructor", "1"); @@ -2695,8 +2695,8 @@ int Language::constructorHandler(Node *n) { functionWrapper(n); Delete(mrename); Swig_restore(n); - if (abstract) - Setattr(Swig_methodclass(n), "abstracts", abstract); + if (abstracts) + Setattr(Swig_methodclass(n), "abstracts", abstracts); return SWIG_OK; } @@ -2708,17 +2708,17 @@ int Language::copyconstructorHandler(Node *n) { Swig_require("copyconstructorHandler", n, "?name", "*sym:name", "?type", "?parms", NIL); String *symname = Getattr(n, "sym:name"); String *mrename = Swig_name_copyconstructor(NSpace, symname); - List *abstract = 0; + List *abstracts = 0; String *director_ctor = get_director_ctor_code(n, director_ctor_code, director_prot_ctor_code, - abstract); + abstracts); Swig_ConstructorToFunction(n, NSpace, ClassType, none_comparison, director_ctor, CPlusPlus, Getattr(n, "template") ? 0 : Extend); Setattr(n, "sym:name", mrename); functionWrapper(n); Delete(mrename); Swig_restore(n); - if (abstract) - Setattr(Swig_methodclass(n), "abstracts", abstract); + if (abstracts) + Setattr(Swig_methodclass(n), "abstracts", abstracts); return SWIG_OK; } @@ -3436,17 +3436,17 @@ int Language::abstractClassTest(Node *n) { if (Getattr(n, "allocate:nonew")) return 1; /* now check for the rest */ - List *abstract = Getattr(n, "abstracts"); - if (!abstract) + List *abstracts = Getattr(n, "abstracts"); + if (!abstracts) return 0; - int labs = Len(abstract); + int labs = Len(abstracts); #ifdef SWIG_DEBUG List *bases = Getattr(n, "allbases"); Printf(stderr, "testing %s %d %d\n", Getattr(n, "name"), labs, Len(bases)); #endif if (!labs) return 0; /*strange, but need to be fixed */ - if (abstract && !directorsEnabled()) + if (abstracts && !directorsEnabled()) return 1; if (!GetFlag(n, "feature:director")) return 1; @@ -3458,7 +3458,7 @@ int Language::abstractClassTest(Node *n) { Printf(stderr, "vtable %s %d %d\n", Getattr(n, "name"), Len(vtable), labs); #endif for (int i = 0; i < labs; i++) { - Node *ni = Getitem(abstract, i); + Node *ni = Getitem(abstracts, i); Node *method_id = vtable_method_id(ni); if (!method_id) continue; From b596ddbbc134246d8af254966652a9c12d5e668d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 26 Nov 2012 20:28:09 +0000 Subject: [PATCH 211/538] Correct type change from char * to String introduced in rev 13904 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13937 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Preprocessor/cpp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 4366a8434..7e45c5bd4 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1870,7 +1870,7 @@ String *Preprocessor_parse(String *s) { push_imported(); } dirname = Swig_file_dirname(Swig_last_file()); - if (sysfile || !strlen(dirname)) { + if (sysfile || !Len(dirname)) { Delete(dirname); dirname = 0; } From c7df90e6752444340ac5a6760c7fe0f7b89641e9 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 26 Nov 2012 20:29:00 +0000 Subject: [PATCH 212/538] Fix String */ char * mismatch git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13938 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index b758316e4..03fc329d8 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1153,7 +1153,7 @@ static void nested_new_struct(const char *kind, String *struct_code, Node *cpp_o * nested class solution is implemented. * ----------------------------------------------------------------------------- */ -static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, const char *name, Node *cpp_opt_declarators) { +static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) { Node *nn = 0; int warned = 0; @@ -1178,7 +1178,7 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S if (!variable_of_anonymous_type) { int anonymous_typedef = !sname && (storage && (strcmp(storage, "typedef") == 0)); Node *n = cpp_opt_declarators; - SwigType *type = NewString(name); + SwigType *type = name; while (n) { Setattr(n, "type", type); Setattr(n, "storage", storage); @@ -1188,7 +1188,6 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S } n = nextSibling(n); } - Delete(type); add_symbols(cpp_opt_declarators); if (nn) { @@ -4660,7 +4659,7 @@ cpp_nested : storage_class cpptype idcolon inherit LBRACE { $$ = 0; if (cplus_mode == CPLUS_PUBLIC) { if (cparse_cplusplus) { - const char *name = $6 ? Getattr($6, "name") : 0; + String *name = $6 ? Getattr($6, "name") : 0; $$ = nested_forward_declaration($1, $2, 0, name, $6); } else { if ($6) { From dac89e16d479366c5e79da4de29898af97262d23 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 26 Nov 2012 20:30:37 +0000 Subject: [PATCH 213/538] const char * correctness fixes (in C code) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13939 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/doh.h | 2 +- Source/DOH/dohint.h | 2 +- Source/DOH/fio.c | 4 ++-- Source/Preprocessor/cpp.c | 4 ++-- Source/Preprocessor/expr.c | 4 ++-- Source/Preprocessor/preprocessor.h | 2 +- Source/Swig/tree.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/DOH/doh.h b/Source/DOH/doh.h index a0bd1817c..8071edd4d 100644 --- a/Source/DOH/doh.h +++ b/Source/DOH/doh.h @@ -254,7 +254,7 @@ extern int DohDelmeta(DOH *, const DOH *); /* Utility functions */ -extern void DohEncoding(char *name, DOH *(*fn) (DOH *s)); +extern void DohEncoding(const char *name, DOH *(*fn) (DOH *s)); extern int DohPrintf(DOHFile * obj, const char *format, ...); extern int DohvPrintf(DOHFile * obj, const char *format, va_list ap); extern int DohPrintv(DOHFile * obj, ...); diff --git a/Source/DOH/dohint.h b/Source/DOH/dohint.h index 9f5c06272..c073bd95b 100644 --- a/Source/DOH/dohint.h +++ b/Source/DOH/dohint.h @@ -63,7 +63,7 @@ typedef struct { * ----------------------------------------------------------------------------- */ typedef struct DohObjInfo { - char *objname; /* Object name */ + const char *objname; /* Object name */ /* Basic object methods */ void (*doh_del) (DOH *obj); /* Delete object */ diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 3557b3c37..c4fbb1e8f 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -47,7 +47,7 @@ static int Writen(DOH *out, void *buffer, int len) { * two file-like objects and operate as a filter. * ----------------------------------------------------------------------------- */ -void DohEncoding(char *name, DOH *(*fn) (DOH *s)) { +void DohEncoding(const char *name, DOH *(*fn) (DOH *s)) { if (!encodings) encodings = NewHash(); Setattr(encodings, (void *) name, NewVoid((void *) fn, 0)); @@ -102,7 +102,7 @@ static DOH *encode(char *name, DOH *s) { * ----------------------------------------------------------------------------- */ int DohvPrintf(DOH *so, const char *format, va_list ap) { - static char *fmt_codes = "dioxXucsSfeEgGpn"; + static const char *fmt_codes = "dioxXucsSfeEgGpn"; int state = 0; const char *p = format; char newformat[256]; diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index 7e45c5bd4..c16fbe7e5 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -1637,7 +1637,7 @@ String *Preprocessor_parse(String *s) { if (Len(sval) > 0) { val = Preprocessor_expr(sval, &e); if (e) { - char *msg = Preprocessor_expr_error(); + const char *msg = Preprocessor_expr_error(); Seek(value, 0, SEEK_SET); Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Could not evaluate expression '%s'\n", value); if (msg) @@ -1671,7 +1671,7 @@ String *Preprocessor_parse(String *s) { if (Len(sval) > 0) { val = Preprocessor_expr(sval, &e); if (e) { - char *msg = Preprocessor_expr_error(); + const char *msg = Preprocessor_expr_error(); Seek(value, 0, SEEK_SET); Swig_warning(WARN_PP_EVALUATION, Getfile(value), Getline(value), "Could not evaluate expression '%s'\n", value); if (msg) diff --git a/Source/Preprocessor/expr.c b/Source/Preprocessor/expr.c index e7470378d..b32665d4a 100644 --- a/Source/Preprocessor/expr.c +++ b/Source/Preprocessor/expr.c @@ -35,7 +35,7 @@ static exprval stack[256]; /* Parsing stack */ static int sp = 0; /* Stack pointer */ static int prec[256]; /* Precedence rules */ static int expr_init = 0; /* Initialization flag */ -static char *errmsg = 0; /* Parsing error */ +static const char *errmsg = 0; /* Parsing error */ /* Initialize the precedence table for various operators. Low values have higher precedence */ static void init_precedence() { @@ -435,6 +435,6 @@ extra_rparen: * Return error message set by the evaluator (if any) * ----------------------------------------------------------------------------- */ -char *Preprocessor_expr_error() { +const char *Preprocessor_expr_error() { return errmsg; } diff --git a/Source/Preprocessor/preprocessor.h b/Source/Preprocessor/preprocessor.h index b08ff31b9..4c24f48d0 100644 --- a/Source/Preprocessor/preprocessor.h +++ b/Source/Preprocessor/preprocessor.h @@ -20,7 +20,7 @@ extern "C" { #endif extern int Preprocessor_expr(String *s, int *error); - extern char *Preprocessor_expr_error(void); + extern const char *Preprocessor_expr_error(void); extern Hash *Preprocessor_define(const_String_or_char_ptr str, int swigmacro); extern void Preprocessor_undef(const_String_or_char_ptr name); extern void Preprocessor_init(void); diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index af22da156..b5c9d26dc 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -82,7 +82,7 @@ void Swig_print_node(Node *obj) { Printf(stdout, "%-12s - %s\n", k, ParmList_str_defaultargs(Getattr(obj, k))); } else { DOH *o; - char *trunc = ""; + const char *trunc = ""; print_indent(2); if (DohIsString(Getattr(obj, k))) { o = Str(Getattr(obj, k)); From 092e2104c7ed49ec967742799cfa7bf7053c7cda Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 26 Nov 2012 20:31:54 +0000 Subject: [PATCH 214/538] More consistent use of DOH namespace git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13940 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/cffi.cxx | 4 ++-- Source/Modules/lua.cxx | 2 +- Source/Modules/perl5.cxx | 2 +- Source/Modules/python.cxx | 2 +- Source/Modules/s-exp.cxx | 2 +- Source/Swig/include.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index ceb1bad67..dcc8ef93e 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -1051,10 +1051,10 @@ String *CFFI::convert_literal(String *literal, String *type, bool try_to_split) if (Len(num) >= 2 && s[0] == '0') { /* octal or hex */ if (s[1] == 'x'){ - DohReplace(num,"0","#",DOH_REPLACE_FIRST); + Replace(num,"0","#",DOH_REPLACE_FIRST); } else{ - DohReplace(num,"0","#o",DOH_REPLACE_FIRST); + Replace(num,"0","#o",DOH_REPLACE_FIRST); } } return num; diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 3d1530331..ef2fa96de 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -62,7 +62,7 @@ char cvsroot_lua_cxx[] = "$Id$"; void display_mapping(DOH *d) { if (d == 0 || !DohIsMapping(d)) return; - for (DohIterator it = DohFirst(d); it.item; it = DohNext(it)) { + for (Iterator it = First(d); it.item; it = Next(it)) { if (DohIsString(it.item)) Printf(stdout, " %s = %s\n", it.key, it.item); else if (DohIsMapping(it.item)) diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 1662f3b55..f786a7607 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -1669,7 +1669,7 @@ public: } /* Split the input text into lines */ - List *clist = DohSplitLines(temp); + List *clist = SplitLines(temp); Delete(temp); int initial = 0; String *s = 0; diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 43d306b09..2295f7801 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1107,7 +1107,7 @@ public: } /* Split the input text into lines */ - List *clist = DohSplitLines(temp); + List *clist = SplitLines(temp); Delete(temp); int initial = 0; String *s = 0; diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 3c50f3076..2c9a0cc99 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -87,7 +87,7 @@ public: Language::top(n); Printf(out, "\n"); Printf(out, ";;; Lisp parse tree produced by SWIG\n"); - print_circle_hash = DohNewHash(); + print_circle_hash = NewHash(); print_circle_count = 0; hanging_parens = 0; need_whitespace = 0; diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 5d37dad7e..5796416a4 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -338,7 +338,7 @@ String *Swig_file_extension(const_String_or_char_ptr filename) { String *Swig_file_basename(const_String_or_char_ptr filename) { String *extension = Swig_file_extension(filename); - String *basename = DohNewStringWithSize(filename, Len(filename) - Len(extension)); + String *basename = NewStringWithSize(filename, Len(filename) - Len(extension)); Delete(extension); return basename; } From e60ae2d81dfc6eb68e082552deeab368818c3575 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Wed, 28 Nov 2012 20:22:56 +0000 Subject: [PATCH 215/538] octave: Simplified module loading. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13941 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 9 ++ Doc/Manual/Octave.html | 44 +------ Examples/octave/module_load/runme.m | 49 +------ Lib/octave/octruntime.swg | 192 ++++++++++++++++++---------- Source/Modules/octave.cxx | 6 +- 5 files changed, 141 insertions(+), 159 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 19912fde6..1675f878b 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,15 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-11-28: kwwette + [Octave] Simplified module loading: now just the syntax + $ example; + is accepted, which loads functions globally but constants and variables relative to the current scope. + This make module loading behaviour reliably consistent, and reduces problems when loading modules which + depend on other modules which may not have been previously loaded. + + *** POTENTIAL INCOMPATIBILITY *** + 2012-11-17: wsfulton [Tcl, Modula3] Add missing support for -outdir. diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index b8cf02a77..0340c2fd5 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -181,12 +181,7 @@ When Octave is asked to invoke example, it will try to find the ".m" or

    -An Octave module can either load its symbols into the global namespace, so that they can be accessed directly without having to type the module name. -Alternatively, an Octave module can be accessed through a local variable, without being loaded globally. -

    - -

    -To load an Octave module globally, simply type its name: +To load an Octave module, simply type its name: 

    @@ -200,43 +195,6 @@ octave:5> cvar.Foo
 ans =  4
    -

    -To access an Octave module through a local variable, without loading it globally, simply assign the module name (e.g. "example") to the desired local variable: -

    - -
    -octave:1> example = example;
-octave:2> example.gcd(6,9)
-ans =  3
-octave:3> example.cvar.Foo
-ans =  3
-
    - -

    -The variable may have the same name as the module, or a shorter one: -

    - -
    -octave:1> ex = example;
-octave:2> ex.gcd(6,9)
-ans =  3
-octave:3> ex.cvar.Foo
-ans =  3
-
    - -

    -It is also possible to rename the global variables namespaces with an assignment, as in: -

    - -
    -octave:1> example;
-octave:2> cvar.gcd(10,4)
-ans =  2
-octave:3> some_vars = cvar;
-octave:4> some_vars.Foo
-ans =  3
-
    -

    Modules can also be loaded from within functions, even before being loaded in the base context. If the module is also used in the base context, however, it must first be loaded again: diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m index 16b437ee8..0fda218cd 100644 --- a/Examples/octave/module_load/runme.m +++ b/Examples/octave/module_load/runme.m @@ -1,17 +1,7 @@ # file: runme_args.m -# test module loading with arguments -clear all - -# access module, no global load -example = example; -assert(example.cvar.ivar == example.ifunc()); -clear all -example = example; -assert(example.cvar.ivar == example.ifunc()); -clear all - -# load module globally +# load module +clear all; example; assert(cvar.ivar == ifunc); assert(exist("example","var")); @@ -21,27 +11,8 @@ assert(cvar.ivar == ifunc); assert(exist("example","var")); clear all -# access module in a function, no global load -function testme - example = example; - assert(example.cvar.ivar == example.ifunc()); -endfunction -testme -testme -example = example; -assert(example.cvar.ivar == example.ifunc()); -clear all -function testme - example = example; - assert(example.cvar.ivar == example.ifunc()); -endfunction -testme -testme -example = example; -assert(example.cvar.ivar == example.ifunc()); -clear all - # load module in a function globally before base context +clear all; function testme example; assert(cvar.ivar == ifunc); @@ -66,6 +37,7 @@ assert(exist("example","var")); clear all # load module in a function globally after base context +clear all; example; assert(cvar.ivar == ifunc); assert(exist("example","var")); @@ -95,17 +67,8 @@ if api_version < 37 exit endif -# access module with no cvar, no global load -example2 = example2; -assert(example2.ivar == example2.ifunc()); -assert(!isglobal("cvar")) -clear all -example2 = example2; -assert(example2.ivar == example2.ifunc()); -assert(!isglobal("cvar")) -clear all - -# load module with no cvar globally +# load module with no cvar +clear all; example2; assert(example2.ivar == ifunc); assert(exist("example2","var")); diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 16ad3f7c9..66b6e265a 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -20,13 +20,74 @@ %insert(initbeforefunc) %{ -static void SWIG_init_user(octave_swig_type* module_ns); +static bool SWIG_init_user(octave_swig_type* module_ns); -SWIGINTERN void SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { - octave_value_list args; - args.append(name); - args.append(octloadfcn->fcn_file_name()); - feval("autoload", args, 0); +SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { + bool retn; + { +#if OCTAVE_API_VERSION_NUMBER < 38 + unwind_protect::begin_frame("SWIG_Octave_LoadModule"); + unwind_protect_int(error_state); + unwind_protect_int(warning_state); + unwind_protect_bool(discard_error_messages); + unwind_protect_bool(discard_warning_messages); +#else + unwind_protect frame; + frame.protect_var(error_state); + frame.protect_var(warning_state); + frame.protect_var(discard_error_messages); + frame.protect_var(discard_warning_messages); +#endif + error_state = 0; + warning_state = 0; + discard_error_messages = true; + discard_warning_messages = true; + feval(name, octave_value_list(), 0); + retn = (error_state == 0); +#if OCTAVE_API_VERSION_NUMBER < 38 + unwind_protect::run_frame("SWIG_Octave_LoadModule"); +#endif + } + if (!retn) { + error(SWIG_name_d ": could not load module `%s'", name.c_str()); + } + return retn; +} + +SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { + bool retn; + { +#if OCTAVE_API_VERSION_NUMBER < 38 + unwind_protect::begin_frame("SWIG_Octave_InstallFunction"); + unwind_protect_int(error_state); + unwind_protect_int(warning_state); + unwind_protect_bool(discard_error_messages); + unwind_protect_bool(discard_warning_messages); +#else + unwind_protect frame; + frame.protect_var(error_state); + frame.protect_var(warning_state); + frame.protect_var(discard_error_messages); + frame.protect_var(discard_warning_messages); +#endif + error_state = 0; + warning_state = 0; + discard_error_messages = true; + discard_warning_messages = true; + octave_value_list args; + args.append(name); + args.append(octloadfcn->fcn_file_name()); + error_state = 0; + feval("autoload", args, 0); + retn = (error_state == 0); +#if OCTAVE_API_VERSION_NUMBER < 38 + unwind_protect::run_frame("SWIG_Octave_InstallFunction"); +#endif + } + if (!retn) { + error(SWIG_name_d ": could not load function `%s'", name.c_str()); + } + return retn; } static const char *const subclass_usage = "-*- texinfo -*- \n\ @@ -44,7 +105,7 @@ DEFUN_DLD( subclass, args, nargout, subclass_usage ) { octave_swig_ref *osr = static_cast < octave_swig_ref *>(args(j).internal_rep()); octave_swig_type *ost = osr->get_ptr(); if (!ost->is_owned()) { - error("cannot subclass object not constructed on octave side"); + error("subclass: cannot subclass object not constructed on octave side"); return octave_value_list(); } top->merge(*ost); @@ -52,13 +113,13 @@ DEFUN_DLD( subclass, args, nargout, subclass_usage ) { top->assign(args(j).fcn_handle_value()->fcn_name(), args(j)); } else if (args(j).is_string()) { if (j + 1 >= args.length()) { - error("member assignments must be of string,value form"); + error("subclass: member assignments must be of string,value form"); return octave_value_list(); } top->assign(args(j).string_value(), args(j + 1)); ++j; } else { - error("invalid arguments to subclass()"); + error("subclass: invalid arguments to subclass()"); return octave_value_list(); } } @@ -72,12 +133,12 @@ Return the underlying C/C++ type name of a SWIG-wrapped object.\n\ DEFUN_DLD( swig_type, args, nargout, swig_type_usage ) { if (args.length() != 1) { - error("swig_type() must be called with only a single object"); + error("swig_type: must be called with only a single object"); return octave_value_list(); } octave_swig_type *ost = Swig::swig_value_deref(args(0)); if (!ost) { - error("object is not a swig_ref"); + error("swig_type: object is not a swig_ref"); return octave_value_list(); } return octave_value(ost->swig_type_name()); @@ -91,7 +152,7 @@ otherwise return `'.\n\ DEFUN_DLD( swig_typequery, args, nargout, swig_typequery_usage ) { if (args.length() != 1 || !args(0).is_string()) { - error("swig_typequery() must be called with single string argument"); + error("swig_typequery: must be called with single string argument"); return octave_value_list(); } swig_module_info *module = SWIG_GetModule(0); @@ -108,14 +169,14 @@ Return the underlying C/C++ pointer of a SWIG-wrapped object.\n\ DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { if (args.length() != 1) { - error("swig_this() must be called with only a single object"); + error("swig_this: must be called with only a single object"); return octave_value_list(); } if (args(0).is_matrix_type() && args(0).rows() == 0 && args(0).columns() == 0) return octave_value(octave_uint64(0)); octave_swig_type *ost = Swig::swig_value_deref(args(0)); if (!ost) { - error("object is not a swig_ref"); + error("swig_this: object is not a swig_ref"); return octave_value_list(); } return octave_value(octave_uint64((unsigned long long) ost->swig_this())); @@ -124,42 +185,34 @@ DEFUN_DLD( swig_this, args, nargout, swig_this_usage ) { static const char *const SWIG_name_usage = "-*- texinfo -*- \n\ @deftypefn {Loadable Module} {} " SWIG_name_d "\n\ Loads the SWIG-generated module `" SWIG_name_d "'.\n\ -\n\ -To load the module into the global namespace:\n\ -@example\n\ -" SWIG_name_d ";\n\ -@end example\n\ -To access the module through a local variable, without loading it globally:\n\ -@example\n\ -" SWIG_name_d " = " SWIG_name_d ";\n\ -@end example\n\ -To access the module locally through a variable named, e.g. @var{modl}:\n\ -@example\n\ -@var{modl} = " SWIG_name_d ";\n\ -@end example\n\ @end deftypefn"; DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { static octave_swig_type* module_ns = 0; - octave_value_list retval; + + // workaround to prevent octave seg-faulting on exit: set Octave exit function + // octave_exit to _Exit, which exits immediately without trying to cleanup memory. + // definitely affects version 3.2.*, not sure about 3.3.*, seems to be fixed in + // version 3.4.* and above. can be turned off with macro definition. +#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK +#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 + octave_exit = ::_Exit; +#endif +#endif + + // check for no input and output args + if (args.length() != 0 || nargout != 0) { + print_usage(); + return octave_value_list(); + } // create module on first function call if (!module_ns) { - // workaround to prevent octave seg-faulting on exit: set Octave exit function - // octave_exit to _Exit, which exits immediately without trying to cleanup memory. - // definitely affects version 3.2.*, not sure about 3.3.*, seems to be - // fixed in version 3.4.* and above. can be turned off with macro def. -#ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK -#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 - octave_exit = ::_Exit; -#endif -#endif - // workaround bug in octave where installing global variable of custom type and then // exiting without explicitly clearing the variable causes octave to segfault. -#if OCTAVE_API_VERSION_NUMBER >= 37 +#if OCTAVE_API_VERSION_NUMBER > 36 octave_value_list eval_args; eval_args.append("base"); eval_args.append("function __swig_atexit__; " @@ -182,10 +235,18 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { octave_function *me = octave_call_stack::current(); - SWIG_Octave_InstallFunction(me, "swig_type"); - SWIG_Octave_InstallFunction(me, "swig_typequery"); - SWIG_Octave_InstallFunction(me, "swig_this"); - SWIG_Octave_InstallFunction(me, "subclass"); + if (!SWIG_Octave_InstallFunction(me, "swig_type")) { + return octave_value_list(); + } + if (!SWIG_Octave_InstallFunction(me, "swig_typequery")) { + return octave_value_list(); + } + if (!SWIG_Octave_InstallFunction(me, "swig_this")) { + return octave_value_list(); + } + if (!SWIG_Octave_InstallFunction(me, "subclass")) { + return octave_value_list(); + } octave_swig_type* cvar_ns=0; if (std::string(SWIG_global_name) != ".") { @@ -219,7 +280,11 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { (new octave_swig_type(0,swig_types[j]))); } - SWIG_init_user(module_ns); + if (!SWIG_init_user(module_ns)) { + delete module_ns; + module_ns=0; + return octave_value_list(); + } SWIG_InstallOps(octave_swig_ref::static_type_id()); @@ -231,38 +296,25 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { } - // return module if asked for - if (args.length() == 0 && nargout == 1) { - retval = octave_value(module_ns->as_value()); - } + octave_function *me = octave_call_stack::current(); - // if call with not output arguments, load globally - else if (args.length() == 0 && nargout == 0) { - - octave_function *me = octave_call_stack::current(); - - octave_swig_type::swig_member_const_iterator mb; - for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) { - if (mb->second.first && mb->second.first->method) { - SWIG_Octave_InstallFunction(me, mb->first); - } - else if (mb->second.second.is_defined()) { - SWIG_Octave_SetGlobalValue(mb->first, mb->second.second); - SWIG_Octave_LinkGlobalValue(mb->first); + octave_swig_type::swig_member_const_iterator mb; + for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) { + if (mb->second.first && mb->second.first->method) { + if (!SWIG_Octave_InstallFunction(me, mb->first)) { + return octave_value_list(); } } - - SWIG_Octave_SetGlobalValue(SWIG_name_d, module_ns->as_value()); - SWIG_Octave_LinkGlobalValue(SWIG_name_d); - + else if (mb->second.second.is_defined()) { + SWIG_Octave_SetGlobalValue(mb->first, mb->second.second); + SWIG_Octave_LinkGlobalValue(mb->first); + } } - // otherwise print usage - else { - print_usage(); - } + SWIG_Octave_SetGlobalValue(SWIG_name_d, module_ns->as_value()); + SWIG_Octave_LinkGlobalValue(SWIG_name_d); - return retval; + return octave_value_list(); } diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 7d27c1095..5758e38c3 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -207,7 +207,7 @@ public: Printf(f_runtime, "\n"); Printf(s_global_tab, "\nstatic const struct swig_octave_member swig_globals[] = {\n"); - Printf(f_init, "static void SWIG_init_user(octave_swig_type* module_ns)\n{\n"); + Printf(f_init, "static bool SWIG_init_user(octave_swig_type* module_ns)\n{\n"); if (!CPlusPlus) Printf(f_header,"extern \"C\" {\n"); @@ -223,7 +223,7 @@ public: if (directorsEnabled()) Swig_insert_file("director.swg", f_runtime); - Printf(f_init, "}\n"); + Printf(f_init, "return true;\n}\n"); Printf(s_global_tab, "{0,0,0,0,0}\n};\n"); Printv(f_wrappers, s_global_tab, NIL); @@ -393,7 +393,7 @@ public: virtual int importDirective(Node *n) { String *modname = Getattr(n, "module"); if (modname) - Printf(f_init, "feval(\"%s\",octave_value_list(),1);\n", modname); + Printf(f_init, "if (!SWIG_Octave_LoadModule(\"%s\")) return false;\n", modname); return Language::importDirective(n); } From 18ef95083d159da9cc4f9df8af5e036b777e6e97 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Wed, 28 Nov 2012 20:23:17 +0000 Subject: [PATCH 216/538] octave: prevent writing to history file when running tests git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13942 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 1e90a01ca..6458512e9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -331,7 +331,7 @@ python_clean: ################################################################## # Make sure these locate your Octave installation -OCTAVE = @OCTAVE@ -qf +OCTAVE = OCTAVE_HISTFILE=/dev/null @OCTAVE@ -qfH OCTAVE_CXX = $(DEFS) @OCTAVE_CPPFLAGS@ @OCTAVE_CXXFLAGS@ # Extra Octave specific dynamic linking options From 89052f3b0ac26c3cd5b787a0f2ad608f29b6b5ad Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 13:36:13 +0000 Subject: [PATCH 217/538] Fix Strcmp - it didn't have consistent null pointer handling - revert to what it used to be - a lightweight wrapper around strcmp which means functions once again must not pass in null to it. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13943 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 2 +- Source/DOH/string.c | 6 +----- Source/Modules/allegrocl.cxx | 2 +- Source/Modules/cffi.cxx | 2 +- Source/Modules/d.cxx | 12 ++++++++---- Source/Modules/go.cxx | 4 ++-- Source/Modules/php.cxx | 3 ++- Source/Modules/r.cxx | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 03fc329d8..5c84c6e69 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -3138,7 +3138,7 @@ c_declaration : c_decl { appendChild($$,n); while (n) { SwigType *decl = Getattr(n,"decl"); - if (SwigType_isfunction(decl) && Strcmp(Getattr(n, "storage"), "typedef") != 0) { + if (SwigType_isfunction(decl) && !Equal(Getattr(n, "storage"), "typedef")) { Setattr(n,"storage","externc"); } n = nextSibling(n); diff --git a/Source/DOH/string.c b/Source/DOH/string.c index e94a2bdb2..d34301691 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -1153,11 +1153,7 @@ DOHString *DohNewStringf(const DOHString_or_char *fmt, ...) { int DohStrcmp(const DOHString_or_char *s1, const DOHString_or_char *s2) { const char *c1 = Char(s1); const char *c2 = Char(s2); - if (c1 && c2) { - return strcmp(c1, c2); - } else { - return c1 < c2; - } + return strcmp(c1, c2); } int DohStrncmp(const DOHString_or_char *s1, const DOHString_or_char *s2, int n) { diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 95022752f..1e0c6c98b 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -1225,7 +1225,7 @@ void emit_full_class(Node *n) { // hack. why would decl have a value of "variableHandler" and now "0"? String *childDecl = Getattr(c, "decl"); // Printf(stderr,"childDecl = '%s' (%s)\n", childDecl, Getattr(c,"view")); - if (!Strcmp(childDecl, "0")) + if (!childDecl || !Strcmp(childDecl, "0")) childDecl = NewString(""); SwigType *childType; diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index dcc8ef93e..017b959a3 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -835,7 +835,7 @@ void CFFI::emit_struct_union(Node *n, bool un = false) { String *typespec = tm ? NewString(tm) : NewString(""); String *slot_name = lispify_name(c, Getattr(c, "sym:name"), "'slotname"); - if (Strcmp(slot_name, "t") == 0 || Strcmp(slot_name, "T") == 0) + if (slot_name && (Strcmp(slot_name, "t") == 0 || Strcmp(slot_name, "T") == 0)) slot_name = NewStringf("t_var"); Printf(f_cl, "\n\t(%s %s)", slot_name, typespec); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 1ea74eb6b..b8e30d50c 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -4418,10 +4418,14 @@ private: // so we can progress up the inheritance hierachy even if there have been // new overloads introduced after the topmost class. Node *base_function = NULL; - for (Node *tmp = firstChild(base_class); tmp; tmp = nextSibling(tmp)) { - if (Strcmp(Getattr(tmp, "sym:name"), Getattr(n, "sym:name")) == 0) { - base_function = tmp; - break; + String *symname = Getattr(n, "sym:name"); + if (symname) { + for (Node *tmp = firstChild(base_class); tmp; tmp = nextSibling(tmp)) { + String *child_symname = Getattr(tmp, "sym:name"); + if (child_symname && (Strcmp(child_symname, symname) == 0)) { + base_function = tmp; + break; + } } } diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 86171d28b..a16f710fd 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -1990,7 +1990,7 @@ private: continue; } String *storage = Getattr(ni, "storage"); - if (Strcmp(storage, "typedef") == 0 || Strcmp(storage, "friend") == 0) { + if (storage && (Strcmp(storage, "typedef") == 0 || Strcmp(storage, "friend") == 0)) { continue; } @@ -4792,7 +4792,7 @@ private: return Copy(ret); } - if (Strcmp(Getattr(n, "type"), "enum ") == 0) { + if (Equal(Getattr(n, "type"), "enum ")) { return NewString("int"); } diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 149b3cd83..01622f4ce 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -1577,7 +1577,8 @@ public: while (i.item) { Node *j = firstChild(i.item); while (j) { - if (Strcmp(Getattr(j, "name"), Getattr(n, "name")) != 0) { + String *jname = Getattr(j, "name"); + if (!jname || Strcmp(jname, Getattr(n, "name")) != 0) { j = nextSibling(j); continue; } diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 078b2576c..6258e327d 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -2351,7 +2351,7 @@ int R::classDeclaration(Node *n) { elName = Getattr(c, "name"); String *elKind = Getattr(c, "kind"); - if (Strcmp(elKind, "variable") != 0) { + if (!Equal(elKind, "variable")) { c = nextSibling(c); continue; } @@ -2453,7 +2453,7 @@ int R::generateCopyRoutines(Node *n) { continue; } String *elKind = Getattr(c, "kind"); - if (Strcmp(elKind, "variable") != 0) { + if (!Equal(elKind, "variable")) { continue; } From 7ca04976477a35af8138d471244edfcb55e3ae08 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 13:36:40 +0000 Subject: [PATCH 218/538] CFFI - fix junk output when wrapping single character constants git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13944 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 ++- Source/Modules/cffi.cxx | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 1675f878b..8b5ed3a6a 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -12,7 +12,8 @@ Version 2.0.9 (in progress) This make module loading behaviour reliably consistent, and reduces problems when loading modules which depend on other modules which may not have been previously loaded. - *** POTENTIAL INCOMPATIBILITY *** +2012-11-27: wsfulton + [cffi] Fix junk output when wrapping single character literal constants. 2012-11-17: wsfulton [Tcl, Modula3] Add missing support for -outdir. diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 017b959a3..c2c79b007 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -1021,9 +1021,8 @@ String *CFFI::convert_literal(String *literal, String *type, bool try_to_split) return num; } else if (SwigType_type(type) == T_CHAR) { /* Use CL syntax for character literals */ - String* result = NewStringf("#\\%c", s[2]); + String* result = NewStringf("#\\%c", s[0]); Delete(num); - // Printf(stderr, "%s %c %d", s, s[2], s); return result; } else if (SwigType_type(type) == T_STRING) { /* Use CL syntax for string literals */ From 6cd247d6533fa4b994f44ef25e30fb2d3c105e53 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 13:37:10 +0000 Subject: [PATCH 219/538] Correct prefix handling - bug introduced in rev 13886 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13945 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/guile.cxx | 2 +- Source/Modules/mzscheme.cxx | 3 +-- Source/Modules/ocaml.cxx | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index c7e8fe7e4..0777b316f 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -280,7 +280,7 @@ public: // Make sure `prefix' ends in an underscore if (prefix) { const char *px = Char(prefix); - if (px[Len(prefix)] != '_') + if (px[Len(prefix) - 1] != '_') Printf(prefix, "_"); } diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index c2abd7ec4..e2f44deef 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -101,10 +101,9 @@ public: } // If a prefix has been specified make sure it ends in a '_' (not actually used!) - if (prefix) { const char *px = Char(prefix); - if (px[Len(prefix)] != '_') + if (px[Len(prefix) - 1] != '_') Printf(prefix, "_"); } else prefix = NewString("swig_"); diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 9fc5e9c71..beac03237 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -130,10 +130,9 @@ public: } // If a prefix has been specified make sure it ends in a '_' (not actually used!) - if (prefix) { const char *px = Char(prefix); - if (px[Len(prefix)] != '_') + if (px[Len(prefix) - 1] != '_') Printf(prefix, "_"); } else prefix = NewString("swig_"); From 00d969d7fd20220518e1e4b6c893f8ba87af4191 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 14:11:19 +0000 Subject: [PATCH 220/538] Makefile tweaks for Coverity builds git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13946 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index eb3ec02b2..d3c4b8c47 100644 --- a/Makefile.in +++ b/Makefile.in @@ -532,9 +532,10 @@ $(srcdir)/configure: $(srcdir)/configure.in EMAIL=wsf@fultondesigns.co.uk PASSWORD= coverity: + test -n "$(PASSWORD)" || (echo "PASSWORD not set" && false) $(MAKE) clean-source rm -rf cov-int - cov-build --dir cov-int $(MAKE) + cov-build --dir cov-int $(MAKE) source tar czvf swig-coverity.tgz cov-int curl --form file=@swig-coverity.tgz --form project=swig --form password=$(PASSWORD) --form email=$(EMAIL) http://scan5.coverity.com/cgi-bin/upload.py From 8b24933842a85aeccfc9775a5eca307875c36594 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 14:33:41 +0000 Subject: [PATCH 221/538] Fix nested classes symbol table problem due to lack of string copy - due to changes in rev 13938 git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13947 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/CParse/parser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 5c84c6e69..0d7c65f85 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -4633,7 +4633,8 @@ cpp_nested : storage_class cpptype idcolon inherit LBRACE { $$ = 0; if (cplus_mode == CPLUS_PUBLIC) { if (cparse_cplusplus) { - $$ = nested_forward_declaration($1, $2, $3, $3, $7); + String *name = Copy($3); + $$ = nested_forward_declaration($1, $2, $3, name, $7); } else if ($7) { nested_new_struct($2, $6, $7); } @@ -4659,7 +4660,7 @@ cpp_nested : storage_class cpptype idcolon inherit LBRACE { $$ = 0; if (cplus_mode == CPLUS_PUBLIC) { if (cparse_cplusplus) { - String *name = $6 ? Getattr($6, "name") : 0; + String *name = $6 ? Copy(Getattr($6, "name")) : 0; $$ = nested_forward_declaration($1, $2, 0, name, $6); } else { if ($6) { From f38147c154e84dea7e61cf581fdd51a76d24f1a4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 2 Dec 2012 18:11:56 +0000 Subject: [PATCH 222/538] Remove some pointless code creating implicit constructors git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13948 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/Modules/lang.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index ad2a0d6b8..8e5a91dbe 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2172,8 +2172,7 @@ static void addCopyConstructor(Node *n) { String *name = Swig_scopename_last(cname); String *cc = NewStringf("r.q(const).%s", type); String *decl = NewStringf("f(%s).", cc); - String *csymname = Getattr(n, "sym:name"); - String *oldname = csymname; + String *oldname = Getattr(n, "sym:name"); if (Getattr(n, "allocate:has_constructor")) { // to work properly with '%rename Class', we must look @@ -2196,9 +2195,6 @@ static void addCopyConstructor(Node *n) { String *symname = Swig_name_make(cn, cname, name, decl, oldname); if (Strcmp(symname, "$ignore") != 0) { - if (!symname) { - symname = Copy(csymname); - } Parm *p = NewParm(cc, "other", n); Setattr(cn, "name", name); @@ -2242,14 +2238,9 @@ static void addDefaultConstructor(Node *n) { String *cname = Getattr(n, "name"); String *name = Swig_scopename_last(cname); String *decl = NewString("f()."); - String *csymname = Getattr(n, "sym:name"); - String *oldname = csymname; + String *oldname = Getattr(n, "sym:name"); String *symname = Swig_name_make(cn, cname, name, decl, oldname); if (Strcmp(symname, "$ignore") != 0) { - if (!symname) { - symname = Copy(csymname); - } - Setattr(cn, "name", name); Setattr(cn, "sym:name", symname); SetFlag(cn, "feature:new"); From 8be65ec8e7d571a67715129298cfb9871232fd6f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 7 Dec 2012 07:38:24 +0000 Subject: [PATCH 223/538] Add in va_list varargs workaround suggested by Antoine Mathys git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13949 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/Varargs.html | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/Doc/Manual/Varargs.html b/Doc/Manual/Varargs.html index c27db603d..13abc8cee 100644 --- a/Doc/Manual/Varargs.html +++ b/Doc/Manual/Varargs.html @@ -839,13 +839,13 @@ of type va_list. For example: 

    -int vfprintf(FILE *f, const char *fmt, va_list ap);
+int vprintf(const char *fmt, va_list ap);

    -As far as we know, there is no obvious way to wrap these functions -with SWIG. This is because there is no documented way to assemble the +As far as we know, there is no obvious way to wrap these functions with +SWIG. This is because there is no documented way to assemble the proper va_list structure (there are no C library functions to do it and the contents of va_list are opaque). Not only that, the contents of a va_list structure are closely tied to the underlying @@ -853,6 +853,36 @@ call-stack. It's not clear that exporting a va_list would have any use or that it would work at all.

    +

    +A workaround can be implemented by writing a simple varargs C wrapper and then using the techniques +discussed earlier in this chapter for varargs. Below is a simple wrapper for vprintf renamed so that +it can still be called as vprintf from your target language. The %varargs +used in the example restricts the function to taking one string argument. +

    + +
    +
    +%{
+int vprintf(const char *fmt, va_list ap);
+%}
+
+%varargs(const char *) my_vprintf;
+%rename(vprintf) my_vprintf;
+
+%inline %{
+int my_vprintf(const char *fmt, ...) {
+  va_list ap;
+  int result;
+
+  va_start(ap, fmt);
+  result = vprintf(fmt, ap);
+  va_end(ap);
+  return result;
+}
+%}
+
    +
    +

    13.8 C++ Issues

    From ba575159f6ae78a5353bd1408fed843ea8089e98 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 8 Dec 2012 10:37:04 +0000 Subject: [PATCH 224/538] Add runtime test for %implicitconv git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13950 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/implicittest.i | 3 +- .../test-suite/python/implicittest_runme.py | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 Examples/test-suite/python/implicittest_runme.py diff --git a/Examples/test-suite/implicittest.i b/Examples/test-suite/implicittest.i index 91205aafa..e07adc5cc 100644 --- a/Examples/test-suite/implicittest.i +++ b/Examples/test-suite/implicittest.i @@ -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; } }; } diff --git a/Examples/test-suite/python/implicittest_runme.py b/Examples/test-suite/python/implicittest_runme.py new file mode 100644 index 000000000..4200543c4 --- /dev/null +++ b/Examples/test-suite/python/implicittest_runme.py @@ -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 + From 73757314318cbade1c38d06e75efd36d0357c500 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 9 Dec 2012 17:47:12 +0000 Subject: [PATCH 225/538] Perl - Fix C++ comment in C wrappers. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13951 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Lib/perl5/perlinit.swg | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index 8b5ed3a6a..b0aee7e75 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-12-08: wsfulton + [Perl] Fix bug #3571361 - C++ comment in C wrappers. + 2012-11-28: kwwette [Octave] Simplified module loading: now just the syntax $ example; diff --git a/Lib/perl5/perlinit.swg b/Lib/perl5/perlinit.swg index af9a35a98..d9ffa9bf8 100644 --- a/Lib/perl5/perlinit.swg +++ b/Lib/perl5/perlinit.swg @@ -33,7 +33,7 @@ XS(SWIG_init) { /* Install commands */ for (i = 0; swig_commands[i].name; i++) { - // Casts only needed for Perl < 5.10. + /* Casts only needed for Perl < 5.10. */ #ifdef __cplusplus newXS(const_cast(swig_commands[i].name), swig_commands[i].wrapper, const_cast(__FILE__)); #else From 5e507b82f1c32ffce40882a930e3894cceb7a4ab Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 9 Dec 2012 20:49:28 +0000 Subject: [PATCH 226/538] Apply patch #3571029 which adds missing director support for const unsigned long long &. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13952 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Lib/csharp/csharp.swg | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index b0aee7e75..72398e2e9 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -8,6 +8,9 @@ Version 2.0.9 (in progress) 2012-12-08: wsfulton [Perl] Fix bug #3571361 - C++ comment in C wrappers. +2012-12-07: wsfulton + [C#] Apply patch #3571029 which adds missing director support for const unsigned long long &. + 2012-11-28: kwwette [Octave] Simplified module loading: now just the syntax $ example; diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg index 107695da1..c0b896e16 100644 --- a/Lib/csharp/csharp.swg +++ b/Lib/csharp/csharp.swg @@ -291,6 +291,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { const long &, const unsigned long &, const long long &, + const unsigned long long &, const float &, const double & %{ static $*1_ltype temp; @@ -308,6 +309,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { %typemap(directorin) const long & "$input = $1;" %typemap(directorin) const unsigned long & "$input = $1;" %typemap(directorin) const long long & "$input = $1;" +%typemap(directorin) const unsigned long long & "$input = $1;" %typemap(directorin) const float & "$input = $1;" %typemap(directorin) const double & "$input = $1;" @@ -321,6 +323,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { const long & ($*1_ltype temp), const unsigned long & ($*1_ltype temp), const long long & ($*1_ltype temp), + const unsigned long long & ($*1_ltype temp), const float & ($*1_ltype temp), const double & ($*1_ltype temp) "$iminput" @@ -335,6 +338,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) { const long & ($*1_ltype temp), const unsigned long & ($*1_ltype temp), const long long & ($*1_ltype temp), + const unsigned long long & ($*1_ltype temp), const float & ($*1_ltype temp), const double & ($*1_ltype temp) "$cscall" From 16481c999e4c02c65e74f0207b0760899bc4b74a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 9 Dec 2012 20:49:52 +0000 Subject: [PATCH 227/538] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13953 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Lib/python/pyhead.swg | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 72398e2e9..0775e31e3 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-12-08: wsfulton + [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types. + 2012-12-08: wsfulton [Perl] Fix bug #3571361 - C++ comment in C wrappers. diff --git a/Lib/python/pyhead.swg b/Lib/python/pyhead.swg index c333e9d89..cedd017a7 100644 --- a/Lib/python/pyhead.swg +++ b/Lib/python/pyhead.swg @@ -175,6 +175,10 @@ static long PyNumber_AsSsize_t (PyObject *x, void *SWIGUNUSEDPARM(exc)) } #endif +#if PY_VERSION_HEX < 0x02050000 +#define PyInt_FromSize_t(x) PyInt_FromLong((long)x) +#endif + #if PY_VERSION_HEX < 0x02040000 #define Py_VISIT(op) \ do { \ From 1ac275790de43d59ca45b3e07d72020cad83aefa Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 10 Dec 2012 19:45:04 +0000 Subject: [PATCH 228/538] Clarify pythonprepend and pythonappend features when used on overloaded methods/constructors git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13954 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/Python.html | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index bd48a37f2..762abebba 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -3386,7 +3386,39 @@ public: +

    +Note that when the underlying C++ method is overloaded, there is only one proxy Python method +for multiple C++ methods. In this case, only one of parsed methods is examined +for the feature. You are better off specifying the feature without the argument list to ensure it will get used, +as it will then get attached to all the overloaded C++ methods. For example: +

    +
    +
    +%module example
+
+// Add python code to bar()
+
+%pythonprepend Foo::bar %{
+   #do something before C++ call
+%}
+
+%pythonappend Foo::bar %{
+   #do something after C++ call
+%}
+
+
+class Foo {
+public:
+    int bar(int x);
+    int bar();
+}
+
    +
    + +

    +The same applies for overloaded constructors. +

    34.6.3 Class extension with %extend

    From 4c1b566f621f854274892af1def2f3589d2eb934 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 11 Dec 2012 18:42:58 +0000 Subject: [PATCH 229/538] Fix fully qualified package paths for Python 3 even if a module is in the same package git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13955 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 4 ++++ Source/Modules/python.cxx | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 0775e31e3..448cf2ef0 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.9 (in progress) =========================== +2012-12-11: wsfulton + [Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the + same package. + 2012-12-08: wsfulton [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types. diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 2295f7801..bd897636f 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1049,7 +1049,7 @@ public: // of this module.) Node *options = Getattr(mod, "options"); String *pkg = options ? Getattr(options, "package") : 0; - if (pkg && (!package || Strcmp(pkg, package) != 0)) { + if (pkg) { Printf(import, "%s.", pkg); } // finally, output the name of the imported module @@ -1057,7 +1057,7 @@ public: if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) { Printf(import, "_%s\n", modname); if (!GetFlagAttr(f_shadow_imports, import)) { - if (pkg && (!package || Strcmp(pkg, package) != 0)) { + if (pkg) { Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s.%s\n", pkg, modname); } else { Printf(builtin ? f_shadow_builtin_imports : f_shadow, "import %s\n", modname); @@ -3168,7 +3168,7 @@ public: // check if the module has a package option Node *options = Getattr(mod, "options"); String *pkg = options ? Getattr(options, "package") : 0; - if (pkg && (!package || Strcmp(pkg, package) != 0)) { + if (pkg) { Printf(importname, "%s.", pkg); } Printf(importname, "%s.", modname); From f26c7b0ac2baf66f105cea6c797a4deaa524866e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 11 Dec 2012 18:43:56 +0000 Subject: [PATCH 230/538] Document null attribute for out typemap for C# git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13956 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Doc/Manual/CSharp.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index b511dc126..a5394eb37 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -190,6 +190,21 @@ csattributes C# attributes for attaching to proxy classes/enums +
  • +

    Additional typemap attributes:

    + +

    +The "null" attribute in the "out" typemap can be specified to provide a value for $null to expand into for wrapped functions that return non-void. Normally the default value of 0 is used. +For example this is needed if you change the return type to void: +

    + +
    +%typemap(ctype) Status "void"
+%typemap(out, null="") Status { ... }
+
    + +
    • +

  • Feature equivalent names:

    
From 413a485ac1990534ac740e05f32e51e15dbc7685 Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Wed, 12 Dec 2012 12:41:07 +0000
Subject: [PATCH 231/538] add finalizer for class fix.  It was missing from
 earlier additions

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13957 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/r.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index 6258e327d..4724ca3a7 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -2115,7 +2115,7 @@ int R::functionWrapper(Node *n) {
 	{ 
 	  String *finalizer = NewString(iname);
 	  Replace(finalizer, "new_", "", DOH_REPLACE_FIRST);
-	  Printf(sfun->code, "reg.finalizer(ans, delete_%s)\n", finalizer);
+	  Printf(sfun->code, "reg.finalizer(ans@ref, delete_%s)\n", finalizer);
 	}                                                                      
       Printf(sfun->code, "ans\n");
     }

From 600b598f67e86c98e95285dba813e29f0566a127 Mon Sep 17 00:00:00 2001
From: Joseph Wang 
Date: Wed, 12 Dec 2012 12:42:42 +0000
Subject: [PATCH 232/538] fix current changes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13958 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 448cf2ef0..b1107dada 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-12: drjoe
+	    [R] add fix to finalizer that was missed earlier
+
 2012-12-11: wsfulton
             [Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the
             same package.

From d994d4702855cc3c19a3ed0beafbb7a79d8a34cc Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 13 Dec 2012 22:37:09 +0000
Subject: [PATCH 233/538] Check for yodl >= 2.02. 1.31.18 is known not to work
 and 2.01.00 to 2.01.03 gave an error message

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13959 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index ef7c2d0b7..1c31b74a0 100644
--- a/configure.in
+++ b/configure.in
@@ -118,7 +118,7 @@ AC_SUBST(ENABLE_CCACHE)
 
 echo ""
 echo "Checking packages required for SWIG developers."
-echo "Note : None of the following packages are required for users to compile and install SWIG"
+echo "Note : None of the following packages are required for users to compile and install SWIG from the distributed tarball"
 echo ""
 
 AC_PROG_YACC
@@ -128,11 +128,22 @@ AC_SUBST(AR)
 AC_CHECK_PROGS(YODL2MAN, yodl2man)
 AC_CHECK_PROGS(YODL2HTML, yodl2html)
 
+if test -n "$YODL2MAN"; then
+  AC_MSG_CHECKING([yodl2man version >= 2.02])
+  yodl_version=`$YODL2MAN --version 2>&1 | grep 'yodl version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.*[0-9]*\).*/\1/g'`
+  AX_COMPARE_VERSION([$yodl_version],[ge],[2.02], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no - $yodl_version found])])
+fi
+
+if test -n "$YODL2HTML"; then
+  AC_MSG_CHECKING([yodl2html version >= 2.02])
+  yodl_version=`$YODL2HTML --version 2>&1 | grep 'yodl version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`
+  AX_COMPARE_VERSION([$yodl_version],[ge],[2.02], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no - $yodl_version found])])
+fi
 
 echo ""
 echo "Checking for installed target languages and other information in order to compile and run"
 echo "the examples and test-suite invoked by 'make check'."
-echo "Note : None of the following packages are required for users to compile and install SWIG"
+echo "Note : None of the following packages are required for users to compile and install SWIG from the distributed tarball"
 echo ""
 
 dnl Some test cases require Boost

From 4714b9b897cdc70671edb3249d68180bbbf3d3f9 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 13 Dec 2012 23:39:25 +0000
Subject: [PATCH 234/538] Fix bad exit running 'swig -go -help'

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13960 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/go.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index a16f710fd..9784ba125 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -129,6 +129,7 @@ private:
   virtual void main(int argc, char *argv[]) {
 
     SWIG_library_directory("go");
+    bool display_help = false;
 
     // Process command line options.
     for (int i = 1; i < argc; i++) {
@@ -190,6 +191,7 @@ private:
 	    Swig_arg_error();
 	  }
 	} else if (strcmp(argv[i], "-help") == 0) {
+	  display_help = true;
 	  Printf(stdout, "%s\n", usage);
 	}
       }
@@ -215,7 +217,7 @@ private:
     // This test may be removed in the future, when we can assume that
     // everybody has upgraded to Go 1.1.  The code below is prepared
     // for this test to simply be taken out.
-    if (intgo_type_size == 0) {
+    if (intgo_type_size == 0 && !display_help) {
       Printf(stderr, "SWIG -go: -intgosize option required but not specified\n");
       SWIG_exit(EXIT_FAILURE);
     }

From 2939f181f138671d2a3ff60b054e7e4bd81820e4 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 14 Dec 2012 07:12:35 +0000
Subject: [PATCH 235/538] Add Android install options for optional storage to
 SD Card

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13961 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/android/class/Makefile  | 3 ++-
 Examples/android/extend/Makefile | 3 ++-
 Examples/android/simple/Makefile | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Examples/android/class/Makefile b/Examples/android/class/Makefile
index 7de95f559..2a3f0ec2d 100644
--- a/Examples/android/class/Makefile
+++ b/Examples/android/class/Makefile
@@ -7,6 +7,7 @@ PACKAGENAME= org.swig.classexample
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample 
 PROJECTNAME= SwigClass
 TARGETID  = 1
+#INSTALLOPTIONS = -s # To install on SD Card
 
 all::	android
 
@@ -18,7 +19,7 @@ android::
 
 install::
 	-adb uninstall $(PACKAGENAME)
-	adb install bin/$(PROJECTNAME)-debug.apk
+	adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
 
 clean::
 	ant clean
diff --git a/Examples/android/extend/Makefile b/Examples/android/extend/Makefile
index 98a0372dd..e8c1b5e16 100644
--- a/Examples/android/extend/Makefile
+++ b/Examples/android/extend/Makefile
@@ -7,6 +7,7 @@ PACKAGENAME= org.swig.extendexample
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample 
 PROJECTNAME= SwigExtend
 TARGETID  = 1
+#INSTALLOPTIONS = -s # To install on SD Card
 
 all::	android
 
@@ -18,7 +19,7 @@ android::
 
 install::
 	-adb uninstall $(PACKAGENAME)
-	adb install bin/$(PROJECTNAME)-debug.apk
+	adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
 
 clean::
 	ant clean
diff --git a/Examples/android/simple/Makefile b/Examples/android/simple/Makefile
index 1e95de6e3..9aeb0c80d 100644
--- a/Examples/android/simple/Makefile
+++ b/Examples/android/simple/Makefile
@@ -7,6 +7,7 @@ PACKAGENAME= org.swig.simple
 SWIGOPT    = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple
 PROJECTNAME= SwigSimple
 TARGETID  = 1
+#INSTALLOPTIONS = -s # To install on SD Card
 
 all::	android
 
@@ -18,7 +19,7 @@ android::
 
 install::
 	-adb uninstall $(PACKAGENAME)
-	adb install bin/$(PROJECTNAME)-debug.apk
+	adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk
 
 clean::
 	ant clean

From 1ab67f5bed7e10f4f67dda4d2d161e3e881bbbce Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 14 Dec 2012 07:38:44 +0000
Subject: [PATCH 236/538] Fix CFFI incorrect constant names

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13962 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current         |  4 ++++
 Source/Modules/cffi.cxx | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index b1107dada..a1e1e1a62 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+
+2012-12-13: wsfulton
+            [CFFI] Fix #3529690 - Fix incorrect constant names.
+
 2012-12-12: drjoe
 	    [R] add fix to finalizer that was missed earlier
 
diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx
index c2c79b007..d3f0391d0 100644
--- a/Source/Modules/cffi.cxx
+++ b/Source/Modules/cffi.cxx
@@ -1031,10 +1031,14 @@ String *CFFI::convert_literal(String *literal, String *type, bool try_to_split)
     return result;
   } else if (SwigType_type(type) == T_INT || SwigType_type(type) == T_UINT) {
     // Printf(stderr, "Is a T_INT or T_UINT %s, before replaceall\n", s);
-    Replaceall(num, "u", "");
-    Replaceall(num, "U", "");
-    Replaceall(num, "l", "");
-    Replaceall(num, "L", "");
+    const char *num_start = Char(num);
+    bool is_literal = isdigit(*num_start) || (*num_start == '.') || (*num_start == '+') || (*num_start == '-');
+    if (is_literal) {
+      Replaceall(num, "u", "");
+      Replaceall(num, "U", "");
+      Replaceall(num, "l", "");
+      Replaceall(num, "L", "");
+    }
 
     int i, j;
     if (sscanf(s, "%d >> %d", &i, &j) == 2) {

From 04b60a150865fa10b6ebabd60882c7b56681ce7e Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 14 Dec 2012 08:00:22 +0000
Subject: [PATCH 237/538] CFFI - Fix some string constants are incorrect

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13963 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                         | 3 +++
 Examples/test-suite/preproc_constants.i | 1 +
 Source/Modules/cffi.cxx                 | 8 +++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index a1e1e1a62..e49b61a78 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -6,6 +6,9 @@ Version 2.0.9 (in progress)
 ===========================
 
 
+2012-12-14: wsfulton
+            [CFFI] Fix #3161614 - Some string constants are incorrect
+
 2012-12-13: wsfulton
             [CFFI] Fix #3529690 - Fix incorrect constant names.
 
diff --git a/Examples/test-suite/preproc_constants.i b/Examples/test-suite/preproc_constants.i
index 1bf84a91a..7507d632c 100644
--- a/Examples/test-suite/preproc_constants.i
+++ b/Examples/test-suite/preproc_constants.i
@@ -39,6 +39,7 @@
 #define CONST_CHAR      'x'
 #define CONST_STRING1   "const string"
 #define CONST_STRING2   "const" " string"
+#define CONST_STRING3   "log-revprops"
 
 // Expressions - runtime tests check the type for any necessary type promotions of the expressions
 
diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx
index d3f0391d0..88f82b647 100644
--- a/Source/Modules/cffi.cxx
+++ b/Source/Modules/cffi.cxx
@@ -565,7 +565,13 @@ void CFFI::emit_defun(Node *n, String *name) {
 
 int CFFI::constantWrapper(Node *n) {
   String *type = Getattr(n, "type");
-  String *converted_value = convert_literal(Getattr(n, "value"), type);
+  String *converted_value;
+  if (SwigType_type(type) == T_STRING) {
+    converted_value = NewString(Getattr(n, "rawval"));
+  } else {
+    converted_value = convert_literal(Getattr(n, "value"), type);
+  }
+
   String *name = lispify_name(n, Getattr(n, "sym:name"), "'constant");
 
   if (Strcmp(name, "t") == 0 || Strcmp(name, "T") == 0)

From ff95b17588bcbb9e0e6ee660e65951009e49c46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Fri, 14 Dec 2012 13:33:37 +0000
Subject: [PATCH 238/538] Adapt configure.in to detect ruby.h in Ruby1.9+
 canonical include pathes

Fixes issue 3595945


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13964 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/configure.in b/configure.in
index 1c31b74a0..07a78fb11 100644
--- a/configure.in
+++ b/configure.in
@@ -1340,7 +1340,13 @@ fi
 
 AC_MSG_CHECKING(for Ruby header files)
 if test -n "$RUBY"; then
+        # Try Ruby1.9 first
+        RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null`
+	if test x"$RUBYDIR" == x""; then
 	RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
+        else
+                RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null`
+        fi
 	if test x"$RUBYDIR" != x""; then
 		dirs="$RUBYDIR"
 		RUBYINCLUDE=none
@@ -1351,6 +1357,9 @@ if test -n "$RUBY"; then
 				break;
 			fi
 		done
+                if test x"$RUBYARCH" != x""; then
+			RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH"
+                fi
 		if test "$RUBYINCLUDE" = none; then
 			RUBYINCLUDE="-I$RUBYDIR"
 			AC_MSG_RESULT(could not locate ruby.h...using $RUBYINCLUDE)

From eab417a3a1900a543e4916b17dd4b7d891db80f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Fri, 14 Dec 2012 14:07:32 +0000
Subject: [PATCH 239/538] Ruby 1.9: Add current dir to load path when running
 Ruby

Ruby 1.9 changes the default load path to _not_ include the current
directory. This breaks running the test cases.



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13965 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/ruby/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in
index e157e72ca..3354acfd8 100644
--- a/Examples/test-suite/ruby/Makefile.in
+++ b/Examples/test-suite/ruby/Makefile.in
@@ -61,7 +61,7 @@ ruby_naming.cpptest: SWIGOPT += -autorename
 # a file is found which has _runme.rb appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
-	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
+	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) -I. $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
 	fi
 
 # Clean

From 5a2f1139c3962a3d8e392283604c8b9c607af28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Fri, 14 Dec 2012 14:13:12 +0000
Subject: [PATCH 240/538] document Ruby fixes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13966 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index e49b61a78..bdb9c682c 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-14: kkaempf
+            [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include
+            pathes to match Ruby 1.9+
 
 2012-12-14: wsfulton
             [CFFI] Fix #3161614 - Some string constants are incorrect

From 23771ef027e6cf72f12e464ccd3b58abaac1607d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Fri, 14 Dec 2012 15:48:31 +0000
Subject: [PATCH 241/538] Ruby: Replace all occurences of STR2CSTR macro with
 calls to StringValuePtr

STR2CSTR was deprecated in Ruby since years and got finally removed
in Ruby 1.9


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13967 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                         | 4 ++++
 Doc/Manual/Ruby.html                    | 8 ++++----
 Examples/ruby/hashargs/example.i        | 2 +-
 Examples/ruby/multimap/example.i        | 6 +++---
 Examples/test-suite/memberin1.i         | 2 +-
 Examples/test-suite/namespace_typemap.i | 2 +-
 Lib/ruby/argcargv.i                     | 2 +-
 Lib/ruby/rubystrings.swg                | 4 ----
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index bdb9c682c..6256f0469 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-14: kkaempf
+            [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro
+            with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9
+
 2012-12-14: kkaempf
             [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include
             pathes to match Ruby 1.9+
diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index 969de7a3d..47cf4f303 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -4926,7 +4926,7 @@ arguments. For example: 
    
 
 
 
    
-
    %typemap(in) (char *str, int len) {
     $1 = STR2CSTR($input);
     $2 = (int) RSTRING($input)->len;
    };

    int count(char c, char *str, int len);
    
+
    %typemap(in) (char *str, int len) {
     $1 = StringValuePtr($input);
     $2 = (int) RSTRING($input)->len;
    };

    int count(char c, char *str, int len);
    
 
 
 
@@ -7135,7 +7135,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input
     
 
     
-      char * STR2CSTR(String)
+      char * StringValuePtr(String)
       SWIG_AsCharPtrAndSize(VALUE, char*, size_t, int* alloc)
     
 
@@ -7518,7 +7518,7 @@ Array instance to be used as a char ** object. 
    
 
 
 
    
-
    %module argv

    // This tells SWIG to treat char ** as a special case
    %typemap(in) char ** {
     /* Get the length of the array */
     int size = RARRAY($input)->len; 
     int i;
     $1 = (char **) malloc((size+1)*sizeof(char *));
     /* Get the first element in memory */
     VALUE *ptr = RARRAY($input)->ptr; 
     for (i=0; i < size; i++, ptr++)
     /* Convert Ruby Object String to char* */
     $1[i]= STR2CSTR(*ptr); 
     $1[i]=NULL; /* End of list */
    }

    // This cleans up the char ** array created before 
    // the function call

    %typemap(freearg) char ** {
     free((char *) $1);
    }

    // Now a test function
    %inline %{
    int print_args(char **argv) {
     int i = 0;
     while (argv[i]) {
     printf("argv[%d] = %s\n", i,argv[i]);
     i++;
     }
     return i;
    }
    %}

    
+
    %module argv

    // This tells SWIG to treat char ** as a special case
    %typemap(in) char ** {
     /* Get the length of the array */
     int size = RARRAY($input)->len; 
     int i;
     $1 = (char **) malloc((size+1)*sizeof(char *));
     /* Get the first element in memory */
     VALUE *ptr = RARRAY($input)->ptr; 
     for (i=0; i < size; i++, ptr++)
     /* Convert Ruby Object String to char* */
     $1[i]= StringValuePtr(*ptr); 
     $1[i]=NULL; /* End of list */
    }

    // This cleans up the char ** array created before 
    // the function call

    %typemap(freearg) char ** {
     free((char *) $1);
    }

    // Now a test function
    %inline %{
    int print_args(char **argv) {
     int i = 0;
     while (argv[i]) {
     printf("argv[%d] = %s\n", i,argv[i]);
     i++;
     }
     return i;
    }
    %}

    
 
 
 
@@ -7796,7 +7796,7 @@ equivalents and store them in our local C arrays: 
    
 
 
 
    
-
    %typemap(in) (int nattributes, const char **names, const int *values)
     (VALUE keys_arr, int i, VALUE key, VALUE val) {
     Check_Type($input, T_HASH);
     $1 = NUM2INT(rb_funcall($input, rb_intern("size"), 0, NULL));
     $2 = NULL;
     $3 = NULL;
     if ($1 > 0) {
     $2 = (char **) malloc($1*sizeof(char *));
     $3 = (int *) malloc($1*sizeof(int));
     keys_arr = rb_funcall($input, rb_intern("keys"), 0, NULL);
     for (i = 0; i < $1; i++) {
     key = rb_ary_entry(keys_arr, i);
     val = rb_hash_aref($input, key);
     Check_Type(key, T_STRING);
     Check_Type(val, T_FIXNUM);
     $2[i] = STR2CSTR(key);
     $3[i] = NUM2INT(val);
    }
    }
    }
    
+
    %typemap(in) (int nattributes, const char **names, const int *values)
     (VALUE keys_arr, int i, VALUE key, VALUE val) {
     Check_Type($input, T_HASH);
     $1 = NUM2INT(rb_funcall($input, rb_intern("size"), 0, NULL));
     $2 = NULL;
     $3 = NULL;
     if ($1 > 0) {
     $2 = (char **) malloc($1*sizeof(char *));
     $3 = (int *) malloc($1*sizeof(int));
     keys_arr = rb_funcall($input, rb_intern("keys"), 0, NULL);
     for (i = 0; i < $1; i++) {
     key = rb_ary_entry(keys_arr, i);
     val = rb_hash_aref($input, key);
     Check_Type(key, T_STRING);
     Check_Type(val, T_FIXNUM);
     $2[i] = StringValuePtr(key);
     $3[i] = NUM2INT(val);
    }
    }
    }
    
 
 
 
diff --git a/Examples/ruby/hashargs/example.i b/Examples/ruby/hashargs/example.i
index 159bbd32a..10e209e5f 100644
--- a/Examples/ruby/hashargs/example.i
+++ b/Examples/ruby/hashargs/example.i
@@ -14,7 +14,7 @@
       val = rb_hash_aref($input, key);
       Check_Type(key, T_STRING);
       Check_Type(val, T_FIXNUM);
-      $2[i] = STR2CSTR(key);
+      $2[i] = StringValuePtr(key);
       $3[i] = NUM2INT(val);
     }
   }
diff --git a/Examples/ruby/multimap/example.i b/Examples/ruby/multimap/example.i
index f68422a18..34f0b899b 100644
--- a/Examples/ruby/multimap/example.i
+++ b/Examples/ruby/multimap/example.i
@@ -31,7 +31,7 @@ extern int    gcd(int x, int y);
       free($2);
       SWIG_exception(SWIG_ValueError, "List items must be strings");
     }
-    $2[i] = STR2CSTR(s);
+    $2[i] = StringValuePtr(s);
   }
   $2[i] = 0;
 }
@@ -46,7 +46,7 @@ extern int gcdmain(int argc, char *argv[]);
   if (TYPE($input) != T_STRING) {
     SWIG_exception(SWIG_ValueError, "Expected a string");
   }
-  $1 = STR2CSTR($input);
+  $1 = StringValuePtr($input);
   $2 = RSTRING_LEN($input);
 }
 
@@ -60,7 +60,7 @@ extern int count(char *bytes, int len, char c);
   if (TYPE($input) != T_STRING) {
     SWIG_exception(SWIG_ValueError,"Expected a string");
   }
-  temp = STR2CSTR($input);
+  temp = StringValuePtr($input);
   $2 = RSTRING_LEN($input);
   $1 = (char *) malloc($2+1);
   memmove($1,temp,$2);
diff --git a/Examples/test-suite/memberin1.i b/Examples/test-suite/memberin1.i
index 920323044..ece489e3d 100644
--- a/Examples/test-suite/memberin1.i
+++ b/Examples/test-suite/memberin1.i
@@ -47,7 +47,7 @@ public:
 #ifdef SWIGRUBY
 %typemap(in) String {
   Check_Type($input, T_STRING);
-  $1 = String(STR2CSTR($input));
+  $1 = String(StringValuePtr($input));
 }
 #endif
 
diff --git a/Examples/test-suite/namespace_typemap.i b/Examples/test-suite/namespace_typemap.i
index f25f88574..8ead78c6c 100644
--- a/Examples/test-suite/namespace_typemap.i
+++ b/Examples/test-suite/namespace_typemap.i
@@ -100,7 +100,7 @@ namespace test {
 #endif
 #ifdef SWIGRUBY
 	%typemap(in) string_class * {
-	    $1 = new string_class(STR2CSTR($input));
+	    $1 = new string_class(StringValuePtr($input));
 	}
 	%typemap(freearg) string_class * {
 	    delete $1;
diff --git a/Lib/ruby/argcargv.i b/Lib/ruby/argcargv.i
index ae1f6bbd3..fc0bc406a 100644
--- a/Lib/ruby/argcargv.i
+++ b/Lib/ruby/argcargv.i
@@ -30,7 +30,7 @@
     $2 = (char **) malloc((size+1)*sizeof(char *));
     VALUE *ptr = RARRAY_PTR($input);
     for (i=0; i < size; i++, ptr++) {
-      $2[i]= STR2CSTR(*ptr);
+      $2[i]= StringValuePtr(*ptr);
     }    
     $2[i]=NULL;
   } else {
diff --git a/Lib/ruby/rubystrings.swg b/Lib/ruby/rubystrings.swg
index e6b92ef58..3adf0008b 100644
--- a/Lib/ruby/rubystrings.swg
+++ b/Lib/ruby/rubystrings.swg
@@ -7,11 +7,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    %#if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    %#else
-    char *cstr = STR2CSTR(obj);
-    %#endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {

From ca61d10d9b6a57d294671731944acf23ee1e66a8 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 15 Dec 2012 12:46:04 +0000
Subject: [PATCH 242/538] Temporary workaround for testcase failing in PHP

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13968 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/typemap_directorout.i | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Examples/test-suite/typemap_directorout.i b/Examples/test-suite/typemap_directorout.i
index 4a85bd47c..fb0a6ab81 100644
--- a/Examples/test-suite/typemap_directorout.i
+++ b/Examples/test-suite/typemap_directorout.i
@@ -13,6 +13,24 @@
 // Can't use the %typemap(directorout) MyType & = SWIGTYPE & approach as non-director languages don't define any directorout typemaps
 %typemap(directorout) MyType &Class1::foo2, MyType &foo1 %{ /* special start */ $input = 0; /* special end */ %}
 
+#ifdef SWIGPHP
+%typemap(directorout, warning="PHP directorout typemaps need fixing") MyType &Class1::foo2, MyType &foo1 %{ /* special start */ /*$input = 0;*/ /* special end */ %}
+/* Patch to make $input work same as other languages. Then $input needs changing to &$input in most (maybe all) typemaps.
+--- a/Source/Modules/php.cxx
++++ b/Source/Modules/php.cxx
+@@ -2631,8 +2631,7 @@ done:
+       if (!is_void) {
+        tm = Swig_typemap_lookup("directorout", n, Swig_cresult_name(), w);
+        if (tm != 0) {
+-         static const String *amp_result = NewStringf("&%s", Swig_cresult_name());
+-         Replaceall(tm, "$input", amp_result);
++         Replaceall(tm, "$input", Swig_cresult_name());
+          char temp[24];
+          sprintf(temp, "%d", idx);
+          Replaceall(tm, "$argnum", temp);
+*/
+#endif
+
 
 #ifdef SWIGCSHARP
 %typemap(csdirectorout) MyType & %{ WILL_NOT_COMPILE %}

From 6679f5dcd0c17e35558a107a5d0e9df0a203787b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 15 Dec 2012 14:55:54 +0000
Subject: [PATCH 243/538] Rework warning fixes in rev 13512 as it introduces
 dead code flagged by sun studio

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13969 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/DOH/fio.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c
index c4fbb1e8f..573bebe7b 100644
--- a/Source/DOH/fio.c
+++ b/Source/DOH/fio.c
@@ -481,14 +481,16 @@ int DohCopyto(DOH *in, DOH *out) {
       cw = buffer;
       while (nwrite) {
 	wret = Write(out, cw, nwrite);
-	if (wret < 0)
-	  return -1;
+	if (wret < 0) {
+	  nbytes = -1;
+	  break;
+	}
 	nwrite = nwrite - wret;
 	cw += wret;
       }
       nbytes += ret;
     } else {
-      return nbytes;
+      break;
     }
   }
   return nbytes;
@@ -579,12 +581,12 @@ DOH *DohReadline(DOH *in) {
     if (Read(in, &c, 1) < 0) {
       if (n == 0) {
 	Delete(s);
-	return 0;
+	s = 0;
       }
-      return s;
+      break;
     }
     if (c == '\n')
-      return s;
+      break;
     if (c == '\r')
       continue;
     Putc(c, s);

From 94fb7629f4b11b19481ec577250304e09716bec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Sat, 15 Dec 2012 16:16:40 +0000
Subject: [PATCH 244/538] Apply patch 3530444

Class#methods and Class#constants returns array of symbols
from Ruby 1.9 on



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13970 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                               |  4 ++++
 Examples/test-suite/ruby/ruby_naming_runme.rb | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 6256f0469..5a7c98e9c 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-15: kkaempf
+            [Ruby] Apply patch 3530444, Class#methods and Class#constants returns array of
+            symbols in Ruby 1.9+
+
 2012-12-14: kkaempf
             [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro
             with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9
diff --git a/Examples/test-suite/ruby/ruby_naming_runme.rb b/Examples/test-suite/ruby/ruby_naming_runme.rb
index 8ea5f13d3..d5525bca8 100644
--- a/Examples/test-suite/ruby/ruby_naming_runme.rb
+++ b/Examples/test-suite/ruby/ruby_naming_runme.rb
@@ -35,23 +35,23 @@ if Ruby_naming::CONSTANT3 != 3
   raise RuntimeError, "Incorrect value for CONSTANT3" 
 end
 
-if not Ruby_naming::methods.include?("constant4")
+if not (Ruby_naming::methods.include?("constant4") || Ruby_naming::methods.include?(:constant4))
   raise RuntimeError, "Incorrect mapping for constant4" 
 end
 
-if not Ruby_naming::methods.include?("constant5")
+if not (Ruby_naming::methods.include?("constant5") || Ruby_naming::methods.include?(:constant5))
   raise RuntimeError, "Incorrect mapping for constant5" 
 end
 
-if not Ruby_naming::methods.include?("constant6")
+if not (Ruby_naming::methods.include?("constant6") || Ruby_naming::methods.include?(:constant6))
   raise RuntimeError, "Incorrect mapping for constant6" 
 end
 
-if not Ruby_naming::TestConstants.instance_methods.include?("constant7")
+if not (Ruby_naming::TestConstants.instance_methods.include?("constant7") || Ruby_naming::TestConstants.instance_methods.include?(:constant7))
   raise RuntimeError, "Incorrect mapping for constant7" 
 end
 
-if not Ruby_naming::TestConstants.methods.include?("constant8")
+if not (Ruby_naming::TestConstants.methods.include?("constant8") || Ruby_naming::TestConstants.methods.include?(:constant8))
   raise RuntimeError, "Incorrect mapping for constant8" 
 end
 
@@ -64,7 +64,7 @@ if Ruby_naming::TestConstants::CONSTANT10 != 10
   raise RuntimeError, "Incorrect value for CONSTANT10" 
 end
 
-if not Ruby_naming::methods.include?("constant11")
+if not (Ruby_naming::methods.include?("constant11") || Ruby_naming::methods.include?(:constant11))
   raise RuntimeError, "Incorrect mapping for constant11" 
 end
 

From e39a16c92a7d564e8ed55d46feee3f6590764b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 
Date: Sat, 15 Dec 2012 16:20:19 +0000
Subject: [PATCH 245/538] Fix detection of Ruby include files for Ruby 1.8.7

svn rev r13964 broke it for Ruby 1.8.7 :-/


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13971 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 configure.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 07a78fb11..455f86fd1 100644
--- a/configure.in
+++ b/configure.in
@@ -1342,8 +1342,8 @@ AC_MSG_CHECKING(for Ruby header files)
 if test -n "$RUBY"; then
         # Try Ruby1.9 first
         RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null`
-	if test x"$RUBYDIR" == x""; then
-	RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
+	if test x"$RUBYDIR" == x"" || test x"$RUBYDIR" == x"nil"; then
+		RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
         else
                 RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null`
         fi
@@ -1357,9 +1357,9 @@ if test -n "$RUBY"; then
 				break;
 			fi
 		done
-                if test x"$RUBYARCH" != x""; then
+		if test x"$RUBYARCH" != x""; then
 			RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH"
-                fi
+		fi
 		if test "$RUBYINCLUDE" = none; then
 			RUBYINCLUDE="-I$RUBYDIR"
 			AC_MSG_RESULT(could not locate ruby.h...using $RUBYINCLUDE)

From 8a8c8e377b114192f4f024b698bdfe758e52a91b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 15 Dec 2012 18:33:02 +0000
Subject: [PATCH 246/538] gcc-4.6 warning fix

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13972 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Source/Modules/php.cxx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index 01622f4ce..5c3ce283e 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -1091,9 +1091,6 @@ public:
       int min_num_of_arguments = emit_num_required(l);
       int max_num_of_arguments = emit_num_arguments(l);
 
-      // For a function with default arguments, we end up with the fullest
-      // parmlist in full_parmlist.
-      ParmList *full_parmlist = l;
       Hash *ret_types = NewHash();
       Setattr(ret_types, d, d);
 
@@ -1126,7 +1123,6 @@ public:
 
 	  if (num_arguments > max_num_of_arguments) {
 	    max_num_of_arguments = num_arguments;
-	    full_parmlist = l2;
 	  }
 	  o = Getattr(o, "sym:nextSibling");
 	}

From 6f819d1cd1f0fbc050d1484ae29266683c51f8dd Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 15 Dec 2012 23:41:01 +0000
Subject: [PATCH 247/538] Detect mono C# compiler on newer linux distributions

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13973 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/csharp/Makefile.in | 2 +-
 configure.in                           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index b89b50eb2..4fd8052c6 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -72,7 +72,7 @@ run_testcase = \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo -debug+ $(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" DYLD_FALLBACK_LIBRARY_PATH= $(RUNTOOL) $(INTERPRETER) $(INTERPRETER_FLAGS) $*_runme.exe; \
+	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_FALLBACK_LIBRARY_PATH= $(RUNTOOL) $(INTERPRETER) $(INTERPRETER_FLAGS) ./$*_runme.exe; \
 	else \
 	  cd $* && \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
diff --git a/configure.in b/configure.in
index 455f86fd1..0ead9b606 100644
--- a/configure.in
+++ b/configure.in
@@ -1771,19 +1771,19 @@ if test -z "$CSHARPCOMPILERBIN" ; then
   case $host in
   *-*-cygwin* | *-*-mingw*)
     # prefer Mono gmcs (.NET 2.0) over mcs (.NET 1.1) - note mcs-1.2.3 has major pinvoke bug
-    AC_CHECK_PROGS(CSHARPCOMPILER, csc gmcs mcs cscc)
+    AC_CHECK_PROGS(CSHARPCOMPILER, csc mono-csc gmcs mcs cscc)
     if test -n "$CSHARPCOMPILER" && test "$CSHARPCOMPILER" = "csc" ; then
       AC_MSG_CHECKING(whether csc is the Microsoft CSharp compiler)
       csc 2>/dev/null | grep "C#" > /dev/null || CSHARPCOMPILER=""
       if test -z "$CSHARPCOMPILER" ; then
         AC_MSG_RESULT(no)
-        AC_CHECK_PROGS(CSHARPCOMPILER, gmcs mcs cscc)
+        AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc)
       else
         AC_MSG_RESULT(yes)
       fi
     fi
     ;;
-  *)AC_CHECK_PROGS(CSHARPCOMPILER, gmcs mcs cscc);;
+  *)AC_CHECK_PROGS(CSHARPCOMPILER, mono-csc gmcs mcs cscc);;
   esac
 else
   CSHARPCOMPILER="$CSHARPCOMPILERBIN"

From 87ee6da3659ec29400ad245fa7eac6a39457e316 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 15 Dec 2012 23:56:27 +0000
Subject: [PATCH 248/538] Make php example C90 compliant

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13974 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/php/cpointer/example.i | 5 +++++
 Examples/php/pointer/example.i  | 6 ++++++
 Examples/php/simple/example.i   | 8 +++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Examples/php/cpointer/example.i b/Examples/php/cpointer/example.i
index 52e6df190..c61d92858 100644
--- a/Examples/php/cpointer/example.i
+++ b/Examples/php/cpointer/example.i
@@ -1,6 +1,11 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(int *, int *, int *);
+extern void sub(int *, int *, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 
diff --git a/Examples/php/pointer/example.i b/Examples/php/pointer/example.i
index c14b94189..1f0059406 100644
--- a/Examples/php/pointer/example.i
+++ b/Examples/php/pointer/example.i
@@ -1,6 +1,12 @@
 /* File : example.i */
 %module example
 
+%{
+extern void add(double *, double *, double *);
+extern void sub(int *, int *, int *);
+extern int divide(int, int, int *);
+%}
+
 /* This example illustrates a couple of different techniques
    for manipulating C pointers */
 
diff --git a/Examples/php/simple/example.i b/Examples/php/simple/example.i
index af4ff08a7..9d4e22aa9 100644
--- a/Examples/php/simple/example.i
+++ b/Examples/php/simple/example.i
@@ -1,10 +1,8 @@
 /* File : example.i */
 %module example
 
-%{
-   extern double Foo;
-%}
-
+%inline %{
+extern int    gcd(int x, int y);
 extern double Foo;
 void print_Foo();
-int    gcd(int x, int y);
+%}

From 6dd4f362b35e19d5d4db7c728bc3accb678bf0ad Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 16 Dec 2012 08:38:22 +0000
Subject: [PATCH 249/538] Testcase correction for missing virtual destructor

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13975 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/virtual_vs_nonvirtual_base.i | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/virtual_vs_nonvirtual_base.i b/Examples/test-suite/virtual_vs_nonvirtual_base.i
index 9e8bc5eab..009461835 100644
--- a/Examples/test-suite/virtual_vs_nonvirtual_base.i
+++ b/Examples/test-suite/virtual_vs_nonvirtual_base.i
@@ -6,6 +6,7 @@ class SimpleVirtual
 {
 	public:
 		virtual int implementMe() = 0;
+		virtual ~SimpleVirtual() {}
 };
 
 class SimpleNonVirtual

From 093dc60d2deb9ee180a3e998ad89c314470b0804 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 16 Dec 2012 13:56:50 +0000
Subject: [PATCH 250/538] Fix garbage line number and empty file name reporting
 for some '}' or ')' error messages

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13976 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 CHANGES.current                                     |  4 ++++
 .../test-suite/errors/cpp_missing_rparenthesis.i    | 13 +++++++++++++
 Examples/test-suite/errors/expected.log             |  6 +++++-
 Examples/test-suite/errors/make.sh                  |  1 +
 Source/CParse/cscanner.c                            |  3 ++-
 Source/Swig/scanner.c                               |  7 +++++++
 6 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 Examples/test-suite/errors/cpp_missing_rparenthesis.i

diff --git a/CHANGES.current b/CHANGES.current
index 5a7c98e9c..22c9a3301 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.9 (in progress)
 ===========================
 
+2012-12-16: wsfulton
+            Fix garbage line number / empty file name reporting for some  missing
+            '}' or ')' error messages.
+
 2012-12-15: kkaempf
             [Ruby] Apply patch 3530444, Class#methods and Class#constants returns array of
             symbols in Ruby 1.9+
diff --git a/Examples/test-suite/errors/cpp_missing_rparenthesis.i b/Examples/test-suite/errors/cpp_missing_rparenthesis.i
new file mode 100644
index 000000000..5d0627e86
--- /dev/null
+++ b/Examples/test-suite/errors/cpp_missing_rparenthesis.i
@@ -0,0 +1,13 @@
+%module xxx
+
+%inline %{
+class Klass {
+Klass(int i) : m_i(
+{
+}
+};
+%}
+
+void something() {
+}
+
diff --git a/Examples/test-suite/errors/expected.log b/Examples/test-suite/errors/expected.log
index 4f56e7146..9d4e5db77 100644
--- a/Examples/test-suite/errors/expected.log
+++ b/Examples/test-suite/errors/expected.log
@@ -46,7 +46,7 @@ c_long_short.i:5: Error: Extra long specifier.
 c_long_short.i:6: Error: Extra short specifier.
 
 :::::::::::::::::::::::::::::::: c_missing_rbrace.i :::::::::::::::::::::::::::::::::::
-:168430090: Error: Missing '}'. Reached end of input.
+c_missing_rbrace.i:3: Error: Missing '}'. Reached end of input.
 c_missing_rbrace.i:3: Error: Syntax error in input(1).
 
 :::::::::::::::::::::::::::::::: c_missing_semi.i :::::::::::::::::::::::::::::::::::
@@ -296,6 +296,10 @@ cpp_macro_locator.i:97: Warning 509: as it is shadowed by overloadinline2(int *)
 cpp_macro_locator.i:101: Warning 509: Overloaded method overload5(int const *) effectively ignored,
 cpp_macro_locator.i:100: Warning 509: as it is shadowed by overload5(int *).
 
+:::::::::::::::::::::::::::::::: cpp_missing_rparenthesis.i :::::::::::::::::::::::::::::::::::
+cpp_missing_rparenthesis.i:5: Error: Missing ')'. Reached end of input.
+cpp_missing_rparenthesis.i:5: Error: Syntax error in input(3).
+
 :::::::::::::::::::::::::::::::: cpp_missing_rtemplate.i :::::::::::::::::::::::::::::::::::
 cpp_missing_rtemplate.i:4: Error: Syntax error in input(1).
 
diff --git a/Examples/test-suite/errors/make.sh b/Examples/test-suite/errors/make.sh
index e243315ec..90f17a92a 100755
--- a/Examples/test-suite/errors/make.sh
+++ b/Examples/test-suite/errors/make.sh
@@ -70,6 +70,7 @@ cpp_extend_undefined
 cpp_inline_namespace
 cpp_inherit
 cpp_macro_locator
+cpp_missing_rparenthesis
 cpp_missing_rtemplate
 cpp_namespace_alias
 cpp_namespace_aliasnot
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index d4678ffdf..64875a4d1 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -103,10 +103,11 @@ void start_inline(char *text, int line) {
  * ----------------------------------------------------------------------------- */
 
 void skip_balanced(int startchar, int endchar) {
+  int start_line = Scanner_line(scan);
   Clear(scanner_ccode);
 
   if (Scanner_skip_balanced(scan,startchar,endchar) < 0) {
-    Swig_error(Scanner_file(scan),Scanner_errline(scan), "Missing '%c'. Reached end of input.\n", endchar);
+    Swig_error(cparse_file, start_line, "Missing '%c'. Reached end of input.\n", endchar);
     return;
   }
 
diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c
index 8b1c6183e..8c4bf26a2 100644
--- a/Source/Swig/scanner.c
+++ b/Source/Swig/scanner.c
@@ -65,6 +65,7 @@ Scanner *NewScanner(void) {
   s->text = NewStringEmpty();
   s->str = 0;
   s->error = 0;
+  s->error_line = 0;
   s->freeze_line = 0;
   return s;
 }
@@ -104,6 +105,12 @@ void Scanner_clear(Scanner * s) {
   s->nexttoken = -1;
   s->start_line = 0;
   s->yylen = 0;
+  /* Should these be cleared too?
+  s->idstart;
+  s->file;
+  s->error_line;
+  s->freeze_line;
+  */
 }
 
 /* -----------------------------------------------------------------------------

From ac75e4ae53b1813f5791798ac5b679b52889a81a Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 16 Dec 2012 14:39:37 +0000
Subject: [PATCH 251/538] 2.0.9 release notes and date

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13977 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 ANNOUNCE                 | 2 +-
 CHANGES.current          | 8 ++++----
 Doc/Manual/Sections.html | 2 +-
 README                   | 2 +-
 RELEASENOTES             | 6 ++++++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index f6a24967a..8ac224247 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 2.0.9 (in progress) ***
+*** ANNOUNCE: SWIG 2.0.9 (16 December 2012) ***
 
 http://www.swig.org
 
diff --git a/CHANGES.current b/CHANGES.current
index 22c9a3301..c88bed34d 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,11 +2,11 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.9 (in progress)
-===========================
+Version 2.0.9 (16 December 2012)
+================================
 
 2012-12-16: wsfulton
-            Fix garbage line number / empty file name reporting for some  missing
+            Fix garbage line number / empty file name reporting for some missing
             '}' or ')' error messages.
 
 2012-12-15: kkaempf
@@ -19,7 +19,7 @@ Version 2.0.9 (in progress)
 
 2012-12-14: kkaempf
             [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include
-            pathes to match Ruby 1.9+
+            paths to match Ruby 1.9+
 
 2012-12-14: wsfulton
             [CFFI] Fix #3161614 - Some string constants are incorrect
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 483d64463..faff95298 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
    SWIG-2.0 Documentation
    
 
-Last update : SWIG-2.0.9 (in progress)
+Last update : SWIG-2.0.9 (16 December 2012)
 
 
    Sections
    
 
diff --git a/README b/README
index c9abef486..68a55e862 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.9 (in progress)
+Version: 2.0.9 (16 December 2012)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua,
diff --git a/RELEASENOTES b/RELEASENOTES
index e09e2cad0..af9f4fb6b 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -4,6 +4,12 @@ and CHANGES files.
 
 Release Notes
 =============
+SWIG-2.0.9 summary:
+- Improved typemap matching.
+- Ruby 1.9 support is much improved.
+- Various bug fixes and minor improvements in C#, CFFI, Go, Java,
+  Modula3, Octave, Perl, Python, R, Ruby, Tcl and in ccache-swig.
+
 SWIG-2.0.8 summary:
 - Fix a couple of regressions introduced in 2.0.5 and 2.0.7.
 - Improved using declarations and using directives support.

From 7ff0dfe426327db14bbc2922dc90408bd17ecf13 Mon Sep 17 00:00:00 2001
From: "Brant K. Kyser" 
Date: Wed, 2 Jan 2013 15:07:56 -0600
Subject: [PATCH 252/538] Fix for SourceForge Bug #1278

* Modify test-suite to test Java directors with multi-level namespaces.
* Path java module to correctly generate method descriptors when multilevel namespaces are used.
---
 .gitignore                                    |  7 ++
 Examples/test-suite/director_nspace.i         | 96 ++++++++++---------
 .../java/director_nspace_runme.java           | 12 +--
 Source/Modules/java.cxx                       |  7 +-
 4 files changed, 70 insertions(+), 52 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..d4ac5207b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Compiled Source
+*.o
+*.class
+
+# Local PCRE
+prce
+*.gz
diff --git a/Examples/test-suite/director_nspace.i b/Examples/test-suite/director_nspace.i
index 6814a43a3..121a06f1f 100644
--- a/Examples/test-suite/director_nspace.i
+++ b/Examples/test-suite/director_nspace.i
@@ -8,28 +8,31 @@ SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE)
 %{
 #include 
 
-namespace Bar
+namespace TopLevel
 {
-  class FooBar {
-  public:
-    FooBar() {}
-    FooBar(const FooBar&) {}
-    virtual ~FooBar() {}
+  namespace Bar
+  {
+    class FooBar {
+    public:
+      FooBar() {}
+      FooBar(const FooBar&) {}
+      virtual ~FooBar() {}
+      
+      std::string FooBarDo() { return "Bar::Foo2::Foo2Bar()"; }
+    };
     
-    std::string FooBarDo() { return "Bar::Foo2::Foo2Bar()"; }
-  };
+    class Foo {
+    public:
+      virtual ~Foo() {}
+      virtual std::string ping() { return "Bar::Foo::ping()"; }
+      virtual std::string pong() { return "Bar::Foo::pong();" + ping(); }
+      virtual std::string fooBar(FooBar* fb) { return fb->FooBarDo(); }
+      virtual Foo makeFoo() { return Foo(); }
+      virtual FooBar makeFooBar() { return FooBar(); }
   
-  class Foo {
-  public:
-    virtual ~Foo() {}
-    virtual std::string ping() { return "Bar::Foo::ping()"; }
-    virtual std::string pong() { return "Bar::Foo::pong();" + ping(); }
-    virtual std::string fooBar(FooBar* fb) { return fb->FooBarDo(); }
-    virtual Foo makeFoo() { return Foo(); }
-    virtual FooBar makeFooBar() { return FooBar(); }
-
-    static Foo* get_self(Foo *self_) {return self_;}
-  };
+      static Foo* get_self(Foo *self_) {return self_;}
+    };
+  }
 }
 
 %}
@@ -38,36 +41,39 @@ namespace Bar
 
 // nspace feature only supported by these languages
 #if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGD)
-%nspace Bar::Foo;
-%nspace Bar::FooBar;
+%nspace TopLevel::Bar::Foo;
+%nspace TopLevel::Bar::FooBar;
 #else
 #warning nspace feature not yet supported in this target language
 #endif
 
-%feature("director") Bar::Foo;
+%feature("director") TopLevel::Bar::Foo;
 
-namespace Bar
-{ 
-  class FooBar {
-  public:
-    FooBar();
-    FooBar(const FooBar&);
-    virtual ~FooBar();
+namespace TopLevel
+{
+  namespace Bar
+  { 
+    class FooBar {
+    public:
+      FooBar();
+      FooBar(const FooBar&);
+      virtual ~FooBar();
+      
+      std::string FooBarDo();
+      
+    };
     
-    std::string FooBarDo();
-    
-  };
-  
-  class Foo
-  {
-  public:
-    virtual ~Foo();
-    virtual std::string ping();
-    virtual std::string pong();
-    virtual std::string fooBar(FooBar* fb);
-    virtual Foo makeFoo();
-    virtual FooBar makeFooBar();
-   
-    static Foo* get_self(Foo *self_);
-  };
+    class Foo
+    {
+    public:
+      virtual ~Foo();
+      virtual std::string ping();
+      virtual std::string pong();
+      virtual std::string fooBar(FooBar* fb);
+      virtual Foo makeFoo();
+      virtual FooBar makeFooBar();
+     
+      static Foo* get_self(Foo *self_);
+    };
+  }
 }
diff --git a/Examples/test-suite/java/director_nspace_runme.java b/Examples/test-suite/java/director_nspace_runme.java
index 4e56f91c2..53a6131a7 100644
--- a/Examples/test-suite/java/director_nspace_runme.java
+++ b/Examples/test-suite/java/director_nspace_runme.java
@@ -19,7 +19,7 @@ public class director_nspace_runme {
 
 }
 
-class director_nspace_MyBarFoo extends director_nspacePackage.Bar.Foo {
+class director_nspace_MyBarFoo extends director_nspacePackage.TopLevel.Bar.Foo {
 
   @Override
   public String ping() {
@@ -32,17 +32,17 @@ class director_nspace_MyBarFoo extends director_nspacePackage.Bar.Foo {
   }
 
   @Override
-  public String fooBar(director_nspacePackage.Bar.FooBar fooBar) {
+  public String fooBar(director_nspacePackage.TopLevel.Bar.FooBar fooBar) {
     return fooBar.FooBarDo();
   }
 
   @Override
-  public director_nspacePackage.Bar.Foo makeFoo() {
-    return new director_nspacePackage.Bar.Foo();
+  public director_nspacePackage.TopLevel.Bar.Foo makeFoo() {
+    return new director_nspacePackage.TopLevel.Bar.Foo();
   }
 
   @Override
-  public director_nspacePackage.Bar.FooBar makeFooBar() {
-    return new director_nspacePackage.Bar.FooBar();
+  public director_nspacePackage.TopLevel.Bar.FooBar makeFooBar() {
+    return new director_nspacePackage.TopLevel.Bar.FooBar();
   }
 }
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index cd8cfe543..971e60659 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4253,8 +4253,13 @@ public:
     Wrapper *w = NewWrapper();
 
     if (Len(package_path) > 0)
-      if (Len(getNSpace()) > 0)
+      if (Len(getNSpace()) > 0) {
         internal_classname = NewStringf("%s/%s/%s", package_path, getNSpace(), classname);
+
+        // If the namespace is multiple levels, the result of getNSpace() will have inserted
+        // .'s to delimit namespaces, so we need to replace those with /'s
+        Replace(internal_classname, ".", "/", DOH_REPLACE_ANY);
+      }
       else
         internal_classname = NewStringf("%s/%s", package_path, classname);
     else

From 981684fc1e1f5a21fd65fe2d07df2daf05a98a64 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 3 Jan 2013 07:17:09 +0000
Subject: [PATCH 253/538] Update Windows instructions for using Github instead
 of svn

---
 Doc/Manual/Windows.html | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html
index 6349f355a..c94a3da3b 100644
--- a/Doc/Manual/Windows.html
+++ b/Doc/Manual/Windows.html
@@ -236,8 +236,8 @@ The short abbreviated instructions follow...
 
 
 
    
-The step by step instructions to download and install MinGW and MSYS, then download and build the latest version of SWIG from SVN follow...
-Note that the instructions for obtaining SWIG from SVN are also online at SWIG SVN.
+The step by step instructions to download and install MinGW and MSYS, then download and build the latest version of SWIG from Github follow...
+Note that the instructions for obtaining SWIG from Github are also online at SWIG Bleeding Edge.
 
    
 
 
    
@@ -300,15 +300,19 @@ tar -zxf bison-2.0-MSYS.tar.gz
  • - To get the latest SWIG SVN (version from Subversion source control), type in the following: + The very latest development version of SWIG is available from SWIG on Github + and can be downloaded as a zip file or if you have Git installed, via Git. + Either download the latest Zip file snapshot and unzip and rename the top level folder to /usr/src/swig. + + Otherwise if using Git, type in the following: 
     mkdir /usr/src
 cd /usr/src
-svn co https://swig.svn.sourceforge.net/svnroot/swig/trunk swig
+git clone https://github.com/swig/swig.git
    Pitfall note: -If you want to check out SWIG to a different folder to the proposed +If you want to place SWIG in a different folder to the proposed /usr/src/swig, do not use MSYS emulated windows drive letters, because the autotools will fail miserably on those.
    • From 382326bfbc65f90b2fef37884d2e5bf171c7400f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 3 Jan 2013 06:49:51 +0000 Subject: [PATCH 254/538] Bump version to 2.0.10 --- ANNOUNCE | 8 +- CHANGES | 155 +++++++++++++++++++++++++++++++++++++++ CHANGES.current | 155 +-------------------------------------- Doc/Manual/Sections.html | 2 +- README | 2 +- configure.in | 2 +- 6 files changed, 164 insertions(+), 160 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8ac224247..1c3297a5c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,8 +1,8 @@ -*** ANNOUNCE: SWIG 2.0.9 (16 December 2012) *** +*** ANNOUNCE: SWIG 2.0.10 (in progress) *** http://www.swig.org -We're pleased to announce SWIG-2.0.9, the latest SWIG release. +We're pleased to announce SWIG-2.0.10, the latest SWIG release. What is SWIG? ============= @@ -21,11 +21,11 @@ Availability ============ The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-2.0.9.tar.gz + http://prdownloads.sourceforge.net/swig/swig-2.0.10.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-2.0.9.zip + http://prdownloads.sourceforge.net/swig/swigwin-2.0.10.zip Please report problems with this release to the swig-devel mailing list, details at http://www.swig.org/mail.html. diff --git a/CHANGES b/CHANGES index b485badd9..d6006a91a 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,161 @@ SWIG (Simplified Wrapper and Interface Generator) See the CHANGES.current file for changes in the current version. See the RELEASENOTES file for a summary of changes in each release. +Version 2.0.9 (16 December 2012) +================================ + +2012-12-16: wsfulton + Fix garbage line number / empty file name reporting for some missing + '}' or ')' error messages. + +2012-12-15: kkaempf + [Ruby] Apply patch 3530444, Class#methods and Class#constants returns array of + symbols in Ruby 1.9+ + +2012-12-14: kkaempf + [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro + with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9 + +2012-12-14: kkaempf + [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include + paths to match Ruby 1.9+ + +2012-12-14: wsfulton + [CFFI] Fix #3161614 - Some string constants are incorrect + +2012-12-13: wsfulton + [CFFI] Fix #3529690 - Fix incorrect constant names. + +2012-12-12: drjoe + [R] add fix to finalizer that was missed earlier + +2012-12-11: wsfulton + [Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the + same package. + +2012-12-08: wsfulton + [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types. + +2012-12-08: wsfulton + [Perl] Fix bug #3571361 - C++ comment in C wrappers. + +2012-12-07: wsfulton + [C#] Apply patch #3571029 which adds missing director support for const unsigned long long &. + +2012-11-28: kwwette + [Octave] Simplified module loading: now just the syntax + $ example; + is accepted, which loads functions globally but constants and variables relative to the current scope. + This make module loading behaviour reliably consistent, and reduces problems when loading modules which + depend on other modules which may not have been previously loaded. + +2012-11-27: wsfulton + [cffi] Fix junk output when wrapping single character literal constants. + +2012-11-17: wsfulton + [Tcl, Modula3] Add missing support for -outdir. + +2012-11-17: wsfulton + Fix segfaults when using filename paths greater than 1024 characters in length. + +2012-11-14: wsfulton + [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using + memory after it has been deleted. + +2012-11-09: vzeitlin + [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. + +2012-11-09: wsfulton + Fix some feature matching issues for implicit destructors and implicit constructors and implicit + copy constructors added with %copyctor. Previously a feature for these had to be fully qualified + in order to match. Now the following will also match: + + %feature("xyz") ~XXX(); + struct XXX {}; + +2012-11-09: wsfulton + Further consistency in named output typemap lookups for implicit constructors and destructors and + implicit copy constructors added with %copyctor. Previously only the fully qualified name was being + used, now the unqualified name will also be used. For example, previously: + + example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More + Looking for: void Space::More::~More + Looking for: void + + Now the unqualified name is also used: + + example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More + Looking for: void Space::More::~More + Looking for: void ~More + Looking for: void + +2012-11-02: wsfulton + Fix some subtle named output typemap lookup misses, the fully qualified name was not always being + used for variables, for example: + + struct Glob { + int MyVar; + }; + + Previously the search rules (as shown by -debug-tmsearch) for the getter wrapper were: + + example.i:44: Searching for a suitable 'out' typemap for: int MyVar + Looking for: int MyVar + Looking for: int + + Now the scope is named correctly: + + example.i:44: Searching for a suitable 'out' typemap for: int Glob::MyVar + Looking for: int Glob::MyVar + Looking for: int MyVar + Looking for: int + +2012-10-26: wsfulton + Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously + the name was ignored during the typemap search. Applies to the following list of typemaps: + directorout, csdirectorout, cstype, imtype, ctype, ddirectorout, dtype, gotype, jtype, jni, javadirectorout. + +2012-10-11: wsfulton + Most of the special variables available for use in %exception are now also available for expansion in + %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentname $parentsymname, see docs + on "Class extension" in SWIGPlus.html. Patch based on submission from Kris Thielemans. + +2012-10-10: wsfulton + Additional new special variables in %exception are expanded as follows: + $parentname - The parent class name (if any) for a method. + $parentsymname - The target language parent class name (if any) for a method. + +2012-10-08: iant + [Go] Generating Go code now requires using the -intgosize option to + indicate the size of the 'int' type in Go. This is because the + size of the type is changing from Go 1.0 to Go 1.1 for x86_64. + +2012-09-14: wsfulton + Add new warning if the empty template instantiation is used as a base class, for example: + + template class Base {}; + %template() Base; + class Derived : public Base {}; + + gives the following warning instead of silently ignoring the base: + + cpp_inherit.i:52: Warning 401: Base class 'Base< int >' has no name as it is an empty template instantiated with '%template()'. Ignored. + cpp_inherit.i:51: Warning 401: The %template directive must be written before 'Base< int >' is used as a base class and be declared with a name. + + +2012-09-11: wsfulton + [Java] Fix #3535304 - Direct use of a weak global reference in directors + sometimes causing seg faults especially on Android. + +2012-09-06: wsfulton + [Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string. + +2012-08-26: drjoe + [R] make ExternalReference slot ref to contain reference + +2012-08-26: drjoe + [R] fix Examples/Makefile to use C in $(CC) rather than $(CXX) + Version 2.0.8 (20 August 2012) ============================== diff --git a/CHANGES.current b/CHANGES.current index c88bed34d..60e8235bb 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -2,157 +2,6 @@ Below are the changes for the current release. See the CHANGES file for changes in older releases. See the RELEASENOTES file for a summary of changes in each release. -Version 2.0.9 (16 December 2012) -================================ +Version 2.0.10 (in progress) +============================ -2012-12-16: wsfulton - Fix garbage line number / empty file name reporting for some missing - '}' or ')' error messages. - -2012-12-15: kkaempf - [Ruby] Apply patch 3530444, Class#methods and Class#constants returns array of - symbols in Ruby 1.9+ - -2012-12-14: kkaempf - [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro - with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9 - -2012-12-14: kkaempf - [Ruby] Applied patches #3530442 and 3530443 to adapt compile and runtime include - paths to match Ruby 1.9+ - -2012-12-14: wsfulton - [CFFI] Fix #3161614 - Some string constants are incorrect - -2012-12-13: wsfulton - [CFFI] Fix #3529690 - Fix incorrect constant names. - -2012-12-12: drjoe - [R] add fix to finalizer that was missed earlier - -2012-12-11: wsfulton - [Python] Apply patch #3590522 - fully qualified package paths for Python 3 even if a module is in the - same package. - -2012-12-08: wsfulton - [Python] Bug #3563647 - PyInt_FromSize_t unavailable prior to Python 2.5 for unsigned int types. - -2012-12-08: wsfulton - [Perl] Fix bug #3571361 - C++ comment in C wrappers. - -2012-12-07: wsfulton - [C#] Apply patch #3571029 which adds missing director support for const unsigned long long &. - -2012-11-28: kwwette - [Octave] Simplified module loading: now just the syntax - $ example; - is accepted, which loads functions globally but constants and variables relative to the current scope. - This make module loading behaviour reliably consistent, and reduces problems when loading modules which - depend on other modules which may not have been previously loaded. - -2012-11-27: wsfulton - [cffi] Fix junk output when wrapping single character literal constants. - -2012-11-17: wsfulton - [Tcl, Modula3] Add missing support for -outdir. - -2012-11-17: wsfulton - Fix segfaults when using filename paths greater than 1024 characters in length. - -2012-11-14: wsfulton - [ccache-swig] Apply patch #3586392 from Frederik Deweerdt to fix some error cases - incorrectly using - memory after it has been deleted. - -2012-11-09: vzeitlin - [Python] Fix overflow when passing values greater than LONG_MAX from Python 3 for parameters with unsigned long C type. - -2012-11-09: wsfulton - Fix some feature matching issues for implicit destructors and implicit constructors and implicit - copy constructors added with %copyctor. Previously a feature for these had to be fully qualified - in order to match. Now the following will also match: - - %feature("xyz") ~XXX(); - struct XXX {}; - -2012-11-09: wsfulton - Further consistency in named output typemap lookups for implicit constructors and destructors and - implicit copy constructors added with %copyctor. Previously only the fully qualified name was being - used, now the unqualified name will also be used. For example, previously: - - example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More - Looking for: void Space::More::~More - Looking for: void - - Now the unqualified name is also used: - - example.i:38: Searching for a suitable 'out' typemap for: void Space::More::~More - Looking for: void Space::More::~More - Looking for: void ~More - Looking for: void - -2012-11-02: wsfulton - Fix some subtle named output typemap lookup misses, the fully qualified name was not always being - used for variables, for example: - - struct Glob { - int MyVar; - }; - - Previously the search rules (as shown by -debug-tmsearch) for the getter wrapper were: - - example.i:44: Searching for a suitable 'out' typemap for: int MyVar - Looking for: int MyVar - Looking for: int - - Now the scope is named correctly: - - example.i:44: Searching for a suitable 'out' typemap for: int Glob::MyVar - Looking for: int Glob::MyVar - Looking for: int MyVar - Looking for: int - -2012-10-26: wsfulton - Fix director typemap searching so that a typemap specified with a name will be correctly matched. Previously - the name was ignored during the typemap search. Applies to the following list of typemaps: - directorout, csdirectorout, cstype, imtype, ctype, ddirectorout, dtype, gotype, jtype, jni, javadirectorout. - -2012-10-11: wsfulton - Most of the special variables available for use in %exception are now also available for expansion in - %extend blocks. These are: $name $symname $overname $decl $fulldecl $parentname $parentsymname, see docs - on "Class extension" in SWIGPlus.html. Patch based on submission from Kris Thielemans. - -2012-10-10: wsfulton - Additional new special variables in %exception are expanded as follows: - $parentname - The parent class name (if any) for a method. - $parentsymname - The target language parent class name (if any) for a method. - -2012-10-08: iant - [Go] Generating Go code now requires using the -intgosize option to - indicate the size of the 'int' type in Go. This is because the - size of the type is changing from Go 1.0 to Go 1.1 for x86_64. - -2012-09-14: wsfulton - Add new warning if the empty template instantiation is used as a base class, for example: - - template class Base {}; - %template() Base; - class Derived : public Base {}; - - gives the following warning instead of silently ignoring the base: - - cpp_inherit.i:52: Warning 401: Base class 'Base< int >' has no name as it is an empty template instantiated with '%template()'. Ignored. - cpp_inherit.i:51: Warning 401: The %template directive must be written before 'Base< int >' is used as a base class and be declared with a name. - - -2012-09-11: wsfulton - [Java] Fix #3535304 - Direct use of a weak global reference in directors - sometimes causing seg faults especially on Android. - -2012-09-06: wsfulton - [Java] Fix (char *STRING, size_t LENGTH) typemaps to accept NULL string. - -2012-08-26: drjoe - [R] make ExternalReference slot ref to contain reference - -2012-08-26: drjoe - [R] fix Examples/Makefile to use C in $(CC) rather than $(CXX) diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html index faff95298..9e4a3dd17 100644 --- a/Doc/Manual/Sections.html +++ b/Doc/Manual/Sections.html @@ -6,7 +6,7 @@

    SWIG-2.0 Documentation

    -Last update : SWIG-2.0.9 (16 December 2012) +Last update : SWIG-2.0.10 (in progress)

    Sections

    diff --git a/README b/README index 68a55e862..305edf078 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ SWIG (Simplified Wrapper and Interface Generator) -Version: 2.0.9 (16 December 2012) +Version: 2.0.10 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, diff --git a/configure.in b/configure.in index 0ead9b606..3927a102a 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl The macros which aren't shipped with the autotools are stored in the dnl Tools/config directory in .m4 files. -AC_INIT([swig],[2.0.9],[http://www.swig.org]) +AC_INIT([swig],[2.0.10],[http://www.swig.org]) dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED dnl definition below can be removed From c9174b3a166a0b123f0e6a3e69341d616d803eb6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 3 Jan 2013 07:25:07 +0000 Subject: [PATCH 255/538] More SVN->Git changes --- Doc/Manual/Extending.html | 4 ++-- Doc/Manual/Preface.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index c3b2740f4..ce205abf5 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -3536,7 +3536,7 @@ If you wish for a new language module to be distributed with SWIG, which we encourage for all popular languages, there are a few requirements. While we appreciate that getting all aspects of a new language working won't happen at the outset, there are a set of minimum requirements before -a module can be committed into the SVN repository for distribution with future +a module can be committed into the official Github repository for distribution with future versions of SWIG. The following are really a summary of this whole section with details being outlined earlier on.

    @@ -3578,7 +3578,7 @@ details being outlined earlier on.

    -Once accepted into SVN, development efforts should concentrate on +Once accepted into the official Git repository, development efforts should concentrate on getting the entire test-suite to work with plenty of runtime tests. Runtime tests should be for existing testcases and new test cases should be added should there be an area not already covered by diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html index 2d0aa093e..58ab9dcb5 100644 --- a/Doc/Manual/Preface.html +++ b/Doc/Manual/Preface.html @@ -98,7 +98,7 @@ about this can be obtained at: 

    -http://www.swig.org/svn.html
+SWIG Bleeding Edge
    From 60525e800d5ddcdbd41a859b23c9c7271b3d3a30 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 14:09:14 -0600 Subject: [PATCH 256/538] Added a test case for SourceForge Bug #1283. This test case exercise directors used in conjunction with smart pointers. --- Examples/test-suite/common.mk | 1 + Examples/test-suite/director_smartptr.i | 63 +++++++++++++++++++ .../java/director_smartptr_runme.java | 48 ++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 Examples/test-suite/director_smartptr.i create mode 100644 Examples/test-suite/java/director_smartptr_runme.java diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 0c790caf6..1cda06140 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -185,6 +185,7 @@ CPP_TEST_CASES += \ director_protected \ director_protected_overloaded \ director_redefined \ + director_smartptr \ director_thread \ director_unroll \ director_using \ diff --git a/Examples/test-suite/director_smartptr.i b/Examples/test-suite/director_smartptr.i new file mode 100644 index 000000000..0d78c2775 --- /dev/null +++ b/Examples/test-suite/director_smartptr.i @@ -0,0 +1,63 @@ +%module(directors="1") director_smartptr + +#ifdef SWIGJAVA +SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) +SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE) +#endif + +%{ +#include +#include + +class FooBar { +public: + FooBar() {} + FooBar(const FooBar&) {} + virtual ~FooBar() {} + + std::string FooBarDo() { return "Bar::Foo2::Foo2Bar()"; } +}; + +class Foo { +public: + virtual ~Foo() {} + virtual std::string ping() { return "Foo::ping()"; } + virtual std::string pong() { return "Foo::pong();" + ping(); } + virtual std::string fooBar(FooBar* fooBarPtr) { return fooBarPtr->FooBarDo(); } + virtual Foo makeFoo() { return Foo(); } + virtual FooBar makeFooBar() { return FooBar(); } + + static Foo* get_self(Foo *self_) {return self_;} +}; + +%} + +%include +%include + +%shared_ptr(Foo) + +%feature("director") Foo; + +class FooBar { +public: + FooBar(); + FooBar(const FooBar&); + virtual ~FooBar(); + + std::string FooBarDo(); + +}; + +class Foo +{ +public: + virtual ~Foo(); + virtual std::string ping(); + virtual std::string pong(); + virtual std::string fooBar(FooBar* fooBarPtr); + virtual Foo makeFoo(); + virtual FooBar makeFooBar(); + + static Foo* get_self(Foo *self_); +}; \ No newline at end of file diff --git a/Examples/test-suite/java/director_smartptr_runme.java b/Examples/test-suite/java/director_smartptr_runme.java new file mode 100644 index 000000000..8c4ddc5d3 --- /dev/null +++ b/Examples/test-suite/java/director_smartptr_runme.java @@ -0,0 +1,48 @@ +// Make sure that directors are connected and disconnected when used inconjunction with +// being a smart pointer + +public class director_smartptr_runme { + + static { + try { + System.loadLibrary("director_smartptr"); + } 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[]) { + director_smartptr_MyBarFoo myBarFoo = + new director_smartptr_MyBarFoo(); + } + +} + +class director_smartptr_MyBarFoo extends director_smartptr.Foo { + + @Override + public String ping() { + return "director_smartptr_MyBarFoo.ping();"; + } + + @Override + public String pong() { + return "director_smartptr_MyBarFoo.pong();" + ping(); + } + + @Override + public String fooBar(director_smartptr.FooBar fooBar) { + return fooBar.FooBarDo(); + } + + @Override + public director_smartptr.Foo makeFoo() { + return new director_smartptr.Foo(); + } + + @Override + public director_smartptr.FooBar makeFooBar() { + return new director_smartptr.FooBar(); + } +} \ No newline at end of file From 3e2c6bb03d07a7cbe004be91d29f711339a61e9e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 3 Jan 2013 20:49:10 +0000 Subject: [PATCH 257/538] director_nspace fixes for C# for previous commit --- CHANGES.current | 3 +++ Examples/test-suite/csharp/director_nspace_runme.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 60e8235bb..a043d3348 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,3 +5,6 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-03: wsfulton + Pull patch from BrantKyser to fix directors and nspace feature when multilevel namespaces are used. + diff --git a/Examples/test-suite/csharp/director_nspace_runme.cs b/Examples/test-suite/csharp/director_nspace_runme.cs index 8126535eb..b1e2b47f5 100644 --- a/Examples/test-suite/csharp/director_nspace_runme.cs +++ b/Examples/test-suite/csharp/director_nspace_runme.cs @@ -8,7 +8,7 @@ public class bools_runme { } } -class director_nspace_MyBarFoo : director_nspaceNamespace.Bar.Foo { +class director_nspace_MyBarFoo : director_nspaceNamespace.TopLevel.Bar.Foo { public override String ping() { return "director_nspace_MyBarFoo.ping();"; @@ -18,15 +18,15 @@ class director_nspace_MyBarFoo : director_nspaceNamespace.Bar.Foo { return "director_nspace_MyBarFoo.pong();" + ping(); } - public override String fooBar(director_nspaceNamespace.Bar.FooBar fooBar) { + public override String fooBar(director_nspaceNamespace.TopLevel.Bar.FooBar fooBar) { return fooBar.FooBarDo(); } - public override director_nspaceNamespace.Bar.Foo makeFoo() { - return new director_nspaceNamespace.Bar.Foo(); + public override director_nspaceNamespace.TopLevel.Bar.Foo makeFoo() { + return new director_nspaceNamespace.TopLevel.Bar.Foo(); } - public override director_nspaceNamespace.Bar.FooBar makeFooBar() { - return new director_nspaceNamespace.Bar.FooBar(); + public override director_nspaceNamespace.TopLevel.Bar.FooBar makeFooBar() { + return new director_nspaceNamespace.TopLevel.Bar.FooBar(); } } From 3e70da14c96072618a58a169a4ccb2f7d799d98e Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 14:54:06 -0600 Subject: [PATCH 258/538] Fix for SourceForge Bug #1283. * Change the name of the memory own variable for base java director classes to match that expected by the director code * Add conditional to appropriately dynamically cast director classes wrapped in smart pointers. --- Lib/java/boost_shared_ptr.i | 8 ++++---- Source/Modules/java.cxx | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i index 31d7efdf9..e75236993 100644 --- a/Lib/java/boost_shared_ptr.i +++ b/Lib/java/boost_shared_ptr.i @@ -146,10 +146,10 @@ // Base proxy classes %typemap(javabody) TYPE %{ private long swigCPtr; - private boolean swigCMemOwnBase; + private boolean swigCMemOwn; PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; + swigCMemOwn = cMemoryOwn; swigCPtr = cPtr; } @@ -176,8 +176,8 @@ %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { if (swigCPtr != 0) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; + if (swigCMemOwn) { + swigCMemOwn = false; $jnicall; } swigCPtr = 0; diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index cd8cfe543..1f7fa29ce 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3381,6 +3381,7 @@ public: String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect"); String *swig_director_connect_jni = makeValidJniName(swig_director_connect); String *sym_name = Getattr(n, "sym:name"); + String *smartptr_feature = Getattr(n, "feature:smartptr"); Wrapper *code_wrap; Printf(imclass_class_code, " public final static native void %s(%s obj, long cptr, boolean mem_own, boolean weak_global);\n", @@ -3390,9 +3391,24 @@ public: Printf(code_wrap->def, "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, " "jboolean jweak_global) {\n", jnipackage, jni_imclass_name, swig_director_connect_jni); - Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); - Printf(code_wrap->code, " (void)jcls;\n"); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + + if (Len(smartptr_feature)) { + Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", smartptr_feature, smartptr_feature); + Printf(code_wrap->code, " (void)jcls;\n"); + Printf(code_wrap->code, " // NOTE: Pulling the raw pointer out of the smart pointer as the following code does\n"); + Printf(code_wrap->code, " // is generally a bad idea. However, in this case we keep a local instance of the\n"); + Printf(code_wrap->code, " // smart pointer around while we are using the raw pointer, which should keep the\n"); + Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); + Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); + Printf(code_wrap->code, " // cast mechanisms.\n"); + Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast< SwigDirector_%s *>(obj->operator->());\n", sym_name, sym_name); + } + else { + Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); + Printf(code_wrap->code, " (void)jcls;\n"); + Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + } + Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself), " "(jswig_mem_own == JNI_TRUE), (jweak_global == JNI_TRUE));\n"); From f0e47b81d69b36eb741acbe8e71a440937515b85 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 14:09:14 -0600 Subject: [PATCH 259/538] Added a test case for SourceForge Bug #1283. This test case exercise directors used in conjunction with smart pointers. --- Examples/test-suite/common.mk | 1 + Examples/test-suite/director_smartptr.i | 63 +++++++++++++++++++ .../java/director_smartptr_runme.java | 48 ++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 Examples/test-suite/director_smartptr.i create mode 100644 Examples/test-suite/java/director_smartptr_runme.java diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 0c790caf6..1cda06140 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -185,6 +185,7 @@ CPP_TEST_CASES += \ director_protected \ director_protected_overloaded \ director_redefined \ + director_smartptr \ director_thread \ director_unroll \ director_using \ diff --git a/Examples/test-suite/director_smartptr.i b/Examples/test-suite/director_smartptr.i new file mode 100644 index 000000000..0d78c2775 --- /dev/null +++ b/Examples/test-suite/director_smartptr.i @@ -0,0 +1,63 @@ +%module(directors="1") director_smartptr + +#ifdef SWIGJAVA +SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) +SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE) +#endif + +%{ +#include +#include + +class FooBar { +public: + FooBar() {} + FooBar(const FooBar&) {} + virtual ~FooBar() {} + + std::string FooBarDo() { return "Bar::Foo2::Foo2Bar()"; } +}; + +class Foo { +public: + virtual ~Foo() {} + virtual std::string ping() { return "Foo::ping()"; } + virtual std::string pong() { return "Foo::pong();" + ping(); } + virtual std::string fooBar(FooBar* fooBarPtr) { return fooBarPtr->FooBarDo(); } + virtual Foo makeFoo() { return Foo(); } + virtual FooBar makeFooBar() { return FooBar(); } + + static Foo* get_self(Foo *self_) {return self_;} +}; + +%} + +%include +%include + +%shared_ptr(Foo) + +%feature("director") Foo; + +class FooBar { +public: + FooBar(); + FooBar(const FooBar&); + virtual ~FooBar(); + + std::string FooBarDo(); + +}; + +class Foo +{ +public: + virtual ~Foo(); + virtual std::string ping(); + virtual std::string pong(); + virtual std::string fooBar(FooBar* fooBarPtr); + virtual Foo makeFoo(); + virtual FooBar makeFooBar(); + + static Foo* get_self(Foo *self_); +}; \ No newline at end of file diff --git a/Examples/test-suite/java/director_smartptr_runme.java b/Examples/test-suite/java/director_smartptr_runme.java new file mode 100644 index 000000000..8c4ddc5d3 --- /dev/null +++ b/Examples/test-suite/java/director_smartptr_runme.java @@ -0,0 +1,48 @@ +// Make sure that directors are connected and disconnected when used inconjunction with +// being a smart pointer + +public class director_smartptr_runme { + + static { + try { + System.loadLibrary("director_smartptr"); + } 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[]) { + director_smartptr_MyBarFoo myBarFoo = + new director_smartptr_MyBarFoo(); + } + +} + +class director_smartptr_MyBarFoo extends director_smartptr.Foo { + + @Override + public String ping() { + return "director_smartptr_MyBarFoo.ping();"; + } + + @Override + public String pong() { + return "director_smartptr_MyBarFoo.pong();" + ping(); + } + + @Override + public String fooBar(director_smartptr.FooBar fooBar) { + return fooBar.FooBarDo(); + } + + @Override + public director_smartptr.Foo makeFoo() { + return new director_smartptr.Foo(); + } + + @Override + public director_smartptr.FooBar makeFooBar() { + return new director_smartptr.FooBar(); + } +} \ No newline at end of file From 540ede0dd36896f0c26ee0f1cbd7ba705db8eacc Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 14:54:06 -0600 Subject: [PATCH 260/538] Fix for SourceForge Bug #1283. * Change the name of the memory own variable for base java director classes to match that expected by the director code * Add conditional to appropriately dynamically cast director classes wrapped in smart pointers. --- Lib/java/boost_shared_ptr.i | 8 ++++---- Source/Modules/java.cxx | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Lib/java/boost_shared_ptr.i b/Lib/java/boost_shared_ptr.i index 31d7efdf9..e75236993 100644 --- a/Lib/java/boost_shared_ptr.i +++ b/Lib/java/boost_shared_ptr.i @@ -146,10 +146,10 @@ // Base proxy classes %typemap(javabody) TYPE %{ private long swigCPtr; - private boolean swigCMemOwnBase; + private boolean swigCMemOwn; PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; + swigCMemOwn = cMemoryOwn; swigCPtr = cPtr; } @@ -176,8 +176,8 @@ %typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { if (swigCPtr != 0) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; + if (swigCMemOwn) { + swigCMemOwn = false; $jnicall; } swigCPtr = 0; diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 971e60659..dbe569643 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3381,6 +3381,7 @@ public: String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect"); String *swig_director_connect_jni = makeValidJniName(swig_director_connect); String *sym_name = Getattr(n, "sym:name"); + String *smartptr_feature = Getattr(n, "feature:smartptr"); Wrapper *code_wrap; Printf(imclass_class_code, " public final static native void %s(%s obj, long cptr, boolean mem_own, boolean weak_global);\n", @@ -3390,9 +3391,24 @@ public: Printf(code_wrap->def, "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, " "jboolean jweak_global) {\n", jnipackage, jni_imclass_name, swig_director_connect_jni); - Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); - Printf(code_wrap->code, " (void)jcls;\n"); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + + if (Len(smartptr_feature)) { + Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", smartptr_feature, smartptr_feature); + Printf(code_wrap->code, " (void)jcls;\n"); + Printf(code_wrap->code, " // NOTE: Pulling the raw pointer out of the smart pointer as the following code does\n"); + Printf(code_wrap->code, " // is generally a bad idea. However, in this case we keep a local instance of the\n"); + Printf(code_wrap->code, " // smart pointer around while we are using the raw pointer, which should keep the\n"); + Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); + Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); + Printf(code_wrap->code, " // cast mechanisms.\n"); + Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast< SwigDirector_%s *>(obj->operator->());\n", sym_name, sym_name); + } + else { + Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); + Printf(code_wrap->code, " (void)jcls;\n"); + Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + } + Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_connect_director(jenv, jself, jenv->GetObjectClass(jself), " "(jswig_mem_own == JNI_TRUE), (jweak_global == JNI_TRUE));\n"); From f6ce5f089f2f782a0987876737c47c7adb69ab3f Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 21:26:08 -0600 Subject: [PATCH 261/538] Qualify generated SwigDirector class names with namespaces --- Source/Modules/directors.cxx | 9 ++++--- Source/Modules/java.cxx | 50 +++++++++++++----------------------- Source/Modules/lang.cxx | 20 ++++++++++++++- Source/Modules/swigmod.h | 2 ++ Source/Swig/cwrap.c | 12 +++++++-- 5 files changed, 55 insertions(+), 38 deletions(-) diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 7f4c8d9d1..5d88b6306 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -78,9 +78,10 @@ String *Swig_class_name(Node *n) { String *Swig_director_declaration(Node *n) { String *classname = Swig_class_name(n); - String *directorname = NewStringf("SwigDirector_%s", classname); + String *directorname = Language::instance()->directorClassName(n); String *base = Getattr(n, "classtype"); String *declaration = Swig_class_declaration(n, directorname); + Printf(declaration, " : public %s, public Swig::Director {\n", base); Delete(classname); Delete(directorname); @@ -281,8 +282,10 @@ void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f) { && !Equal(nodeType(n), "constructor"))) { Node *parent = Getattr(n, "parentNode"); String *symname = Getattr(parent, "sym:name"); - String *dirname = NewStringf("SwigDirector_%s", symname); - String *dirdecl = NewStringf("%s *darg = 0", dirname); + String *dirname; + String *dirdecl; + dirname = Language::instance()->directorClassName(parent); + dirdecl = NewStringf("%s *darg = 0", dirname); Wrapper_add_local(f, "darg", dirdecl); Printf(f->code, "darg = dynamic_cast<%s *>(arg1);\n", dirname); Delete(dirname); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 1f7fa29ce..c642387dc 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -204,24 +204,6 @@ public: return valid_jni_name; } - /* ----------------------------------------------------------------------------- - * directorClassName() - * ----------------------------------------------------------------------------- */ - - String *directorClassName(Node *n) { - String *dirclassname; - const char *attrib = "director:classname"; - - if (!(dirclassname = Getattr(n, attrib))) { - String *classname = Getattr(n, "sym:name"); - - dirclassname = NewStringf("SwigDirector_%s", classname); - Setattr(n, attrib, dirclassname); - } - - return dirclassname; - } - /* ------------------------------------------------------------ * main() * ------------------------------------------------------------ */ @@ -2008,7 +1990,7 @@ public: Printf(dcast_wrap->code, " jobject jresult = (jobject) 0;\n"); Printf(dcast_wrap->code, " %s *obj = *((%s **)&jCPtrBase);\n", norm_name, norm_name); Printf(dcast_wrap->code, " if (obj) director = dynamic_cast(obj);\n"); - Printf(dcast_wrap->code, " if (director) jresult = director->swig_get_self(jenv);\n"); + Printf(dcast_wrap->code, " if (director) jresult = director->swig_get_self);\n"); Printf(dcast_wrap->code, " return jresult;\n"); Printf(dcast_wrap->code, "}\n"); @@ -3380,8 +3362,8 @@ public: String *norm_name = SwigType_namestr(Getattr(n, "name")); String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect"); String *swig_director_connect_jni = makeValidJniName(swig_director_connect); - String *sym_name = Getattr(n, "sym:name"); String *smartptr_feature = Getattr(n, "feature:smartptr"); + String *dirClassName = directorClassName(n); Wrapper *code_wrap; Printf(imclass_class_code, " public final static native void %s(%s obj, long cptr, boolean mem_own, boolean weak_global);\n", @@ -3401,12 +3383,12 @@ public: Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); Printf(code_wrap->code, " // cast mechanisms.\n"); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast< SwigDirector_%s *>(obj->operator->());\n", sym_name, sym_name); + Printf(code_wrap->code, " %s *director = dynamic_cast< %s *>(obj->operator->());\n", dirClassName, dirClassName); } else { Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); Printf(code_wrap->code, " (void)jcls;\n"); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); } Printf(code_wrap->code, " if (director) {\n"); @@ -3432,7 +3414,7 @@ public: "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jtake_or_release) {\n", jnipackage, jni_imclass_name, changeown_jnimethod_name); Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); Printf(code_wrap->code, " (void)jcls;\n"); Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_java_change_ownership(jenv, jself, jtake_or_release ? true : false);\n"); @@ -3445,6 +3427,7 @@ public: Delete(changeown_method_name); Delete(changeown_jnimethod_name); Delete(norm_name); + Delete(dirClassName); Delete(jni_imclass_name); } @@ -3583,7 +3566,7 @@ public: // we're consistent with the sym:overload name in functionWrapper. (?? when // does the overloaded method name get set?) - imclass_dmethod = NewStringf("SwigDirector_%s", Swig_name_member(getNSpace(), classname, overloaded_name)); + imclass_dmethod = NewStringf("%s", Swig_name_member(getNSpace(), dirclassname, overloaded_name)); qualified_return = SwigType_rcaststr(returntype, "c_result"); @@ -4182,16 +4165,18 @@ public: int classDirectorDefaultConstructor(Node *n) { String *classname = Swig_class_name(n); String *classtype = SwigType_namestr(Getattr(n, "name")); + String *dirClassName = directorClassName(n); Wrapper *w = NewWrapper(); - Printf(w->def, "SwigDirector_%s::SwigDirector_%s(JNIEnv *jenv) : %s {", classname, classname, Getattr(n, "director:ctor")); + Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor")); Printf(w->code, "}\n"); Wrapper_print(w, f_directors); - Printf(f_directors_h, " SwigDirector_%s(JNIEnv *jenv);\n", classname); + Printf(f_directors_h, " %s(JNIEnv *jenv);\n", dirClassName); DelWrapper(w); Delete(classtype); Delete(classname); + Delete(dirClassName); directorPrefixArgs(n); return Language::classDirectorDefaultConstructor(n); } @@ -4228,14 +4213,15 @@ public: Node *current_class = getCurrentClass(); String *full_classname = Getattr(current_class, "name"); String *classname = Swig_class_name(current_class); + String *dirClassName = directorClassName(current_class); Wrapper *w = NewWrapper(); if (Getattr(n, "throw")) { - Printf(f_directors_h, " virtual ~SwigDirector_%s() throw ();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() throw () {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s() throw ();\n", dirClassName); + Printf(w->def, "%s::~%s() throw () {\n", dirClassName, dirClassName); } else { - Printf(f_directors_h, " virtual ~SwigDirector_%s();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s();\n", dirClassName); + Printf(w->def, "%s::~%s() {\n", dirClassName, dirClassName); } /* Ensure that correct directordisconnect typemap's method name is called @@ -4254,6 +4240,7 @@ public: DelWrapper(w); Delete(disconn_attr); Delete(classname); + Delete(dirClassName); return SWIG_OK; } @@ -4395,8 +4382,7 @@ public: String *base = Getattr(n, "classtype"); String *class_ctor = NewString("Swig::Director(jenv)"); - String *classname = Swig_class_name(n); - String *directorname = NewStringf("SwigDirector_%s", classname); + String *directorname = directorClassName(n); String *declaration = Swig_class_declaration(n, directorname); Printf(declaration, " : public %s, public Swig::Director", base); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 8e5a91dbe..410945592 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -347,6 +347,24 @@ Language::~Language() { this_ = 0; } + /* ----------------------------------------------------------------------------- + * directorClassName() + * ----------------------------------------------------------------------------- */ + + String *Language::directorClassName(Node *n) { + String *dirclassname; + String *nspace = Getattr(n, "sym:nspace"); + const char *attrib = "director:classname"; + String *classname = Getattr(n, "sym:name"); + + Replace(nspace, ".", "_", DOH_REPLACE_ANY); + dirclassname = NewStringf("SwigDirector_%s_%s", nspace, classname); + Setattr(n, attrib, dirclassname); + + Delete(nspace); + return dirclassname; + } + /* ---------------------------------------------------------------------- emit_one() ---------------------------------------------------------------------- */ @@ -2405,7 +2423,7 @@ int Language::classDeclaration(Node *n) { } if (dir) { - DirectorClassName = NewStringf("SwigDirector_%s", symname); + DirectorClassName = directorClassName(n); classDirector(n); } /* check for abstract after resolving directors */ diff --git a/Source/Modules/swigmod.h b/Source/Modules/swigmod.h index 4a65444fc..b3722af40 100644 --- a/Source/Modules/swigmod.h +++ b/Source/Modules/swigmod.h @@ -120,6 +120,8 @@ public: virtual ~Language(); virtual int emit_one(Node *n); + String *directorClassName(Node *n); + /* Parse command line options */ virtual void main(int argc, char *argv[]); diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 063ab9858..d47f072e7 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -855,6 +855,9 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas String *self = 0; int is_smart_pointer_overload = 0; String *qualifier = Getattr(n, "qualifier"); + String *directorScope = NewString(nspace); + + Replace(directorScope, ".", "_", DOH_REPLACE_ANY); /* If smart pointer without const overload or mutable method, change self dereferencing */ if (flags & CWRAP_SMART_POINTER) { @@ -937,7 +940,7 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas /* If protected access (can only be if a director method) then call the extra public accessor method (language module must provide this) */ String *explicit_qualifier_tmp = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname")); explicitcall_name = NewStringf("%sSwigPublic", name); - explicit_qualifier = NewStringf("SwigDirector_%s", explicit_qualifier_tmp); + explicit_qualifier = NewStringf("SwigDirector_%s_%s", directorScope, explicit_qualifier_tmp); Delete(explicit_qualifier_tmp); } else { explicit_qualifier = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname")); @@ -1057,6 +1060,7 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas Delete(p); Delete(self); Delete(parms); + Delete(directorScope); return SWIG_OK; } @@ -1107,6 +1111,9 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String ParmList *directorparms; SwigType *type; int use_director; + String *directorScope = NewString(nspace); + + Replace(directorScope, ".", "_", DOH_REPLACE_ANY); use_director = Swig_directorclass(n); @@ -1167,7 +1174,7 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String Node *parent = Swig_methodclass(n); int abstract = Getattr(parent, "abstracts") != 0; String *name = Getattr(parent, "sym:name"); - String *directorname = NewStringf("SwigDirector_%s", name); + String *directorname = NewStringf("SwigDirector_%s_%s", directorScope, name); String *action = NewStringEmpty(); String *tmp_none_comparison = Copy(none_comparison); String *director_call; @@ -1233,6 +1240,7 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String if (directorparms != parms) Delete(directorparms); Delete(parms); + Delete(directorScope); return SWIG_OK; } From 00c71edbedc8412c90daec57a59936b79acd626c Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 23:09:29 -0600 Subject: [PATCH 262/538] Change test to reflect new director class naming convention. --- Examples/test-suite/java_director_assumeoverride.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/java_director_assumeoverride.i b/Examples/test-suite/java_director_assumeoverride.i index 7364a3d58..310a20e0c 100644 --- a/Examples/test-suite/java_director_assumeoverride.i +++ b/Examples/test-suite/java_director_assumeoverride.i @@ -10,7 +10,7 @@ public: #include "java_director_assumeoverride_wrap.h" bool isFuncOverridden(OverrideMe* f) { - SwigDirector_OverrideMe* director = dynamic_cast(f); + SwigDirector__OverrideMe* director = dynamic_cast(f); if (!director) { return false; } From 747b50e2d7f43c73214867c9821dccef786b3107 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 3 Jan 2013 23:10:28 -0600 Subject: [PATCH 263/538] Clean up fix for SourceForge Bug #1299. --- Source/Modules/directors.cxx | 1 - Source/Modules/lang.cxx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 5d88b6306..4b23a52bb 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -281,7 +281,6 @@ void Swig_director_emit_dynamic_cast(Node *n, Wrapper *f) { checkAttribute(n, "storage", "static")) && !Equal(nodeType(n), "constructor"))) { Node *parent = Getattr(n, "parentNode"); - String *symname = Getattr(parent, "sym:name"); String *dirname; String *dirdecl; dirname = Language::instance()->directorClassName(parent); diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 410945592..b7ce2c4a8 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -353,7 +353,7 @@ Language::~Language() { String *Language::directorClassName(Node *n) { String *dirclassname; - String *nspace = Getattr(n, "sym:nspace"); + String *nspace = NewString(Getattr(n, "sym:nspace")); const char *attrib = "director:classname"; String *classname = Getattr(n, "sym:name"); From da00bdb12dba1383983a62a385da6aa1036d12e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Fri, 4 Jan 2013 15:43:44 +0100 Subject: [PATCH 264/538] added python test case li_std_except_as_class for SF bug 1295 --- Examples/test-suite/common.mk | 1 + Examples/test-suite/li_std_except_as_class.i | 19 +++++++++++++++++++ .../python/li_std_except_as_class_runme.py | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 Examples/test-suite/li_std_except_as_class.i create mode 100644 Examples/test-suite/python/li_std_except_as_class_runme.py diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 0c790caf6..4ba669497 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -480,6 +480,7 @@ CPP_STD_TEST_CASES += \ li_std_combinations \ li_std_deque \ li_std_except \ + li_std_except_as_class \ li_std_map \ li_std_pair \ li_std_pair_using \ diff --git a/Examples/test-suite/li_std_except_as_class.i b/Examples/test-suite/li_std_except_as_class.i new file mode 100644 index 000000000..00de76eac --- /dev/null +++ b/Examples/test-suite/li_std_except_as_class.i @@ -0,0 +1,19 @@ +/* File : li_std_except_as_class.i */ +%module li_std_except_as_class + +/* NOTE: SF bug 1295: + * if there were also functions throwing 'std::logic_error' and + * 'std::exception' then the bug would not be fully replicated */ + +%{ +#include +#include +void test_domain_error() throw(std::domain_error) +{ throw std::domain_error("std::domain_error"); } +%} + +%include +#define SWIG_STD_EXCEPTIONS_AS_CLASSES +%include +void test_domain_error() throw(std::domain_error) +{ throw std::domain_error("std::domain_error"); } diff --git a/Examples/test-suite/python/li_std_except_as_class_runme.py b/Examples/test-suite/python/li_std_except_as_class_runme.py new file mode 100644 index 000000000..386a878bf --- /dev/null +++ b/Examples/test-suite/python/li_std_except_as_class_runme.py @@ -0,0 +1,9 @@ +from li_std_except_as_class import * + +# std::domain_error hierarchy +try: test_domain_error() +except domain_error: pass +try: test_domain_error() +except logic_error: pass +try: test_domain_error() +except exception: pass From a6f733602e56a00f91deedb86d0b5a02b37a99a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Fri, 4 Jan 2013 16:57:04 +0100 Subject: [PATCH 265/538] added patch for SF bug #1295 --- Lib/typemaps/std_except.swg | 62 +------------------------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/Lib/typemaps/std_except.swg b/Lib/typemaps/std_except.swg index 3ce479a50..cb5ed3050 100644 --- a/Lib/typemaps/std_except.swg +++ b/Lib/typemaps/std_except.swg @@ -1,5 +1,4 @@ %include -%include /* Mark all of std exception classes as "exception classes" via @@ -34,63 +33,4 @@ namespace std { %std_exception_map(underflow_error, SWIG_OverflowError); } -#if defined(SWIG_STD_EXCEPTIONS_AS_CLASSES) - -namespace std { - struct exception - { - virtual ~exception() throw(); - virtual const char* what() const throw(); - }; - - struct bad_exception : exception - { - }; - - struct logic_error : exception - { - logic_error(const string& msg); - }; - - struct domain_error : logic_error - { - domain_error(const string& msg); - }; - - struct invalid_argument : logic_error - { - invalid_argument(const string& msg); - }; - - struct length_error : logic_error - { - length_error(const string& msg); - }; - - struct out_of_range : logic_error - { - out_of_range(const string& msg); - }; - - struct runtime_error : exception - { - runtime_error(const string& msg); - }; - - struct range_error : runtime_error - { - range_error(const string& msg); - }; - - struct overflow_error : runtime_error - { - overflow_error(const string& msg); - }; - - struct underflow_error : runtime_error - { - underflow_error(const string& msg); - }; -} - -#endif +%include From 2bb6a8c4a82670a590d45ba0555ac073100459e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Fri, 4 Jan 2013 18:20:19 +0100 Subject: [PATCH 266/538] added test case for SF bug #1296 --- Examples/test-suite/common.mk | 1 + .../template_default_arg_virtual_destructor.i | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 Examples/test-suite/template_default_arg_virtual_destructor.i diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 0c790caf6..f29374df6 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -355,6 +355,7 @@ CPP_TEST_CASES += \ template_default \ template_default2 \ template_default_arg \ + template_default_arg_virtual_destructor \ template_default_class_parms \ template_default_class_parms_typedef \ template_default_inherit \ diff --git a/Examples/test-suite/template_default_arg_virtual_destructor.i b/Examples/test-suite/template_default_arg_virtual_destructor.i new file mode 100644 index 000000000..c56c29bc6 --- /dev/null +++ b/Examples/test-suite/template_default_arg_virtual_destructor.i @@ -0,0 +1,24 @@ +%module template_default_arg_virtual_destructor + +// SF bug #1296: +// virtual destructor in template class (template specification having +// default parameter(s)) triggers the warnint "illegal destructor name" + +%inline %{ +struct A {}; + +template + struct B + { + B(T const&) {} + virtual ~B() {} + }; +template + struct B + { + B(int,int) {} // constructor specific to this partial specialization + virtual ~B() {} // "illegal destructor name" when ~B() is virtual + }; +%} +%template(B_AF) B; +%template(B_A) B; // this instantiation triggert the warning From 02246d7294fb7d20f5b42e3cbec9719f3d918039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Fri, 4 Jan 2013 18:24:57 +0100 Subject: [PATCH 267/538] applied patch for SF bug #1296 --- Source/CParse/parser.y | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 0d7c65f85..e4f3d67b2 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -4472,17 +4472,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end { | VIRTUAL NOT idtemplate LPAREN parms RPAREN cpp_vend { String *name; - char *c = 0; $$ = new_node("destructor"); - /* Check for template names. If the class is a template - and the constructor is missing the template part, we - add it */ - if (Classprefix) { - c = strchr(Char(Classprefix),'<'); - if (c && !Strchr($3,'<')) { - $3 = NewStringf("%s%s",$3,c); - } - } Setattr($$,"storage","virtual"); name = NewStringf("%s",$3); if (*(Char(name)) != '~') Insert(name,0,"~"); From 8e418d61e6414fe2659b647d609515e15c5fe495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Fri, 4 Jan 2013 18:41:10 +0100 Subject: [PATCH 268/538] corrected some typos --- Examples/test-suite/common.mk | 2 +- Examples/test-suite/template_default_arg_virtual_destructor.i | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index f29374df6..b39416ac9 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -355,7 +355,7 @@ CPP_TEST_CASES += \ template_default \ template_default2 \ template_default_arg \ - template_default_arg_virtual_destructor \ + template_default_arg_virtual_destructor \ template_default_class_parms \ template_default_class_parms_typedef \ template_default_inherit \ diff --git a/Examples/test-suite/template_default_arg_virtual_destructor.i b/Examples/test-suite/template_default_arg_virtual_destructor.i index c56c29bc6..319d5b837 100644 --- a/Examples/test-suite/template_default_arg_virtual_destructor.i +++ b/Examples/test-suite/template_default_arg_virtual_destructor.i @@ -2,7 +2,7 @@ // SF bug #1296: // virtual destructor in template class (template specification having -// default parameter(s)) triggers the warnint "illegal destructor name" +// default parameter(s)) triggers the warning "illegal destructor name" %inline %{ struct A {}; From 328d6d01bb3011fc0f414e681fc76f9e2e830453 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 4 Jan 2013 20:35:13 +0000 Subject: [PATCH 269/538] Cosmetic whitespace change --- Source/Modules/java.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index dbe569643..0b34d10e7 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3401,7 +3401,7 @@ public: Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); Printf(code_wrap->code, " // cast mechanisms.\n"); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast< SwigDirector_%s *>(obj->operator->());\n", sym_name, sym_name); + Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj->operator->());\n", sym_name, sym_name); } else { Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", norm_name, norm_name); From 078daa5b57a4c92a8d49614716aaede389a08995 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 4 Jan 2013 20:35:43 +0000 Subject: [PATCH 270/538] Change note updates for last two pull requests --- CHANGES.current | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index a043d3348..515387120 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ -2013-01-03: wsfulton - Pull patch from BrantKyser to fix directors and nspace feature when multilevel namespaces are used. +2013-01-04: wsfulton + [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction + with directors. + +2013-01-03: wsfulton + [Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when + multilevel namespaces are used. From fade4f1b943b17ba454dfe12d4b407ed5e0f7efe Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 4 Jan 2013 20:48:58 +0000 Subject: [PATCH 271/538] .gitignore additions/fixes --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d4ac5207b..6f2af0b00 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.o *.class +# Editor junk +*.sw? + # Local PCRE -prce +pcre *.gz From c786781e9273f341183fe927c9061cc1979b2769 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 5 Jan 2013 03:14:42 -0600 Subject: [PATCH 272/538] Add test case for SourceForge Bug #1299 --- Examples/test-suite/common.mk | 1 + .../director_nspace_director_name_collision.i | 66 +++++++++++++++++++ Examples/test-suite/java/Makefile.in | 1 + 3 files changed, 68 insertions(+) create mode 100644 Examples/test-suite/director_nspace_director_name_collision.i diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 1cda06140..09112c316 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -178,6 +178,7 @@ CPP_TEST_CASES += \ director_keywords \ director_namespace_clash \ director_nspace \ + director_nspace_director_name_collision \ director_nested \ director_overload \ director_overload2 \ diff --git a/Examples/test-suite/director_nspace_director_name_collision.i b/Examples/test-suite/director_nspace_director_name_collision.i new file mode 100644 index 000000000..5ef2509f8 --- /dev/null +++ b/Examples/test-suite/director_nspace_director_name_collision.i @@ -0,0 +1,66 @@ +%module(directors="1") director_nspace_director_name_collision + +#ifdef SWIGJAVA +SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) +SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE) +#endif + +%{ +#include + +namespace TopLevel +{ + namespace A + { + class Foo { + public: + virtual ~Foo() {} + virtual std::string ping() { return "TopLevel::A::Foo::ping()"; } + }; + } + + namespace B + { + class Foo { + public: + virtual ~Foo() {} + virtual std::string ping() { return "TopLevel::B:Foo::ping()"; } + }; + } +} + +%} + +%include + +// nspace feature only supported by these languages +#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGD) +%nspace TopLevel::A::Foo; +%nspace TopLevel::B::Foo; +#else +#warning nspace feature not yet supported in this target language +#endif + +%feature("director") TopLevel::A::Foo; +%feature("director") TopLevel::B::Foo; + +namespace TopLevel +{ + namespace A + { + class Foo { + public: + virtual ~Foo(); + virtual std::string ping(); + }; + } + + namespace B + { + class Foo { + public: + virtual ~Foo(); + virtual std::string ping(); + }; + } +} diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 0b3f7babb..f8da8e6cc 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -46,6 +46,7 @@ SWIGOPT += -package $(JAVA_PACKAGE) nspace.%: JAVA_PACKAGE = $*Package nspace_extend.%: JAVA_PACKAGE = $*Package director_nspace.%: JAVA_PACKAGE = $*Package +director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests %.cpptest: From 3c12306b2146a00c27080d43f60e8e29d7b94cd9 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 5 Jan 2013 03:40:06 -0600 Subject: [PATCH 273/538] Remove extra underscore from generated director names to maintain prevent breaking languages that do not support nspace. --- Examples/test-suite/java_director_assumeoverride.i | 2 +- Source/Modules/lang.cxx | 5 ++++- Source/Swig/cwrap.c | 12 ++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Examples/test-suite/java_director_assumeoverride.i b/Examples/test-suite/java_director_assumeoverride.i index 310a20e0c..7364a3d58 100644 --- a/Examples/test-suite/java_director_assumeoverride.i +++ b/Examples/test-suite/java_director_assumeoverride.i @@ -10,7 +10,7 @@ public: #include "java_director_assumeoverride_wrap.h" bool isFuncOverridden(OverrideMe* f) { - SwigDirector__OverrideMe* director = dynamic_cast(f); + SwigDirector_OverrideMe* director = dynamic_cast(f); if (!director) { return false; } diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index b7ce2c4a8..7468774a3 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -358,7 +358,10 @@ Language::~Language() { String *classname = Getattr(n, "sym:name"); Replace(nspace, ".", "_", DOH_REPLACE_ANY); - dirclassname = NewStringf("SwigDirector_%s_%s", nspace, classname); + if (Len(nspace) > 0) + dirclassname = NewStringf("SwigDirector_%s_%s", nspace, classname); + else + dirclassname = NewStringf("SwigDirector_%s", classname); Setattr(n, attrib, dirclassname); Delete(nspace); diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index d47f072e7..c4c4621a1 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -940,7 +940,10 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas /* If protected access (can only be if a director method) then call the extra public accessor method (language module must provide this) */ String *explicit_qualifier_tmp = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname")); explicitcall_name = NewStringf("%sSwigPublic", name); - explicit_qualifier = NewStringf("SwigDirector_%s_%s", directorScope, explicit_qualifier_tmp); + if (Len(directorScope) > 0) + explicit_qualifier = NewStringf("SwigDirector_%s_%s", directorScope, explicit_qualifier_tmp); + else + explicit_qualifier = NewStringf("SwigDirector_%s", explicit_qualifier_tmp); Delete(explicit_qualifier_tmp); } else { explicit_qualifier = SwigType_namestr(Getattr(Getattr(parentNode(n), "typescope"), "qname")); @@ -1174,12 +1177,17 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String Node *parent = Swig_methodclass(n); int abstract = Getattr(parent, "abstracts") != 0; String *name = Getattr(parent, "sym:name"); - String *directorname = NewStringf("SwigDirector_%s_%s", directorScope, name); + String *directorname; String *action = NewStringEmpty(); String *tmp_none_comparison = Copy(none_comparison); String *director_call; String *nodirector_call; + if (Len(directorScope) > 0) + directorname = NewStringf("SwigDirector_%s_%s", directorScope, name); + else + directorname = NewStringf("SwigDirector_%s", name); + Replaceall(tmp_none_comparison, "$arg", "arg1"); director_call = Swig_cppconstructor_director_call(directorname, directorparms); From b005c68009b51f521f2d469eb557164cb657bc8f Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 5 Jan 2013 04:54:02 -0600 Subject: [PATCH 274/538] Patch for SourceForge Bug #1299 broke D and C#. Update D module to reflect these changes NOTE: There are several test failures in the D test suite, so it is difficult to be entirely sure this does not break something. --- Source/Modules/d.cxx | 71 +++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index b8e30d50c..b66f8d2be 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -1897,7 +1897,7 @@ public: // Write C++ director class declaration, for example: // class SwigDirector_myclass : public myclass, public Swig::Director { String *classname = Swig_class_name(n); - String *directorname = NewStringf("SwigDirector_%s", classname); + String *directorname = directorClassName(n); String *declaration = Swig_class_declaration(n, directorname); const String *base = Getattr(n, "classtype"); @@ -1949,7 +1949,7 @@ public: bool pure_virtual = (!(Cmp(storage, "virtual")) && !(Cmp(value, "0"))); int status = SWIG_OK; bool output_director = true; - String *dirclassname = getDirectorClassName(parent); + String *dirclassname = directorClassName(parent); String *qualified_name = NewStringf("%s::%s", dirclassname, name); SwigType *c_ret_type = NULL; String *dcallback_call_args = NewString(""); @@ -2373,10 +2373,12 @@ public: Printf(director_callback_pointers, " SWIG_Callback%s_t swig_callback_%s;\n", methid, overloaded_name); // Write the type alias for the callback to the intermediary D module. - String* proxy_callback_type = NewString(""); - Printf(proxy_callback_type, "SwigDirector_%s_Callback%s", classname, methid); + String *proxy_callback_type = NewString(""); + String *dirClassName = directorClassName(parent); + Printf(proxy_callback_type, "%s_Callback%s", dirClassName, methid); Printf(im_dmodule_code, "alias extern(C) %s function(void*%s) %s;\n", proxy_callback_return_type, delegate_parms, proxy_callback_type); Delete(proxy_callback_type); + Delete(dirClassName); } Delete(qualified_return); @@ -2399,7 +2401,7 @@ public: Node *parent = parentNode(n); String *decl = Getattr(n, "decl");; String *supername = Swig_class_name(parent); - String *classname = getDirectorClassName(parent); + String *classname = directorClassName(parent); String *sub = NewString(""); Parm *p; ParmList *superparms = Getattr(n, "parms"); @@ -2454,15 +2456,15 @@ public: * D::classDirectorDefaultConstructor() * --------------------------------------------------------------------------- */ virtual int classDirectorDefaultConstructor(Node *n) { - String *classname = Swig_class_name(n); + String *classname = directorClassName(n); String *classtype = SwigType_namestr(Getattr(n, "name")); Wrapper *w = NewWrapper(); - Printf(w->def, "SwigDirector_%s::SwigDirector_%s() : %s {", classname, classname, Getattr(n, "director:ctor")); + Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor")); Printf(w->code, "}\n"); Wrapper_print(w, f_directors); - Printf(f_directors_h, " SwigDirector_%s();\n", classname); + Printf(f_directors_h, " %s();\n", classname); DelWrapper(w); Delete(classtype); Delete(classname); @@ -2474,15 +2476,15 @@ public: * --------------------------------------------------------------------------- */ virtual int classDirectorDestructor(Node *n) { Node *current_class = getCurrentClass(); - String *classname = Swig_class_name(current_class); + String *classname = directorClassName(current_class); Wrapper *w = NewWrapper(); if (Getattr(n, "throw")) { - Printf(f_directors_h, " virtual ~SwigDirector_%s() throw ();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() throw () {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s() throw ();\n", classname); + Printf(w->def, "%s::~%s() throw () {\n", classname, classname); } else { - Printf(f_directors_h, " virtual ~SwigDirector_%s();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s();\n", classname); + Printf(w->def, "%s::~%s() {\n", classname, classname); } Printv(w->code, "}\n", NIL); @@ -2499,7 +2501,7 @@ public: * --------------------------------------------------------------------------- */ virtual int classDirectorEnd(Node *n) { int i; - String *director_classname = getDirectorClassName(n); + String *director_classname = directorClassName(n); Wrapper *w = NewWrapper(); @@ -3308,7 +3310,7 @@ private: // If directors are enabled for the current class, generate the // director connect helper function which is called from the constructor // and write it to the class body. - writeDirectorConnectProxy(); + writeDirectorConnectProxy(n); } // Write all constants and enumerations first to prevent forward reference @@ -3475,12 +3477,15 @@ private: } /* --------------------------------------------------------------------------- - * D::writeDirectorConnectProxy() + * D::writeDirectorConnectProxy(Node *classNode) * * Writes the helper method which registers the director callbacks by calling * the director connect function from the D side to the proxy class. * --------------------------------------------------------------------------- */ - void writeDirectorConnectProxy() { + void writeDirectorConnectProxy(Node* classNode) { + String *dirClassName = directorClassName(classNode); + String *connect_name = Swig_name_member(getNSpace(), + proxy_class_name, "director_connect"); Printf(proxy_class_body_code, "\nprivate void swigDirectorConnect() {\n"); int i; @@ -3491,12 +3496,12 @@ private: String *return_type = Getattr(udata, "return_type"); String *param_list = Getattr(udata, "param_list"); String *methid = Getattr(udata, "class_methodidx"); - Printf(proxy_class_body_code, " %s.SwigDirector_%s_Callback%s callback%s;\n", im_dmodule_fq_name, proxy_class_name, methid, methid); + Printf(proxy_class_body_code, " %s.%s_Callback%s callback%s;\n", im_dmodule_fq_name, dirClassName, methid, methid); Printf(proxy_class_body_code, " if (swigIsMethodOverridden!(%s delegate(%s), %s function(%s), %s)()) {\n", return_type, param_list, return_type, param_list, method); Printf(proxy_class_body_code, " callback%s = &swigDirectorCallback_%s_%s;\n", methid, proxy_class_name, overloaded_name); Printf(proxy_class_body_code, " }\n\n"); } - Printf(proxy_class_body_code, " %s.%s_director_connect(cast(void*)swigCPtr, cast(void*)this", im_dmodule_fq_name, proxy_class_name); + Printf(proxy_class_body_code, " %s.%s(cast(void*)swigCPtr, cast(void*)this", im_dmodule_fq_name, connect_name); for (i = first_class_dmethod; i < curr_class_dmethod; ++i) { UpcallData *udata = Getitem(dmethods_seq, i); String *methid = Getattr(udata, "class_methodidx"); @@ -3532,6 +3537,8 @@ private: director_callback_pointers = NULL; Delete(director_dcallbacks_code); director_dcallbacks_code = NULL; + Delete(dirClassName); + Delete(connect_name); } /* --------------------------------------------------------------------------- @@ -3548,7 +3555,7 @@ private: String *norm_name = SwigType_namestr(Getattr(n, "name")); String *connect_name = Swig_name_member(getNSpace(), proxy_class_name, "director_connect"); - String *sym_name = Getattr(n, "sym:name"); + String *dirClassName = directorClassName(n); Wrapper *code_wrap; Printv(wrapper_loader_bind_code, wrapper_loader_bind_command, NIL); @@ -3561,7 +3568,7 @@ private: Printf(code_wrap->def, "SWIGEXPORT void D_%s(void *objarg, void *dobj", connect_name); Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", norm_name, norm_name); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_connect_director(dobj"); @@ -3570,9 +3577,9 @@ private: UpcallData *udata = Getitem(dmethods_seq, i); String *methid = Getattr(udata, "class_methodidx"); - Printf(code_wrap->def, ", SwigDirector_%s::SWIG_Callback%s_t callback%s", sym_name, methid, methid); + Printf(code_wrap->def, ", %s::SWIG_Callback%s_t callback%s", dirClassName, methid, methid); Printf(code_wrap->code, ", callback%s", methid); - Printf(im_dmodule_code, ", SwigDirector_%s_Callback%s callback%s", sym_name, methid, methid); + Printf(im_dmodule_code, ", %s_Callback%s callback%s", dirClassName, methid, methid); } Printf(code_wrap->def, ") {\n"); @@ -3585,6 +3592,7 @@ private: DelWrapper(code_wrap); Delete(connect_name); + Delete(dirClassName); } /* --------------------------------------------------------------------------- @@ -4298,23 +4306,6 @@ private: return proxyname; } - /* --------------------------------------------------------------------------- - * D::directorClassName() - * --------------------------------------------------------------------------- */ - String *getDirectorClassName(Node *n) const { - String *dirclassname; - const char *attrib = "director:classname"; - - if (!(dirclassname = Getattr(n, attrib))) { - String *classname = Getattr(n, "sym:name"); - - dirclassname = NewStringf("SwigDirector_%s", classname); - Setattr(n, attrib, dirclassname); - } - - return dirclassname; - } - /* --------------------------------------------------------------------------- * D::makeParameterName() * From c62cd63f713aeeda9dd938a3dc1311f8d2f14e06 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 5 Jan 2013 05:25:33 -0600 Subject: [PATCH 275/538] Patch for SourceForge Bug #1299 broke D and C#. Update C# module to reflect these changes. --- Source/Modules/csharp.cxx | 45 +++++++++++++-------------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index c54475029..d78253f1a 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -198,24 +198,6 @@ public: return proxyname; } - /* ----------------------------------------------------------------------------- - * directorClassName() - * ----------------------------------------------------------------------------- */ - - String *directorClassName(Node *n) { - String *dirclassname; - const char *attrib = "director:classname"; - - if (!(dirclassname = Getattr(n, attrib))) { - String *classname = Getattr(n, "sym:name"); - - dirclassname = NewStringf("SwigDirector_%s", classname); - Setattr(n, attrib, dirclassname); - } - - return dirclassname; - } - /* ------------------------------------------------------------ * main() * ------------------------------------------------------------ */ @@ -3407,6 +3389,7 @@ public: String *sym_name = Getattr(n, "sym:name"); String *qualified_classname = Copy(sym_name); String *nspace = getNSpace(); + String *dirClassName = directorClassName(n); if (nspace) Insert(qualified_classname, 0, NewStringf("%s.", nspace)); @@ -3418,7 +3401,7 @@ public: Printf(code_wrap->def, "SWIGEXPORT void SWIGSTDCALL %s(void *objarg", wname); Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", norm_name, norm_name); - Printf(code_wrap->code, " SwigDirector_%s *director = dynamic_cast(obj);\n", sym_name, sym_name); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); // TODO: if statement not needed?? - Java too Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_connect_director("); @@ -3430,7 +3413,7 @@ public: Printf(code_wrap->def, ", "); if (i != first_class_dmethod) Printf(code_wrap->code, ", "); - Printf(code_wrap->def, "SwigDirector_%s::SWIG_Callback%s_t callback%s", sym_name, methid, methid); + Printf(code_wrap->def, "%s::SWIG_Callback%s_t callback%s", dirClassName, methid, methid); Printf(code_wrap->code, "callback%s", methid); Printf(imclass_class_code, ", %s.SwigDelegate%s_%s delegate%s", qualified_classname, sym_name, methid, methid); } @@ -3447,6 +3430,7 @@ public: Delete(wname); Delete(swig_director_connect); Delete(qualified_classname); + Delete(dirClassName); } /* --------------------------------------------------------------- @@ -3962,15 +3946,15 @@ public: * ------------------------------------------------------------ */ int classDirectorDefaultConstructor(Node *n) { - String *classname = Swig_class_name(n); + String *classname = directorClassName(n); String *classtype = SwigType_namestr(Getattr(n, "name")); Wrapper *w = NewWrapper(); - Printf(w->def, "SwigDirector_%s::SwigDirector_%s() : %s {", classname, classname, Getattr(n, "director:ctor")); + Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor")); Printf(w->code, "}\n"); Wrapper_print(w, f_directors); - Printf(f_directors_h, " SwigDirector_%s();\n", classname); + Printf(f_directors_h, " %s();\n", classname); DelWrapper(w); Delete(classtype); Delete(classname); @@ -4014,15 +3998,15 @@ public: int classDirectorDestructor(Node *n) { Node *current_class = getCurrentClass(); - String *classname = Swig_class_name(current_class); + String *classname = directorClassName(current_class); Wrapper *w = NewWrapper(); if (Getattr(n, "throw")) { - Printf(f_directors_h, " virtual ~SwigDirector_%s() throw ();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() throw () {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s() throw ();\n", classname); + Printf(w->def, "%s::~%s() throw () {\n", classname, classname); } else { - Printf(f_directors_h, " virtual ~SwigDirector_%s();\n", classname); - Printf(w->def, "SwigDirector_%s::~SwigDirector_%s() {\n", classname, classname); + Printf(f_directors_h, " virtual ~%s();\n", classname); + Printf(w->def, "%s::~%s() {\n", classname, classname); } Printv(w->code, "}\n", NIL); @@ -4120,8 +4104,7 @@ public: String *base = Getattr(n, "classtype"); String *class_ctor = NewString("Swig::Director()"); - String *classname = Swig_class_name(n); - String *directorname = NewStringf("SwigDirector_%s", classname); + String *directorname = directorClassName(n); String *declaration = Swig_class_declaration(n, directorname); Printf(declaration, " : public %s, public Swig::Director", base); @@ -4129,6 +4112,8 @@ public: // Stash stuff for later. Setattr(n, "director:decl", declaration); Setattr(n, "director:ctor", class_ctor); + + Delete(directorname); } }; /* class CSHARP */ From 0fa284019acc83ccfbf054040b120fe4e702b3e0 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 5 Jan 2013 05:58:46 -0600 Subject: [PATCH 276/538] Add generated files to .gitignore. --- .gitignore | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d4ac5207b..5d2c7ce4e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,79 @@ *.o *.class +# Editor junk +*.sw? + # Local PCRE -prce +pcre *.gz + +# Generated by autogen.sh +CCache/autom4te.cache/ +CCache/config.h.in +CCache/configure +Source/Include/swigconfig.h.in +Source/Makefile.in +Tools/config/compile +Tools/config/config.guess +Tools/config/config.sub +Tools/config/depcomp +Tools/config/install-sh +Tools/config/missing +Tools/config/ylwrap +aclocal.m4 +autom4te.cache/ +configure + +# Generated by ./configure +CCache/Makefile +CCache/ccache_swig_config.h +CCache/config.h +CCache/config.log +CCache/config.status +Examples/Makefile +Examples/guile/Makefile +Examples/test-suite/*/Makefile +Examples/xml/Makefile +Lib/ocaml/swigp4.ml +/Makefile +Source/Include/stamp-h1 +Source/Include/swigconfig.h +Source/Makefile +.deps +config.log +config.status +preinst-swig +swig.spec + +# Build Artifacts +.dirstamp +CCache/ccache-swig +Source/CParse/parser.c +Source/CParse/parser.h +Source/eswig +swig + +# Test Suite Generated Files +Examples/test-suite/allegrocl/*/ +Examples/test-suite/cffi/*/ +Examples/test-suite/chicken/*/ +Examples/test-suite/clisp/*/ +Examples/test-suite/csharp/*/ +Examples/test-suite/d/*/ +Examples/test-suite/go/*/ +Examples/test-suite/guile/*/ +Examples/test-suite/guilescm/*/ +Examples/test-suite/java/*/ +Examples/test-suite/lua/*/ +Examples/test-suite/mzscheme/*/ +Examples/test-suite/ocaml/*/ +Examples/test-suite/octave/*/ +Examples/test-suite/perl5/*/ +Examples/test-suite/php/*/ +Examples/test-suite/pike/*/ +Examples/test-suite/python/*/ +Examples/test-suite/r/*/ +Examples/test-suite/ruby/*/ +Examples/test-suite/tcl/*/ +Examples/test-suite/uffi/*/ \ No newline at end of file From 41ddc7b240e4357c372c0b4992562d8a795a8e3a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 5 Jan 2013 19:31:10 +0000 Subject: [PATCH 277/538] Add change notes for last commit --- CHANGES.current | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 515387120..21978e1d9 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-05: wsfulton + [Python] Pull patch #3 from ptomulik to fix SF Bug #1295 - standard exceptions as + classes using the SWIG_STD_EXCEPTIONS_AS_CLASSES macro. + 2013-01-04: wsfulton [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction with directors. From 0207a9b24f128aacd80627decb4c561dc2f83708 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 6 Jan 2013 01:49:25 +0000 Subject: [PATCH 278/538] Add CHANGES note for virtual destructor in templates bug in prev commit --- CHANGES.current | 5 +++++ .../test-suite/template_default_arg_virtual_destructor.i | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index 21978e1d9..6be460a1e 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-06: wsfulton + Pull patch #4 from ptomulik to fix SF Bug #1296 - Fix incorrect warning for virtual destructors + in templates, such as: + Warning 521: Illegal destructor name B< A >::~B(). Ignored. + 2013-01-05: wsfulton [Python] Pull patch #3 from ptomulik to fix SF Bug #1295 - standard exceptions as classes using the SWIG_STD_EXCEPTIONS_AS_CLASSES macro. diff --git a/Examples/test-suite/template_default_arg_virtual_destructor.i b/Examples/test-suite/template_default_arg_virtual_destructor.i index 319d5b837..844e9225b 100644 --- a/Examples/test-suite/template_default_arg_virtual_destructor.i +++ b/Examples/test-suite/template_default_arg_virtual_destructor.i @@ -21,4 +21,4 @@ template }; %} %template(B_AF) B; -%template(B_A) B; // this instantiation triggert the warning +%template(B_A) B; // this instantiation triggers the warning From 308b5dab3f363dcb02cdc3f4853fcd409c00cab9 Mon Sep 17 00:00:00 2001 From: joequant Date: Sun, 6 Jan 2013 19:42:12 +0800 Subject: [PATCH 279/538] r changes to handle external pointers --- Lib/r/rtype.swg | 2 +- Lib/r/std_vector.i | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Lib/r/rtype.swg b/Lib/r/rtype.swg index 92f9b4f3d..b4571af46 100644 --- a/Lib/r/rtype.swg +++ b/Lib/r/rtype.swg @@ -91,7 +91,7 @@ %{ $input = enumToInteger($input, "$R_class"); %} %typemap(scoercein) SWIGTYPE, SWIGTYPE *, SWIGTYPE *const, SWIGTYPE & - %{ $input = slot($input,"ref") %} + %{ if (inherits($input, "ExternalReference")) $input = slot($input,"ref") %} /* %typemap(scoercein) SWIGTYPE *, SWIGTYPE *const diff --git a/Lib/r/std_vector.i b/Lib/r/std_vector.i index f7ad94aac..836c95b53 100644 --- a/Lib/r/std_vector.i +++ b/Lib/r/std_vector.i @@ -510,68 +510,71 @@ %typemap("rtypecheck") std::vector, std::vector const, std::vector const& %{ is.numeric($arg) %} %typemap("rtype") std::vector "numeric" +%typemap("scoercein") std::vector, std::vector const, std::vector const& ""; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector) %traits_type_name(std::vector) %typemap("rtypecheck") std::vector, std::vector const, std::vector const& %{ is.numeric($arg) %} %typemap("rtype") std::vector "numeric" +%typemap("scoercein") std::vector, std::vector const, std::vector const& ""; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector); %traits_type_name(std::vector); %typemap("rtypecheck") std::vector , std::vector const, std::vector const& %{ is.logical($arg) %} %typemap("rtype") std::vector "logical" -%typemap("scoercein") std::vector "$input = as.logical($input);"; +%typemap("scoercein") std::vector , std::vector const, std::vector const& "$input = as.logical($input);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector); %traits_type_name(std::vector); %typemap("rtypecheck") std::vector , std::vector const, std::vector const& %{ is.integer($arg) || is.numeric($arg) %} %typemap("rtype") std::vector "integer" -%typemap("scoercein") std::vector "$input = as.integer($input);"; +%typemap("scoercein") std::vector , std::vector const, std::vector const& "$input = as.integer($input);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector); %traits_type_name(std::vector); %typemap("rtypecheck") std::vector, std::vector const, std::vector const& %{ is.integer($arg) || is.numeric($arg) %} %typemap("rtype") std::vector "integer" -%typemap("scoercein") std::vector "$input = as.integer($input);"; +%typemap("scoercein") std::vector, std::vector const, std::vector const& "$input = as.integer($input);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >); %traits_type_name(std::vector< std::vector >); %typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const& %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %} %typemap("rtype") std::vector > "list" -%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.integer);"; +%typemap("scoercein") std::vector< std::vector >, std::vector > const, std::vector >const& "$input = lapply($input, as.integer);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >); %traits_type_name(std::vector< std::vector >); %typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const& %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %} %typemap("rtype") std::vector > "list" -%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.integer);"; +%typemap("scoercein") std::vector< std::vector >, std::vector > const, std::vector >const& "$input = lapply($input, as.integer);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >); %traits_type_name(std::vector< std::vector >); %typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const& %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %} %typemap("rtype") std::vector > "list" -%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.numeric);"; +%typemap("scoercein") std::vector< std::vector >, std::vector > const, std::vector >const& "$input = lapply($input, as.numeric);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >); %traits_type_name(std::vector< std::vector >); %typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const& %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %} %typemap("rtype") std::vector > "list" -%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.numeric);"; +%typemap("scoercein") std::vector< std::vector >, std::vector > const, std::vector >const& + "$input = lapply($input, as.numeric);"; %typemap_traits_ptr(SWIG_TYPECHECK_VECTOR, std::vector >); %traits_type_name(std::vector< std::vector >); %typemap("rtypecheck") std::vector >, std::vector > const, std::vector >const& %{ is.list($arg) && all(sapply($arg , is.integer) || sapply($arg, is.numeric)) %} %typemap("rtype") std::vector > "list" -%typemap("scoercein") std::vector< std::vector > "$input = lapply($input, as.logical);"; +%typemap("scoercein") std::vector< std::vector >, std::vector > const, std::vector >const& "$input = lapply($input, as.logical);"; // we don't want these to be given R classes as they // have already been turned into R vectors. From 9d0d59ead7b133eca06e3792a19306d1470b485a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Sun, 6 Jan 2013 16:55:38 +0100 Subject: [PATCH 280/538] remove __pycache__ directories when cleaning python test cases --- Examples/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 6458512e9..6e1731f6b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -320,6 +320,7 @@ runme3.py: runme.py # ----------------------------------------------------------------- python_clean: + rm -rf __pycache__ rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@ @@ -372,6 +373,7 @@ octave_run: $(OCTSCRIPT) # ----------------------------------------------------------------- octave_clean: + rm -rf __pycache__ rm -f *_wrap* *~ .~* myoctave@EXEEXT@ *.pyc rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ *@OCTAVE_SO@ From 2928bde7777a00411209938f3d2af8de0309fcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Sun, 6 Jan 2013 17:33:17 +0100 Subject: [PATCH 281/538] some patterns added to .gitignore --- .gitignore | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.gitignore b/.gitignore index 7d6db8f9a..8509eebd3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,41 @@ pcre *.gz +# Python generated files, based on: +# https://github.com/github/gitignore/blob/master/Python.gitignore +*.py[cod] +*/__pycache__/ +/__pycache__/ + +# C/C++ object files, based on: +# https://github.com/github/gitignore/blob/master/C.gitignore +# https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore +*.slo +*.lo + +# C/C++ dynamic libraries, based on: +# https://github.com/github/gitignore/blob/master/C.gitignore +# https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore +*.dll +*.so +*.so.* +*.dylib + +# C/C++ static libraries, based on: +# https://github.com/github/gitignore/blob/master/C.gitignore +# https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore +*.lib +*.lai +*.la +*.a + +# C/C++ executables, based on: +# https://github.com/github/gitignore/blob/master/C.gitignore +# https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore +*.exe +*.out +*.app + # Generated by autogen.sh CCache/autom4te.cache/ CCache/config.h.in From beb40008b1091d75f776dc0d3e1077a8e049e129 Mon Sep 17 00:00:00 2001 From: joequant Date: Mon, 7 Jan 2013 06:03:37 +0800 Subject: [PATCH 282/538] add boost_shared_ptr for R --- Lib/r/boost_shared_ptr.i | 307 +++++++++++++++++++++++++++++++++++++++ Lib/r/rrun.swg | 7 + 2 files changed, 314 insertions(+) create mode 100644 Lib/r/boost_shared_ptr.i diff --git a/Lib/r/boost_shared_ptr.i b/Lib/r/boost_shared_ptr.i new file mode 100644 index 000000000..17e9cfe8a --- /dev/null +++ b/Lib/r/boost_shared_ptr.i @@ -0,0 +1,307 @@ +%include + +// Language specific macro implementing all the customisations for handling the smart pointer +%define SWIG_SHARED_PTR_TYPEMAPS(CONST, TYPE...) + +// %naturalvar is as documented for member variables +%naturalvar TYPE; +%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; + +// destructor wrapper customisation +%feature("unref") TYPE +//"if (debug_shared) { cout << \"deleting use_count: \" << (*smartarg1).use_count() << \" [\" << (boost::get_deleter(*smartarg1) ? std::string(\"CANNOT BE DETERMINED SAFELY\") : ( (*smartarg1).get() ? (*smartarg1)->getValue() : std::string(\"NULL PTR\") )) << \"]\" << endl << flush; }\n" + "(void)arg1; delete smartarg1;" + +// Typemap customisations... + +// plain value +%typemap(in) CONST TYPE (void *argp, int res = 0) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (!argp) { + %argument_nullref("$type", $symname, $argnum); + } else { + $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get()); + if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + } +} +%typemap(out) CONST TYPE { + %set_output(SWIG_NewPointerObj(new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) CONST TYPE { + void *argp = 0; + int newmem = 0; + int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %variable_fail(res, "$type", "$name"); + } + if (!argp) { + %argument_nullref("$type", $symname, $argnum); + } else { + $1 = *(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get()); + if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + } +} +%typemap(varout) CONST TYPE { + %set_varoutput(SWIG_NewPointerObj(new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +// plain pointer +// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +%typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (newmem & SWIG_CAST_NEW_MEMORY) { + tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = %const_cast(tempshared.get(), $1_ltype); + } else { + smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype); + } +} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0; + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), $owner | SWIG_POINTER_OWN)); +} + +%typemap(varin) CONST TYPE * { + void *argp = 0; + int newmem = 0; + int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %variable_fail(res, "$type", "$name"); + } + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared; + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0; + if (newmem & SWIG_CAST_NEW_MEMORY) { + tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = %const_cast(tempshared.get(), $1_ltype); + } else { + smartarg = %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = %const_cast((smartarg ? smartarg->get() : 0), $1_ltype); + } +} +%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE * { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; + %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +// plain reference +%typemap(in) CONST TYPE & (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (!argp) { %argument_nullref("$type", $symname, $argnum); } + if (newmem & SWIG_CAST_NEW_MEMORY) { + tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = %const_cast(tempshared.get(), $1_ltype); + } else { + $1 = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype); + } +} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) CONST TYPE & { + void *argp = 0; + int newmem = 0; + int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %variable_fail(res, "$type", "$name"); + } + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared; + if (!argp) { %argument_nullref("$type", $symname, $argnum); } + if (newmem & SWIG_CAST_NEW_MEMORY) { + tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + $1 = *%const_cast(tempshared.get(), $1_ltype); + } else { + $1 = *%const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $1_ltype); + } +} +%typemap(varout, fragment="SWIG_null_deleter") CONST TYPE & { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(&$1 SWIG_NO_NULL_DELETER_0); + %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +// plain pointer by reference +// Note: $disown not implemented as it will lead to a memory leak of the shared_ptr instance +%typemap(in) TYPE *CONST& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (newmem & SWIG_CAST_NEW_MEMORY) { + tempshared = *%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + delete %reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *); + temp = %const_cast(tempshared.get(), $*1_ltype); + } else { + temp = %const_cast(%reinterpret_cast(argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *)->get(), $*1_ltype); + } + $1 = &temp; +} +%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) TYPE *CONST& %{ +#error "varin typemap not implemented" +%} +%typemap(varout) TYPE *CONST& %{ +#error "varout typemap not implemented" +%} + +// shared_ptr by value +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (argp) $1 = *(%reinterpret_cast(argp, $<ype)); + if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $<ype); +} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0; + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + int newmem = 0; + void *argp = 0; + int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %variable_fail(res, "$type", "$name"); + } + $1 = argp ? *(%reinterpret_cast(argp, $<ype)) : SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE >(); + if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $<ype); +} +%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1) : 0; + %set_varoutput(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +// shared_ptr by reference +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (newmem & SWIG_CAST_NEW_MEMORY) { + if (argp) tempshared = *%reinterpret_cast(argp, $ltype); + delete %reinterpret_cast(argp, $ltype); + $1 = &tempshared; + } else { + $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared; + } +} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0; + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{ +#error "varin typemap not implemented" +%} +%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & %{ +#error "varout typemap not implemented" +%} + +// shared_ptr by pointer +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (newmem & SWIG_CAST_NEW_MEMORY) { + if (argp) tempshared = *%reinterpret_cast(argp, $ltype); + delete %reinterpret_cast(argp, $ltype); + $1 = &tempshared; + } else { + $1 = (argp) ? %reinterpret_cast(argp, $ltype) : &tempshared; + } +} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = $1 && *$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1) : 0; + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); + if ($owner) delete $1; +} + +%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{ +#error "varin typemap not implemented" +%} +%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * %{ +#error "varout typemap not implemented" +%} + +// shared_ptr by pointer reference +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) { + int newmem = 0; + res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); + if (!SWIG_IsOK(res)) { + %argument_fail(res, "$type", $symname, $argnum); + } + if (argp) tempshared = *%reinterpret_cast(argp, $*ltype); + if (newmem & SWIG_CAST_NEW_MEMORY) delete %reinterpret_cast(argp, $*ltype); + temp = &tempshared; + $1 = &temp; +} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& { + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartresult = *$1 && **$1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(**$1) : 0; + %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); +} + +%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{ +#error "varin typemap not implemented" +%} +%typemap(varout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& %{ +#error "varout typemap not implemented" +%} + +// Typecheck typemaps +// Note: SWIG_ConvertPtr with void ** parameter set to 0 instead of using SWIG_ConvertPtrAndOwn, so that the casting +// function is not called thereby avoiding a possible smart pointer copy constructor call when casting up the inheritance chain. +%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER,noblock=1) + TYPE CONST, + TYPE CONST &, + TYPE CONST *, + TYPE *CONST&, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > &, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& { + int res = SWIG_ConvertPtr($input, 0, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), 0); + $1 = SWIG_CheckState(res); +} + + +// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug +%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} +%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} + + +%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; +%enddef + diff --git a/Lib/r/rrun.swg b/Lib/r/rrun.swg index c441a5222..f8bc9f497 100644 --- a/Lib/r/rrun.swg +++ b/Lib/r/rrun.swg @@ -3,6 +3,12 @@ extern "C" { #endif +/* for raw pointer */ +#define SWIG_ConvertPtr(obj, pptr, type, flags) SWIG_R_ConvertPtr(obj, pptr, type, flags) +#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own) SWIG_R_ConvertPtr(obj, pptr, type, flags) +#define SWIG_NewPointerObj(ptr, type, flags) SWIG_R_NewPointerObj(ptr, type, flags) + + /* Remove global namespace pollution */ #if !defined(SWIG_NO_R_NO_REMAP) # define R_NO_REMAP @@ -264,6 +270,7 @@ SWIG_R_NewPointerObj(void *ptr, swig_type_info *type, int flags) { return rptr; } + /* Convert a pointer value */ SWIGRUNTIMEINLINE int SWIG_R_ConvertPtr(SEXP obj, void **ptr, swig_type_info *ty, int flags) { From cec9faf6885ed7d994d08f1494b1b94e88910c47 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 7 Jan 2013 16:47:32 +1300 Subject: [PATCH 283/538] Fix bashism in configure, introduced in 2.0.9. --- CHANGES.current | 3 +++ configure.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index 6be460a1e..0b1d7ccc7 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-07: olly + Fix bashism in configure, introduced in 2.0.9. + 2013-01-06: wsfulton Pull patch #4 from ptomulik to fix SF Bug #1296 - Fix incorrect warning for virtual destructors in templates, such as: diff --git a/configure.in b/configure.in index 3927a102a..0e8ad5bb1 100644 --- a/configure.in +++ b/configure.in @@ -1342,7 +1342,7 @@ AC_MSG_CHECKING(for Ruby header files) if test -n "$RUBY"; then # Try Ruby1.9 first RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null` - if test x"$RUBYDIR" == x"" || test x"$RUBYDIR" == x"nil"; then + if test x"$RUBYDIR" = x"" || test x"$RUBYDIR" = x"nil"; then RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null` else RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null` From 0dd11cdd8daa120f24f196f5dc6b02507f3292ee Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 8 Jan 2013 18:33:47 +1300 Subject: [PATCH 284/538] Fix to work with a ZTS build of PHP (broken in 2.0.7) --- CHANGES.current | 3 +++ Source/Modules/php.cxx | 1 + 2 files changed, 4 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 0b1d7ccc7..05d533c17 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-08: olly + [PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7). + 2013-01-07: olly Fix bashism in configure, introduced in 2.0.9. diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 5c3ce283e..9b68d072c 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -418,6 +418,7 @@ public: Append(s_header, "static void SWIG_FAIL() __attribute__ ((__noreturn__));\n"); Append(s_header, "#endif\n\n"); Append(s_header, "static void SWIG_FAIL() {\n"); + Append(s_header, " TSRMLS_FETCH();\n"); Append(s_header, " zend_error(SWIG_ErrorCode(), \"%s\", SWIG_ErrorMsg());\n"); // zend_error() should never return with the parameters we pass, but if it // does, we really don't want to let SWIG_FAIL() return. This also avoids From f9566ad2df496e3447857962f55cb959dab3ac8a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 8 Jan 2013 18:47:40 +1300 Subject: [PATCH 285/538] Fix assorted typos. From https://sourceforge.net/p/swig/patches/332/ and some others too. --- CHANGES | 14 +++++++------- Doc/Manual/Allegrocl.html | 2 +- Doc/Manual/Extending.html | 2 +- Examples/test-suite/chicken/README | 4 ++-- Examples/test-suite/perl5/default_args_runme.pl | 2 +- Lib/std/std_pair.i | 2 +- Lib/std/std_vector.i | 2 +- Source/CParse/cscanner.c | 4 ++-- Source/DOH/README | 2 +- Source/Modules/d.cxx | 2 +- Source/Modules/lua.cxx | 2 +- Tools/pyname_patch.py | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index d6006a91a..8b1945ad9 100644 --- a/CHANGES +++ b/CHANGES @@ -15,7 +15,7 @@ Version 2.0.9 (16 December 2012) symbols in Ruby 1.9+ 2012-12-14: kkaempf - [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro + [Ruby] Apply patch 3530439 and finally replace all occurrences of the STR2CSTR() macro with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9 2012-12-14: kkaempf @@ -12144,7 +12144,7 @@ Version 1.3.20 (December 17, 2003) 06/25/2003: mrose (Mark Rose) [Python] Director typemap marshalling checks for null pointers when walking the parameter list instead of relying soley on the parameter - count. Cures a segfault that occured for multiple argument inv typemaps. + count. Cures a segfault that occurred for multiple argument inv typemaps. Someone with more Swig experience should probably review this code. 06/24/2003: mkoeppe (Matthias Koeppe) @@ -17619,7 +17619,7 @@ Version 1.3.10 (December 10, 2001) shadow classes. In early implementations, shadow classes were merely Python wrappers around typed pointer objects. However, some users actually wanted to receive the shadow class object in C. - To accomodate this, the dereferencing of the "this" pointer in + To accommodate this, the dereferencing of the "this" pointer in a shadow class was moved to C as described in CHANGES [8/8/99]. However, the process of returning pointers to Python was still somewhat problematic. Specifically, shadow classes never worked @@ -19533,7 +19533,7 @@ Version 1.3.6 (July 9, 2001) [Java] destructor (_delete()) was not aware of %name renaming [Java] extends baseclass did not know about %name renaming [Java] extends baseclass did extend even when the baseclass was not known to swig - [Java] sometimes enum-declarations occured before the Java class declaration + [Java] sometimes enum-declarations occurred before the Java class declaration [Java] unrelated enum initialisations no longer appear in Java class [Java] if module ends in '_' correct JNI names are now produced @@ -20686,7 +20686,7 @@ Version 1.3 Alpha 1 (February 11, 2000) names or use %apply to map typemaps to alternate names. 8/8/99 : Handling of the 'this' pointer has been changed in Python shadow - classes. Previously, dereferencing of '.this' occured in the + classes. Previously, dereferencing of '.this' occurred in the Python shadow class itself. Now, this step occurs in the C wrappers using the following function: @@ -21243,7 +21243,7 @@ Version 1.1 Patch 1 (August 27, 1997) Would generate completely bogus code with garbage replacing the '%d'. Caused by one faulty use of printf (wasn't able to find - any other occurences). + any other occurrences). 7/7/97 : Fixed bug in Python shadow class generation with non-member functions that are returning more than one value. @@ -21359,7 +21359,7 @@ Version 1.1 (June 24, 1997) .... later ... int OldName(int); - Unlike %name, %rename will rename any occurence of the old name. + Unlike %name, %rename will rename any occurrence of the old name. This applies to functions, variables, class members and so forth. There is no way to disable %rename once set, but you can change the name by redeclaring it to something else. diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html index 5d00c4cd0..283ff7e2c 100644 --- a/Doc/Manual/Allegrocl.html +++ b/Doc/Manual/Allegrocl.html @@ -1118,7 +1118,7 @@ namespace BAR { function that returns an object (or pointer/reference) of C/C++ type X, the wrapping defun (or defmethod) on the Lisp side will automatically wrap the pointer returned in an instance - of the apropriate class. This makes it much easier to write and + of the appropriate class. This makes it much easier to write and debug code than if pointers were passed around as a jumble of integer values.

    diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index ce205abf5..059388717 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -2975,7 +2975,7 @@ There are a lot of issues to address. 
     virtual int functionWrapper(Node *n) {
-  /* get useful atributes */
+  /* get useful attributes */
   String   *name   = Getattr(n,"sym:name");
   SwigType *type   = Getattr(n,"type");
   ParmList *parms  = Getattr(n,"parms");
diff --git a/Examples/test-suite/chicken/README b/Examples/test-suite/chicken/README
index ba32bb464..aad730ec4 100644
--- a/Examples/test-suite/chicken/README
+++ b/Examples/test-suite/chicken/README
@@ -1,10 +1,10 @@
 See ../README for common README file.
 
 Any testcases which have _runme.ss appended after the testcase name will be detected and run.
-NOTE: I had to use _runme.ss becuase otherwise it would be hard to implement make clean
+NOTE: I had to use _runme.ss because otherwise it would be hard to implement make clean
 Since when SWIG runs it generates an example.scm file for every test, to clean those files
 I needed to add a rm -f *.scm to make clean.  But we don't want the runme scripts to
-dissappear as well!
+disappear as well!
 
 Any testcases which have _runme_proxy.ss appended after the testcase name will be detected
 and run with the -proxy argument passed to SWIG.  SWIG will not be run with the -unhide-primitive
diff --git a/Examples/test-suite/perl5/default_args_runme.pl b/Examples/test-suite/perl5/default_args_runme.pl
index 45f10b37e..20f0c9bc6 100644
--- a/Examples/test-suite/perl5/default_args_runme.pl
+++ b/Examples/test-suite/perl5/default_args_runme.pl
@@ -51,7 +51,7 @@ my $ex = new default_args::Except($false);
 
 my $hit = 0;
 eval { $ex->exspec(); $hit = 1; };
-# a zero was thrown, an exception occured, but $@ is false
+# a zero was thrown, an exception occurred, but $@ is false
 is($hit, 0, "exspec 1");
 eval { $ex->exspec(-1) };
 like($@, qr/^ciao/, "exspec 2");
diff --git a/Lib/std/std_pair.i b/Lib/std/std_pair.i
index 7c8327795..2743430e9 100644
--- a/Lib/std/std_pair.i
+++ b/Lib/std/std_pair.i
@@ -49,7 +49,7 @@ namespace std {
   };
 
   // ***
-  // The following specializations should dissapear or get 
+  // The following specializations should disappear or get
   // simplified when a 'const SWIGTYPE*&' can be defined
   // ***
   template  struct pair {      
diff --git a/Lib/std/std_vector.i b/Lib/std/std_vector.i
index e4f9f140d..baecf8507 100644
--- a/Lib/std/std_vector.i
+++ b/Lib/std/std_vector.i
@@ -95,7 +95,7 @@ namespace std {
   };
 
   // ***
-  // This specialization should dissapear or get simplified when
+  // This specialization should disappear or get simplified when
   // a 'const SWIGTYPE*&' can be defined
   // ***
   template
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index 64875a4d1..b52618606 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -9,7 +9,7 @@
  * scanner.c
  *
  * SWIG tokenizer.  This file is a wrapper around the generic C scanner
- * found in Swig/scanner.c.   Extra logic is added both to accomodate the
+ * found in Swig/scanner.c.   Extra logic is added both to accommodate the
  * bison-based grammar and certain peculiarities of C++ parsing (e.g.,
  * operator overloading, typedef resolution, etc.).  This code also splits
  * C identifiers up into keywords and SWIG directives.
@@ -373,7 +373,7 @@ void scanner_clear_rename() {
   rename_active = 0;
 }
 
-/* Used to push a ficticious token into the scanner */
+/* Used to push a fictitious token into the scanner */
 static int next_token = 0;
 void scanner_next_token(int tok) {
   next_token = tok;
diff --git a/Source/DOH/README b/Source/DOH/README
index 9a42e8b8b..9baaabc8a 100644
--- a/Source/DOH/README
+++ b/Source/DOH/README
@@ -69,7 +69,7 @@ Close(obj)                      Close
 
 String Operations
 -----------------
-Replace(obj, orig, rep, flags)  Replace occurences of orig with rep.
+Replace(obj, orig, rep, flags)  Replace occurrences of orig with rep.
 Chop(obj)                       Remove trailing whitespace
 
 flags is one of the following:
diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index b8e30d50c..560835751 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -3625,7 +3625,7 @@ private:
       // If the import statement has been found in the target string, we have to
       // check if the previous import was static, which would lead to problems
       // if this import is not.
-      // Thus, we check if the seven characters in front of the occurence are
+      // Thus, we check if the seven characters in front of the occurrence are
       // »static «. If the import string passed is also static, the checks fail
       // even if the found statement is also static because the last seven
       // characters would be part of the previous import statement then.
diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx
index ef2fa96de..34763290f 100644
--- a/Source/Modules/lua.cxx
+++ b/Source/Modules/lua.cxx
@@ -113,7 +113,7 @@ private:
   String *s_var_tab;		// table of global variables
   String *s_const_tab;		// table of global constants
   String *s_methods_tab;	// table of class methods
-  String *s_attr_tab;		// table of class atributes
+  String *s_attr_tab;		// table of class attributes
   String *s_luacode;		// luacode to be called during init
   String *s_dot_get;            // table of variable 'get' functions
   String *s_dot_set;            // table of variable 'set' functions
diff --git a/Tools/pyname_patch.py b/Tools/pyname_patch.py
index 5931269f9..f8f436c38 100644
--- a/Tools/pyname_patch.py
+++ b/Tools/pyname_patch.py
@@ -109,7 +109,7 @@ def main(fns):
             if patch_file(fn):
                 print "Patched file", fn
         except IOError:
-            print "Error occured during patching", fn
+            print "Error occurred during patching", fn
     return
 
 if __name__=="__main__":

From 2b407f4b2728b03a5b143adf8c842a3eaad99c7e Mon Sep 17 00:00:00 2001
From: Vladimir Kalinin 
Date: Tue, 8 Jan 2013 18:20:01 +0400
Subject: [PATCH 286/538] SF Patch#268 - Add 'pre', 'post' and 'terminator'
 attributes to the csdirectorin typemap

"csdirectorin" "pre:" and "post" code attributes in C# module. Without them it is
not trivial to marshal strings and smart-pointers back and forth
between user callback code and native code. (especially by reference)

Also fixes 2 minor issues in director code generation that are
difficult to come by until "csdirectorin" attribute is extended.
The first is that "ref" types used in directors lead to invalid
signature generation (the type array used to match methods possibly
overloaded by user). typeof(ref T) is used instead of
typeof().MakeByRefType()
The second is that ignored director methods are not completely ignored
- if there was a %typemap(imtype, "directorinattributes") it is not
skipped for ignored method.
---
 .../test-suite/csharp/csharp_prepost_runme.cs | 22 +++++
 Examples/test-suite/csharp_prepost.i          | 39 +++++++-
 Examples/test-suite/director_ignore.i         |  7 ++
 Source/Modules/csharp.cxx                     | 88 +++++++++++++++++--
 4 files changed, 147 insertions(+), 9 deletions(-)

diff --git a/Examples/test-suite/csharp/csharp_prepost_runme.cs b/Examples/test-suite/csharp/csharp_prepost_runme.cs
index f76dae38e..8842a79b3 100644
--- a/Examples/test-suite/csharp/csharp_prepost_runme.cs
+++ b/Examples/test-suite/csharp/csharp_prepost_runme.cs
@@ -5,6 +5,17 @@ using csharp_prepostNamespace;
 
 public class csharp_prepost_runme {
 
+  class PrePost3_Derived : PrePost3
+  {
+    public PrePost3_Derived(){}
+    public override void method(ref double[] vpre, DoubleVector vpost)
+    {
+      Assert(vpre[0], 1.0);
+      vpre[0] = 2.0;
+      Assert(vpost.Count, 2);
+      vpost.Add(1.0);
+    }
+  }
   public static void Main() {
     {
       double[] v;
@@ -37,6 +48,17 @@ public class csharp_prepost_runme {
       Assert(v[1], 8.8);
     }
 
+    {
+      PrePost3_Derived p = new PrePost3_Derived();
+      double[] vpre = new double[] { 1.0 };
+      DoubleVector vpost = new DoubleVector();
+      vpost.Add(3.0);
+      vpost.Add(4.0);
+      p.method(ref vpre, vpost);
+      Assert(vpre[0], 2.0);
+      Assert(vpost.Count, 3);
+    }
+
     // Check attributes are generated for the constructor helper function
     {
       CsinAttributes c = new CsinAttributes(5);
diff --git a/Examples/test-suite/csharp_prepost.i b/Examples/test-suite/csharp_prepost.i
index 31e6ec753..4f5a49362 100644
--- a/Examples/test-suite/csharp_prepost.i
+++ b/Examples/test-suite/csharp_prepost.i
@@ -1,4 +1,4 @@
-%module csharp_prepost
+%module (directors="1") csharp_prepost
 
 // Test the pre, post, terminate and cshin attributes for csin typemaps
 
@@ -64,9 +64,11 @@ bool globalfunction2(std::vector & v, std::vector &v2, std::vect
 struct PrePost2 {
   PrePost2() {
   }
+  virtual ~PrePost2() {
+  }
   PrePost2(std::vector & v, std::vector &v2, std::vector & vpre, std::vector & vpost) {
   }
-  bool method(std::vector & v, std::vector &v2, std::vector & vpre, std::vector & vpost) {
+  virtual bool method(std::vector & v, std::vector &v2, std::vector & vpre, std::vector & vpost) {
     return true;
   }
   static bool staticmethod(std::vector & v, std::vector &v2, std::vector & vpre, std::vector & vpost) {
@@ -75,6 +77,39 @@ struct PrePost2 {
 };
 %}
 
+// Check csdirectorin pre and post attributes
+// ref param
+%typemap(csdirectorin,
+   pre="      DoubleVector d$iminput = new DoubleVector($iminput, false);\n"
+       "      int count$iminput = d$iminput.Count;\n"
+       "      double[] v$iminput = new double[count$iminput];\n"
+       "      for (int i=0; i &vpre
+  "ref v$iminput"
+// post only in csdirectorin typemap
+%typemap(csdirectorin, post="      DoubleVector d$iminput = new DoubleVector($iminput, false);\n"
+                            "      int size = d$iminput.Count;\n"
+                            "      for (int i=0; i &vpost
+  "new $csclassname($iminput, false)"
+
+%feature("director") PrePost3;
+%inline %{
+struct PrePost3 {
+  PrePost3() {
+  }
+  virtual ~PrePost3(){}
+  virtual void method(std::vector & vpre, std::vector & vpost) {}
+};
+%}
+
+
 %template(DoubleVector) std::vector;
 
 // Check attributes in the typemaps
diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i
index 51317fbe0..05ba17ce1 100644
--- a/Examples/test-suite/director_ignore.i
+++ b/Examples/test-suite/director_ignore.i
@@ -21,6 +21,13 @@
 %ignore ProtectedPureVirtualMethod1;
 %ignore ProtectedPureVirtualMethod2;
 
+%typemap(imtype,
+  inattributes="[inattributes should not be used]",
+  outattributes="[outattributes should not be used]",
+  directorinattributes="[directorinattributes should not be used]",
+  directoroutattributes="[directoroutattributes should not be used]"
+ ) int& "imtype should not be used"
+
 %inline %{
 
 #include 
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index c54475029..f559d23aa 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3468,6 +3468,9 @@ public:
     String *value = Getattr(n, "value");
     String *decl = Getattr(n, "decl");
     String *declaration = NewString("");
+    String *pre_code = NewString("");
+    String *post_code = NewString("");
+    String *terminator_code = NewString("");
     String *tm;
     Parm *p;
     int i;
@@ -3556,7 +3559,8 @@ public:
       const String *im_directoroutattributes = Getattr(n, "tmap:imtype:directoroutattributes");
       if (im_directoroutattributes) {
 	Printf(callback_def, "  %s\n", im_directoroutattributes);
-	Printf(director_delegate_definitions, "  %s\n", im_directoroutattributes);
+	if (!ignored_method)
+	  Printf(director_delegate_definitions, "  %s\n", im_directoroutattributes);
       }
 
       Printf(callback_def, "  private %s SwigDirector%s(", tm, overloaded_name);
@@ -3674,6 +3678,33 @@ public:
 	      substituteClassname(pt, din);
 	      Replaceall(din, "$iminput", ln);
 
+	      // :pre and :post attribute support
+	      String *pre = Getattr(p, "tmap:csdirectorin:pre");
+	      if (pre) {
+		substituteClassname(pt, pre);
+		Replaceall(pre, "$iminput", ln);
+		if (Len(pre_code) > 0)
+		  Printf(pre_code, "\n");
+		  Printv(pre_code, pre, NIL);
+	      }
+	      String *post = Getattr(p, "tmap:csdirectorin:post");
+	      if (post) {
+		substituteClassname(pt, post);
+		Replaceall(post, "$iminput", ln);
+		if (Len(post_code) > 0)
+		  Printf(post_code, "\n");
+		Printv(post_code, post, NIL);
+	      }
+	      String *terminator = Getattr(p, "tmap:csdirectorin:terminator");
+	      if (terminator) {
+		substituteClassname(pt, terminator);
+		Replaceall(terminator, "$iminput", ln);
+		if (Len(terminator_code) > 0)
+		Insert(terminator_code, 0, "\n");
+		Insert(terminator_code, 0, terminator);
+	      }
+	      // end :pre and :post attribute support
+
 	      if (i > 0) {
 		Printf(delegate_parms, ", ");
 		Printf(proxy_method_types, ", ");
@@ -3689,7 +3720,15 @@ public:
 	      /* Get the C# parameter type */
 	      if ((tm = Getattr(p, "tmap:cstype"))) {
 		substituteClassname(pt, tm);
-		Printf(proxy_method_types, "typeof(%s)", tm);
+		if (Strncmp(tm, "ref ", 4) == 0) {
+		  DohReplace(tm, "ref ", "", DOH_REPLACE_FIRST);
+		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
+		} else if (Strncmp(tm, "out ", 4) == 0) {
+		  DohReplace(tm, "out ", "", DOH_REPLACE_FIRST);
+		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
+		} else {
+		  Printf(proxy_method_types, "typeof(%s)", tm);
+		}
 	      } else {
 		Swig_warning(WARN_CSHARP_TYPEMAP_CSWTYPE_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(pt, 0));
 	      }
@@ -3777,13 +3816,45 @@ public:
       if ((tm = Swig_typemap_lookup("csdirectorout", n, "", 0))) {
 	substituteClassname(returntype, tm);
 	Replaceall(tm, "$cscall", upcall);
-
-	Printf(callback_code, "    return %s;\n", tm);
+	// pre: and post: attribute support
+	bool is_pre_code = Len(pre_code) > 0;
+	bool is_post_code = Len(post_code) > 0;
+	bool is_terminator_code = Len(terminator_code) > 0;
+	if (is_pre_code || is_post_code || is_terminator_code) {
+	  Insert(tm, 0, "      return ");
+	  Printf(tm, ";");
+	  if (is_post_code) {
+	    Insert(tm, 0, "\n    try {\n ");
+	    Printv(tm, "\n    }\n    finally {\n", post_code, "\n    }", NIL);
+	  } else {
+	    Insert(tm, 0, "\n    ");
+	  }
+	  if (is_pre_code) {
+	    Insert(tm, 0, pre_code);
+	    Insert(tm, 0, "\n");
+	  }
+	  if (is_terminator_code)
+	    Printv(tm, "\n", terminator_code, NIL);
+	  Printf(callback_code, "       %s\n", tm);
+	} else {
+	  Printf(callback_code, "    return %s;\n", tm);
+	}
       }
-
       Delete(tm);
-    } else
-      Printf(callback_code, "    %s;\n", upcall);
+    } else {
+      bool is_pre_code = Len(pre_code) > 0;
+      bool is_post_code = Len(post_code) > 0;
+      if (is_pre_code && is_post_code)
+	Printf(callback_code, "    %s\n    try {\n    %s;\n    }\n    finally {\n    %s\n    }\n", pre_code, upcall, post_code);
+      else if (is_pre_code)
+	Printf(callback_code, "    %s\n    %s;\n", pre_code, upcall);
+      else if (is_post_code)
+	Printf(callback_code, "    try {\n    %s;\n    }\n    finally {\n    %s\n    }\n", upcall, post_code);
+      else
+	Printf(callback_code, "    %s;\n", upcall);
+      if (Len(terminator_code) > 0)
+	Printv(callback_code, "\n", terminator_code, NIL);
+    }
 
     Printf(callback_code, "  }\n");
     Delete(upcall);
@@ -3886,6 +3957,9 @@ public:
       Printf(director_connect_parms, "SwigDirector%s%s delegate%s", classname, methid, methid);
     }
 
+    Delete(pre_code);
+    Delete(post_code);
+    Delete(terminator_code);
     Delete(qualified_return);
     Delete(declaration);
     Delete(callback_typedef_parms);

From 6cb5b5487f414fb20524e557210669fbb0609a4b Mon Sep 17 00:00:00 2001
From: "Brant K. Kyser" 
Date: Tue, 8 Jan 2013 21:28:13 -0600
Subject: [PATCH 287/538] Use NSPACE_SEPARATOR rather than liter string for
 package seperator.

---
 Source/Modules/lang.cxx | 2 +-
 Source/Swig/cwrap.c     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 7468774a3..dc21d7f96 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -357,7 +357,7 @@ Language::~Language() {
     const char *attrib = "director:classname";
     String *classname = Getattr(n, "sym:name");
 
-    Replace(nspace, ".", "_", DOH_REPLACE_ANY);
+    Replace(nspace, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
     if (Len(nspace) > 0)
       dirclassname = NewStringf("SwigDirector_%s_%s", nspace, classname);
     else
diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c
index c4c4621a1..38787fc63 100644
--- a/Source/Swig/cwrap.c
+++ b/Source/Swig/cwrap.c
@@ -857,7 +857,7 @@ int Swig_MethodToFunction(Node *n, const_String_or_char_ptr nspace, String *clas
   String *qualifier = Getattr(n, "qualifier");
   String *directorScope = NewString(nspace);
 
-  Replace(directorScope, ".", "_", DOH_REPLACE_ANY);
+  Replace(directorScope, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
   
   /* If smart pointer without const overload or mutable method, change self dereferencing */
   if (flags & CWRAP_SMART_POINTER) {
@@ -1116,7 +1116,7 @@ int Swig_ConstructorToFunction(Node *n, const_String_or_char_ptr nspace, String
   int use_director;
   String *directorScope = NewString(nspace);
  
-  Replace(directorScope, ".", "_", DOH_REPLACE_ANY);
+  Replace(directorScope, NSPACE_SEPARATOR, "_", DOH_REPLACE_ANY);
 
   use_director = Swig_directorclass(n);
 

From e1a59ae2c78e46d2593cdbe965da3330e3914494 Mon Sep 17 00:00:00 2001
From: "Brant K. Kyser" 
Date: Tue, 8 Jan 2013 21:38:57 -0600
Subject: [PATCH 288/538] Clean up local variable name that store the director
 class's name to prevent confusion with the class name.

---
 Source/Modules/csharp.cxx | 29 +++++++++++++++--------------
 Source/Modules/d.cxx      | 29 +++++++++++++++--------------
 Source/Modules/java.cxx   |  9 +++++----
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index d78253f1a..5010c6cee 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3890,7 +3890,7 @@ public:
     Node *parent = parentNode(n);
     String *decl = Getattr(n, "decl");
     String *supername = Swig_class_name(parent);
-    String *classname = directorClassName(parent);
+    String *dirclassname = directorClassName(parent);
     String *sub = NewString("");
     Parm *p;
     ParmList *superparms = Getattr(n, "parms");
@@ -3914,11 +3914,11 @@ public:
       /* constructor */
       {
 	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
 	String *call = Swig_csuperclass_call(0, basetype, superparms);
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
-	Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor"));
+	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
 	Printf(f_directors, "  swig_init_callbacks();\n");
 	Printf(f_directors, "}\n\n");
 
@@ -3929,7 +3929,7 @@ public:
 
       /* constructor header */
       {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
 	Printf(f_directors_h, "    %s;\n", target);
 	Delete(target);
       }
@@ -3938,6 +3938,7 @@ public:
     Delete(sub);
     Delete(supername);
     Delete(parms);
+    Delete(dirclassname);
     return Language::classDirectorConstructor(n);
   }
 
@@ -3946,18 +3947,18 @@ public:
    * ------------------------------------------------------------ */
 
   int classDirectorDefaultConstructor(Node *n) {
-    String *classname = directorClassName(n);
+    String *dirclassname = directorClassName(n);
     String *classtype = SwigType_namestr(Getattr(n, "name"));
     Wrapper *w = NewWrapper();
 
-    Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor"));
+    Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 
-    Printf(f_directors_h, "    %s();\n", classname);
+    Printf(f_directors_h, "    %s();\n", dirclassname);
     DelWrapper(w);
     Delete(classtype);
-    Delete(classname);
+    Delete(dirclassname);
     return Language::classDirectorDefaultConstructor(n);
   }
 
@@ -3998,15 +3999,15 @@ public:
 
   int classDirectorDestructor(Node *n) {
     Node *current_class = getCurrentClass();
-    String *classname = directorClassName(current_class);
+    String *dirclassname = directorClassName(current_class);
     Wrapper *w = NewWrapper();
 
     if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", classname);
-      Printf(w->def, "%s::~%s() throw () {\n", classname, classname);
+      Printf(f_directors_h, "    virtual ~%s() throw ();\n", dirclassname);
+      Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
     } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", classname);
-      Printf(w->def, "%s::~%s() {\n", classname, classname);
+      Printf(f_directors_h, "    virtual ~%s();\n", dirclassname);
+      Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
     }
 
     Printv(w->code, "}\n", NIL);
@@ -4014,7 +4015,7 @@ public:
     Wrapper_print(w, f_directors);
 
     DelWrapper(w);
-    Delete(classname);
+    Delete(dirclassname);
     return SWIG_OK;
   }
 
diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index b66f8d2be..46a6a2b07 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -2401,7 +2401,7 @@ public:
     Node *parent = parentNode(n);
     String *decl = Getattr(n, "decl");;
     String *supername = Swig_class_name(parent);
-    String *classname = directorClassName(parent);
+    String *dirclassname = directorClassName(parent);
     String *sub = NewString("");
     Parm *p;
     ParmList *superparms = Getattr(n, "parms");
@@ -2425,11 +2425,11 @@ public:
       /* constructor */
       {
 	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
 	String *call = Swig_csuperclass_call(0, basetype, superparms);
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
-	Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor"));
+	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
 	Printf(f_directors, "  swig_init_callbacks();\n");
 	Printf(f_directors, "}\n\n");
 
@@ -2440,7 +2440,7 @@ public:
 
       /* constructor header */
       {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
 	Printf(f_directors_h, "    %s;\n", target);
 	Delete(target);
       }
@@ -2449,6 +2449,7 @@ public:
     Delete(sub);
     Delete(supername);
     Delete(parms);
+    Delete(dirclassname);
     return Language::classDirectorConstructor(n);
   }
 
@@ -2456,18 +2457,18 @@ public:
    * D::classDirectorDefaultConstructor()
    * --------------------------------------------------------------------------- */
   virtual int classDirectorDefaultConstructor(Node *n) {
-    String *classname = directorClassName(n);
+    String *dirclassname = directorClassName(n);
     String *classtype = SwigType_namestr(Getattr(n, "name"));
     Wrapper *w = NewWrapper();
 
-    Printf(w->def, "%s::%s() : %s {", classname, classname, Getattr(n, "director:ctor"));
+    Printf(w->def, "%s::%s() : %s {", dirclassname, dirclassname, Getattr(n, "director:ctor"));
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 
-    Printf(f_directors_h, "    %s();\n", classname);
+    Printf(f_directors_h, "    %s();\n", dirclassname);
     DelWrapper(w);
     Delete(classtype);
-    Delete(classname);
+    Delete(dirclassname);
     return Language::classDirectorDefaultConstructor(n);
   }
 
@@ -2476,15 +2477,15 @@ public:
    * --------------------------------------------------------------------------- */
   virtual int classDirectorDestructor(Node *n) {
     Node *current_class = getCurrentClass();
-    String *classname = directorClassName(current_class);
+    String *dirclassname = directorClassName(current_class);
     Wrapper *w = NewWrapper();
 
     if (Getattr(n, "throw")) {
-      Printf(f_directors_h, "    virtual ~%s() throw ();\n", classname);
-      Printf(w->def, "%s::~%s() throw () {\n", classname, classname);
+      Printf(f_directors_h, "    virtual ~%s() throw ();\n", dirclassname);
+      Printf(w->def, "%s::~%s() throw () {\n", dirclassname, dirclassname);
     } else {
-      Printf(f_directors_h, "    virtual ~%s();\n", classname);
-      Printf(w->def, "%s::~%s() {\n", classname, classname);
+      Printf(f_directors_h, "    virtual ~%s();\n", dirclassname);
+      Printf(w->def, "%s::~%s() {\n", dirclassname, dirclassname);
     }
 
     Printv(w->code, "}\n", NIL);
@@ -2492,7 +2493,7 @@ public:
     Wrapper_print(w, f_directors);
 
     DelWrapper(w);
-    Delete(classname);
+    Delete(dirclassname);
     return SWIG_OK;
   }
 
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 28d8b88aa..b4703bd3e 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4099,7 +4099,7 @@ public:
     Node *parent = parentNode(n);
     String *decl = Getattr(n, "decl");
     String *supername = Swig_class_name(parent);
-    String *classname = directorClassName(parent);
+    String *dirclassname = directorClassName(parent);
     String *sub = NewString("");
     Parm *p;
     ParmList *superparms = Getattr(n, "parms");
@@ -4131,11 +4131,11 @@ public:
       /* constructor */
       {
 	String *basetype = Getattr(parent, "classtype");
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 0);
 	String *call = Swig_csuperclass_call(0, basetype, superparms);
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
-	Printf(f_directors, "%s::%s : %s, %s {\n", classname, target, call, Getattr(parent, "director:ctor"));
+	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
 	Printf(f_directors, "}\n\n");
 
 	Delete(classtype);
@@ -4145,7 +4145,7 @@ public:
 
       /* constructor header */
       {
-	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
+	String *target = Swig_method_decl(0, decl, dirclassname, parms, 0, 1);
 	Printf(f_directors_h, "    %s;\n", target);
 	Delete(target);
       }
@@ -4155,6 +4155,7 @@ public:
     Delete(supername);
     Delete(jenv_type);
     Delete(parms);
+    Delete(dirclassname);
     return Language::classDirectorConstructor(n);
   }
 

From 13d9e19cdbb9c3dc6d89fc0a44a97d66051d0068 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 11 Jan 2013 06:19:24 +0000
Subject: [PATCH 289/538] Fix spacing in generated code for csdirectorin 'pre',
 'post' and 'terminator' attributes. Add some more tests for these attributes.

---
 .../test-suite/csharp/csharp_prepost_runme.cs | 16 ++++++
 Examples/test-suite/csharp_prepost.i          | 15 ++---
 Source/Modules/csharp.cxx                     | 56 ++++++-------------
 3 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/Examples/test-suite/csharp/csharp_prepost_runme.cs b/Examples/test-suite/csharp/csharp_prepost_runme.cs
index 8842a79b3..ca3979065 100644
--- a/Examples/test-suite/csharp/csharp_prepost_runme.cs
+++ b/Examples/test-suite/csharp/csharp_prepost_runme.cs
@@ -15,6 +15,11 @@ public class csharp_prepost_runme {
       Assert(vpost.Count, 2);
       vpost.Add(1.0);
     }
+    public override int methodint(ref double[] vpre, DoubleVector vpost)
+    {
+      method(ref vpre, vpost);
+      return vpost.Count;
+    }
   }
   public static void Main() {
     {
@@ -58,6 +63,17 @@ public class csharp_prepost_runme {
       Assert(vpre[0], 2.0);
       Assert(vpost.Count, 3);
     }
+    {
+      PrePost3_Derived p = new PrePost3_Derived();
+      double[] vpre = new double[] { 1.0 };
+      DoubleVector vpost = new DoubleVector();
+      vpost.Add(3.0);
+      vpost.Add(4.0);
+      int size = p.methodint(ref vpre, vpost);
+      Assert(vpre[0], 2.0);
+      Assert(vpost.Count, 3);
+      Assert(size, 3);
+    }
 
     // Check attributes are generated for the constructor helper function
     {
diff --git a/Examples/test-suite/csharp_prepost.i b/Examples/test-suite/csharp_prepost.i
index 4f5a49362..32ee10677 100644
--- a/Examples/test-suite/csharp_prepost.i
+++ b/Examples/test-suite/csharp_prepost.i
@@ -80,14 +80,14 @@ struct PrePost2 {
 // Check csdirectorin pre and post attributes
 // ref param
 %typemap(csdirectorin,
-   pre="      DoubleVector d$iminput = new DoubleVector($iminput, false);\n"
-       "      int count$iminput = d$iminput.Count;\n"
-       "      double[] v$iminput = new double[count$iminput];\n"
-       "      for (int i=0; i &vpre
   "ref v$iminput"
@@ -106,6 +106,7 @@ struct PrePost3 {
   }
   virtual ~PrePost3(){}
   virtual void method(std::vector & vpre, std::vector & vpost) {}
+  virtual int methodint(std::vector & vpre, std::vector & vpost) { return 0; }
 };
 %}
 
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index f559d23aa..81b3b3f8b 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3678,7 +3678,7 @@ public:
 	      substituteClassname(pt, din);
 	      Replaceall(din, "$iminput", ln);
 
-	      // :pre and :post attribute support
+	      // pre and post attribute support
 	      String *pre = Getattr(p, "tmap:csdirectorin:pre");
 	      if (pre) {
 		substituteClassname(pt, pre);
@@ -3703,7 +3703,6 @@ public:
 		Insert(terminator_code, 0, "\n");
 		Insert(terminator_code, 0, terminator);
 	      }
-	      // end :pre and :post attribute support
 
 	      if (i > 0) {
 		Printf(delegate_parms, ", ");
@@ -3721,10 +3720,10 @@ public:
 	      if ((tm = Getattr(p, "tmap:cstype"))) {
 		substituteClassname(pt, tm);
 		if (Strncmp(tm, "ref ", 4) == 0) {
-		  DohReplace(tm, "ref ", "", DOH_REPLACE_FIRST);
+		  Replace(tm, "ref ", "", DOH_REPLACE_FIRST);
 		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
 		} else if (Strncmp(tm, "out ", 4) == 0) {
-		  DohReplace(tm, "out ", "", DOH_REPLACE_FIRST);
+		  Replace(tm, "out ", "", DOH_REPLACE_FIRST);
 		  Printf(proxy_method_types, "typeof(%s).MakeByRefType()", tm);
 		} else {
 		  Printf(proxy_method_types, "typeof(%s)", tm);
@@ -3812,47 +3811,26 @@ public:
 
     String *upcall = NewStringf("%s(%s)", symname, imcall_args);
 
-    if (!is_void) {
-      if ((tm = Swig_typemap_lookup("csdirectorout", n, "", 0))) {
-	substituteClassname(returntype, tm);
-	Replaceall(tm, "$cscall", upcall);
-	// pre: and post: attribute support
-	bool is_pre_code = Len(pre_code) > 0;
-	bool is_post_code = Len(post_code) > 0;
-	bool is_terminator_code = Len(terminator_code) > 0;
-	if (is_pre_code || is_post_code || is_terminator_code) {
-	  Insert(tm, 0, "      return ");
-	  Printf(tm, ";");
-	  if (is_post_code) {
-	    Insert(tm, 0, "\n    try {\n ");
-	    Printv(tm, "\n    }\n    finally {\n", post_code, "\n    }", NIL);
-	  } else {
-	    Insert(tm, 0, "\n    ");
-	  }
-	  if (is_pre_code) {
-	    Insert(tm, 0, pre_code);
-	    Insert(tm, 0, "\n");
-	  }
-	  if (is_terminator_code)
-	    Printv(tm, "\n", terminator_code, NIL);
-	  Printf(callback_code, "       %s\n", tm);
-	} else {
-	  Printf(callback_code, "    return %s;\n", tm);
-	}
-      }
-      Delete(tm);
-    } else {
+    if ((tm = Swig_typemap_lookup("csdirectorout", n, "", 0))) {
+      substituteClassname(returntype, tm);
+      Replaceall(tm, "$cscall", upcall);
+      if (!is_void)
+	Insert(tm, 0, "return ");
+      Replaceall(tm, "\n ", "\n   "); // add extra indentation to code in typemap
+
+      // pre and post attribute support
       bool is_pre_code = Len(pre_code) > 0;
       bool is_post_code = Len(post_code) > 0;
+      bool is_terminator_code = Len(terminator_code) > 0;
       if (is_pre_code && is_post_code)
-	Printf(callback_code, "    %s\n    try {\n    %s;\n    }\n    finally {\n    %s\n    }\n", pre_code, upcall, post_code);
+	Printf(callback_code, "%s\n    try {\n      %s;\n    } finally {\n%s\n    }\n", pre_code, tm, post_code);
       else if (is_pre_code)
-	Printf(callback_code, "    %s\n    %s;\n", pre_code, upcall);
+	Printf(callback_code, "%s\n    %s;\n", pre_code, tm);
       else if (is_post_code)
-	Printf(callback_code, "    try {\n    %s;\n    }\n    finally {\n    %s\n    }\n", upcall, post_code);
+	Printf(callback_code, "    try {\n      %s;\n    } finally {\n%s\n    }\n", tm, post_code);
       else
-	Printf(callback_code, "    %s;\n", upcall);
-      if (Len(terminator_code) > 0)
+	Printf(callback_code, "    %s;\n", tm);
+      if (is_terminator_code)
 	Printv(callback_code, "\n", terminator_code, NIL);
     }
 

From 245b8a0b344dce99e24c13a01da56fd9fafea9b6 Mon Sep 17 00:00:00 2001
From: Vladimir Kalinin 
Date: Fri, 11 Jan 2013 21:46:40 +0400
Subject: [PATCH 290/538] Documentation for csdirectorin 'pre', 'post' and
 'terminator' support.

---
 Doc/Manual/CSharp.html | 47 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index a5394eb37..1281f7973 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -197,11 +197,56 @@ csattributes                C# attributes for attaching to proxy classes/enums
 The "null" attribute in the "out" typemap can be specified to provide a value for $null to expand into for wrapped functions that return non-void. Normally the default value of 0 is used.
 For example this is needed if you change the return type to void:
 
    
-
 
     %typemap(ctype) Status "void"
 %typemap(out, null="") Status { ... }
 
    
+
    
+The "pre" and "post" attributes in "csdirectorin" typemap act like the same attributes in "csin" typemap.
+ For example if we modify Date marshalling example like this:
+
    +class CDate {
+...
+  void setYear(int);
+  void setMonth(int);
+  void setDay(int);
+};
+struct Action {
+virtual void someCallback(CDate& date);
+...
+};
+
    
+and declare %feature ("director") for the Action class, we would have to define additional
+marshaling rules for CDate. Director typemap may look like this:
+
    +%typemap(csdirectorin,
+         pre="System.DateTime temp$iminput = new System.DateTime();",
+         post="CDate temp2$iminput = new CDate($iminput, false);\n"
+              "temp2$iminput.setYear(tempdate.Year);\n"
+              "temp2$iminput.setMonth(tempdate.Month);\n"
+              "temp2$iminput.setDay(tempdate.Day);"
+         ) CDate& date "out temp$iminput"
+
    
+The generated proxy class code will then contain the following wrapper for calling user-overloaded someCallback():
+
    +...
+  private void SwigDirectorsomeCallback(IntPtr date) {
+    System.DateTime tempdate = new System.DateTime();
+    try {
+      someCallback(out tempdate);
+    }
+    finally {
+    // we create managed wrapper around existing C reference, just for convenience
+      CDate temp2date = new CDate(date, false);
+      temp2date.setYear(tempdate.Year);
+      temp2date.setMonth(tempdate.Month);
+      temp2date.setDay(tempdate.Day);
+    }
+  }
+...
+
    
+Pay special attention to the memory management issues, using these attributes.
+
    
 
 
 

From a1c3e54ab4bd6e2258aaecc7cf2d78af1a5bba29 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 11 Jan 2013 21:59:38 +0000
Subject: [PATCH 291/538] Improvements to documentation for csdirectorin 'pre',
 'post' and 'terminator' support.

---
 CHANGES.current          |   3 +
 Doc/Manual/CSharp.html   | 122 ++++++++++++++++++++++-----------------
 Doc/Manual/Contents.html |   1 +
 3 files changed, 74 insertions(+), 52 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 05d533c17..e75e04dac 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-01-11: Vladimir Kalinin
+	    [C#] Add support for csdirectorin 'pre', 'post' and 'terminator' attributes.
+
 2013-01-08: olly
 	    [PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7).
 
diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index 1281f7973..6df2594c4 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -38,6 +38,7 @@
 
  • Memory management for objects passed to the C++ layer
 
  • Date marshalling using the csin typemap and associated attributes
 
  • A date example demonstrating marshalling of C# properties
+
  • Date example demonstrating the 'pre' and 'post' typemap attributes for directors
 
  • Turning wrapped classes into partial classes
 
  • Extending proxy classes with additional C# code
 
  • Underlying type for enums
@@ -201,52 +202,6 @@ For example this is needed if you change the return type to void:
 %typemap(ctype) Status "void"
 %typemap(out, null="") Status { ... }
    • -

    -The "pre" and "post" attributes in "csdirectorin" typemap act like the same attributes in "csin" typemap. - For example if we modify Date marshalling example like this: -

    -class CDate {
-...
-  void setYear(int);
-  void setMonth(int);
-  void setDay(int);
-};
-struct Action {
-virtual void someCallback(CDate& date);
-...
-};
-
    -and declare %feature ("director") for the Action class, we would have to define additional -marshaling rules for CDate. Director typemap may look like this: -
    -%typemap(csdirectorin,
-         pre="System.DateTime temp$iminput = new System.DateTime();",
-         post="CDate temp2$iminput = new CDate($iminput, false);\n"
-              "temp2$iminput.setYear(tempdate.Year);\n"
-              "temp2$iminput.setMonth(tempdate.Month);\n"
-              "temp2$iminput.setDay(tempdate.Day);"
-         ) CDate& date "out temp$iminput"
-
    -The generated proxy class code will then contain the following wrapper for calling user-overloaded someCallback(): -
    -...
-  private void SwigDirectorsomeCallback(IntPtr date) {
-    System.DateTime tempdate = new System.DateTime();
-    try {
-      someCallback(out tempdate);
-    }
-    finally {
-    // we create managed wrapper around existing C reference, just for convenience
-      CDate temp2date = new CDate(date, false);
-      temp2date.setYear(tempdate.Year);
-      temp2date.setMonth(tempdate.Month);
-      temp2date.setDay(tempdate.Day);
-    }
-  }
-...
-
    -Pay special attention to the memory management issues, using these attributes. -

    @@ -287,10 +242,12 @@ $jnicall -> $imcall

    Unlike the "javain" typemap, the "csin" typemap does not support the 'pgcpp' attribute as the C# module does not have a premature garbage collection prevention parameter. The "csin" typemap supports additional optional attributes called 'cshin' and 'terminator'. +The "csdirectorin" typemap supports additional optional attributes called 'terminator'. The 'cshin' attribute should contain the parameter type and name whenever a constructor helper function is generated due to the 'pre' or 'post' attributes. The 'terminator' attribute normally just contains a closing brace for when the 'pre' attribute contains an opening brace, such as when a C# using or fixed block is started. Note that 'pre', 'post', 'terminator' and 'cshin' attributes are not used for marshalling the property set. Please see the Date marshalling example and Date marshalling of properties example for further understanding of these "csin" applicable attributes. +Please see the Date marshalling director example for further understanding of the "csdirectorin" attributes.

    @@ -2100,13 +2057,13 @@ The typemaps to achieve this are shown below. 
    -%typemap(cstype) const CDate& "System.DateTime"
+%typemap(cstype) const CDate & "System.DateTime"
 %typemap(csin, 
          pre="    CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day);"
         ) const CDate &
          "$csclassname.getCPtr(temp$csinput)"
 
-%typemap(cstype) CDate& "out System.DateTime"
+%typemap(cstype) CDate & "out System.DateTime"
 %typemap(csin, 
          pre="    CDate temp$csinput = new CDate();", 
          post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
@@ -2317,7 +2274,7 @@ Console.WriteLine("Important date: " + importantDate);

    -When SWIG wraps a variable that is a class/struct/union, it is wrapped using a pointer to the type for the reasons given in Stucture data members. +When SWIG wraps a variable that is a class/struct/union, it is wrapped using a pointer to the type for the reasons given in Structure data members. The typemap type required is thus CDate *. Given that the previous section already designed CDate * typemaps, we'll use those same typemaps plus the 'csvarin' and 'csvarout' typemaps.

    @@ -2389,8 +2346,69 @@ Some points to note:
  • The 'csin' typemap has 'pre', 'post' and 'cshin' attributes, and these are all ignored in the property set. The code in these attributes must instead be replicated within the 'csvarin' typemap. The line creating the temp$csinput variable is such an example; it is identical to what is in the 'pre' attribute. +

    19.8.5 Date example demonstrating the 'pre' and 'post' typemap attributes for directors

    -

    19.8.5 Turning wrapped classes into partial classes

    + +

    +The 'pre' and 'post' attributes in the "csdirectorin" typemap act like the attributes of the same name in the "csin" typemap. +For example if we modify the Date marshalling example like this: +

    + +
    +class CDate {
+  ...
+  void setYear(int);
+  void setMonth(int);
+  void setDay(int);
+};
+struct Action {
+  virtual void someCallback(CDate &date);
+  virtual ~Action();
+  ...
+};
+
    + +

    +and declare %feature ("director") for the Action class, we would have to define additional +marshalling rules for CDate & parameter. The typemap may look like this: +

    + +
    +%typemap(csdirectorin,
+         pre="System.DateTime temp$iminput = new System.DateTime();",
+         post="CDate temp2$iminput = new CDate($iminput, false);\n"
+              "temp2$iminput.setYear(tempdate.Year);\n"
+              "temp2$iminput.setMonth(tempdate.Month);\n"
+              "temp2$iminput.setDay(tempdate.Day);"
+         ) CDate &date "out temp$iminput"
+
    + +

    +The generated proxy class code will then contain the following wrapper for calling user-overloaded someCallback(): +

    + +
    +...
+  private void SwigDirectorsomeCallback(IntPtr date) {
+    System.DateTime tempdate = new System.DateTime();
+    try {
+      someCallback(out tempdate);
+    } finally {
+      // we create a managed wrapper around the existing C reference, just for convenience
+      CDate temp2date = new CDate(date, false);
+      temp2date.setYear(tempdate.Year);
+      temp2date.setMonth(tempdate.Month);
+      temp2date.setDay(tempdate.Day);
+    }
+  }
+...
+
    +

    +Pay special attention to the memory management issues, using these attributes. +

    + + +

    19.8.6 Turning wrapped classes into partial classes

    @@ -2490,7 +2508,7 @@ demonstrating that the class contains methods calling both unmanaged code - The following example is an alternative approach to adding managed code to the generated proxy class.

    -

    19.8.6 Extending proxy classes with additional C# code

    +

    19.8.7 Extending proxy classes with additional C# code

    @@ -2529,7 +2547,7 @@ public class ExtendMe : IDisposable {

    • -

    19.8.7 Underlying type for enums

    +

    19.8.8 Underlying type for enums

    diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index 74040ff0e..42e135140 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -686,6 +686,7 @@

  • Memory management for objects passed to the C++ layer
  • Date marshalling using the csin typemap and associated attributes
  • A date example demonstrating marshalling of C# properties +
  • Date example demonstrating the 'pre' and 'post' typemap attributes for directors
  • Turning wrapped classes into partial classes
  • Extending proxy classes with additional C# code
  • Underlying type for enums From 62d2ec5a12aa7db6cb4a4b36ef9536fe4c77077c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 Jan 2013 19:41:26 +0000 Subject: [PATCH 292/538] Update .gitignore for C# test-suite --- .gitignore | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8509eebd3..928b0ac07 100644 --- a/.gitignore +++ b/.gitignore @@ -9,12 +9,6 @@ pcre *.gz -# Python generated files, based on: -# https://github.com/github/gitignore/blob/master/Python.gitignore -*.py[cod] -*/__pycache__/ -/__pycache__/ - # C/C++ object files, based on: # https://github.com/github/gitignore/blob/master/C.gitignore # https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore @@ -113,3 +107,14 @@ Examples/test-suite/r/*/ Examples/test-suite/ruby/*/ Examples/test-suite/tcl/*/ Examples/test-suite/uffi/*/ + +# Python generated files, based on: +# https://github.com/github/gitignore/blob/master/Python.gitignore +*.py[cod] +*/__pycache__/ +/__pycache__/ + +# C# generated files +*_runme.exe.mdb +*_runme.exe + From 1fe1bb254373ef324408eb08ddad92e020988625 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 Jan 2013 21:57:43 +0000 Subject: [PATCH 293/538] Update .gitignore for generated documentation --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 928b0ac07..800ac4669 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,9 @@ *.o *.class -# Editor junk +# Editor files and various other junk *.sw? +*.bak # Local PCRE pcre @@ -84,6 +85,12 @@ Source/CParse/parser.h Source/eswig swig +# Generated documentation +Doc/Manual/CCache.html +Doc/Manual/SWIGDocumentation.html +Doc/Manual/SWIGDocumentation.pdf +Doc/Manual/*.book + # Test Suite Generated Files Examples/test-suite/allegrocl/*/ Examples/test-suite/cffi/*/ From 7408332eb59f5c852331eead60a8f7b460272980 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 11 Jan 2013 23:46:32 +0000 Subject: [PATCH 294/538] Add notes on SF Bug #1299 - nspace and class name collisions --- CHANGES.current | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index e75e04dac..0d6a69959 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-11: Brant Kyser + [Java, C#, D] SF Bug #1299 - Fix generated names for when %nspace is used on + classes with the same name in two different namespaces. + 2013-01-11: Vladimir Kalinin [C#] Add support for csdirectorin 'pre', 'post' and 'terminator' attributes. From acfc4cad3b0e01280520cff6bb10e9e7f6ffa0c4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 00:23:16 +0000 Subject: [PATCH 295/538] Update README file --- README | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/README b/README index 305edf078..d69e7c6d8 100644 --- a/README +++ b/README @@ -3,9 +3,11 @@ SWIG (Simplified Wrapper and Interface Generator) Version: 2.0.10 (in progress) Tagline: SWIG is a compiler that integrates C and C++ with languages - including Perl, Python, Tcl, Ruby, PHP, Java, Ocaml, Lua, - Scheme (Guile, MzScheme, CHICKEN), Pike, C#, Modula-3, - Common Lisp (CLISP, Allegro CL, CFFI, UFFI), Octave and R. + including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua, + Octave, R, Scheme (Guile, MzScheme/Racket, CHICKEN), Ocaml, + Modula-3, Common Lisp (CLISP, Allegro CL, CFFI, UFFI) and Pike. + SWIG can also export its parse tree into Lisp s-expressions and + XML. SWIG reads annotated C/C++ header files and creates wrapper code (glue code) in order to make the corresponding C/C++ libraries available to @@ -31,6 +33,22 @@ new features for the current release. The CHANGES file contains bug fixes and new features for older versions. A summary of changes in each release can be found in the RELEASENOTES file. +Documentation +============= +The Doc/Manual directory contains the most recent set of updated +documentation for this release. The documentation is available in +three different formats, each of which contains identical content. +These format are, pdf (Doc/Manual/SWIGDocumentation.pdf), single +page html (Doc/Manual/SWIGDocumentation.html) or multiple page html +(other files in Doc/Manual). Please select your chosen format and +copy/install to wherever takes your fancy. + +There is some technical developer documentation available in the +Doc/Devel subdirectory. This is not necessarily up-to-date, but it +has some information on SWIG internals. + +Documentation is also online at http://www.swig.org/doc.html. + Backwards Compatibility ======================= The developers strive their best to preserve backwards compatibility @@ -97,9 +115,6 @@ minimal effect. All they do is reduce the amount of testing done with 'make check'. The SWIG executable and library files installed cannot currently be configured with a subset of target languages. -Please see the Documentation section below on installing documentation as -none is installed by default. - SWIG used to include a set of runtime libraries for some languages for working with multiple modules. These are no longer built during the installation stage. However, users can build them just like any wrapper module as described in @@ -108,7 +123,7 @@ examples which build the runtime library. Notes: -(1) If you checked the code out via SVN, you will have to run ./autogen.sh +(1) If you checked the code out via Git, you will have to run ./autogen.sh before typing 'configure'. In addition, a full build of SWIG requires the a number of packages to be installed. Full instructions at http://www.swig.org/svn.html @@ -175,8 +190,9 @@ The Examples directory contains a variety of examples of using SWIG and it has some browsable documentation. Simply point your browser to the file "Example/index.html". -The Examples directory also includes Visual C++ project (.dsp) files for -building some of the examples on Windows. +The Examples directory also includes Visual C++ project 6 (.dsp) files for +building some of the examples on Windows. Later versions of Visual Studio +will convert these old style project files into a current solution file. Known Issues ============ @@ -215,20 +231,6 @@ installed. To fix this: If you are having other troubles, you might look at the SWIG Wiki at http://www.dabeaz.com/cgi-bin/wiki.pl. -Documentation -============= -The Doc/Manual directory contains the most recent set of updated -documentation for this release. The documentation is available in -three different formats, each of which contains identical content. -These format are, pdf (Doc/Manual/SWIGDocumentation.pdf), single -page html (Doc/Manual/SWIGDocumentation.html) or multiple page html -(other files in Doc/Manual). Please select your chosen format and -copy/install to wherever takes your fancy. - -There is some technical developer documentation available in the -Doc/Devel subdirectory. This is not necessarily up-to-date, but it -has some information on SWIG internals. - Participate! ============ Please report any errors and submit patches (if possible)! We only From 5b108acab6595d1d52d6a4b42e93b8a1317c5d53 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 00:27:17 +0000 Subject: [PATCH 296/538] Remove seemingly useless .project file --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 86af75213..000000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - SWIG - - - - - - - - From e2a0b892484590ce8b5a742fbea0dc781154ad94 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 00:57:17 +0000 Subject: [PATCH 297/538] Rename configure.in files to expected modern name configure.ac --- CCache/{configure.in => configure.ac} | 0 configure.in => configure.ac | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename CCache/{configure.in => configure.ac} (100%) rename configure.in => configure.ac (100%) diff --git a/CCache/configure.in b/CCache/configure.ac similarity index 100% rename from CCache/configure.in rename to CCache/configure.ac diff --git a/configure.in b/configure.ac similarity index 100% rename from configure.in rename to configure.ac From 7841a0d097e679baafe06c29539b686b50eb144b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 01:21:16 +0000 Subject: [PATCH 298/538] Remove cvs/svn Id strings --- Source/CParse/cscanner.c | 2 -- Source/CParse/parser.y | 2 -- Source/CParse/templ.c | 2 -- Source/CParse/util.c | 2 -- Source/DOH/base.c | 2 -- Source/DOH/file.c | 2 -- Source/DOH/fio.c | 2 -- Source/DOH/hash.c | 2 -- Source/DOH/list.c | 2 -- Source/DOH/memory.c | 2 -- Source/DOH/string.c | 2 -- Source/DOH/void.c | 2 -- Source/Modules/allegrocl.cxx | 2 -- Source/Modules/allocate.cxx | 2 -- Source/Modules/browser.cxx | 2 -- Source/Modules/cffi.cxx | 2 -- Source/Modules/chicken.cxx | 2 -- Source/Modules/clisp.cxx | 2 -- Source/Modules/contract.cxx | 2 -- Source/Modules/csharp.cxx | 2 -- Source/Modules/d.cxx | 2 -- Source/Modules/directors.cxx | 2 -- Source/Modules/emit.cxx | 2 -- Source/Modules/go.cxx | 2 -- Source/Modules/guile.cxx | 2 -- Source/Modules/java.cxx | 2 -- Source/Modules/lang.cxx | 2 -- Source/Modules/lua.cxx | 2 -- Source/Modules/main.cxx | 2 -- Source/Modules/modula3.cxx | 2 -- Source/Modules/module.cxx | 2 -- Source/Modules/mzscheme.cxx | 2 -- Source/Modules/ocaml.cxx | 2 -- Source/Modules/octave.cxx | 2 -- Source/Modules/overload.cxx | 2 -- Source/Modules/perl5.cxx | 2 -- Source/Modules/php.cxx | 2 -- Source/Modules/pike.cxx | 2 -- Source/Modules/python.cxx | 2 -- Source/Modules/r.cxx | 2 -- Source/Modules/ruby.cxx | 2 -- Source/Modules/s-exp.cxx | 2 -- Source/Modules/swigmain.cxx | 2 -- Source/Modules/tcl8.cxx | 2 -- Source/Modules/typepass.cxx | 2 -- Source/Modules/uffi.cxx | 2 -- Source/Modules/utils.cxx | 2 -- Source/Modules/xml.cxx | 2 -- Source/Preprocessor/cpp.c | 2 -- Source/Preprocessor/expr.c | 2 -- Source/Swig/cwrap.c | 2 -- Source/Swig/deprecate.c | 2 -- Source/Swig/error.c | 2 -- Source/Swig/fragment.c | 2 -- Source/Swig/getopt.c | 2 -- Source/Swig/include.c | 2 -- Source/Swig/misc.c | 2 -- Source/Swig/naming.c | 2 -- Source/Swig/parms.c | 2 -- Source/Swig/scanner.c | 2 -- Source/Swig/stype.c | 2 -- Source/Swig/symbol.c | 2 -- Source/Swig/tree.c | 2 -- Source/Swig/typemap.c | 2 -- Source/Swig/typeobj.c | 2 -- Source/Swig/typesys.c | 2 -- Source/Swig/wrapfunc.c | 2 -- 67 files changed, 134 deletions(-) diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c index b52618606..791cf5949 100644 --- a/Source/CParse/cscanner.c +++ b/Source/CParse/cscanner.c @@ -15,8 +15,6 @@ * C identifiers up into keywords and SWIG directives. * ----------------------------------------------------------------------------- */ -char cvsroot_cscanner_c[] = "$Id$"; - #include "cparse.h" #include "parser.h" #include diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index e4f3d67b2..c93f44cd0 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -17,8 +17,6 @@ #define yylex yylex -char cvsroot_parser_y[] = "$Id$"; - #include "swig.h" #include "cparse.h" #include "preprocessor.h" diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index b14cd1e4d..ed6acfc8c 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -11,8 +11,6 @@ * Expands a template into a specialized version. * ----------------------------------------------------------------------------- */ -char cvsroot_templ_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" diff --git a/Source/CParse/util.c b/Source/CParse/util.c index fa934ffc0..7572dff10 100644 --- a/Source/CParse/util.c +++ b/Source/CParse/util.c @@ -11,8 +11,6 @@ * Parsing utilities. * ----------------------------------------------------------------------------- */ -char cvsroot_util_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" diff --git a/Source/DOH/base.c b/Source/DOH/base.c index e64b0f561..1f92b6542 100644 --- a/Source/DOH/base.c +++ b/Source/DOH/base.c @@ -12,8 +12,6 @@ * DOH objects. A number of small utility functions are also included. * ----------------------------------------------------------------------------- */ -char cvsroot_base_c[] = "$Id$"; - #include "dohint.h" /* ----------------------------------------------------------------------------- diff --git a/Source/DOH/file.c b/Source/DOH/file.c index 11482fa7f..7409ebbfb 100644 --- a/Source/DOH/file.c +++ b/Source/DOH/file.c @@ -12,8 +12,6 @@ * ordinary FILE * or integer file descriptor. * ----------------------------------------------------------------------------- */ -char cvsroot_file_c[] = "$Id$"; - #include "dohint.h" #ifdef DOH_INTFILE diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c index 573bebe7b..5693deeb5 100644 --- a/Source/DOH/fio.c +++ b/Source/DOH/fio.c @@ -12,8 +12,6 @@ * formatted output, readline, and splitting. * ----------------------------------------------------------------------------- */ -char cvsroot_fio_c[] = "$Id$"; - #include "dohint.h" #define OBUFLEN 512 diff --git a/Source/DOH/hash.c b/Source/DOH/hash.c index 566cb349a..c2bc3dd95 100644 --- a/Source/DOH/hash.c +++ b/Source/DOH/hash.c @@ -11,8 +11,6 @@ * Implements a simple hash table object. * ----------------------------------------------------------------------------- */ -char cvsroot_hash_c[] = "$Id$"; - #include "dohint.h" extern DohObjInfo DohHashType; diff --git a/Source/DOH/list.c b/Source/DOH/list.c index d20311150..8a96a9a60 100644 --- a/Source/DOH/list.c +++ b/Source/DOH/list.c @@ -11,8 +11,6 @@ * Implements a simple list object. * ----------------------------------------------------------------------------- */ -char cvsroot_list_c[] = "$Id$"; - #include "dohint.h" typedef struct List { diff --git a/Source/DOH/memory.c b/Source/DOH/memory.c index 5ad11019d..b916870d7 100644 --- a/Source/DOH/memory.c +++ b/Source/DOH/memory.c @@ -12,8 +12,6 @@ * of objects and checking of objects. * ----------------------------------------------------------------------------- */ -char cvsroot_memory_c[] = "$Id$"; - #include "dohint.h" #ifndef DOH_POOL_SIZE diff --git a/Source/DOH/string.c b/Source/DOH/string.c index d34301691..50676c7c3 100644 --- a/Source/DOH/string.c +++ b/Source/DOH/string.c @@ -12,8 +12,6 @@ * file semantics. * ----------------------------------------------------------------------------- */ -char cvsroot_string_c[] = "$Id$"; - #include "dohint.h" extern DohObjInfo DohStringType; diff --git a/Source/DOH/void.c b/Source/DOH/void.c index 2d684b9cd..6111a8c49 100644 --- a/Source/DOH/void.c +++ b/Source/DOH/void.c @@ -12,8 +12,6 @@ * an arbitrary C object represented as a void *. * ----------------------------------------------------------------------------- */ -char cvsroot_void_c[] = "$Id$"; - #include "dohint.h" typedef struct { diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx index 1e0c6c98b..93477057f 100644 --- a/Source/Modules/allegrocl.cxx +++ b/Source/Modules/allegrocl.cxx @@ -11,8 +11,6 @@ * ALLEGROCL language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_allegrocl_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" #include diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx index 4c884caca..5320d9689 100644 --- a/Source/Modules/allocate.cxx +++ b/Source/Modules/allocate.cxx @@ -15,8 +15,6 @@ * Doc/Manual/SWIGPlus.html for details. * ----------------------------------------------------------------------------- */ -char cvsroot_allocate_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" diff --git a/Source/Modules/browser.cxx b/Source/Modules/browser.cxx index b1365c0b4..f5ceae5b1 100644 --- a/Source/Modules/browser.cxx +++ b/Source/Modules/browser.cxx @@ -12,8 +12,6 @@ * feature that's normally disabled. * ----------------------------------------------------------------------------- */ -char cvsroot_browser_cxx[] = "$Id$"; - #include "swigmod.h" #ifdef SWIG_SWILL diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx index 88f82b647..29de9f9ed 100644 --- a/Source/Modules/cffi.cxx +++ b/Source/Modules/cffi.cxx @@ -11,8 +11,6 @@ * cffi language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_cffi_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" #include diff --git a/Source/Modules/chicken.cxx b/Source/Modules/chicken.cxx index 8ff154f82..89e583d18 100644 --- a/Source/Modules/chicken.cxx +++ b/Source/Modules/chicken.cxx @@ -11,8 +11,6 @@ * CHICKEN language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_chicken_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/clisp.cxx b/Source/Modules/clisp.cxx index 7bfb6298c..4290b5452 100644 --- a/Source/Modules/clisp.cxx +++ b/Source/Modules/clisp.cxx @@ -11,8 +11,6 @@ * clisp language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_clisp_cxx[] = "$Id$"; - #include "swigmod.h" static const char *usage = (char *) "\ diff --git a/Source/Modules/contract.cxx b/Source/Modules/contract.cxx index 4240945b0..5fa5bcad5 100644 --- a/Source/Modules/contract.cxx +++ b/Source/Modules/contract.cxx @@ -11,8 +11,6 @@ * Support for Wrap by Contract in SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_contract_cxx[] = "$Id$"; - #include "swigmod.h" /* Contract structure. This holds rules about the different kinds of contract sections diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index c31d070be..88cd679b9 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -11,8 +11,6 @@ * C# language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_csharp_cxx[] = "$Id$"; - #include "swigmod.h" #include // for INT_MAX #include "cparse.h" diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 3fffd8e33..88c3ccfff 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -11,8 +11,6 @@ * D language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_d_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" #include diff --git a/Source/Modules/directors.cxx b/Source/Modules/directors.cxx index 4b23a52bb..4cb38d0aa 100644 --- a/Source/Modules/directors.cxx +++ b/Source/Modules/directors.cxx @@ -13,8 +13,6 @@ * in SWIG. --MR * ----------------------------------------------------------------------------- */ -char cvsroot_directors_cxx[] = "$Id"; - #include "swigmod.h" /* Swig_csuperclass_call() diff --git a/Source/Modules/emit.cxx b/Source/Modules/emit.cxx index c16eaac0f..7c2607fc8 100644 --- a/Source/Modules/emit.cxx +++ b/Source/Modules/emit.cxx @@ -11,8 +11,6 @@ * Useful functions for emitting various pieces of code. * ----------------------------------------------------------------------------- */ -char cvsroot_emit_cxx[] = "$Id$"; - #include "swigmod.h" /* ----------------------------------------------------------------------------- diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx index 9784ba125..fa706cb62 100644 --- a/Source/Modules/go.cxx +++ b/Source/Modules/go.cxx @@ -7,8 +7,6 @@ * Go language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_go_cxx[] = "$Id"; - #include "swigmod.h" #include "cparse.h" #include diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 0777b316f..211b11baf 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -11,8 +11,6 @@ * Guile language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_guile_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b4703bd3e..57ac7ca52 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -11,8 +11,6 @@ * Java language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_java_cxx[] = "$Id$"; - #include "swigmod.h" #include // for INT_MAX #include "cparse.h" diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index dc21d7f96..4f1657825 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -11,8 +11,6 @@ * Language base class functions. Default C++ handling is also implemented here. * ----------------------------------------------------------------------------- */ -char cvsroot_lang_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" #include diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index 34763290f..cfb3a3f5b 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -44,8 +44,6 @@ Added support for embedded Lua. Try swig -lua -help for more information */ -char cvsroot_lua_cxx[] = "$Id$"; - #include "swigmod.h" /**** Diagnostics: diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index d2876c16f..d1f3ab274 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -11,8 +11,6 @@ * Main entry point to the SWIG core. * ----------------------------------------------------------------------------- */ -char cvsroot_main_cxx[] = "$Id$"; - #include "swigconfig.h" #if defined(_WIN32) diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index f7b60825d..ffb172f8f 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -11,8 +11,6 @@ * Modula3 language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_modula3_cxx[] = "$Id$"; - /* Text formatted with indent -sob -br -ce -nut -npsl diff --git a/Source/Modules/module.cxx b/Source/Modules/module.cxx index f4ab560dd..aa48689ab 100644 --- a/Source/Modules/module.cxx +++ b/Source/Modules/module.cxx @@ -11,8 +11,6 @@ * This file is responsible for the module system. * ----------------------------------------------------------------------------- */ -char cvsroot_module_cxx[] = "$Id$"; - #include "swigmod.h" struct Module { diff --git a/Source/Modules/mzscheme.cxx b/Source/Modules/mzscheme.cxx index e2f44deef..a147dd9c4 100644 --- a/Source/Modules/mzscheme.cxx +++ b/Source/Modules/mzscheme.cxx @@ -11,8 +11,6 @@ * Mzscheme language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_mzscheme_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index beac03237..34c8975c5 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -11,8 +11,6 @@ * Ocaml language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_ocaml_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 5758e38c3..5584176a1 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -11,8 +11,6 @@ * Octave language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_octave_cxx[] = "$Id$"; - #include "swigmod.h" static String *global_name = 0; diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx index 6a574fdbe..0112d2d9e 100644 --- a/Source/Modules/overload.cxx +++ b/Source/Modules/overload.cxx @@ -13,8 +13,6 @@ * building a dispatch function. * ----------------------------------------------------------------------------- */ -char cvsroot_overload_cxx[] = "$Id$"; - #include "swigmod.h" #define MAX_OVERLOAD 4096 diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index f786a7607..7147e67c1 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -11,8 +11,6 @@ * Perl5 language module for SWIG. * ------------------------------------------------------------------------- */ -char cvsroot_perl5_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" static int treduce = SWIG_cparse_template_reduce(0); diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 9b68d072c..292f979ba 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -37,8 +37,6 @@ * (may need to add more WARN_PHP_xxx codes...) */ -char cvsroot_php_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/pike.cxx b/Source/Modules/pike.cxx index 6749989f2..cdbddc15d 100644 --- a/Source/Modules/pike.cxx +++ b/Source/Modules/pike.cxx @@ -29,8 +29,6 @@ * */ -char cvsroot_pike_cxx[] = "$Id$"; - #include "swigmod.h" #include // for isalnum() diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index bd897636f..280a36923 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -11,8 +11,6 @@ * Python language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_python_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx index 4724ca3a7..8b3bc20bb 100644 --- a/Source/Modules/r.cxx +++ b/Source/Modules/r.cxx @@ -11,8 +11,6 @@ * R language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_r_cxx[] = "$Id$"; - #include "swigmod.h" static const double DEFAULT_NUMBER = .0000123456712312312323; diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index ff8d70d46..eaec0e185 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -11,8 +11,6 @@ * Ruby language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_ruby_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" static int treduce = SWIG_cparse_template_reduce(0); diff --git a/Source/Modules/s-exp.cxx b/Source/Modules/s-exp.cxx index 2c9a0cc99..fe3b1facc 100644 --- a/Source/Modules/s-exp.cxx +++ b/Source/Modules/s-exp.cxx @@ -11,8 +11,6 @@ * A parse tree represented as Lisp s-expressions. * ----------------------------------------------------------------------------- */ -char cvsroot_s_exp_cxx[] = "$Id$"; - #include "swigmod.h" #include "dohint.h" diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx index 01ab1b79f..7c9cded70 100644 --- a/Source/Modules/swigmain.cxx +++ b/Source/Modules/swigmain.cxx @@ -16,8 +16,6 @@ * to SWIG, you would modify this file. * ----------------------------------------------------------------------------- */ -char cvsroot_swigmain_cxx[] = "$Id$"; - #include "swigmod.h" #include diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 91e74f4ca..9ef1b8706 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -11,8 +11,6 @@ * Tcl8 language module for SWIG. * ----------------------------------------------------------------------------- */ -char cvsroot_tcl8_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" static int treduce = SWIG_cparse_template_reduce(0); diff --git a/Source/Modules/typepass.cxx b/Source/Modules/typepass.cxx index cda56aecf..2346c94e1 100644 --- a/Source/Modules/typepass.cxx +++ b/Source/Modules/typepass.cxx @@ -16,8 +16,6 @@ * and other information needed for compilation. * ----------------------------------------------------------------------------- */ -char cvsroot_typepass_cxx[] = "$Id$"; - #include "swigmod.h" #include "cparse.h" diff --git a/Source/Modules/uffi.cxx b/Source/Modules/uffi.cxx index 3b9a0abaa..b0136a361 100644 --- a/Source/Modules/uffi.cxx +++ b/Source/Modules/uffi.cxx @@ -13,8 +13,6 @@ // TODO: remove remnants of lisptype -char cvsroot_uffi_cxx[] = "$Id$"; - #include "swigmod.h" static const char *usage = (char *) "\ diff --git a/Source/Modules/utils.cxx b/Source/Modules/utils.cxx index 6e868eec7..a91ebe098 100644 --- a/Source/Modules/utils.cxx +++ b/Source/Modules/utils.cxx @@ -11,8 +11,6 @@ * Various utility functions. * ----------------------------------------------------------------------------- */ -char cvsroot_utils_cxx[] = "$Id$"; - #include int is_public(Node *n) { diff --git a/Source/Modules/xml.cxx b/Source/Modules/xml.cxx index 4bd524815..45b7f7a89 100644 --- a/Source/Modules/xml.cxx +++ b/Source/Modules/xml.cxx @@ -11,8 +11,6 @@ * An Xml parse tree generator. * ----------------------------------------------------------------------------- */ -char cvsroot_xml_cxx[] = "$Id$"; - #include "swigmod.h" static const char *usage = "\ diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index c16fbe7e5..baadf7132 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -17,8 +17,6 @@ * - Lines beginning with %# are stripped down to #... and passed through. * ----------------------------------------------------------------------------- */ -char cvsroot_cpp_c[] = "$Id$"; - #include "swig.h" #include "preprocessor.h" #include diff --git a/Source/Preprocessor/expr.c b/Source/Preprocessor/expr.c index b32665d4a..6d22c8c5e 100644 --- a/Source/Preprocessor/expr.c +++ b/Source/Preprocessor/expr.c @@ -12,8 +12,6 @@ * encountered during preprocessing. * ----------------------------------------------------------------------------- */ -char cvsroot_expr_c[] = "$Id$"; - #include "swig.h" #include "preprocessor.h" diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 38787fc63..8cd48e94e 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -12,8 +12,6 @@ * the naming of local variables, calling conventions, and so forth. * ----------------------------------------------------------------------------- */ -char cvsroot_cwrap_c[] = "$Id$"; - #include "swig.h" extern int cparse_cplusplus; diff --git a/Source/Swig/deprecate.c b/Source/Swig/deprecate.c index ead4d5bd6..08dc06a66 100644 --- a/Source/Swig/deprecate.c +++ b/Source/Swig/deprecate.c @@ -13,8 +13,6 @@ * that the function and/or API needs to be changed in some future release. * ----------------------------------------------------------------------------- */ -char cvsroot_deprecate_c[] = "$Id: parms.c 9630 2007-01-02 21:17:19Z beazley $"; - #include "swig.h" /* --------------------------------------------------------------------- diff --git a/Source/Swig/error.c b/Source/Swig/error.c index 5dfcf605b..2c93cfb21 100644 --- a/Source/Swig/error.c +++ b/Source/Swig/error.c @@ -12,8 +12,6 @@ * error messages. * ----------------------------------------------------------------------------- */ -char cvsroot_error_c[] = "$Id$"; - #include "swig.h" #include #include diff --git a/Source/Swig/fragment.c b/Source/Swig/fragment.c index 4a3fea5a2..15f701ae4 100644 --- a/Source/Swig/fragment.c +++ b/Source/Swig/fragment.c @@ -16,8 +16,6 @@ * wrapper code and to generate cleaner wrapper files. * ----------------------------------------------------------------------------- */ -char cvsroot_fragment_c[] = "$Id$"; - #include "swig.h" #include "swigwarn.h" diff --git a/Source/Swig/getopt.c b/Source/Swig/getopt.c index f6f196bfd..74076a5f0 100644 --- a/Source/Swig/getopt.c +++ b/Source/Swig/getopt.c @@ -20,8 +20,6 @@ * Should have cleaner error handling in general. * ----------------------------------------------------------------------------- */ -char cvsroot_getopt_c[] = "$Id$"; - #include "swig.h" static char **args; diff --git a/Source/Swig/include.c b/Source/Swig/include.c index 5796416a4..13afb21ae 100644 --- a/Source/Swig/include.c +++ b/Source/Swig/include.c @@ -13,8 +13,6 @@ * are provided. * ----------------------------------------------------------------------------- */ -char cvsroot_include_c[] = "$Id$"; - #include "swig.h" static List *directories = 0; /* List of include directories */ diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index ca471b72a..05dd0c480 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -11,8 +11,6 @@ * Miscellaneous functions that don't really fit anywhere else. * ----------------------------------------------------------------------------- */ -char cvsroot_misc_c[] = "$Id$"; - #include "swig.h" #include #include diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index e96dbd14e..a4bff35af 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -20,8 +20,6 @@ * %v - variable name is substituted * ----------------------------------------------------------------------------- */ -char cvsroot_naming_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" #include diff --git a/Source/Swig/parms.c b/Source/Swig/parms.c index 0f4d17b73..bec1e63fa 100644 --- a/Source/Swig/parms.c +++ b/Source/Swig/parms.c @@ -11,8 +11,6 @@ * Parameter list class. * ----------------------------------------------------------------------------- */ -char cvsroot_parms_c[] = "$Id$"; - #include "swig.h" /* ------------------------------------------------------------------------ diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 8c4bf26a2..52e21dc0a 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -14,8 +14,6 @@ * to easily construct yacc-compatible scanners. * ----------------------------------------------------------------------------- */ -char cvsroot_scanner_c[] = "$Id$"; - #include "swig.h" #include diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 5b9708b9a..8dc189725 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -12,8 +12,6 @@ * the form of simple strings. * ----------------------------------------------------------------------------- */ -char cvsroot_stype_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" #include diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c index 6b54eac08..e77f818de 100644 --- a/Source/Swig/symbol.c +++ b/Source/Swig/symbol.c @@ -11,8 +11,6 @@ * This file implements the SWIG symbol table. See details below. * ----------------------------------------------------------------------------- */ -char cvsroot_symbol_c[] = "$Id$"; - #include "swig.h" #include "swigwarn.h" #include diff --git a/Source/Swig/tree.c b/Source/Swig/tree.c index b5c9d26dc..784d3ab84 100644 --- a/Source/Swig/tree.c +++ b/Source/Swig/tree.c @@ -12,8 +12,6 @@ * parse trees. * ----------------------------------------------------------------------------- */ -char cvsroot_tree_c[] = "$Id$"; - #include "swig.h" #include #include diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c index 2570e8090..a607e92b8 100644 --- a/Source/Swig/typemap.c +++ b/Source/Swig/typemap.c @@ -11,8 +11,6 @@ * A somewhat generalized implementation of SWIG1.1 typemaps. * ----------------------------------------------------------------------------- */ -char cvsroot_typemap_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" #include diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 2e8d08f10..20caa9ec9 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -14,8 +14,6 @@ * like typedef, namespaces, etc. * ----------------------------------------------------------------------------- */ -char cvsroot_typeobj_c[] = "$Id$"; - #include "swig.h" #include diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 76d84c960..d12d70543 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -14,8 +14,6 @@ * run-time type checker is also handled here. * ----------------------------------------------------------------------------- */ -char cvsroot_typesys_c[] = "$Id$"; - #include "swig.h" #include "cparse.h" diff --git a/Source/Swig/wrapfunc.c b/Source/Swig/wrapfunc.c index 2c9f7c86a..29a59cc49 100644 --- a/Source/Swig/wrapfunc.c +++ b/Source/Swig/wrapfunc.c @@ -13,8 +13,6 @@ * to be created in a piecemeal manner. * ----------------------------------------------------------------------------- */ -char cvsroot_wrapfunc_c[] = "$Id$"; - #include "swig.h" #include From a6d456a15eb509719aece348c5717f76c68b9e71 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 01:24:22 +0000 Subject: [PATCH 299/538] Replace references to Subversion with Git --- Doc/Devel/engineering.html | 28 +++++++++------------------- Doc/Manual/Preface.html | 2 +- Lib/python/pyname_compat.i | 4 ++-- Makefile.in | 4 ++-- swig.spec.in | 4 ++-- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/Doc/Devel/engineering.html b/Doc/Devel/engineering.html index 2e78fbe35..c12eb1328 100644 --- a/Doc/Devel/engineering.html +++ b/Doc/Devel/engineering.html @@ -25,7 +25,7 @@
  • 8. Naming Conventions
  • 9. Visibility
  • 10. Miscellaneous Coding Guidelines -
  • 11. SVN Tagging Conventions +
  • 11. Git Tagging Conventions @@ -119,8 +119,8 @@ are case-insensitive on Windows so this convention will prevent you from inadver creating two files that differ in case-only.

    -Each file should include a short abstract, license information and -a SVN revision tag like this: +Each file should include a short abstract and license information +like this: 

    @@ -137,8 +137,6 @@ a SVN revision tag like this:
  * This file defines ...
  * ----------------------------------------------------------------------------- */
 
-static char cvs[] = "$Id$";
-
 #include "swig.h"
 
 /* Declarations */
@@ -159,12 +157,6 @@ static int  avariable;
    -The SVN revision tag should be placed into a static string as shown -above mangled with the name of the file. -This adds the revision information to the SWIG executable and -makes it possible to extract version information from a raw binary -(sometimes useful in debugging). -

    As a general rule, files start to get unmanageable once they exceed about 2000 lines. Files larger than this should be broken up into @@ -379,10 +371,10 @@ making your changes. These are largely covered in the main documentation in the Extending.html file. -

    11. SVN Tagging Conventions

    +

    11. Git Tagging Conventions

     -Use svn tag to declare some set of file revisions as related in some +Use git tag to declare some set of file revisions as related in some symbolic way. This eases reference, retrieval and manipulation of these files later. At the moment (2001/01/16 14:02:53), the conventions are very simple; let's hope they stay that way! @@ -390,10 +382,10 @@ let's hope they stay that way!

    There are two types of tags, internal (aka personal) and external. Internal tags are used by SWIG developers primarily, whereas external -tags are used when communicating with people w/ anonymous svn access. +tags are used when communicating with people w/ anonymous git access.

    • Internal tags should start with the developer name and a hyphen. -
    • External tags should start with "v-". +
    • External tags should start with "rel-".
    That's all there is to it. Some example tags: @@ -402,10 +394,8 @@ That's all there is to it. Some example tags:
  • ttn-pre-xml-patch
  • ttn-post-xml-patch
  • ttn-going-on-vacation-so-dutifully-tagging-now -
  • v-1-3-a37-fixes-bug-2432 -
  • v-1-3-a37-fixes-bug-2433 -
  • v-1-3-a37-fixes-bug-2432-again -
  • v-1-3-a37-release +
  • rel-1.3.40 +
  • rel-2.0.9
    diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html index 58ab9dcb5..e1fcfbbd8 100644 --- a/Doc/Manual/Preface.html +++ b/Doc/Manual/Preface.html @@ -93,7 +93,7 @@ SWIG along with information about beta releases and future work.

    -Subversion access to the latest version of SWIG is also available. More information +Git and Subversion access to the latest version of SWIG is also available. More information about this can be obtained at:

    diff --git a/Lib/python/pyname_compat.i b/Lib/python/pyname_compat.i index b5acca955..4026805ba 100644 --- a/Lib/python/pyname_compat.i +++ b/Lib/python/pyname_compat.i @@ -20,8 +20,8 @@ * However, this file may be removed in future release of SWIG, so using this file to * keep these inappropriate names in your SWIG interface file is also not recommended. * Instead, we provide a simple tool for converting your interface files to -* the new naming convention. You can download the tool here: -* https://swig.svn.sourceforge.net/svnroot/swig/trunk/Tools/pyname_patch.py +* the new naming convention. You can get the tool from the SWIG distribution: +* Tools/pyname_patch.py */ %fragment("PySequence_Base", "header", fragment="SwigPySequence_Base") {} diff --git a/Makefile.in b/Makefile.in index d3c4b8c47..c6259916b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -494,7 +494,7 @@ dist: srcrpm: rm -fr $(srpm) $(srpm).src.rpm - echo "TODO: update to use svn instead of cvs" + echo "TODO: update to use git instead of cvs" cvs export -d $(srpm) -r HEAD SWIG cp swig.spec $(srpm) tar -cf - $(srpm) | gzip --best > $(srpm).tar.gz @@ -503,7 +503,7 @@ srcrpm: # Update the autoconf files for detecting host/targets. Automake will do this in # version 1.10 for our case of not having a top level Makefile.am. Until then we -# can fetch them manually and will have to commit them to SVN. +# can fetch them manually and will have to commit them to Git. configfiles: wget ftp://ftp.gnu.org/pub/gnu/config/config.guess -O Tools/config/config.guess chmod a+x Tools/config/config.guess diff --git a/swig.spec.in b/swig.spec.in index 0f64235fb..9229274c2 100644 --- a/swig.spec.in +++ b/swig.spec.in @@ -1,4 +1,4 @@ -# You can build the package from SVN using something like: +# You can build the package from Git using something like: # tar -czf swig-@PACKAGE_VERSION@.tar.gz swig-@PACKAGE_VERSION@ && rpmbuild -tb swig-@PACKAGE_VERSION@.tar.gz # @configure_input@ @@ -36,7 +36,7 @@ its parse tree in the form of XML and Lisp s-expressions. %setup -q -n %{name}-%{version} %build -# so we can build package from SVN source too +# so we can build package from Git source too [ ! -r configure ] && ./autogen.sh %configure make From bd67f57921245470317e54403d78922d4d8258d1 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 16:54:37 +0000 Subject: [PATCH 300/538] Convert to unix fileformat --- Lib/intrusive_ptr.i | 164 +++--- Lib/java/boost_intrusive_ptr.i | 946 ++++++++++++++++----------------- 2 files changed, 555 insertions(+), 555 deletions(-) diff --git a/Lib/intrusive_ptr.i b/Lib/intrusive_ptr.i index eed750c79..ceaeaf0bb 100644 --- a/Lib/intrusive_ptr.i +++ b/Lib/intrusive_ptr.i @@ -1,82 +1,82 @@ -// Allow for different namespaces for shared_ptr / intrusive_ptr - they could be boost or std or std::tr1 -// For example for std::tr1, use: -// #define SWIG_SHARED_PTR_NAMESPACE std -// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 -// #define SWIG_INTRUSIVE_PTR_NAMESPACE boost -// #define SWIG_INTRUSIVE_PTR_SUBNAMESPACE - -#if !defined(SWIG_INTRUSIVE_PTR_NAMESPACE) -# define SWIG_INTRUSIVE_PTR_NAMESPACE boost -#endif - -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) -# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE::SWIG_INTRUSIVE_PTR_SUBNAMESPACE -#else -# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE -#endif - -namespace SWIG_INTRUSIVE_PTR_NAMESPACE { -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) - namespace SWIG_INTRUSIVE_PTR_SUBNAMESPACE { -#endif - template class intrusive_ptr { - }; -#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) - } -#endif -} - -%fragment("SWIG_intrusive_deleter", "header") { -template struct SWIG_intrusive_deleter { - void operator()(T *p) { - if (p) - intrusive_ptr_release(p); - } -}; -} - -%fragment("SWIG_null_deleter", "header") { -struct SWIG_null_deleter { - void operator() (void const *) const { - } -}; -%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter() -%#define SWIG_NO_NULL_DELETER_1 -} - -// Workaround empty first macro argument bug -#define SWIGEMPTYHACK -// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types -%define %intrusive_ptr(TYPE...) -%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } -SWIG_INTRUSIVE_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS(const, TYPE) -%enddef - -%define %intrusive_ptr_no_wrap(TYPE...) -%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(SWIGEMPTYHACK, TYPE) -SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(const, TYPE) -%enddef - -// Legacy macros -%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...) -#warning "SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead." -%intrusive_ptr(TYPE) -%enddef - -%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) -#warning "SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead." -%intrusive_ptr(TYPE) -%enddef - -%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...) -#warning "SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead." -%intrusive_ptr_no_wrap(TYPE) -%enddef - -%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...) -#warning "SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead." -%intrusive_ptr_no_wrap(TYPE) -%enddef - +// Allow for different namespaces for shared_ptr / intrusive_ptr - they could be boost or std or std::tr1 +// For example for std::tr1, use: +// #define SWIG_SHARED_PTR_NAMESPACE std +// #define SWIG_SHARED_PTR_SUBNAMESPACE tr1 +// #define SWIG_INTRUSIVE_PTR_NAMESPACE boost +// #define SWIG_INTRUSIVE_PTR_SUBNAMESPACE + +#if !defined(SWIG_INTRUSIVE_PTR_NAMESPACE) +# define SWIG_INTRUSIVE_PTR_NAMESPACE boost +#endif + +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) +# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE::SWIG_INTRUSIVE_PTR_SUBNAMESPACE +#else +# define SWIG_INTRUSIVE_PTR_QNAMESPACE SWIG_INTRUSIVE_PTR_NAMESPACE +#endif + +namespace SWIG_INTRUSIVE_PTR_NAMESPACE { +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) + namespace SWIG_INTRUSIVE_PTR_SUBNAMESPACE { +#endif + template class intrusive_ptr { + }; +#if defined(SWIG_INTRUSIVE_PTR_SUBNAMESPACE) + } +#endif +} + +%fragment("SWIG_intrusive_deleter", "header") { +template struct SWIG_intrusive_deleter { + void operator()(T *p) { + if (p) + intrusive_ptr_release(p); + } +}; +} + +%fragment("SWIG_null_deleter", "header") { +struct SWIG_null_deleter { + void operator() (void const *) const { + } +}; +%#define SWIG_NO_NULL_DELETER_0 , SWIG_null_deleter() +%#define SWIG_NO_NULL_DELETER_1 +} + +// Workaround empty first macro argument bug +#define SWIGEMPTYHACK +// Main user macro for defining intrusive_ptr typemaps for both const and non-const pointer types +%define %intrusive_ptr(TYPE...) +%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } +SWIG_INTRUSIVE_PTR_TYPEMAPS(SWIGEMPTYHACK, TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS(const, TYPE) +%enddef + +%define %intrusive_ptr_no_wrap(TYPE...) +%feature("smartptr", noblock=1) TYPE { SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > } +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(SWIGEMPTYHACK, TYPE) +SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(const, TYPE) +%enddef + +// Legacy macros +%define SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE...) +#warning "SWIG_INTRUSIVE_PTR(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead." +%intrusive_ptr(TYPE) +%enddef + +%define SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE...) +#warning "SWIG_INTRUSIVE_PTR_DERIVED(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr(TYPE) instead." +%intrusive_ptr(TYPE) +%enddef + +%define SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE...) +#warning "SWIG_INTRUSIVE_PTR_NO_WRAP(PROXYCLASS, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead." +%intrusive_ptr_no_wrap(TYPE) +%enddef + +%define SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE...) +#warning "SWIG_INTRUSIVE_PTR_DERIVED_NO_WRAP(PROXYCLASS, BASECLASSTYPE, TYPE) is deprecated. Please use %intrusive_ptr_no_wrap(TYPE) instead." +%intrusive_ptr_no_wrap(TYPE) +%enddef + diff --git a/Lib/java/boost_intrusive_ptr.i b/Lib/java/boost_intrusive_ptr.i index 3ae3ed886..f9525894f 100644 --- a/Lib/java/boost_intrusive_ptr.i +++ b/Lib/java/boost_intrusive_ptr.i @@ -1,473 +1,473 @@ -// Users can provide their own SWIG_INTRUSIVE_PTR_TYPEMAPS or SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP macros before including this file to change the -// visibility of the constructor and getCPtr method if desired to public if using multiple modules. -#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP -#define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(protected, protected, CONST, TYPE) -#endif -#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS -#define SWIG_INTRUSIVE_PTR_TYPEMAPS(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(protected, protected, CONST, TYPE) -#endif - - -%include - -// Language specific macro implementing all the customisations for handling the smart pointer -%define SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...) - -// %naturalvar is as documented for member variables -%naturalvar TYPE; -%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; - -// destructor wrapper customisation -%feature("unref") TYPE "(void)arg1; delete smartarg1;" - -// Typemap customisations... - -%typemap(in) CONST TYPE ($&1_type argp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain value - argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; - if (!argp) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); - return $null; - } - $1 = *argp; -%} -%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{ - //plain value(out) - $1_ltype* resultp = new $1_ltype(($1_ltype &)$1); - intrusive_ptr_add_ref(resultp); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >()); -%} - -%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain pointer - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; - $1 = (TYPE *)(smartarg ? smartarg->get() : 0); -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{ - //plain pointer(out) - #if ($owner) - if ($1) { - intrusive_ptr_add_ref($1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; - #endif -%} - -%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain reference - $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if(!$1) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); - return $null; - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{ - //plain reference(out) - #if ($owner) - if ($1) { - intrusive_ptr_add_ref($1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; - #endif -%} - -%typemap(in) TYPE *CONST& ($*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - // plain pointer by reference - temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - $1 = &temp; -%} -%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") TYPE *CONST& %{ - // plain pointer by reference(out) - #if ($owner) - if (*$1) { - intrusive_ptr_add_ref(*$1); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - #else - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0); - #endif -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by value - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - if (smartarg) { - $1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{ - if ($1) { - intrusive_ptr_add_ref(result.get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(result.get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ - // shared_ptr by value - smartarg = *($&1_ltype*)&$input; - if (smartarg) $1 = *smartarg; -%} -%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ - *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by reference - if ( $input ) { - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - $1 = &temp; - } else { - $1 = &tempnull; - } -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ - delete &($1); - if ($self) { - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); - $1 = *temp; - } -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ - if (*$1) { - intrusive_ptr_add_ref($1->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by pointer - if ( $input ) { - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - $1 = &temp; - } else { - $1 = &tempnull; - } -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ - delete $1; - if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ - if ($1 && *$1) { - intrusive_ptr_add_ref($1->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } - if ($owner) delete $1; -%} - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ - // intrusive_ptr by pointer reference - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; - if ($input) { - temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); - } - tempp = &temp; - $1 = &tempp; -%} -%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ - if ($self) $1 = *$input; -%} -%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ - if (*$1 && **$1) { - intrusive_ptr_add_ref((*$1)->get()); - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >()); - } else { - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; - } -%} - -// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug -%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} -%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} - - -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, - SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, - SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)" - -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } - - -%typemap(javaout) CONST TYPE { - return new $typemap(jstype, TYPE)($jnicall, true); - } -%typemap(javaout) CONST TYPE & { - return new $typemap(jstype, TYPE)($jnicall, true); - } -%typemap(javaout) CONST TYPE * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) TYPE *CONST& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } - -// Base proxy classes -%typemap(javabody) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnBase; - - PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; - swigCPtr = cPtr; - } - - CPTR_VISIBILITY static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -// Derived proxy classes -%typemap(javabody_derived) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnDerived; - - PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true); - swigCMemOwnDerived = cMemoryOwn; - swigCPtr = cPtr; - } - - CPTR_VISIBILITY static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; - } - swigCPtr = 0; - } - -%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if(swigCPtr != 0 && swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; - } - swigCPtr = 0; - super.delete(); - } - -// CONST version needed ???? also for C# -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" - - -%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; -%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; -%enddef - - -///////////////////////////////////////////////////////////////////// - - -%include - -%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...) - -%naturalvar TYPE; -%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; - -// destructor mods -%feature("unref") TYPE "(void)arg1; delete smartarg1;" - - -// plain value -%typemap(in) CONST TYPE ($&1_type argp = 0) %{ - argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; - if (!argp) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); - return $null; - } - $1 = *argp; %} -%typemap(out) CONST TYPE -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %} - -// plain pointer -%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ - smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; - $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %} -%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{ - *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0; -%} - -// plain reference -%typemap(in) CONST TYPE & %{ - $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - if (!$1) { - SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); - return $null; - } %} -%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %} - -// plain pointer by reference -%typemap(in) TYPE *CONST& ($*1_ltype temp = 0) -%{ temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); - $1 = &temp; %} -%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& -%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %} - -%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ - // shared_ptr by value - smartarg = *($&1_ltype*)&$input; - if (smartarg) $1 = *smartarg; -%} -%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ - *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; -%} - -// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug -%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} -%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ -#error "typemaps for $1_type not available" -%} - - -%typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong" -%typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long" -%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE)" -%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE).getCPtr($javainput)" -%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } - -%typemap(javaout) CONST TYPE { - return new $typemap(jstype, TYPE)($jnicall, true); - } -%typemap(javaout) CONST TYPE & { - return new $typemap(jstype, TYPE)($jnicall, true); - } -%typemap(javaout) CONST TYPE * { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } -%typemap(javaout) TYPE *CONST& { - long cPtr = $jnicall; - return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); - } - -// Base proxy classes -%typemap(javabody) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnBase; - - PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - swigCMemOwnBase = cMemoryOwn; - swigCPtr = cPtr; - } - - CPTR_VISIBILITY static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -// Derived proxy classes -%typemap(javabody_derived) TYPE %{ - private long swigCPtr; - private boolean swigCMemOwnDerived; - - PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { - super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true); - swigCMemOwnDerived = cMemoryOwn; - swigCPtr = cPtr; - } - - CPTR_VISIBILITY static long getCPtr($javaclassname obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } -%} - -%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnBase) { - swigCMemOwnBase = false; - $jnicall; - } - swigCPtr = 0; - } - } - -%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { - if (swigCPtr != 0) { - if (swigCMemOwnDerived) { - swigCMemOwnDerived = false; - $jnicall; - } - swigCPtr = 0; - } - super.delete(); - } - -// CONST version needed ???? also for C# -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" -%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" - - -%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; -%enddef - +// Users can provide their own SWIG_INTRUSIVE_PTR_TYPEMAPS or SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP macros before including this file to change the +// visibility of the constructor and getCPtr method if desired to public if using multiple modules. +#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP +#define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(protected, protected, CONST, TYPE) +#endif +#ifndef SWIG_INTRUSIVE_PTR_TYPEMAPS +#define SWIG_INTRUSIVE_PTR_TYPEMAPS(CONST, TYPE...) SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(protected, protected, CONST, TYPE) +#endif + + +%include + +// Language specific macro implementing all the customisations for handling the smart pointer +%define SWIG_INTRUSIVE_PTR_TYPEMAPS_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...) + +// %naturalvar is as documented for member variables +%naturalvar TYPE; +%naturalvar SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; + +// destructor wrapper customisation +%feature("unref") TYPE "(void)arg1; delete smartarg1;" + +// Typemap customisations... + +%typemap(in) CONST TYPE ($&1_type argp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain value + argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; + if (!argp) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); + return $null; + } + $1 = *argp; +%} +%typemap(out, fragment="SWIG_intrusive_deleter") CONST TYPE %{ + //plain value(out) + $1_ltype* resultp = new $1_ltype(($1_ltype &)$1); + intrusive_ptr_add_ref(resultp); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(resultp, SWIG_intrusive_deleter< CONST TYPE >()); +%} + +%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain pointer + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; + $1 = (TYPE *)(smartarg ? smartarg->get() : 0); +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE * %{ + //plain pointer(out) + #if ($owner) + if ($1) { + intrusive_ptr_add_ref($1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; + #endif +%} + +%typemap(in) CONST TYPE & (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain reference + $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + if(!$1) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); + return $null; + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") CONST TYPE & %{ + //plain reference(out) + #if ($owner) + if ($1) { + intrusive_ptr_add_ref($1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_0) : 0; + #endif +%} + +%typemap(in) TYPE *CONST& ($*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + // plain pointer by reference + temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + $1 = &temp; +%} +%typemap(out, fragment="SWIG_intrusive_deleter,SWIG_null_deleter") TYPE *CONST& %{ + // plain pointer by reference(out) + #if ($owner) + if (*$1) { + intrusive_ptr_add_ref(*$1); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1, SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + #else + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_0); + #endif +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > ($&1_type argp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by value + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + if (smartarg) { + $1 = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > %{ + if ($1) { + intrusive_ptr_add_ref(result.get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(result.get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ + // shared_ptr by value + smartarg = *($&1_ltype*)&$input; + if (smartarg) $1 = *smartarg; +%} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ + *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by reference + if ( $input ) { + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + $1 = &temp; + } else { + $1 = &tempnull; + } +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ + delete &($1); + if ($self) { + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * temp = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); + $1 = *temp; + } +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & %{ + if (*$1) { + intrusive_ptr_add_ref($1->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * ($*1_ltype tempnull, $*1_ltype temp, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by pointer + if ( $input ) { + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + $1 = &temp; + } else { + $1 = &tempnull; + } +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ + delete $1; + if ($self) $1 = new SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(*$input); +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * %{ + if ($1 && *$1) { + intrusive_ptr_add_ref($1->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } + if ($owner) delete $1; +%} + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& (SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > temp, $*1_ltype tempp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * smartarg) %{ + // intrusive_ptr by pointer reference + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >**)&$input; + if ($input) { + temp = SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >(smartarg->get(), true); + } + tempp = &temp; + $1 = &tempp; +%} +%typemap(memberin) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ + if ($self) $1 = *$input; +%} +%typemap(out, fragment="SWIG_intrusive_deleter") SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& %{ + if (*$1 && **$1) { + intrusive_ptr_add_ref((*$1)->get()); + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >((*$1)->get(), SWIG_intrusive_deleter< CONST TYPE >()); + } else { + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = 0; + } +%} + +// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug +%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} +%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} + + +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE)" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >, + SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > &, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *, + SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& "$typemap(jstype, TYPE).getCPtr($javainput)" + +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > & { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE > *& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } + + +%typemap(javaout) CONST TYPE { + return new $typemap(jstype, TYPE)($jnicall, true); + } +%typemap(javaout) CONST TYPE & { + return new $typemap(jstype, TYPE)($jnicall, true); + } +%typemap(javaout) CONST TYPE * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) TYPE *CONST& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } + +// Base proxy classes +%typemap(javabody) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnBase; + + PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { + swigCMemOwnBase = cMemoryOwn; + swigCPtr = cPtr; + } + + CPTR_VISIBILITY static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +// Derived proxy classes +%typemap(javabody_derived) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnDerived; + + PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { + super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true); + swigCMemOwnDerived = cMemoryOwn; + swigCPtr = cPtr; + } + + CPTR_VISIBILITY static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { + if(swigCPtr != 0 && swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; + } + swigCPtr = 0; + } + +%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { + if(swigCPtr != 0 && swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; + } + swigCPtr = 0; + super.delete(); + } + +// CONST version needed ???? also for C# +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" + + +%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; +%template() SWIG_INTRUSIVE_PTR_QNAMESPACE::intrusive_ptr< CONST TYPE >; +%enddef + + +///////////////////////////////////////////////////////////////////// + + +%include + +%define SWIG_INTRUSIVE_PTR_TYPEMAPS_NO_WRAP_IMPLEMENTATION(PTRCTOR_VISIBILITY, CPTR_VISIBILITY, CONST, TYPE...) + +%naturalvar TYPE; +%naturalvar SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; + +// destructor mods +%feature("unref") TYPE "(void)arg1; delete smartarg1;" + + +// plain value +%typemap(in) CONST TYPE ($&1_type argp = 0) %{ + argp = (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0; + if (!argp) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "Attempt to dereference null $1_type"); + return $null; + } + $1 = *argp; %} +%typemap(out) CONST TYPE +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(new $1_ltype(($1_ltype &)$1)); %} + +// plain pointer +%typemap(in) CONST TYPE * (SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) %{ + smartarg = *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input; + $1 = (TYPE *)(smartarg ? smartarg->get() : 0); %} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE * %{ + *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = $1 ? new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner) : 0; +%} + +// plain reference +%typemap(in) CONST TYPE & %{ + $1 = ($1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + if (!$1) { + SWIG_JavaThrowException(jenv, SWIG_JavaNullPointerException, "$1_type reference is null"); + return $null; + } %} +%typemap(out, fragment="SWIG_null_deleter") CONST TYPE & +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >($1 SWIG_NO_NULL_DELETER_$owner); %} + +// plain pointer by reference +%typemap(in) TYPE *CONST& ($*1_ltype temp = 0) +%{ temp = ($*1_ltype)((*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input) ? (*(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$input)->get() : 0); + $1 = &temp; %} +%typemap(out, fragment="SWIG_null_deleter") TYPE *CONST& +%{ *(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > **)&$result = new SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >(*$1 SWIG_NO_NULL_DELETER_$owner); %} + +%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast ($&1_type smartarg) %{ + // shared_ptr by value + smartarg = *($&1_ltype*)&$input; + if (smartarg) $1 = *smartarg; +%} +%typemap(out) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > ANY_TYPE_SWIGSharedPtrUpcast %{ + *($&1_ltype*)&$result = $1 ? new $1_ltype($1) : 0; +%} + +// various missing typemaps - If ever used (unlikely) ensure compilation error rather than runtime bug +%typemap(in) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} +%typemap(out) CONST TYPE[], CONST TYPE[ANY], CONST TYPE (CLASS::*) %{ +#error "typemaps for $1_type not available" +%} + + +%typemap (jni) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "jlong" +%typemap (jtype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "long" +%typemap (jstype) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE)" +%typemap (javain) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > "$typemap(jstype, TYPE).getCPtr($javainput)" +%typemap(javaout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } + +%typemap(javaout) CONST TYPE { + return new $typemap(jstype, TYPE)($jnicall, true); + } +%typemap(javaout) CONST TYPE & { + return new $typemap(jstype, TYPE)($jnicall, true); + } +%typemap(javaout) CONST TYPE * { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } +%typemap(javaout) TYPE *CONST& { + long cPtr = $jnicall; + return (cPtr == 0) ? null : new $typemap(jstype, TYPE)(cPtr, true); + } + +// Base proxy classes +%typemap(javabody) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnBase; + + PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { + swigCMemOwnBase = cMemoryOwn; + swigCPtr = cPtr; + } + + CPTR_VISIBILITY static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +// Derived proxy classes +%typemap(javabody_derived) TYPE %{ + private long swigCPtr; + private boolean swigCMemOwnDerived; + + PTRCTOR_VISIBILITY $javaclassname(long cPtr, boolean cMemoryOwn) { + super($imclassname.$javaclazznameSWIGSmartPtrUpcast(cPtr), true); + swigCMemOwnDerived = cMemoryOwn; + swigCPtr = cPtr; + } + + CPTR_VISIBILITY static long getCPtr($javaclassname obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +%} + +%typemap(javadestruct, methodname="delete", methodmodifiers="public synchronized") TYPE { + if (swigCPtr != 0) { + if (swigCMemOwnBase) { + swigCMemOwnBase = false; + $jnicall; + } + swigCPtr = 0; + } + } + +%typemap(javadestruct_derived, methodname="delete", methodmodifiers="public synchronized") TYPE { + if (swigCPtr != 0) { + if (swigCMemOwnDerived) { + swigCMemOwnDerived = false; + $jnicall; + } + swigCPtr = 0; + } + super.delete(); + } + +// CONST version needed ???? also for C# +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > swigSharedPtrUpcast "long" +%typemap(jtype, nopgcpp="1") SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > swigSharedPtrUpcast "long" + + +%template() SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE >; +%enddef + From 079165abe2b10a8f10633a2e16d50006e3a1bc2e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Jan 2013 16:54:45 +0000 Subject: [PATCH 301/538] Convert to unix fileformat --- Examples/lua/arrays/Makefile | 36 +- Examples/lua/arrays/example.c | 50 +- Examples/lua/arrays/example.i | 84 +- Examples/lua/arrays/runme.lua | 148 +- Examples/lua/embed/embed.c | 170 +- Examples/lua/embed/example.c | 44 +- Examples/lua/embed2/embed2.c | 466 +++--- Examples/lua/embed2/example.c | 44 +- Examples/lua/embed3/example.i | 16 +- Examples/lua/exception/Makefile | 38 +- Examples/lua/exception/example.h | 106 +- Examples/lua/exception/example.i | 34 +- Examples/lua/exception/runme.lua | 192 +-- Examples/lua/owner/Makefile | 38 +- Examples/lua/owner/example.cxx | 138 +- Examples/lua/owner/example.h | 108 +- Examples/lua/owner/example.i | 64 +- Examples/lua/owner/runme.lua | 208 +-- .../test-suite/csharp/li_std_map_runme.cs | 492 +++--- .../java/li_boost_intrusive_ptr_runme.java | 1402 ++++++++--------- Examples/test-suite/li_boost_intrusive_ptr.i | 996 ++++++------ Examples/test-suite/lua/li_typemaps_runme.lua | 84 +- 22 files changed, 2479 insertions(+), 2479 deletions(-) diff --git a/Examples/lua/arrays/Makefile b/Examples/lua/arrays/Makefile index bb9cf0b3b..f181818a6 100644 --- a/Examples/lua/arrays/Makefile +++ b/Examples/lua/arrays/Makefile @@ -1,18 +1,18 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -SRCS = example.c -TARGET = example -INTERFACE = example.i - -all:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua - -static:: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ - TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static - -clean:: - $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +SRCS = example.c +TARGET = example +INTERFACE = example.i + +all:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua + +static:: + $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static + +clean:: + $(MAKE) -f $(TOP)/Makefile lua_clean + +check: all diff --git a/Examples/lua/arrays/example.c b/Examples/lua/arrays/example.c index 56c7b19d9..ed23738c8 100644 --- a/Examples/lua/arrays/example.c +++ b/Examples/lua/arrays/example.c @@ -1,25 +1,25 @@ -/* File : example.c */ - -#include - -/* we are using the qsort function, which needs a helper function to sort */ -int compare_int(const void * a, const void * b) -{ - return ( *(int*)a - *(int*)b ); -} - -void sort_int(int* arr, int len) -{ - qsort(arr, len, sizeof(int), compare_int); -} - -// ditto doubles -int compare_double(const void * a, const void * b) -{ - return (int)( *(double*)a - *(double*)b ); -} - -void sort_double(double* arr, int len) -{ - qsort(arr, len, sizeof(double), compare_double); -} +/* File : example.c */ + +#include + +/* we are using the qsort function, which needs a helper function to sort */ +int compare_int(const void * a, const void * b) +{ + return ( *(int*)a - *(int*)b ); +} + +void sort_int(int* arr, int len) +{ + qsort(arr, len, sizeof(int), compare_int); +} + +// ditto doubles +int compare_double(const void * a, const void * b) +{ + return (int)( *(double*)a - *(double*)b ); +} + +void sort_double(double* arr, int len) +{ + qsort(arr, len, sizeof(double), compare_double); +} diff --git a/Examples/lua/arrays/example.i b/Examples/lua/arrays/example.i index 197a5a21b..3d5b60dc6 100644 --- a/Examples/lua/arrays/example.i +++ b/Examples/lua/arrays/example.i @@ -1,42 +1,42 @@ -/* File : example.i */ -%module example - -/* in this file there are two sorting functions -and three different ways to wrap them. - -See the lua code for how they are called -*/ - -%include // array helpers - -// this declares a batch of function for manipulating C integer arrays -%array_functions(int,int) - -// this adds some lua code directly into the module -// warning: you need the example. prefix if you want it added into the module -// addmittedly this code is a bit tedious, but its a one off effort -%luacode { -function example.sort_int2(t) - local len=table.maxn(t) -- the len - local arr=example.new_int(len) - for i=1,len do - example.int_setitem(arr,i-1,t[i]) -- note: C index is one less then lua indea - end - example.sort_int(arr,len) -- call the fn - -- copy back - for i=1,len do - t[i]=example.int_getitem(arr,i-1) -- note: C index is one less then lua indea - end - example.delete_int(arr) -- must delete it -end -} - -// this way uses the SWIG-Lua typemaps to do the conversion for us -// the %apply command states to apply this wherever the argument signature matches -%include -%apply (double *INOUT,int) {(double* arr,int len)}; - -%inline %{ -extern void sort_int(int* arr, int len); -extern void sort_double(double* arr, int len); -%} \ No newline at end of file +/* File : example.i */ +%module example + +/* in this file there are two sorting functions +and three different ways to wrap them. + +See the lua code for how they are called +*/ + +%include // array helpers + +// this declares a batch of function for manipulating C integer arrays +%array_functions(int,int) + +// this adds some lua code directly into the module +// warning: you need the example. prefix if you want it added into the module +// addmittedly this code is a bit tedious, but its a one off effort +%luacode { +function example.sort_int2(t) + local len=table.maxn(t) -- the len + local arr=example.new_int(len) + for i=1,len do + example.int_setitem(arr,i-1,t[i]) -- note: C index is one less then lua indea + end + example.sort_int(arr,len) -- call the fn + -- copy back + for i=1,len do + t[i]=example.int_getitem(arr,i-1) -- note: C index is one less then lua indea + end + example.delete_int(arr) -- must delete it +end +} + +// this way uses the SWIG-Lua typemaps to do the conversion for us +// the %apply command states to apply this wherever the argument signature matches +%include +%apply (double *INOUT,int) {(double* arr,int len)}; + +%inline %{ +extern void sort_int(int* arr, int len); +extern void sort_double(double* arr, int len); +%} diff --git a/Examples/lua/arrays/runme.lua b/Examples/lua/arrays/runme.lua index b0f5cfc96..7ab6dc42b 100644 --- a/Examples/lua/arrays/runme.lua +++ b/Examples/lua/arrays/runme.lua @@ -1,74 +1,74 @@ ----- importing ---- -if string.sub(_VERSION,1,7)=='Lua 5.0' then - -- lua5.0 doesnt have a nice way to do this - lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') - assert(lib)() -else - -- lua 5.1 does - require('example') -end - --- a helper to print a Lua table -function print_table(t) - print(table.concat(t,",")) -end - --- a helper to print a C array -function print_array(arr,len) - for i=0,len-1 do - io.write(example.int_getitem(arr,i),",") - end - io.write("\n") -end - -math.randomseed(0) -- init random - - ---[[ version 1: passing a C array to the code -lets test call sort_int() -this requires a C array, so is the hardest to use]] -ARRAY_SIZE=10 -arr=example.new_int(ARRAY_SIZE) -for i=0,ARRAY_SIZE-1 do - example.int_setitem(arr,i,math.random(1000)) -end -print "unsorted" -print_array(arr,ARRAY_SIZE) -example.sort_int(arr,ARRAY_SIZE) -print "sorted" -print_array(arr,ARRAY_SIZE) -example.delete_int(arr) -- must delete it -print "" - ---[[ version 2: using %luacode to write a helper -a simpler way is to use a %luacode -which is a lua function added into the module -this can do the conversion for us -so we can just add a lua table directly -(what we do is move the lua code into the module instead) -]] -t={} -for i=1,ARRAY_SIZE do - t[i]=math.random(1000) -end -print "unsorted" -print_table(t) -example.sort_int2(t) -- calls lua helper which then calls C -print "sorted" -print_table(t) -print "" - ---[[ version 3: use a typemap -this is the best way -it uses the SWIG-Lua typemaps to do the work -one item of note: the typemap creates a copy, rather than edit-in-place]] -t={} -for i=1,ARRAY_SIZE do - t[i]=math.random(1000)/10 -end -print "unsorted" -print_table(t) -t=example.sort_double(t) -- replace t with the result -print "sorted" -print_table(t) - +---- importing ---- +if string.sub(_VERSION,1,7)=='Lua 5.0' then + -- lua5.0 doesnt have a nice way to do this + lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') + assert(lib)() +else + -- lua 5.1 does + require('example') +end + +-- a helper to print a Lua table +function print_table(t) + print(table.concat(t,",")) +end + +-- a helper to print a C array +function print_array(arr,len) + for i=0,len-1 do + io.write(example.int_getitem(arr,i),",") + end + io.write("\n") +end + +math.randomseed(0) -- init random + + +--[[ version 1: passing a C array to the code +lets test call sort_int() +this requires a C array, so is the hardest to use]] +ARRAY_SIZE=10 +arr=example.new_int(ARRAY_SIZE) +for i=0,ARRAY_SIZE-1 do + example.int_setitem(arr,i,math.random(1000)) +end +print "unsorted" +print_array(arr,ARRAY_SIZE) +example.sort_int(arr,ARRAY_SIZE) +print "sorted" +print_array(arr,ARRAY_SIZE) +example.delete_int(arr) -- must delete it +print "" + +--[[ version 2: using %luacode to write a helper +a simpler way is to use a %luacode +which is a lua function added into the module +this can do the conversion for us +so we can just add a lua table directly +(what we do is move the lua code into the module instead) +]] +t={} +for i=1,ARRAY_SIZE do + t[i]=math.random(1000) +end +print "unsorted" +print_table(t) +example.sort_int2(t) -- calls lua helper which then calls C +print "sorted" +print_table(t) +print "" + +--[[ version 3: use a typemap +this is the best way +it uses the SWIG-Lua typemaps to do the work +one item of note: the typemap creates a copy, rather than edit-in-place]] +t={} +for i=1,ARRAY_SIZE do + t[i]=math.random(1000)/10 +end +print "unsorted" +print_table(t) +t=example.sort_double(t) -- replace t with the result +print "sorted" +print_table(t) + diff --git a/Examples/lua/embed/embed.c b/Examples/lua/embed/embed.c index 55ea099be..9df168f94 100644 --- a/Examples/lua/embed/embed.c +++ b/Examples/lua/embed/embed.c @@ -1,85 +1,85 @@ -/* embed.c a simple test for an embeded interpreter - -The idea is that we wrapper a few simple function (example.c) -and write our own app to call it. - -What it will do is load the wrappered lib, load runme.lua and then call some functions. -To make life easier, all the printf's have either [C] or [Lua] at the start -so you can see where they are coming from. - -We will be using the luaL_dostring()/lua_dostring() function to call into lua - -*/ - -#include -#include - -#include -#include -#include - -/* the SWIG wrappered library */ -extern int luaopen_example(lua_State*L); - -/* a really simple way of calling lua from C - just give it a lua state & a string to execute -Unfortunately lua keeps changing its API's. -In lua 5.0.X its lua_dostring() -In lua 5.1.X its luaL_dostring() -so we have a few extra compiles -*/ -int dostring(lua_State *L, char* str) { - int ok; -#if (defined(LUA_VERSION_NUM) && (LUA_VERSION_NUM>=501)) - - ok=luaL_dostring(L,str); /* looks like this is lua 5.1.X or later, good */ -#else - - ok=lua_dostring(L,str); /* might be lua 5.0.x, using lua_dostring */ -#endif - - if (ok!=0) - printf("[C] ERROR in dostring: %s\n",lua_tostring(L,-1)); - return ok; -} - - -int main(int argc,char* argv[]) { - lua_State *L; - int ok; - printf("[C] Welcome to the simple embedded lua example\n"); - printf("[C] We are in C\n"); - printf("[C] opening a lua state & loading the libraries\n"); - L=lua_open(); - luaopen_base(L); - luaopen_string(L); - luaopen_math(L); - printf("[C] now loading the SWIG wrappered library\n"); - luaopen_example(L); - printf("[C] all looks ok\n"); - printf("\n"); - printf("[C] lets load the file 'runme.lua'\n"); - printf("[C] any lua code in this file will be executed\n"); - if (luaL_loadfile(L, "runme.lua") || lua_pcall(L, 0, 0, 0)) { - printf("[C] ERROR: cannot run lua file: %s",lua_tostring(L, -1)); - exit(3); - } - printf("[C] We are now back in C, all looks ok\n"); - printf("\n"); - printf("[C] lets call the function 'do_tests()'\n"); - ok=dostring(L,"do_tests()"); - printf("[C] We are back in C, the dostring() function returned %d\n",ok); - printf("\n"); - printf("[C] Lets call lua again, but create an error\n"); - ok=dostring(L,"no_such_function()"); - printf("[C] We are back in C, the dostring() function returned %d\n",ok); - printf("[C] it should also have returned 1 and printed an error message\n"); - printf("\n"); - printf("[C] Lets call lua again, calling the greeting function\n"); - ok=dostring(L,"call_greeting()"); - printf("[C] This was C=>Lua=>C (getting a bit complex)\n"); - printf("\n"); - printf("[C] all finished, closing the lua state\n"); - lua_close(L); - return 0; -} +/* embed.c a simple test for an embeded interpreter + +The idea is that we wrapper a few simple function (example.c) +and write our own app to call it. + +What it will do is load the wrappered lib, load runme.lua and then call some functions. +To make life easier, all the printf's have either [C] or [Lua] at the start +so you can see where they are coming from. + +We will be using the luaL_dostring()/lua_dostring() function to call into lua + +*/ + +#include +#include + +#include +#include +#include + +/* the SWIG wrappered library */ +extern int luaopen_example(lua_State*L); + +/* a really simple way of calling lua from C + just give it a lua state & a string to execute +Unfortunately lua keeps changing its API's. +In lua 5.0.X its lua_dostring() +In lua 5.1.X its luaL_dostring() +so we have a few extra compiles +*/ +int dostring(lua_State *L, char* str) { + int ok; +#if (defined(LUA_VERSION_NUM) && (LUA_VERSION_NUM>=501)) + + ok=luaL_dostring(L,str); /* looks like this is lua 5.1.X or later, good */ +#else + + ok=lua_dostring(L,str); /* might be lua 5.0.x, using lua_dostring */ +#endif + + if (ok!=0) + printf("[C] ERROR in dostring: %s\n",lua_tostring(L,-1)); + return ok; +} + + +int main(int argc,char* argv[]) { + lua_State *L; + int ok; + printf("[C] Welcome to the simple embedded lua example\n"); + printf("[C] We are in C\n"); + printf("[C] opening a lua state & loading the libraries\n"); + L=lua_open(); + luaopen_base(L); + luaopen_string(L); + luaopen_math(L); + printf("[C] now loading the SWIG wrappered library\n"); + luaopen_example(L); + printf("[C] all looks ok\n"); + printf("\n"); + printf("[C] lets load the file 'runme.lua'\n"); + printf("[C] any lua code in this file will be executed\n"); + if (luaL_loadfile(L, "runme.lua") || lua_pcall(L, 0, 0, 0)) { + printf("[C] ERROR: cannot run lua file: %s",lua_tostring(L, -1)); + exit(3); + } + printf("[C] We are now back in C, all looks ok\n"); + printf("\n"); + printf("[C] lets call the function 'do_tests()'\n"); + ok=dostring(L,"do_tests()"); + printf("[C] We are back in C, the dostring() function returned %d\n",ok); + printf("\n"); + printf("[C] Lets call lua again, but create an error\n"); + ok=dostring(L,"no_such_function()"); + printf("[C] We are back in C, the dostring() function returned %d\n",ok); + printf("[C] it should also have returned 1 and printed an error message\n"); + printf("\n"); + printf("[C] Lets call lua again, calling the greeting function\n"); + ok=dostring(L,"call_greeting()"); + printf("[C] This was C=>Lua=>C (getting a bit complex)\n"); + printf("\n"); + printf("[C] all finished, closing the lua state\n"); + lua_close(L); + return 0; +} diff --git a/Examples/lua/embed/example.c b/Examples/lua/embed/example.c index c6c6d7ba1..efd13f662 100644 --- a/Examples/lua/embed/example.c +++ b/Examples/lua/embed/example.c @@ -1,22 +1,22 @@ -/* File : example.c */ - -#include - -/* A global variable */ -double Foo = 3.0; - -/* Compute the greatest common divisor of positive integers */ -int gcd(int x, int y) { - int g; - g = y; - while (x > 0) { - g = x; - x = y % x; - y = g; - } - return g; -} - -void greeting() { - printf("Hello from the C function 'greeting'\n"); -} +/* File : example.c */ + +#include + +/* A global variable */ +double Foo = 3.0; + +/* Compute the greatest common divisor of positive integers */ +int gcd(int x, int y) { + int g; + g = y; + while (x > 0) { + g = x; + x = y % x; + y = g; + } + return g; +} + +void greeting() { + printf("Hello from the C function 'greeting'\n"); +} diff --git a/Examples/lua/embed2/embed2.c b/Examples/lua/embed2/embed2.c index dac527eb4..8d28ee6ea 100644 --- a/Examples/lua/embed2/embed2.c +++ b/Examples/lua/embed2/embed2.c @@ -1,233 +1,233 @@ -/* embed2.c some more test for an embeded interpreter - -This will go a bit further as it will pass values to and from the lua code. -It uses less of the SWIG code, and more of the raw lua API's - -What it will do is load the wrappered lib, load runme.lua and then call some functions. -To make life easier, all the printf's have either [C] or [Lua] at the start -so you can see where they are coming from. - -We will be using the luaL_dostring()/lua_dostring() function to call into lua - -*/ - -/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ -#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE -#endif - -/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ -#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) -# define _SCL_SECURE_NO_DEPRECATE -#endif - - -#include -#include - -#include -#include -#include -#include -#include - - -/* the SWIG wrappered library */ -extern int luaopen_example(lua_State*L); - -/* This is an example of how to call the Lua function - int add(int,int) - its very tedious, but gives you an idea of the issues involded. - (look below for a better idea) -*/ -int call_add(lua_State *L,int a,int b,int* res) { - int top; - /* ok, here we go: - push a, push b, call 'add' check & return res - */ - top=lua_gettop(L); /* for later */ - lua_pushstring(L, "add"); /* function name */ - lua_gettable(L, LUA_GLOBALSINDEX); /* function to be called */ - if (!lua_isfunction(L,-1)) { - printf("[C] error: cannot find function 'add'\n"); - lua_settop(L,top); // reset - return 0; - } - lua_pushnumber(L,a); - lua_pushnumber(L,b); - if (lua_pcall(L, 2, 1, 0) != 0) /* call function with 2 arguments and 1 result */ - { - printf("[C] error running function `add': %s\n",lua_tostring(L, -1)); - lua_settop(L,top); // reset - return 0; - } - // check results - if (!lua_isnumber(L,-1)) { - printf("[C] error: returned value is not a number\n"); - lua_settop(L,top); // reset - return 0; - } - *res=(int)lua_tonumber(L,-1); - lua_settop(L,top); /* reset stack */ - return 1; // ok -} - -/* This is a variargs call function for calling from C into Lua. -Original Code from Programming in Lua (PIL) by Roberto Ierusalimschy -ISBN 85-903798-1-7 -http://www.lua.org/pil/25.3.html -This has been modified slightly to make it compile, and its still a bit rough. -But it gives the idea of how to make it work. -*/ -int call_va (lua_State *L,const char *func, const char *sig, ...) { - va_list vl; - int narg, nres; /* number of arguments and results */ - int top; - top=lua_gettop(L); /* for later */ - - va_start(vl, sig); - lua_getglobal(L, func); /* get function */ - - /* push arguments */ - narg = 0; - while (*sig) { /* push arguments */ - switch (*sig++) { - - case 'd': /* double argument */ - lua_pushnumber(L, va_arg(vl, double)); - break; - - case 'i': /* int argument */ - lua_pushnumber(L, va_arg(vl, int)); - break; - - case 's': /* string argument */ - lua_pushstring(L, va_arg(vl, char *)); - break; - - case '>': - goto endwhile; - - default: - printf("invalid option (%c)\n", *(sig - 1)); - goto fail; - } - narg++; - /* do we need this?*/ - /* luaL_checkstack(L, 1, "too many arguments"); */ - } -endwhile: - - /* do the call */ - nres = (int)strlen(sig); /* number of expected results */ - if (lua_pcall(L, narg, nres, 0) != 0) /* do the call */ - { - printf("error running function `%s': %s\n",func, lua_tostring(L, -1)); - goto fail; - } - - /* retrieve results */ - nres = -nres; /* stack index of first result */ - while (*sig) { /* get results */ - switch (*sig++) { - - case 'd': /* double result */ - if (!lua_isnumber(L, nres)) { - printf("wrong result type\n"); - goto fail; - } - *va_arg(vl, double *) = lua_tonumber(L, nres); - break; - - case 'i': /* int result */ - if (!lua_isnumber(L, nres)) { - printf("wrong result type\n"); - goto fail; - } - *va_arg(vl, int *) = (int)lua_tonumber(L, nres); - break; - - case 's': /* string result */ - if (!lua_isstring(L, nres)) { - printf("wrong result type\n"); - goto fail; - } - strcpy(va_arg(vl, char *),lua_tostring(L, nres));/* WARNING possible buffer overflow */ - break; - - default: { - printf("invalid option (%c)", *(sig - 1)); - goto fail; - } - } - nres++; - } - va_end(vl); - - lua_settop(L,top); /* reset stack */ - return 1; /* ok */ -fail: - lua_settop(L,top); /* reset stack */ - return 0; /* error */ -} - -int main(int argc,char* argv[]) { - lua_State *L; - int ok; - int res; - char str[80]; - printf("[C] Welcome to the simple embedded Lua example v2\n"); - printf("[C] We are in C\n"); - printf("[C] opening a Lua state & loading the libraries\n"); - L=lua_open(); - luaopen_base(L); - luaopen_string(L); - luaopen_math(L); - printf("[C] now loading the SWIG wrappered library\n"); - luaopen_example(L); - printf("[C] all looks ok\n"); - printf("\n"); - printf("[C] lets load the file 'runme.lua'\n"); - printf("[C] any lua code in this file will be executed\n"); - if (luaL_loadfile(L, "runme.lua") || lua_pcall(L, 0, 0, 0)) { - printf("[C] ERROR: cannot run lua file: %s",lua_tostring(L, -1)); - exit(3); - } - printf("[C] We are now back in C, all looks ok\n"); - printf("\n"); - printf("[C] lets call the Lua function 'add(1,1)'\n"); - printf("[C] using the C function 'call_add'\n"); - ok=call_add(L,1,1,&res); - printf("[C] the function returned %d with value %d\n",ok,res); - printf("\n"); - printf("[C] lets do this rather easier\n"); - printf("[C] we will call the same Lua function using a generic C function 'call_va'\n"); - ok=call_va(L,"add","ii>i",1,1,&res); - printf("[C] the function returned %d with value %d\n",ok,res); - printf("\n"); - printf("[C] we will now use the same generic C function to call 'append(\"cat\",\"dog\")'\n"); - ok=call_va(L,"append","ss>s","cat","dog",str); - printf("[C] the function returned %d with value %s\n",ok,str); - printf("\n"); - printf("[C] we can also make some bad calls to ensure the code doesn't fail\n"); - printf("[C] calling adds(1,2)\n"); - ok=call_va(L,"adds","ii>i",1,2,&res); - printf("[C] the function returned %d with value %d\n",ok,res); - printf("[C] calling add(1,'fred')\n"); - ok=call_va(L,"add","is>i",1,"fred",&res); - printf("[C] the function returned %d with value %d\n",ok,res); - printf("\n"); - printf("[C] Note: no protection if you mess up the va-args, this is C\n"); - printf("\n"); - printf("[C] Finally we will call the wrappered gcd function gdc(6,9):\n"); - printf("[C] This will pass the values to Lua, then call the wrappered function\n"); - printf(" Which will get the values from Lua, call the C code \n"); - printf(" and return the value to Lua and eventually back to C\n"); - printf("[C] Certainly not the best way to do it :-)\n"); - ok=call_va(L,"gcd","ii>i",6,9,&res); - printf("[C] the function returned %d with value %d\n",ok,res); - printf("\n"); - printf("[C] all finished, closing the lua state\n"); - lua_close(L); - return 0; -} +/* embed2.c some more test for an embeded interpreter + +This will go a bit further as it will pass values to and from the lua code. +It uses less of the SWIG code, and more of the raw lua API's + +What it will do is load the wrappered lib, load runme.lua and then call some functions. +To make life easier, all the printf's have either [C] or [Lua] at the start +so you can see where they are coming from. + +We will be using the luaL_dostring()/lua_dostring() function to call into lua + +*/ + +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) +# define _CRT_SECURE_NO_DEPRECATE +#endif + +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */ +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE) +# define _SCL_SECURE_NO_DEPRECATE +#endif + + +#include +#include + +#include +#include +#include +#include +#include + + +/* the SWIG wrappered library */ +extern int luaopen_example(lua_State*L); + +/* This is an example of how to call the Lua function + int add(int,int) + its very tedious, but gives you an idea of the issues involded. + (look below for a better idea) +*/ +int call_add(lua_State *L,int a,int b,int* res) { + int top; + /* ok, here we go: + push a, push b, call 'add' check & return res + */ + top=lua_gettop(L); /* for later */ + lua_pushstring(L, "add"); /* function name */ + lua_gettable(L, LUA_GLOBALSINDEX); /* function to be called */ + if (!lua_isfunction(L,-1)) { + printf("[C] error: cannot find function 'add'\n"); + lua_settop(L,top); // reset + return 0; + } + lua_pushnumber(L,a); + lua_pushnumber(L,b); + if (lua_pcall(L, 2, 1, 0) != 0) /* call function with 2 arguments and 1 result */ + { + printf("[C] error running function `add': %s\n",lua_tostring(L, -1)); + lua_settop(L,top); // reset + return 0; + } + // check results + if (!lua_isnumber(L,-1)) { + printf("[C] error: returned value is not a number\n"); + lua_settop(L,top); // reset + return 0; + } + *res=(int)lua_tonumber(L,-1); + lua_settop(L,top); /* reset stack */ + return 1; // ok +} + +/* This is a variargs call function for calling from C into Lua. +Original Code from Programming in Lua (PIL) by Roberto Ierusalimschy +ISBN 85-903798-1-7 +http://www.lua.org/pil/25.3.html +This has been modified slightly to make it compile, and its still a bit rough. +But it gives the idea of how to make it work. +*/ +int call_va (lua_State *L,const char *func, const char *sig, ...) { + va_list vl; + int narg, nres; /* number of arguments and results */ + int top; + top=lua_gettop(L); /* for later */ + + va_start(vl, sig); + lua_getglobal(L, func); /* get function */ + + /* push arguments */ + narg = 0; + while (*sig) { /* push arguments */ + switch (*sig++) { + + case 'd': /* double argument */ + lua_pushnumber(L, va_arg(vl, double)); + break; + + case 'i': /* int argument */ + lua_pushnumber(L, va_arg(vl, int)); + break; + + case 's': /* string argument */ + lua_pushstring(L, va_arg(vl, char *)); + break; + + case '>': + goto endwhile; + + default: + printf("invalid option (%c)\n", *(sig - 1)); + goto fail; + } + narg++; + /* do we need this?*/ + /* luaL_checkstack(L, 1, "too many arguments"); */ + } +endwhile: + + /* do the call */ + nres = (int)strlen(sig); /* number of expected results */ + if (lua_pcall(L, narg, nres, 0) != 0) /* do the call */ + { + printf("error running function `%s': %s\n",func, lua_tostring(L, -1)); + goto fail; + } + + /* retrieve results */ + nres = -nres; /* stack index of first result */ + while (*sig) { /* get results */ + switch (*sig++) { + + case 'd': /* double result */ + if (!lua_isnumber(L, nres)) { + printf("wrong result type\n"); + goto fail; + } + *va_arg(vl, double *) = lua_tonumber(L, nres); + break; + + case 'i': /* int result */ + if (!lua_isnumber(L, nres)) { + printf("wrong result type\n"); + goto fail; + } + *va_arg(vl, int *) = (int)lua_tonumber(L, nres); + break; + + case 's': /* string result */ + if (!lua_isstring(L, nres)) { + printf("wrong result type\n"); + goto fail; + } + strcpy(va_arg(vl, char *),lua_tostring(L, nres));/* WARNING possible buffer overflow */ + break; + + default: { + printf("invalid option (%c)", *(sig - 1)); + goto fail; + } + } + nres++; + } + va_end(vl); + + lua_settop(L,top); /* reset stack */ + return 1; /* ok */ +fail: + lua_settop(L,top); /* reset stack */ + return 0; /* error */ +} + +int main(int argc,char* argv[]) { + lua_State *L; + int ok; + int res; + char str[80]; + printf("[C] Welcome to the simple embedded Lua example v2\n"); + printf("[C] We are in C\n"); + printf("[C] opening a Lua state & loading the libraries\n"); + L=lua_open(); + luaopen_base(L); + luaopen_string(L); + luaopen_math(L); + printf("[C] now loading the SWIG wrappered library\n"); + luaopen_example(L); + printf("[C] all looks ok\n"); + printf("\n"); + printf("[C] lets load the file 'runme.lua'\n"); + printf("[C] any lua code in this file will be executed\n"); + if (luaL_loadfile(L, "runme.lua") || lua_pcall(L, 0, 0, 0)) { + printf("[C] ERROR: cannot run lua file: %s",lua_tostring(L, -1)); + exit(3); + } + printf("[C] We are now back in C, all looks ok\n"); + printf("\n"); + printf("[C] lets call the Lua function 'add(1,1)'\n"); + printf("[C] using the C function 'call_add'\n"); + ok=call_add(L,1,1,&res); + printf("[C] the function returned %d with value %d\n",ok,res); + printf("\n"); + printf("[C] lets do this rather easier\n"); + printf("[C] we will call the same Lua function using a generic C function 'call_va'\n"); + ok=call_va(L,"add","ii>i",1,1,&res); + printf("[C] the function returned %d with value %d\n",ok,res); + printf("\n"); + printf("[C] we will now use the same generic C function to call 'append(\"cat\",\"dog\")'\n"); + ok=call_va(L,"append","ss>s","cat","dog",str); + printf("[C] the function returned %d with value %s\n",ok,str); + printf("\n"); + printf("[C] we can also make some bad calls to ensure the code doesn't fail\n"); + printf("[C] calling adds(1,2)\n"); + ok=call_va(L,"adds","ii>i",1,2,&res); + printf("[C] the function returned %d with value %d\n",ok,res); + printf("[C] calling add(1,'fred')\n"); + ok=call_va(L,"add","is>i",1,"fred",&res); + printf("[C] the function returned %d with value %d\n",ok,res); + printf("\n"); + printf("[C] Note: no protection if you mess up the va-args, this is C\n"); + printf("\n"); + printf("[C] Finally we will call the wrappered gcd function gdc(6,9):\n"); + printf("[C] This will pass the values to Lua, then call the wrappered function\n"); + printf(" Which will get the values from Lua, call the C code \n"); + printf(" and return the value to Lua and eventually back to C\n"); + printf("[C] Certainly not the best way to do it :-)\n"); + ok=call_va(L,"gcd","ii>i",6,9,&res); + printf("[C] the function returned %d with value %d\n",ok,res); + printf("\n"); + printf("[C] all finished, closing the lua state\n"); + lua_close(L); + return 0; +} diff --git a/Examples/lua/embed2/example.c b/Examples/lua/embed2/example.c index c6c6d7ba1..efd13f662 100644 --- a/Examples/lua/embed2/example.c +++ b/Examples/lua/embed2/example.c @@ -1,22 +1,22 @@ -/* File : example.c */ - -#include - -/* A global variable */ -double Foo = 3.0; - -/* Compute the greatest common divisor of positive integers */ -int gcd(int x, int y) { - int g; - g = y; - while (x > 0) { - g = x; - x = y % x; - y = g; - } - return g; -} - -void greeting() { - printf("Hello from the C function 'greeting'\n"); -} +/* File : example.c */ + +#include + +/* A global variable */ +double Foo = 3.0; + +/* Compute the greatest common divisor of positive integers */ +int gcd(int x, int y) { + int g; + g = y; + while (x > 0) { + g = x; + x = y % x; + y = g; + } + return g; +} + +void greeting() { + printf("Hello from the C function 'greeting'\n"); +} diff --git a/Examples/lua/embed3/example.i b/Examples/lua/embed3/example.i index 032805c0e..950d2549d 100644 --- a/Examples/lua/embed3/example.i +++ b/Examples/lua/embed3/example.i @@ -1,8 +1,8 @@ -/* File : example.i */ -%module example - -%{ -#include "example.h" -%} - -%include "example.h" +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +%include "example.h" diff --git a/Examples/lua/exception/Makefile b/Examples/lua/exception/Makefile index 8657f1922..0feee14dd 100644 --- a/Examples/lua/exception/Makefile +++ b/Examples/lua/exception/Makefile @@ -1,19 +1,19 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -CXXSRCS = -TARGET = example -INTERFACE = example.i -LIBS = -lm - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp - -static:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static - -clean:: - $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +CXXSRCS = +TARGET = example +INTERFACE = example.i +LIBS = -lm + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp + +static:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static + +clean:: + $(MAKE) -f $(TOP)/Makefile lua_clean + +check: all diff --git a/Examples/lua/exception/example.h b/Examples/lua/exception/example.h index 5148a5962..251ef1132 100644 --- a/Examples/lua/exception/example.h +++ b/Examples/lua/exception/example.h @@ -1,53 +1,53 @@ -/* File : example.h */ - -#include -#ifndef SWIG -struct A { -}; -#endif - -class Exc { -public: - Exc(int c, const char *m) { - code = c; - strncpy(msg,m,256); - } - int code; - char msg[256]; -}; - -#if defined(_MSC_VER) - #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - -class Test { -public: - int simple() throw(int&) { - throw(37); - return 1; - } - int message() throw(const char *) { - throw("I died."); - return 1; - } - int hosed() throw(Exc) { - throw(Exc(42,"Hosed")); - return 1; - } - int unknown() throw(A*) { - static A a; - throw &a; - return 1; - } - int multi(int x) throw(int, const char *, Exc) { - if (x == 1) throw(37); - if (x == 2) throw("Bleah!"); - if (x == 3) throw(Exc(42,"No-go-diggy-die")); - return 1; - } -}; - -#if defined(_MSC_VER) - #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) -#endif - +/* File : example.h */ + +#include +#ifndef SWIG +struct A { +}; +#endif + +class Exc { +public: + Exc(int c, const char *m) { + code = c; + strncpy(msg,m,256); + } + int code; + char msg[256]; +}; + +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + +class Test { +public: + int simple() throw(int&) { + throw(37); + return 1; + } + int message() throw(const char *) { + throw("I died."); + return 1; + } + int hosed() throw(Exc) { + throw(Exc(42,"Hosed")); + return 1; + } + int unknown() throw(A*) { + static A a; + throw &a; + return 1; + } + int multi(int x) throw(int, const char *, Exc) { + if (x == 1) throw(37); + if (x == 2) throw("Bleah!"); + if (x == 3) throw(Exc(42,"No-go-diggy-die")); + return 1; + } +}; + +#if defined(_MSC_VER) + #pragma warning(default: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif + diff --git a/Examples/lua/exception/example.i b/Examples/lua/exception/example.i index 09cd9e812..6187f8eff 100644 --- a/Examples/lua/exception/example.i +++ b/Examples/lua/exception/example.i @@ -1,17 +1,17 @@ -/* File : example.i */ -%module example - -%{ -#include "example.h" -%} - -%include "std_string.i" - -// we want to return Exc objects to the interpreter -// therefore we add this typemap -// note: only works if Exc is copyable -%apply SWIGTYPE EXCEPTION_BY_VAL {Exc}; - -/* Let's just grab the original header file here */ -%include "example.h" - +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +%include "std_string.i" + +// we want to return Exc objects to the interpreter +// therefore we add this typemap +// note: only works if Exc is copyable +%apply SWIGTYPE EXCEPTION_BY_VAL {Exc}; + +/* Let's just grab the original header file here */ +%include "example.h" + diff --git a/Examples/lua/exception/runme.lua b/Examples/lua/exception/runme.lua index 39b2d6da8..d8125caec 100644 --- a/Examples/lua/exception/runme.lua +++ b/Examples/lua/exception/runme.lua @@ -1,96 +1,96 @@ --- file: example.lua - ----- importing ---- -if string.sub(_VERSION,1,7)=='Lua 5.0' then - -- lua5.0 doesnt have a nice way to do this - lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') - assert(lib)() -else - -- lua 5.1 does - require('example') -end - --- throw a lot of exceptions: --- you must catch exceptions using pcall and then checking the result - -t = example.Test() - -print "calling t:unknown()" -ok,res=pcall(function() t:unknown() end) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res) -end - -print "calling t:simple()" -ok,res=pcall(function() t:simple() end) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res) -end - -print "calling t:message()" -ok,res=pcall(function() t:message() end) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res) -end - -print "calling t:hosed()" -ok,res=pcall(function() t:hosed() end) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res.code,res.msg) -end - --- this is a rather strange way to perform the multiple catch of exceptions -print "calling t:mutli()" -for i=1,3 do - ok,res=pcall(function() t:multi(i) end) - if ok then - print " that worked! Funny" - else - if swig_type(res)=="Exc *" then - print(" call failed with Exc exception:",res.code,res.msg) - else - print(" call failed with error:",res) - end - end -end - --- this is a bit crazy, but it shows obtaining of the stacktrace -function a() - b() -end -function b() - t:message() -end -print [[ -Now lets call function a() - which calls b() - which calls into C++ - which will throw an exception!]] -ok,res=pcall(a) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res) -end -print "Now lets do the same using xpcall(a,debug.traceback)" -ok,res=xpcall(a,debug.traceback) -if ok then - print " that worked! Funny" -else - print(" call failed with error:",res) -end -print "As you can see, the xpcall gives a nice stacktrace to work with" - - -ok,res=pcall(a) -print(ok,res) -ok,res=xpcall(a,debug.traceback) -print(ok,res) +-- file: example.lua + +---- importing ---- +if string.sub(_VERSION,1,7)=='Lua 5.0' then + -- lua5.0 doesnt have a nice way to do this + lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') + assert(lib)() +else + -- lua 5.1 does + require('example') +end + +-- throw a lot of exceptions: +-- you must catch exceptions using pcall and then checking the result + +t = example.Test() + +print "calling t:unknown()" +ok,res=pcall(function() t:unknown() end) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res) +end + +print "calling t:simple()" +ok,res=pcall(function() t:simple() end) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res) +end + +print "calling t:message()" +ok,res=pcall(function() t:message() end) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res) +end + +print "calling t:hosed()" +ok,res=pcall(function() t:hosed() end) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res.code,res.msg) +end + +-- this is a rather strange way to perform the multiple catch of exceptions +print "calling t:mutli()" +for i=1,3 do + ok,res=pcall(function() t:multi(i) end) + if ok then + print " that worked! Funny" + else + if swig_type(res)=="Exc *" then + print(" call failed with Exc exception:",res.code,res.msg) + else + print(" call failed with error:",res) + end + end +end + +-- this is a bit crazy, but it shows obtaining of the stacktrace +function a() + b() +end +function b() + t:message() +end +print [[ +Now lets call function a() + which calls b() + which calls into C++ + which will throw an exception!]] +ok,res=pcall(a) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res) +end +print "Now lets do the same using xpcall(a,debug.traceback)" +ok,res=xpcall(a,debug.traceback) +if ok then + print " that worked! Funny" +else + print(" call failed with error:",res) +end +print "As you can see, the xpcall gives a nice stacktrace to work with" + + +ok,res=pcall(a) +print(ok,res) +ok,res=xpcall(a,debug.traceback) +print(ok,res) diff --git a/Examples/lua/owner/Makefile b/Examples/lua/owner/Makefile index 1fe68ec7f..44888f66f 100644 --- a/Examples/lua/owner/Makefile +++ b/Examples/lua/owner/Makefile @@ -1,19 +1,19 @@ -TOP = ../.. -SWIG = $(TOP)/../preinst-swig -CXXSRCS = example.cxx -TARGET = example -INTERFACE = example.i -LIBS = -lm - -all:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp - -static:: - $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ - TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static - -clean:: - $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i +LIBS = -lm + +all:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp + +static:: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static + +clean:: + $(MAKE) -f $(TOP)/Makefile lua_clean + +check: all diff --git a/Examples/lua/owner/example.cxx b/Examples/lua/owner/example.cxx index d6caeef15..bce484aea 100644 --- a/Examples/lua/owner/example.cxx +++ b/Examples/lua/owner/example.cxx @@ -1,69 +1,69 @@ -/* File : example.c */ - -#include "example.h" -#include - -#define M_PI 3.14159265358979323846 - -/* Move the shape to a new location */ -void Shape::move(double dx, double dy) { - x += dx; - y += dy; -} - -int Shape::nshapes = 0; - -double Circle::area(void) { - return M_PI*radius*radius; -} - -double Circle::perimeter(void) { - return 2*M_PI*radius; -} - -double Square::area(void) { - return width*width; -} - -double Square::perimeter(void) { - return 4*width; -} - -Circle* createCircle(double w) -{ - return new Circle(w); -} - -Square* createSquare(double w) -{ - return new Square(w); -} - -ShapeOwner::ShapeOwner() {printf(" ShapeOwner(%p)\n",this);} -ShapeOwner::~ShapeOwner() -{ - printf(" ~ShapeOwner(%p)\n",this); - for(unsigned i=0;i= static_cast(shapes.size())) - return NULL; - return shapes[idx]; -} - -Shape* ShapeOwner::remove(int idx) // this method returns memory which must be deleted -{ - if (idx < 0 || idx >= static_cast(shapes.size())) - return NULL; - Shape* ptr=shapes[idx]; - shapes.erase(shapes.begin()+idx); - return ptr; -} +/* File : example.c */ + +#include "example.h" +#include + +#define M_PI 3.14159265358979323846 + +/* Move the shape to a new location */ +void Shape::move(double dx, double dy) { + x += dx; + y += dy; +} + +int Shape::nshapes = 0; + +double Circle::area(void) { + return M_PI*radius*radius; +} + +double Circle::perimeter(void) { + return 2*M_PI*radius; +} + +double Square::area(void) { + return width*width; +} + +double Square::perimeter(void) { + return 4*width; +} + +Circle* createCircle(double w) +{ + return new Circle(w); +} + +Square* createSquare(double w) +{ + return new Square(w); +} + +ShapeOwner::ShapeOwner() {printf(" ShapeOwner(%p)\n",this);} +ShapeOwner::~ShapeOwner() +{ + printf(" ~ShapeOwner(%p)\n",this); + for(unsigned i=0;i= static_cast(shapes.size())) + return NULL; + return shapes[idx]; +} + +Shape* ShapeOwner::remove(int idx) // this method returns memory which must be deleted +{ + if (idx < 0 || idx >= static_cast(shapes.size())) + return NULL; + Shape* ptr=shapes[idx]; + shapes.erase(shapes.begin()+idx); + return ptr; +} diff --git a/Examples/lua/owner/example.h b/Examples/lua/owner/example.h index b00568025..320bb2569 100644 --- a/Examples/lua/owner/example.h +++ b/Examples/lua/owner/example.h @@ -1,54 +1,54 @@ -/* File : example.h */ -#include - -class Shape { -public: - Shape() { - nshapes++; - } - virtual ~Shape() { - nshapes--; - }; - double x, y; - void move(double dx, double dy); - virtual double area(void) = 0; - virtual double perimeter(void) = 0; - static int nshapes; -}; - -class Circle : public Shape { -private: - double radius; -public: - Circle(double r) : radius(r) { }; - virtual double area(void); - virtual double perimeter(void); -}; - -class Square : public Shape { -private: - double width; -public: - Square(double w) : width(w) { }; - virtual double area(void); - virtual double perimeter(void); -}; - - -Circle* createCircle(double w); // this method creates a new object -Square* createSquare(double w); // this method creates a new object - -class ShapeOwner { -private: - std::vector shapes; - ShapeOwner(const ShapeOwner&); // no copying - ShapeOwner& operator=(const ShapeOwner&); // no copying -public: - ShapeOwner(); - ~ShapeOwner(); - void add(Shape* ptr); // this method takes ownership of the object - Shape* get(int idx); // this pointer is still owned by the class (assessor) - Shape* remove(int idx); // this method returns memory which must be deleted -}; - - +/* File : example.h */ +#include + +class Shape { +public: + Shape() { + nshapes++; + } + virtual ~Shape() { + nshapes--; + }; + double x, y; + void move(double dx, double dy); + virtual double area(void) = 0; + virtual double perimeter(void) = 0; + static int nshapes; +}; + +class Circle : public Shape { +private: + double radius; +public: + Circle(double r) : radius(r) { }; + virtual double area(void); + virtual double perimeter(void); +}; + +class Square : public Shape { +private: + double width; +public: + Square(double w) : width(w) { }; + virtual double area(void); + virtual double perimeter(void); +}; + + +Circle* createCircle(double w); // this method creates a new object +Square* createSquare(double w); // this method creates a new object + +class ShapeOwner { +private: + std::vector shapes; + ShapeOwner(const ShapeOwner&); // no copying + ShapeOwner& operator=(const ShapeOwner&); // no copying +public: + ShapeOwner(); + ~ShapeOwner(); + void add(Shape* ptr); // this method takes ownership of the object + Shape* get(int idx); // this pointer is still owned by the class (assessor) + Shape* remove(int idx); // this method returns memory which must be deleted +}; + + diff --git a/Examples/lua/owner/example.i b/Examples/lua/owner/example.i index 4e7c331bc..1dfac4a09 100644 --- a/Examples/lua/owner/example.i +++ b/Examples/lua/owner/example.i @@ -1,32 +1,32 @@ -/* File : example.i */ -%module example - -%{ -#include "example.h" -%} - -// before we grab the header file, we must warn SWIG about some of these functions. - -// these functions create data, so must be managed -%newobject createCircle; -%newobject createSquare; - -// this method returns as pointer which must be managed -%newobject ShapeOwner::remove; - -// you cannot use %delobject on ShapeOwner::add() -// as this disowns the ShapeOwner, not the Shape (oops) -//%delobject ShapeOwner::add(Shape*); DO NOT USE - -// either you can use a new function (such as this) -/*%delobject add_Shape; -%inline %{ -void add_Shape(Shape* s,ShapeOwner* own){own->add(s);} -%}*/ - -// or a better solution is a typemap -%apply SWIGTYPE *DISOWN {Shape* ptr}; - -// now we can grab the header file -%include "example.h" - +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +// before we grab the header file, we must warn SWIG about some of these functions. + +// these functions create data, so must be managed +%newobject createCircle; +%newobject createSquare; + +// this method returns as pointer which must be managed +%newobject ShapeOwner::remove; + +// you cannot use %delobject on ShapeOwner::add() +// as this disowns the ShapeOwner, not the Shape (oops) +//%delobject ShapeOwner::add(Shape*); DO NOT USE + +// either you can use a new function (such as this) +/*%delobject add_Shape; +%inline %{ +void add_Shape(Shape* s,ShapeOwner* own){own->add(s);} +%}*/ + +// or a better solution is a typemap +%apply SWIGTYPE *DISOWN {Shape* ptr}; + +// now we can grab the header file +%include "example.h" + diff --git a/Examples/lua/owner/runme.lua b/Examples/lua/owner/runme.lua index d2d8a9c6f..ed745f7b2 100644 --- a/Examples/lua/owner/runme.lua +++ b/Examples/lua/owner/runme.lua @@ -1,104 +1,104 @@ --- Operator overloading example ----- importing ---- -if string.sub(_VERSION,1,7)=='Lua 5.0' then - -- lua5.0 doesnt have a nice way to do this - lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') - assert(lib)() -else - -- lua 5.1 does - require('example') -end - -print "ok, lets test Lua's ownership of C++ objects" -print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") - -print "\nLets make a couple" -a=example.Square(10) -b=example.Circle(1) -print("Currently there are",example.Shape_nshapes,"shapes (there should be 2)") - -print "\nNote lets use the createX functions" -c=example.createCircle(5) -d=example.createSquare(3) -print("Currently there are",example.Shape_nshapes,"shapes (there should be 4)") - -print "\nWe will run the garbage collector & see if they are till here" -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 4)") - -print "\nLets get rid of them all, collect garbage & see if they are till here" -a,b,c,d=nil,nil,nil,nil -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") - -print "\nLets start putting stuff into the ShapeOwner" -print "The ShapeOwner now owns the shapes, but Lua still has pointers to them" -o=example.ShapeOwner() -a=example.Square(10) -b=example.Circle(1) -o:add(a) -o:add(b) -o:add(example.createSquare(5)) -print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") - -print "\nWe will nil our references,run the garbage collector & see if they are till here" -print "they should be, as the ShapeOwner owns them" -a,b=nil,nil -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") - -print "\nWe will access them and check that they are still valid" -a=o:get(0) -b=o:get(1) -print(" Area's are",a:area(),b:area(),o:get(2):area()) -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") - -print "\nWe will remove one from the C++ owner & pass its ownership to Lua," -print " then check that they are still unchanged" -a,b=nil,nil -a=o:remove(0) -- a now owns it -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") - -print "\nDelete the ShapeOwner (this should destroy two shapes)," -print " but we have one left in Lua" -o=nil -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 1)") - -print "\nFinal tidy up " -a=nil -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") - - -print "Final test, we will create some Shapes & pass them around like mad" -print "If there is any memory leak, you will see it in the memory usage" -io.flush() -sh={} --- make some objects -for i=0,10 do - a=example.Circle(i) - b=example.Square(i) - sh[a]=true - sh[b]=true -end -o=example.ShapeOwner() -for i=0,10000 do - for k,_ in pairs(sh) do - o:add(k) - end - sh={} -- clear it - while true do - a=o:remove(0) - if a==nil then break end - sh[a]=true - end - if i%100==0 then collectgarbage() end -end -print "done" -o,sh=nil,nil -collectgarbage() -print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") -print "thats all folks!" \ No newline at end of file +-- Operator overloading example +---- importing ---- +if string.sub(_VERSION,1,7)=='Lua 5.0' then + -- lua5.0 doesnt have a nice way to do this + lib=loadlib('example.dll','luaopen_example') or loadlib('example.so','luaopen_example') + assert(lib)() +else + -- lua 5.1 does + require('example') +end + +print "ok, lets test Lua's ownership of C++ objects" +print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") + +print "\nLets make a couple" +a=example.Square(10) +b=example.Circle(1) +print("Currently there are",example.Shape_nshapes,"shapes (there should be 2)") + +print "\nNote lets use the createX functions" +c=example.createCircle(5) +d=example.createSquare(3) +print("Currently there are",example.Shape_nshapes,"shapes (there should be 4)") + +print "\nWe will run the garbage collector & see if they are till here" +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 4)") + +print "\nLets get rid of them all, collect garbage & see if they are till here" +a,b,c,d=nil,nil,nil,nil +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") + +print "\nLets start putting stuff into the ShapeOwner" +print "The ShapeOwner now owns the shapes, but Lua still has pointers to them" +o=example.ShapeOwner() +a=example.Square(10) +b=example.Circle(1) +o:add(a) +o:add(b) +o:add(example.createSquare(5)) +print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") + +print "\nWe will nil our references,run the garbage collector & see if they are till here" +print "they should be, as the ShapeOwner owns them" +a,b=nil,nil +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") + +print "\nWe will access them and check that they are still valid" +a=o:get(0) +b=o:get(1) +print(" Area's are",a:area(),b:area(),o:get(2):area()) +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") + +print "\nWe will remove one from the C++ owner & pass its ownership to Lua," +print " then check that they are still unchanged" +a,b=nil,nil +a=o:remove(0) -- a now owns it +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 3)") + +print "\nDelete the ShapeOwner (this should destroy two shapes)," +print " but we have one left in Lua" +o=nil +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 1)") + +print "\nFinal tidy up " +a=nil +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") + + +print "Final test, we will create some Shapes & pass them around like mad" +print "If there is any memory leak, you will see it in the memory usage" +io.flush() +sh={} +-- make some objects +for i=0,10 do + a=example.Circle(i) + b=example.Square(i) + sh[a]=true + sh[b]=true +end +o=example.ShapeOwner() +for i=0,10000 do + for k,_ in pairs(sh) do + o:add(k) + end + sh={} -- clear it + while true do + a=o:remove(0) + if a==nil then break end + sh[a]=true + end + if i%100==0 then collectgarbage() end +end +print "done" +o,sh=nil,nil +collectgarbage() +print("Currently there are",example.Shape_nshapes,"shapes (there should be 0)") +print "thats all folks!" diff --git a/Examples/test-suite/csharp/li_std_map_runme.cs b/Examples/test-suite/csharp/li_std_map_runme.cs index 551cf2dc1..0fe1ab5cd 100644 --- a/Examples/test-suite/csharp/li_std_map_runme.cs +++ b/Examples/test-suite/csharp/li_std_map_runme.cs @@ -1,246 +1,246 @@ -/* ----------------------------------------------------------------------------- - * li_std_map_runme.cs - * - * SWIG C# tester for std_map.i - * This class tests all the functionality of the std_map.i wrapper. - * Upon successful testing, the main function doesn't print out anything. - * If any error is found - it will be printed on the screen. - * ----------------------------------------------------------------------------- */ - -using System; -using System.Collections.Generic; -using li_std_mapNamespace; - -public class li_std_map_runme { - - private static readonly int collectionSize = 20; - private static readonly int midCollection = collectionSize / 2; - - public static void Main() - { - // Set up an int int map - StringIntMap simap = new StringIntMap(); - for (int i = 0; i < collectionSize; i++) - { - int val = i * 18; - simap.Add(i.ToString(), val); - } - - // Count property test - if (simap.Count != collectionSize) - throw new Exception("Count test failed"); - - // IsReadOnly property test - if (simap.IsReadOnly) - throw new Exception("IsReadOnly test failed"); - - // Item indexing test - simap["0"] = 200; - if (simap["0"] != 200) - throw new Exception("Item property test failed"); - simap["0"] = 0 * 18; - - // ContainsKey() test - for (int i = 0; i < collectionSize; i++) - { - if (!simap.ContainsKey(i.ToString())) - throw new Exception("ContainsKey test " + i + " failed"); - } - - // ContainsKey() test - for (int i = 0; i < collectionSize; i++) - { - if (!simap.Contains(new KeyValuePair(i.ToString(), i * 18))) - throw new Exception("Contains test " + i + " failed"); - } - - // TryGetValue() test - int value; - bool rc = simap.TryGetValue("3", out value); - if (rc != true || value != (3 * 18)) - throw new Exception("TryGetValue test 1 failed"); - - rc = simap.TryGetValue("-1", out value); - if (rc != false) - throw new Exception("TryGetValue test 2 failed"); - - // Keys and Values test - { - IList keys = new List(simap.Keys); - IList values = new List(simap.Values); - Dictionary check = new Dictionary(); - if (keys.Count != collectionSize) - throw new Exception("Keys count test failed"); - - if (values.Count != collectionSize) - throw new Exception("Values count test failed"); - - for (int i = 0; i < keys.Count; i++) - { - if (simap[keys[i]] != values[i]) - throw new Exception("Keys and values test failed for index " + i); - check.Add(keys[i], values[i]); - } - - for (int i = 0; i < collectionSize; i++) - { - if (!check.ContainsKey(i.ToString())) - throw new Exception("Keys and Values ContainsKey test " + i + " failed"); - } - } - - // Add and Remove test - for (int i = 100; i < 103; i++) - { - 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); - - 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++) - { - simap.Add(new KeyValuePair(i.ToString(), i * 18)); - if (!simap.ContainsKey(i.ToString()) || simap[i.ToString()] != (i * 18)) - throw new Exception("Add explicit test failed for index " + i); - - simap.Remove(new KeyValuePair(i.ToString(), i * 18)); - if (simap.ContainsKey(i.ToString())) - throw new Exception("Remove explicit test failed for index " + i); - } - - // Duplicate key test - try - { - simap.Add("3", 0); - throw new Exception("Adding duplicate key test failed"); - } - catch (ArgumentException) - { - } - - // CopyTo() test - { - KeyValuePair[] outputarray = new KeyValuePair[collectionSize]; - simap.CopyTo(outputarray); - foreach (KeyValuePair val in outputarray) - { - if (simap[val.Key] != val.Value) - throw new Exception("CopyTo (1) test failed, index:" + val.Key); - } - } - { - KeyValuePair[] outputarray = new KeyValuePair[midCollection + collectionSize]; - simap.CopyTo(outputarray, midCollection); - for (int i = midCollection; i < midCollection + collectionSize; i++) - { - KeyValuePair val = outputarray[i]; - if (simap[val.Key] != val.Value) - throw new Exception("CopyTo (2) test failed, index:" + val.Key); - } - } - { - KeyValuePair[] outputarray = new KeyValuePair[collectionSize - 1]; - try - { - simap.CopyTo(outputarray); - throw new Exception("CopyTo (4) test failed"); - } - catch (ArgumentException) - { - } - } - - // Clear test - simap.Clear(); - if (simap.Count != 0) - throw new Exception("Clear test failed"); - - // Test wrapped methods - for (int i = 1; i <= 5; i++) - { - simap[i.ToString()] = i; - } - double avg = li_std_map.valueAverage(simap); - if (avg != 3.0) - 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 complex type (Struct) - { - IntStructMap ismap = new IntStructMap(); - for (int i = 0; i < 10; i++) - { - ismap.Add(i, new Struct(i * 10.1)); - } - - if (ismap.Count != 10) - throw new Exception("Count test on complex type map failed"); - - foreach (KeyValuePair p in ismap) - { - if ((p.Key * 10.1) != p.Value.num) - throw new Exception("Iteration test on complex type map failed for index " + p.Key); - } - } - - // Test a map of pointers - { - IntStructPtrMap ispmap = new IntStructPtrMap(); - for (int i = 0; i < 10; i++) - { - ispmap.Add(i, new Struct(i * 10.1)); - } - - if (ispmap.Count != 10) - throw new Exception("Count test on complex type pointer map failed"); - - foreach (KeyValuePair p in ispmap) - { - if ((p.Key * 10.1) != p.Value.num) - throw new Exception("Iteration test on complex type pointer map failed for index " + p.Key); - } - } - { - IntStructConstPtrMap iscpmap = new IntStructConstPtrMap(); - for (int i = 0; i < 10; i++) - { - iscpmap.Add(i, new Struct(i * 10.1)); - } - - if (iscpmap.Count != 10) - throw new Exception("Count test on complex type const pointer map failed"); - - foreach (KeyValuePair p in iscpmap) - { - if ((p.Key * 10.1) != p.Value.num) - throw new Exception("Iteration test on complex type const pointer map failed for index " + p.Key); - } - } - - // Test complex type as key (Struct) - { - StructIntMap limap = new StructIntMap(); - Struct s7 = new Struct(7); - Struct s8 = new Struct(8); - limap[s7] = 8; - if (limap[s7] != 8) - throw new Exception("Assignment test on complex key map failed"); - - if (!limap.ContainsKey(s7)) - throw new Exception("Key test (1) on complex key map failed"); - - if (limap.ContainsKey(s8)) - throw new Exception("Key test (2) on complex key map failed"); - } - - // All done - } -} - +/* ----------------------------------------------------------------------------- + * li_std_map_runme.cs + * + * SWIG C# tester for std_map.i + * This class tests all the functionality of the std_map.i wrapper. + * Upon successful testing, the main function doesn't print out anything. + * If any error is found - it will be printed on the screen. + * ----------------------------------------------------------------------------- */ + +using System; +using System.Collections.Generic; +using li_std_mapNamespace; + +public class li_std_map_runme { + + private static readonly int collectionSize = 20; + private static readonly int midCollection = collectionSize / 2; + + public static void Main() + { + // Set up an int int map + StringIntMap simap = new StringIntMap(); + for (int i = 0; i < collectionSize; i++) + { + int val = i * 18; + simap.Add(i.ToString(), val); + } + + // Count property test + if (simap.Count != collectionSize) + throw new Exception("Count test failed"); + + // IsReadOnly property test + if (simap.IsReadOnly) + throw new Exception("IsReadOnly test failed"); + + // Item indexing test + simap["0"] = 200; + if (simap["0"] != 200) + throw new Exception("Item property test failed"); + simap["0"] = 0 * 18; + + // ContainsKey() test + for (int i = 0; i < collectionSize; i++) + { + if (!simap.ContainsKey(i.ToString())) + throw new Exception("ContainsKey test " + i + " failed"); + } + + // ContainsKey() test + for (int i = 0; i < collectionSize; i++) + { + if (!simap.Contains(new KeyValuePair(i.ToString(), i * 18))) + throw new Exception("Contains test " + i + " failed"); + } + + // TryGetValue() test + int value; + bool rc = simap.TryGetValue("3", out value); + if (rc != true || value != (3 * 18)) + throw new Exception("TryGetValue test 1 failed"); + + rc = simap.TryGetValue("-1", out value); + if (rc != false) + throw new Exception("TryGetValue test 2 failed"); + + // Keys and Values test + { + IList keys = new List(simap.Keys); + IList values = new List(simap.Values); + Dictionary check = new Dictionary(); + if (keys.Count != collectionSize) + throw new Exception("Keys count test failed"); + + if (values.Count != collectionSize) + throw new Exception("Values count test failed"); + + for (int i = 0; i < keys.Count; i++) + { + if (simap[keys[i]] != values[i]) + throw new Exception("Keys and values test failed for index " + i); + check.Add(keys[i], values[i]); + } + + for (int i = 0; i < collectionSize; i++) + { + if (!check.ContainsKey(i.ToString())) + throw new Exception("Keys and Values ContainsKey test " + i + " failed"); + } + } + + // Add and Remove test + for (int i = 100; i < 103; i++) + { + 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); + + 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++) + { + simap.Add(new KeyValuePair(i.ToString(), i * 18)); + if (!simap.ContainsKey(i.ToString()) || simap[i.ToString()] != (i * 18)) + throw new Exception("Add explicit test failed for index " + i); + + simap.Remove(new KeyValuePair(i.ToString(), i * 18)); + if (simap.ContainsKey(i.ToString())) + throw new Exception("Remove explicit test failed for index " + i); + } + + // Duplicate key test + try + { + simap.Add("3", 0); + throw new Exception("Adding duplicate key test failed"); + } + catch (ArgumentException) + { + } + + // CopyTo() test + { + KeyValuePair[] outputarray = new KeyValuePair[collectionSize]; + simap.CopyTo(outputarray); + foreach (KeyValuePair val in outputarray) + { + if (simap[val.Key] != val.Value) + throw new Exception("CopyTo (1) test failed, index:" + val.Key); + } + } + { + KeyValuePair[] outputarray = new KeyValuePair[midCollection + collectionSize]; + simap.CopyTo(outputarray, midCollection); + for (int i = midCollection; i < midCollection + collectionSize; i++) + { + KeyValuePair val = outputarray[i]; + if (simap[val.Key] != val.Value) + throw new Exception("CopyTo (2) test failed, index:" + val.Key); + } + } + { + KeyValuePair[] outputarray = new KeyValuePair[collectionSize - 1]; + try + { + simap.CopyTo(outputarray); + throw new Exception("CopyTo (4) test failed"); + } + catch (ArgumentException) + { + } + } + + // Clear test + simap.Clear(); + if (simap.Count != 0) + throw new Exception("Clear test failed"); + + // Test wrapped methods + for (int i = 1; i <= 5; i++) + { + simap[i.ToString()] = i; + } + double avg = li_std_map.valueAverage(simap); + if (avg != 3.0) + 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 complex type (Struct) + { + IntStructMap ismap = new IntStructMap(); + for (int i = 0; i < 10; i++) + { + ismap.Add(i, new Struct(i * 10.1)); + } + + if (ismap.Count != 10) + throw new Exception("Count test on complex type map failed"); + + foreach (KeyValuePair p in ismap) + { + if ((p.Key * 10.1) != p.Value.num) + throw new Exception("Iteration test on complex type map failed for index " + p.Key); + } + } + + // Test a map of pointers + { + IntStructPtrMap ispmap = new IntStructPtrMap(); + for (int i = 0; i < 10; i++) + { + ispmap.Add(i, new Struct(i * 10.1)); + } + + if (ispmap.Count != 10) + throw new Exception("Count test on complex type pointer map failed"); + + foreach (KeyValuePair p in ispmap) + { + if ((p.Key * 10.1) != p.Value.num) + throw new Exception("Iteration test on complex type pointer map failed for index " + p.Key); + } + } + { + IntStructConstPtrMap iscpmap = new IntStructConstPtrMap(); + for (int i = 0; i < 10; i++) + { + iscpmap.Add(i, new Struct(i * 10.1)); + } + + if (iscpmap.Count != 10) + throw new Exception("Count test on complex type const pointer map failed"); + + foreach (KeyValuePair p in iscpmap) + { + if ((p.Key * 10.1) != p.Value.num) + throw new Exception("Iteration test on complex type const pointer map failed for index " + p.Key); + } + } + + // Test complex type as key (Struct) + { + StructIntMap limap = new StructIntMap(); + Struct s7 = new Struct(7); + Struct s8 = new Struct(8); + limap[s7] = 8; + if (limap[s7] != 8) + throw new Exception("Assignment test on complex key map failed"); + + if (!limap.ContainsKey(s7)) + throw new Exception("Key test (1) on complex key map failed"); + + if (limap.ContainsKey(s8)) + throw new Exception("Key test (2) on complex key map failed"); + } + + // All done + } +} + diff --git a/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java b/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java index f40c28e9e..9b480e7e0 100644 --- a/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java +++ b/Examples/test-suite/java/li_boost_intrusive_ptr_runme.java @@ -1,701 +1,701 @@ -import li_boost_intrusive_ptr.*; - -public class li_boost_intrusive_ptr_runme { - static { - try { - System.loadLibrary("li_boost_intrusive_ptr"); - } 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); - } - } - - // Debugging flag - public final static boolean debug = false; - - public static void main(String argv[]) - { - if (debug) - System.out.println("Started"); - - li_boost_intrusive_ptr.setDebug_shared(debug); - - // Change loop count to run for a long time to monitor memory - final int loopCount = 5000; //5000; - for (int i=0; i - -// Uncomment macro below to turn on intrusive_ptr memory leak checking as described above -//#define INTRUSIVE_PTR_WRAPPER - -#ifdef INTRUSIVE_PTR_WRAPPER -# include "intrusive_ptr_wrapper.h" -# include "shared_ptr_wrapper.h" -#endif -%} - -%{ -#ifndef INTRUSIVE_PTR_WRAPPER -# define SwigBoost boost -#endif -%} - -%include "std_string.i" -#ifndef INTRUSIVE_PTR_WRAPPER -# define SWIG_INTRUSIVE_PTR_NAMESPACE SwigBoost -# define SWIG_SHARED_PTR_NAMESPACE SwigBoost -#endif - -#if defined(SWIGJAVA) || defined(SWIGCSHARP) -#define INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED -#endif - -#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) - -%include -%intrusive_ptr(Space::Klass) -%intrusive_ptr_no_wrap(Space::KlassWithoutRefCount) -%intrusive_ptr(Space::KlassDerived) -%intrusive_ptr(Space::KlassDerivedDerived) - -//For the use_count shared_ptr functions -#if defined(SWIGJAVA) -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass.getCPtr($javainput)" - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived.getCPtr($javainput)" - -%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & ($*1_ltype tempnull) %{ - $1 = $input ? *($&1_ltype)&$input : &tempnull; -%} -%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "jlong" -%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "long" -%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived" -%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived.getCPtr($javainput)" - -#elif defined(SWIGCSHARP) -// TODO! -#endif - -#endif - -// TODO: -// const intrusive_ptr -// std::vector -// Add in generic %extend for the Upcast function for derived classes -// Remove proxy upcast method - implement %feature("shadow") ??? which replaces the proxy method - -%exception { - if (debug_shared) { - cout << "++++++" << endl << flush; - cout << "calling $name" << endl << flush; - } - $action - if (debug_shared) { - cout << "------" << endl << flush; - } -} - -%ignore IgnoredRefCountingBase; -%ignore *::operator=; -%ignore intrusive_ptr_add_ref; -%ignore intrusive_ptr_release; -%newobject pointerownertest(); -%newobject smartpointerpointerownertest(); - -%inline %{ -#include -using namespace std; - -static bool debug_shared = false; - -namespace Space { - -struct Klass { - Klass() : value("EMPTY"), count(0) { if (debug_shared) cout << "Klass() [" << value << "]" << endl << flush; increment(); } - - Klass(const std::string &val) : value(val), count(0) { if (debug_shared) cout << "Klass(string) [" << value << "]" << endl << flush; increment(); } - - virtual ~Klass() { if (debug_shared) cout << "~Klass() [" << value << "]" << endl << flush; decrement(); } - virtual std::string getValue() const { return value; } - void append(const std::string &s) { value += s; } - Klass(const Klass &other) : value(other.value), count(0) { if (debug_shared) cout << "Klass(const Klass&) [" << value << "]" << endl << flush; increment(); } - - Klass &operator=(const Klass &other) { value = other.value; return *this; } - - void addref(void) const { ++count; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } - static long getTotal_count() { return total_count; } - -private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx Klass::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - std::string value; - int array[1024]; - mutable boost::detail::atomic_count count; -}; - -struct KlassWithoutRefCount { - KlassWithoutRefCount() : value("EMPTY") { if (debug_shared) cout << "KlassWithoutRefCount() [" << value << "]" << endl << flush; increment(); } - - KlassWithoutRefCount(const std::string &val) : value(val) { if (debug_shared) cout << "KlassWithoutRefCount(string) [" << value << "]" << endl << flush; increment(); } - - virtual ~KlassWithoutRefCount() { if (debug_shared) cout << "~KlassWithoutRefCount() [" << value << "]" << endl << flush; decrement(); } - virtual std::string getValue() const { return value; } - void append(const std::string &s) { value += s; } - KlassWithoutRefCount(const KlassWithoutRefCount &other) : value(other.value) { if (debug_shared) cout << "KlassWithoutRefCount(const KlassWithoutRefCount&) [" << value << "]" << endl << flush; increment(); } - std::string getSpecialValueFromUnwrappableClass() { return "this class cannot be wrapped by intrusive_ptrs but we can still use it"; } - KlassWithoutRefCount &operator=(const KlassWithoutRefCount &other) { value = other.value; return *this; } - static long getTotal_count() { return total_count; } - -private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassWithoutRefCount::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassWithoutRefCount::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - std::string value; - int array[1024]; -}; - -struct IgnoredRefCountingBase { - IgnoredRefCountingBase() : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase()" << endl << flush; increment(); } - - IgnoredRefCountingBase(const IgnoredRefCountingBase &other) : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase(const IgnoredRefCountingBase&)" << endl << flush; increment(); } - - IgnoredRefCountingBase &operator=(const IgnoredRefCountingBase& other) { - return *this; - } - - virtual ~IgnoredRefCountingBase() { if (debug_shared) cout << "~IgnoredRefCountingBase()" << endl << flush; decrement(); } - - void addref(void) const { ++count; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx IgnoredRefCountingBase::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx IgnoredRefCountingBase::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; - double d; - double e; - mutable boost::detail::atomic_count count; -}; - -long getTotal_IgnoredRefCountingBase_count() { - return IgnoredRefCountingBase::getTotal_count(); -} - -// For most compilers, this use of multiple inheritance results in different derived and base class -// pointer values ... for some more challenging tests :) -struct KlassDerived : IgnoredRefCountingBase, KlassWithoutRefCount { - KlassDerived() : KlassWithoutRefCount() { if (debug_shared) cout << "KlassDerived()" << endl << flush; increment(); } - KlassDerived(const std::string &val) : KlassWithoutRefCount(val) { if (debug_shared) cout << "KlassDerived(string) [" << val << "]" << endl << flush; increment(); } - KlassDerived(const KlassDerived &other) : KlassWithoutRefCount(other) { if (debug_shared) cout << "KlassDerived(const KlassDerived&))" << endl << flush; increment(); } - virtual ~KlassDerived() { if (debug_shared) cout << "~KlassDerived()" << endl << flush; decrement(); } - virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-Derived"; } - int use_count(void) const { return IgnoredRefCountingBase::use_count(); } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerived::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerived::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; -}; -struct KlassDerivedDerived : KlassDerived { - KlassDerivedDerived() : KlassDerived() { if (debug_shared) cout << "KlassDerivedDerived()" << endl << flush; increment(); } - KlassDerivedDerived(const std::string &val) : KlassDerived(val) { if (debug_shared) cout << "KlassDerivedDerived(string) [" << val << "]" << endl << flush; increment(); } - KlassDerivedDerived(const KlassDerived &other) : KlassDerived(other) { if (debug_shared) cout << "KlassDerivedDerived(const KlassDerivedDerived&))" << endl << flush; increment(); } - virtual ~KlassDerivedDerived() { if (debug_shared) cout << "~KlassDerivedDerived()" << endl << flush; decrement(); } - virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-DerivedDerived"; } - static long getTotal_count() { return total_count; } - - private: - static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerivedDerived::increment tot: " << total_count << endl;} - static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerivedDerived::decrement tot: " << total_count << endl;} - static boost::detail::atomic_count total_count; -}; -KlassDerived* derivedpointertest(KlassDerived* kd) { - if (kd) - kd->append(" derivedpointertest"); - return kd; -} -KlassDerived derivedvaluetest(KlassDerived kd) { - kd.append(" derivedvaluetest"); - return kd; -} -KlassDerived& derivedreftest(KlassDerived& kd) { - kd.append(" derivedreftest"); - return kd; -} -SwigBoost::intrusive_ptr derivedsmartptrtest(SwigBoost::intrusive_ptr kd) { - if (kd) - kd->append(" derivedsmartptrtest"); - return kd; -} -SwigBoost::intrusive_ptr* derivedsmartptrpointertest(SwigBoost::intrusive_ptr* kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrpointertest"); - return kd; -} -SwigBoost::intrusive_ptr* derivedsmartptrreftest(SwigBoost::intrusive_ptr* kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrreftest"); - return kd; -} -SwigBoost::intrusive_ptr*& derivedsmartptrpointerreftest(SwigBoost::intrusive_ptr*& kd) { - if (kd && *kd) - (*kd)->append(" derivedsmartptrpointerreftest"); - return kd; -} - -SwigBoost::intrusive_ptr factorycreate() { - return SwigBoost::intrusive_ptr(new Klass("factorycreate")); -} -// smart pointer -SwigBoost::intrusive_ptr smartpointertest(SwigBoost::intrusive_ptr k) { - if (k) - k->append(" smartpointertest"); - return SwigBoost::intrusive_ptr(k); -} -SwigBoost::intrusive_ptr* smartpointerpointertest(SwigBoost::intrusive_ptr* k) { - if (k && *k) - (*k)->append(" smartpointerpointertest"); - return k; -} -SwigBoost::intrusive_ptr& smartpointerreftest(SwigBoost::intrusive_ptr& k) { - if (k) - k->append(" smartpointerreftest"); - return k; -} -SwigBoost::intrusive_ptr*& smartpointerpointerreftest(SwigBoost::intrusive_ptr*& k) { - if (k && *k) - (*k)->append(" smartpointerpointerreftest"); - return k; -} -// const -SwigBoost::intrusive_ptr constsmartpointertest(SwigBoost::intrusive_ptr k) { - return SwigBoost::intrusive_ptr(k); -} -SwigBoost::intrusive_ptr* constsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { - return k; -} -SwigBoost::intrusive_ptr& constsmartpointerreftest(SwigBoost::intrusive_ptr& k) { - return k; -} -// plain pointer -Klass valuetest(Klass k) { - k.append(" valuetest"); - return k; -} -Klass *pointertest(Klass *k) { - if (k) - k->append(" pointertest"); - return k; -} -Klass& reftest(Klass& k) { - k.append(" reftest"); - return k; -} -Klass *const& pointerreftest(Klass *const& k) { - k->append(" pointerreftest"); - return k; -} -// null -std::string nullsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { - if (k && *k) - return "not null"; - else if (!k) - return "null smartpointer pointer"; - else if (!*k) - return "null pointer"; - else - return "also not null"; -} -// $owner -Klass *pointerownertest() { - return new Klass("pointerownertest"); -} -SwigBoost::intrusive_ptr* smartpointerpointerownertest() { - return new SwigBoost::intrusive_ptr(new Klass("smartpointerpointerownertest")); -} - -const SwigBoost::intrusive_ptr& ref_1() { - static SwigBoost::intrusive_ptr sptr; - return sptr; -} - -// overloading tests -std::string overload_rawbyval(int i) { return "int"; } -std::string overload_rawbyval(Klass k) { return "rawbyval"; } - -std::string overload_rawbyref(int i) { return "int"; } -std::string overload_rawbyref(Klass &k) { return "rawbyref"; } - -std::string overload_rawbyptr(int i) { return "int"; } -std::string overload_rawbyptr(Klass *k) { return "rawbyptr"; } - -std::string overload_rawbyptrref(int i) { return "int"; } -std::string overload_rawbyptrref(Klass *const&k) { return "rawbyptrref"; } - - - -std::string overload_smartbyval(int i) { return "int"; } -std::string overload_smartbyval(SwigBoost::intrusive_ptr k) { return "smartbyval"; } - -std::string overload_smartbyref(int i) { return "int"; } -std::string overload_smartbyref(SwigBoost::intrusive_ptr &k) { return "smartbyref"; } - -std::string overload_smartbyptr(int i) { return "int"; } -std::string overload_smartbyptr(SwigBoost::intrusive_ptr *k) { return "smartbyptr"; } - -std::string overload_smartbyptrref(int i) { return "int"; } -std::string overload_smartbyptrref(SwigBoost::intrusive_ptr *&k) { return "smartbyptrref"; } - -} // namespace Space - -%} -%{ - boost::detail::atomic_count Space::Klass::total_count(0); - boost::detail::atomic_count Space::KlassWithoutRefCount::total_count(0); - boost::detail::atomic_count Space::IgnoredRefCountingBase::total_count(0); - boost::detail::atomic_count Space::KlassDerived::total_count(0); - boost::detail::atomic_count Space::KlassDerivedDerived::total_count(0); -%} - -// Member variables - -%inline %{ -struct MemberVariables { - MemberVariables() : SmartMemberPointer(new SwigBoost::intrusive_ptr()), SmartMemberReference(*(new SwigBoost::intrusive_ptr())), MemberPointer(0), MemberReference(MemberValue) {} - virtual ~MemberVariables() { - delete SmartMemberPointer; - delete &SmartMemberReference; - } - SwigBoost::intrusive_ptr SmartMemberValue; - SwigBoost::intrusive_ptr * SmartMemberPointer; - SwigBoost::intrusive_ptr & SmartMemberReference; - Space::Klass MemberValue; - Space::Klass * MemberPointer; - Space::Klass & MemberReference; -}; - -// Global variables -SwigBoost::intrusive_ptr GlobalSmartValue; -Space::Klass GlobalValue; -Space::Klass * GlobalPointer = 0; -Space::Klass & GlobalReference = GlobalValue; - -%} - -#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) - -// Note: %template after the intrusive_ptr typemaps -%intrusive_ptr(Base) -%intrusive_ptr(Pair) - -#endif - -// Templates -%inline %{ -template struct Base { - Space::Klass klassBase; - T1 baseVal1; - T2 baseVal2; - Base(T1 t1, T2 t2) : baseVal1(t1*2), baseVal2(t2*2) {} - virtual std::string getValue() const { return "Base<>"; }; - mutable int count; - void addref(void) const { count++; } - void release(void) const { if (--count == 0) delete this; } - int use_count(void) const { return count; } -}; -%} - -%template(BaseIntDouble) Base; - -%inline %{ -template struct Pair : Base { - Space::Klass klassPair; - T1 val1; - T2 val2; - Pair(T1 t1, T2 t2) : Base(t1, t2), val1(t1), val2(t2) {} - virtual std::string getValue() const { return "Pair<>"; }; -}; - -Pair pair_id2(Pair p) { return p; } -SwigBoost::intrusive_ptr< Pair > pair_id1(SwigBoost::intrusive_ptr< Pair > p) { return p; } - -template void intrusive_ptr_add_ref(const T* r) { r->addref(); } - -template void intrusive_ptr_release(const T* r) { r->release(); } - -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -long use_count(const SwigBoost::shared_ptr& sptr) { - return sptr.use_count(); -} -%} - -%template(PairIntDouble) Pair; - -// For counting the instances of intrusive_ptr (all of which are created on the heap) -// intrusive_ptr_wrapper_count() gives overall count -%inline %{ -namespace SwigBoost { - const int NOT_COUNTING = -123456; - int intrusive_ptr_wrapper_count() { - #ifdef INTRUSIVE_PTR_WRAPPER - return SwigBoost::IntrusivePtrWrapper::getTotalCount(); - #else - return NOT_COUNTING; - #endif - } - #ifdef INTRUSIVE_PTR_WRAPPER - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "Klass: " + (*t)->getValue(); - else - return "Klass: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "Klass: " + (*t)->getValue(); - else - return "Klass: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "KlassDerived: " + (*t)->getValue(); - else - return "KlassDerived: NULL"; - } - template<> std::string show_message(boost::intrusive_ptr*t) { - if (!t) - return "null intrusive_ptr!!!"; - if (*t) - return "KlassDerived: " + (*t)->getValue(); - else - return "KlassDerived: NULL"; - } - #endif -} -%} - +// This tests intrusive_ptr is working okay. It also checks that there are no memory leaks in the +// class that intrusive_ptr is pointing via a counting mechanism in the constructors and destructor of Klass. +// In order to test that there are no leaks of the intrusive_ptr class itself (as it is created on the heap) +// the runtime tests can be run for a long time to monitor memory leaks using memory monitor tools +// like 'top'. There is a wrapper for intrusive_ptr in intrusive_ptr_wrapper.h which enables one to +// count the instances of intrusive_ptr. Uncomment the INTRUSIVE_PTR_WRAPPER macro to turn this on. +// +// Also note the debug_shared flag which can be set from the target language. + +%module li_boost_intrusive_ptr + +%warnfilter(SWIGWARN_TYPEMAP_SWIGTYPELEAK); +%warnfilter(SWIGWARN_LANG_SMARTPTR_MISSING) KlassDerived; +%warnfilter(SWIGWARN_LANG_SMARTPTR_MISSING) KlassDerivedDerived; + +%inline %{ +#include "boost/shared_ptr.hpp" +#include "boost/intrusive_ptr.hpp" +#include + +// Uncomment macro below to turn on intrusive_ptr memory leak checking as described above +//#define INTRUSIVE_PTR_WRAPPER + +#ifdef INTRUSIVE_PTR_WRAPPER +# include "intrusive_ptr_wrapper.h" +# include "shared_ptr_wrapper.h" +#endif +%} + +%{ +#ifndef INTRUSIVE_PTR_WRAPPER +# define SwigBoost boost +#endif +%} + +%include "std_string.i" +#ifndef INTRUSIVE_PTR_WRAPPER +# define SWIG_INTRUSIVE_PTR_NAMESPACE SwigBoost +# define SWIG_SHARED_PTR_NAMESPACE SwigBoost +#endif + +#if defined(SWIGJAVA) || defined(SWIGCSHARP) +#define INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED +#endif + +#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) + +%include +%intrusive_ptr(Space::Klass) +%intrusive_ptr_no_wrap(Space::KlassWithoutRefCount) +%intrusive_ptr(Space::KlassDerived) +%intrusive_ptr(Space::KlassDerivedDerived) + +//For the use_count shared_ptr functions +#if defined(SWIGJAVA) +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::Klass > & "Klass.getCPtr($javainput)" + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerived > & "KlassDerived.getCPtr($javainput)" + +%typemap(in) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & ($*1_ltype tempnull) %{ + $1 = $input ? *($&1_ltype)&$input : &tempnull; +%} +%typemap (jni) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "jlong" +%typemap (jtype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "long" +%typemap (jstype) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived" +%typemap(javain) SWIG_INTRUSIVE_PTR_QNAMESPACE::shared_ptr< Space::KlassDerivedDerived > & "KlassDerivedDerived.getCPtr($javainput)" + +#elif defined(SWIGCSHARP) +// TODO! +#endif + +#endif + +// TODO: +// const intrusive_ptr +// std::vector +// Add in generic %extend for the Upcast function for derived classes +// Remove proxy upcast method - implement %feature("shadow") ??? which replaces the proxy method + +%exception { + if (debug_shared) { + cout << "++++++" << endl << flush; + cout << "calling $name" << endl << flush; + } + $action + if (debug_shared) { + cout << "------" << endl << flush; + } +} + +%ignore IgnoredRefCountingBase; +%ignore *::operator=; +%ignore intrusive_ptr_add_ref; +%ignore intrusive_ptr_release; +%newobject pointerownertest(); +%newobject smartpointerpointerownertest(); + +%inline %{ +#include +using namespace std; + +static bool debug_shared = false; + +namespace Space { + +struct Klass { + Klass() : value("EMPTY"), count(0) { if (debug_shared) cout << "Klass() [" << value << "]" << endl << flush; increment(); } + + Klass(const std::string &val) : value(val), count(0) { if (debug_shared) cout << "Klass(string) [" << value << "]" << endl << flush; increment(); } + + virtual ~Klass() { if (debug_shared) cout << "~Klass() [" << value << "]" << endl << flush; decrement(); } + virtual std::string getValue() const { return value; } + void append(const std::string &s) { value += s; } + Klass(const Klass &other) : value(other.value), count(0) { if (debug_shared) cout << "Klass(const Klass&) [" << value << "]" << endl << flush; increment(); } + + Klass &operator=(const Klass &other) { value = other.value; return *this; } + + void addref(void) const { ++count; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } + static long getTotal_count() { return total_count; } + +private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx Klass::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx Klass::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + std::string value; + int array[1024]; + mutable boost::detail::atomic_count count; +}; + +struct KlassWithoutRefCount { + KlassWithoutRefCount() : value("EMPTY") { if (debug_shared) cout << "KlassWithoutRefCount() [" << value << "]" << endl << flush; increment(); } + + KlassWithoutRefCount(const std::string &val) : value(val) { if (debug_shared) cout << "KlassWithoutRefCount(string) [" << value << "]" << endl << flush; increment(); } + + virtual ~KlassWithoutRefCount() { if (debug_shared) cout << "~KlassWithoutRefCount() [" << value << "]" << endl << flush; decrement(); } + virtual std::string getValue() const { return value; } + void append(const std::string &s) { value += s; } + KlassWithoutRefCount(const KlassWithoutRefCount &other) : value(other.value) { if (debug_shared) cout << "KlassWithoutRefCount(const KlassWithoutRefCount&) [" << value << "]" << endl << flush; increment(); } + std::string getSpecialValueFromUnwrappableClass() { return "this class cannot be wrapped by intrusive_ptrs but we can still use it"; } + KlassWithoutRefCount &operator=(const KlassWithoutRefCount &other) { value = other.value; return *this; } + static long getTotal_count() { return total_count; } + +private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassWithoutRefCount::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassWithoutRefCount::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + std::string value; + int array[1024]; +}; + +struct IgnoredRefCountingBase { + IgnoredRefCountingBase() : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase()" << endl << flush; increment(); } + + IgnoredRefCountingBase(const IgnoredRefCountingBase &other) : count(0) { if (debug_shared) cout << "IgnoredRefCountingBase(const IgnoredRefCountingBase&)" << endl << flush; increment(); } + + IgnoredRefCountingBase &operator=(const IgnoredRefCountingBase& other) { + return *this; + } + + virtual ~IgnoredRefCountingBase() { if (debug_shared) cout << "~IgnoredRefCountingBase()" << endl << flush; decrement(); } + + void addref(void) const { ++count; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx IgnoredRefCountingBase::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx IgnoredRefCountingBase::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; + double d; + double e; + mutable boost::detail::atomic_count count; +}; + +long getTotal_IgnoredRefCountingBase_count() { + return IgnoredRefCountingBase::getTotal_count(); +} + +// For most compilers, this use of multiple inheritance results in different derived and base class +// pointer values ... for some more challenging tests :) +struct KlassDerived : IgnoredRefCountingBase, KlassWithoutRefCount { + KlassDerived() : KlassWithoutRefCount() { if (debug_shared) cout << "KlassDerived()" << endl << flush; increment(); } + KlassDerived(const std::string &val) : KlassWithoutRefCount(val) { if (debug_shared) cout << "KlassDerived(string) [" << val << "]" << endl << flush; increment(); } + KlassDerived(const KlassDerived &other) : KlassWithoutRefCount(other) { if (debug_shared) cout << "KlassDerived(const KlassDerived&))" << endl << flush; increment(); } + virtual ~KlassDerived() { if (debug_shared) cout << "~KlassDerived()" << endl << flush; decrement(); } + virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-Derived"; } + int use_count(void) const { return IgnoredRefCountingBase::use_count(); } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerived::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerived::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; +}; +struct KlassDerivedDerived : KlassDerived { + KlassDerivedDerived() : KlassDerived() { if (debug_shared) cout << "KlassDerivedDerived()" << endl << flush; increment(); } + KlassDerivedDerived(const std::string &val) : KlassDerived(val) { if (debug_shared) cout << "KlassDerivedDerived(string) [" << val << "]" << endl << flush; increment(); } + KlassDerivedDerived(const KlassDerived &other) : KlassDerived(other) { if (debug_shared) cout << "KlassDerivedDerived(const KlassDerivedDerived&))" << endl << flush; increment(); } + virtual ~KlassDerivedDerived() { if (debug_shared) cout << "~KlassDerivedDerived()" << endl << flush; decrement(); } + virtual std::string getValue() const { return KlassWithoutRefCount::getValue() + "-DerivedDerived"; } + static long getTotal_count() { return total_count; } + + private: + static void increment() { ++total_count; if (debug_shared) cout << " ++xxxxx KlassDerivedDerived::increment tot: " << total_count << endl;} + static void decrement() { --total_count; if (debug_shared) cout << " --xxxxx KlassDerivedDerived::decrement tot: " << total_count << endl;} + static boost::detail::atomic_count total_count; +}; +KlassDerived* derivedpointertest(KlassDerived* kd) { + if (kd) + kd->append(" derivedpointertest"); + return kd; +} +KlassDerived derivedvaluetest(KlassDerived kd) { + kd.append(" derivedvaluetest"); + return kd; +} +KlassDerived& derivedreftest(KlassDerived& kd) { + kd.append(" derivedreftest"); + return kd; +} +SwigBoost::intrusive_ptr derivedsmartptrtest(SwigBoost::intrusive_ptr kd) { + if (kd) + kd->append(" derivedsmartptrtest"); + return kd; +} +SwigBoost::intrusive_ptr* derivedsmartptrpointertest(SwigBoost::intrusive_ptr* kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrpointertest"); + return kd; +} +SwigBoost::intrusive_ptr* derivedsmartptrreftest(SwigBoost::intrusive_ptr* kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrreftest"); + return kd; +} +SwigBoost::intrusive_ptr*& derivedsmartptrpointerreftest(SwigBoost::intrusive_ptr*& kd) { + if (kd && *kd) + (*kd)->append(" derivedsmartptrpointerreftest"); + return kd; +} + +SwigBoost::intrusive_ptr factorycreate() { + return SwigBoost::intrusive_ptr(new Klass("factorycreate")); +} +// smart pointer +SwigBoost::intrusive_ptr smartpointertest(SwigBoost::intrusive_ptr k) { + if (k) + k->append(" smartpointertest"); + return SwigBoost::intrusive_ptr(k); +} +SwigBoost::intrusive_ptr* smartpointerpointertest(SwigBoost::intrusive_ptr* k) { + if (k && *k) + (*k)->append(" smartpointerpointertest"); + return k; +} +SwigBoost::intrusive_ptr& smartpointerreftest(SwigBoost::intrusive_ptr& k) { + if (k) + k->append(" smartpointerreftest"); + return k; +} +SwigBoost::intrusive_ptr*& smartpointerpointerreftest(SwigBoost::intrusive_ptr*& k) { + if (k && *k) + (*k)->append(" smartpointerpointerreftest"); + return k; +} +// const +SwigBoost::intrusive_ptr constsmartpointertest(SwigBoost::intrusive_ptr k) { + return SwigBoost::intrusive_ptr(k); +} +SwigBoost::intrusive_ptr* constsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { + return k; +} +SwigBoost::intrusive_ptr& constsmartpointerreftest(SwigBoost::intrusive_ptr& k) { + return k; +} +// plain pointer +Klass valuetest(Klass k) { + k.append(" valuetest"); + return k; +} +Klass *pointertest(Klass *k) { + if (k) + k->append(" pointertest"); + return k; +} +Klass& reftest(Klass& k) { + k.append(" reftest"); + return k; +} +Klass *const& pointerreftest(Klass *const& k) { + k->append(" pointerreftest"); + return k; +} +// null +std::string nullsmartpointerpointertest(SwigBoost::intrusive_ptr* k) { + if (k && *k) + return "not null"; + else if (!k) + return "null smartpointer pointer"; + else if (!*k) + return "null pointer"; + else + return "also not null"; +} +// $owner +Klass *pointerownertest() { + return new Klass("pointerownertest"); +} +SwigBoost::intrusive_ptr* smartpointerpointerownertest() { + return new SwigBoost::intrusive_ptr(new Klass("smartpointerpointerownertest")); +} + +const SwigBoost::intrusive_ptr& ref_1() { + static SwigBoost::intrusive_ptr sptr; + return sptr; +} + +// overloading tests +std::string overload_rawbyval(int i) { return "int"; } +std::string overload_rawbyval(Klass k) { return "rawbyval"; } + +std::string overload_rawbyref(int i) { return "int"; } +std::string overload_rawbyref(Klass &k) { return "rawbyref"; } + +std::string overload_rawbyptr(int i) { return "int"; } +std::string overload_rawbyptr(Klass *k) { return "rawbyptr"; } + +std::string overload_rawbyptrref(int i) { return "int"; } +std::string overload_rawbyptrref(Klass *const&k) { return "rawbyptrref"; } + + + +std::string overload_smartbyval(int i) { return "int"; } +std::string overload_smartbyval(SwigBoost::intrusive_ptr k) { return "smartbyval"; } + +std::string overload_smartbyref(int i) { return "int"; } +std::string overload_smartbyref(SwigBoost::intrusive_ptr &k) { return "smartbyref"; } + +std::string overload_smartbyptr(int i) { return "int"; } +std::string overload_smartbyptr(SwigBoost::intrusive_ptr *k) { return "smartbyptr"; } + +std::string overload_smartbyptrref(int i) { return "int"; } +std::string overload_smartbyptrref(SwigBoost::intrusive_ptr *&k) { return "smartbyptrref"; } + +} // namespace Space + +%} +%{ + boost::detail::atomic_count Space::Klass::total_count(0); + boost::detail::atomic_count Space::KlassWithoutRefCount::total_count(0); + boost::detail::atomic_count Space::IgnoredRefCountingBase::total_count(0); + boost::detail::atomic_count Space::KlassDerived::total_count(0); + boost::detail::atomic_count Space::KlassDerivedDerived::total_count(0); +%} + +// Member variables + +%inline %{ +struct MemberVariables { + MemberVariables() : SmartMemberPointer(new SwigBoost::intrusive_ptr()), SmartMemberReference(*(new SwigBoost::intrusive_ptr())), MemberPointer(0), MemberReference(MemberValue) {} + virtual ~MemberVariables() { + delete SmartMemberPointer; + delete &SmartMemberReference; + } + SwigBoost::intrusive_ptr SmartMemberValue; + SwigBoost::intrusive_ptr * SmartMemberPointer; + SwigBoost::intrusive_ptr & SmartMemberReference; + Space::Klass MemberValue; + Space::Klass * MemberPointer; + Space::Klass & MemberReference; +}; + +// Global variables +SwigBoost::intrusive_ptr GlobalSmartValue; +Space::Klass GlobalValue; +Space::Klass * GlobalPointer = 0; +Space::Klass & GlobalReference = GlobalValue; + +%} + +#if defined(INTRUSIVE_PTR_WRAPPERS_IMPLEMENTED) + +// Note: %template after the intrusive_ptr typemaps +%intrusive_ptr(Base) +%intrusive_ptr(Pair) + +#endif + +// Templates +%inline %{ +template struct Base { + Space::Klass klassBase; + T1 baseVal1; + T2 baseVal2; + Base(T1 t1, T2 t2) : baseVal1(t1*2), baseVal2(t2*2) {} + virtual std::string getValue() const { return "Base<>"; }; + mutable int count; + void addref(void) const { count++; } + void release(void) const { if (--count == 0) delete this; } + int use_count(void) const { return count; } +}; +%} + +%template(BaseIntDouble) Base; + +%inline %{ +template struct Pair : Base { + Space::Klass klassPair; + T1 val1; + T2 val2; + Pair(T1 t1, T2 t2) : Base(t1, t2), val1(t1), val2(t2) {} + virtual std::string getValue() const { return "Pair<>"; }; +}; + +Pair pair_id2(Pair p) { return p; } +SwigBoost::intrusive_ptr< Pair > pair_id1(SwigBoost::intrusive_ptr< Pair > p) { return p; } + +template void intrusive_ptr_add_ref(const T* r) { r->addref(); } + +template void intrusive_ptr_release(const T* r) { r->release(); } + +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +long use_count(const SwigBoost::shared_ptr& sptr) { + return sptr.use_count(); +} +%} + +%template(PairIntDouble) Pair; + +// For counting the instances of intrusive_ptr (all of which are created on the heap) +// intrusive_ptr_wrapper_count() gives overall count +%inline %{ +namespace SwigBoost { + const int NOT_COUNTING = -123456; + int intrusive_ptr_wrapper_count() { + #ifdef INTRUSIVE_PTR_WRAPPER + return SwigBoost::IntrusivePtrWrapper::getTotalCount(); + #else + return NOT_COUNTING; + #endif + } + #ifdef INTRUSIVE_PTR_WRAPPER + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "Klass: " + (*t)->getValue(); + else + return "Klass: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "Klass: " + (*t)->getValue(); + else + return "Klass: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "KlassDerived: " + (*t)->getValue(); + else + return "KlassDerived: NULL"; + } + template<> std::string show_message(boost::intrusive_ptr*t) { + if (!t) + return "null intrusive_ptr!!!"; + if (*t) + return "KlassDerived: " + (*t)->getValue(); + else + return "KlassDerived: NULL"; + } + #endif +} +%} + diff --git a/Examples/test-suite/lua/li_typemaps_runme.lua b/Examples/test-suite/lua/li_typemaps_runme.lua index fd7764cf3..7456d8245 100644 --- a/Examples/test-suite/lua/li_typemaps_runme.lua +++ b/Examples/test-suite/lua/li_typemaps_runme.lua @@ -1,42 +1,42 @@ -require("import") -- the import fn -import("li_typemaps") -- import code - --- catch "undefined" global variables -local env = _ENV -- Lua 5.2 -if not env then env = getfenv () end -- Lua 5.1 -setmetatable(env, {__index=function (t,i) error("undefined global variable `"..i.."'",2) end}) - --- Check double INPUT typemaps -assert(li_typemaps.in_double(22.22) == 22.22) -assert(li_typemaps.inr_double(22.22) == 22.22) - --- Check double OUTPUT typemaps -assert(li_typemaps.out_double(22.22) == 22.22) -assert(li_typemaps.outr_double(22.22) == 22.22) - --- Check double INOUT typemaps -assert(li_typemaps.inout_double(22.22) == 22.22) -assert(li_typemaps.inoutr_double(22.22) == 22.22) - --- check long long -assert(li_typemaps.in_ulonglong(20)==20) -assert(li_typemaps.inr_ulonglong(20)==20) -assert(li_typemaps.out_ulonglong(20)==20) -assert(li_typemaps.outr_ulonglong(20)==20) -assert(li_typemaps.inout_ulonglong(20)==20) -assert(li_typemaps.inoutr_ulonglong(20)==20) - --- check bools -assert(li_typemaps.in_bool(true)==true) -assert(li_typemaps.inr_bool(false)==false) -assert(li_typemaps.out_bool(true)==true) -assert(li_typemaps.outr_bool(false)==false) -assert(li_typemaps.inout_bool(true)==true) -assert(li_typemaps.inoutr_bool(false)==false) - --- the others -a,b=li_typemaps.inoutr_int2(1,2) -assert(a==1 and b==2) - -f,i=li_typemaps.out_foo(10) -assert(f.a==10 and i==20) +require("import") -- the import fn +import("li_typemaps") -- import code + +-- catch "undefined" global variables +local env = _ENV -- Lua 5.2 +if not env then env = getfenv () end -- Lua 5.1 +setmetatable(env, {__index=function (t,i) error("undefined global variable `"..i.."'",2) end}) + +-- Check double INPUT typemaps +assert(li_typemaps.in_double(22.22) == 22.22) +assert(li_typemaps.inr_double(22.22) == 22.22) + +-- Check double OUTPUT typemaps +assert(li_typemaps.out_double(22.22) == 22.22) +assert(li_typemaps.outr_double(22.22) == 22.22) + +-- Check double INOUT typemaps +assert(li_typemaps.inout_double(22.22) == 22.22) +assert(li_typemaps.inoutr_double(22.22) == 22.22) + +-- check long long +assert(li_typemaps.in_ulonglong(20)==20) +assert(li_typemaps.inr_ulonglong(20)==20) +assert(li_typemaps.out_ulonglong(20)==20) +assert(li_typemaps.outr_ulonglong(20)==20) +assert(li_typemaps.inout_ulonglong(20)==20) +assert(li_typemaps.inoutr_ulonglong(20)==20) + +-- check bools +assert(li_typemaps.in_bool(true)==true) +assert(li_typemaps.inr_bool(false)==false) +assert(li_typemaps.out_bool(true)==true) +assert(li_typemaps.outr_bool(false)==false) +assert(li_typemaps.inout_bool(true)==true) +assert(li_typemaps.inoutr_bool(false)==false) + +-- the others +a,b=li_typemaps.inoutr_int2(1,2) +assert(a==1 and b==2) + +f,i=li_typemaps.out_foo(10) +assert(f.a==10 and i==20) From 0afbb357d05e64b5fb9deace5c3dd9960aff8a81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Sun, 13 Jan 2013 23:14:46 +0100 Subject: [PATCH 302/538] moved testdir/* to testdir/inctest/* under Examples/test-suite/ --- Examples/test-suite/common.mk | 10 +++++----- Examples/test-suite/inctest.i | 6 +++--- .../test-suite/testdir/{ => inctest}/subdir1/hello.i | 0 .../test-suite/testdir/{ => inctest}/subdir1/imports.i | 0 .../test-suite/testdir/{ => inctest}/subdir1/subinc1.i | 0 .../test-suite/testdir/{ => inctest}/subdir2/hello.i | 0 .../test-suite/testdir/{ => inctest}/subdir2/imports.i | 0 .../test-suite/testdir/{ => inctest}/subdir2/subinc2.i | 0 Examples/test-suite/testdir/{ => inctest}/test.i | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename Examples/test-suite/testdir/{ => inctest}/subdir1/hello.i (100%) rename Examples/test-suite/testdir/{ => inctest}/subdir1/imports.i (100%) rename Examples/test-suite/testdir/{ => inctest}/subdir1/subinc1.i (100%) rename Examples/test-suite/testdir/{ => inctest}/subdir2/hello.i (100%) rename Examples/test-suite/testdir/{ => inctest}/subdir2/imports.i (100%) rename Examples/test-suite/testdir/{ => inctest}/subdir2/subinc2.i (100%) rename Examples/test-suite/testdir/{ => inctest}/test.i (100%) diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 23988404d..173e9b287 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -234,7 +234,7 @@ CPP_TEST_CASES += \ inherit_void_arg \ inline_initializer \ insert_directive \ - keyword_rename \ + keyword_rename \ kind \ langobj \ li_attribute \ @@ -281,7 +281,7 @@ CPP_TEST_CASES += \ operator_overload \ operator_overload_break \ operator_pointer_ref \ - operbool \ + operbool \ ordering \ overload_copy \ overload_method \ @@ -485,8 +485,8 @@ CPP_STD_TEST_CASES += \ li_std_except \ li_std_except_as_class \ li_std_map \ - li_std_pair \ - li_std_pair_using \ + li_std_pair \ + li_std_pair_using \ li_std_string \ li_std_vector \ li_std_vector_enum \ @@ -519,7 +519,7 @@ C_TEST_CASES += \ immutable_values \ inctest \ integers \ - keyword_rename \ + keyword_rename \ lextype \ li_carrays \ li_cdata \ diff --git a/Examples/test-suite/inctest.i b/Examples/test-suite/inctest.i index f33304284..0b01ef4bb 100644 --- a/Examples/test-suite/inctest.i +++ b/Examples/test-suite/inctest.i @@ -4,8 +4,8 @@ // This test fails if swig is not able to include // the following two files: // - // 'testdir/subdir1/hello.i' - // 'testdir/subdir2/hello.i' + // 'testdir/inctest/subdir1/hello.i' + // 'testdir/inctest/subdir2/hello.i' // // since they have the same basename 'hello', swig is only // including one. This is not right, it must include both, @@ -13,7 +13,7 @@ // // Also repeats the test for the import directive in subdirectories -%include "testdir/test.i" +%include "testdir/inctest/test.i" // Bug #1162194 diff --git a/Examples/test-suite/testdir/subdir1/hello.i b/Examples/test-suite/testdir/inctest/subdir1/hello.i similarity index 100% rename from Examples/test-suite/testdir/subdir1/hello.i rename to Examples/test-suite/testdir/inctest/subdir1/hello.i diff --git a/Examples/test-suite/testdir/subdir1/imports.i b/Examples/test-suite/testdir/inctest/subdir1/imports.i similarity index 100% rename from Examples/test-suite/testdir/subdir1/imports.i rename to Examples/test-suite/testdir/inctest/subdir1/imports.i diff --git a/Examples/test-suite/testdir/subdir1/subinc1.i b/Examples/test-suite/testdir/inctest/subdir1/subinc1.i similarity index 100% rename from Examples/test-suite/testdir/subdir1/subinc1.i rename to Examples/test-suite/testdir/inctest/subdir1/subinc1.i diff --git a/Examples/test-suite/testdir/subdir2/hello.i b/Examples/test-suite/testdir/inctest/subdir2/hello.i similarity index 100% rename from Examples/test-suite/testdir/subdir2/hello.i rename to Examples/test-suite/testdir/inctest/subdir2/hello.i diff --git a/Examples/test-suite/testdir/subdir2/imports.i b/Examples/test-suite/testdir/inctest/subdir2/imports.i similarity index 100% rename from Examples/test-suite/testdir/subdir2/imports.i rename to Examples/test-suite/testdir/inctest/subdir2/imports.i diff --git a/Examples/test-suite/testdir/subdir2/subinc2.i b/Examples/test-suite/testdir/inctest/subdir2/subinc2.i similarity index 100% rename from Examples/test-suite/testdir/subdir2/subinc2.i rename to Examples/test-suite/testdir/inctest/subdir2/subinc2.i diff --git a/Examples/test-suite/testdir/test.i b/Examples/test-suite/testdir/inctest/test.i similarity index 100% rename from Examples/test-suite/testdir/test.i rename to Examples/test-suite/testdir/inctest/test.i From bdd5dac21e779b2d43c0cd0bebaf473442d4fd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Tomulik?= Date: Sun, 13 Jan 2013 23:40:46 +0100 Subject: [PATCH 303/538] updated info on lang-specific subdirs in Doc/Manual/Library.html --- Doc/Manual/Library.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html index 1c7b84a1a..1ae3c77a3 100644 --- a/Doc/Manual/Library.html +++ b/Doc/Manual/Library.html @@ -66,18 +66,19 @@ Library files are included using the %include directive. When searching for files, directories are searched in the following order:

    -
      +
      1. The current directory
      2. Directories specified with the -I command line option
      3. ./swig_lib
      4. SWIG library install location as reported by swig -swiglib, for example /usr/local/share/swig/1.3.30
      5. On Windows, a directory Lib relative to the location of swig.exe is also searched. -
    +

    -Within each directory, SWIG first looks for a subdirectory corresponding to a target language (e.g., python, -tcl, etc.). If found, SWIG will search the language specific directory first. This allows -for language-specific implementations of library files. +Within directories mentioned in points 3-5, SWIG first looks for a subdirectory +corresponding to a target language (e.g., python, tcl, etc.). +If found, SWIG will search the language specific directory first. This allows +for language-specific implementations of library files.

    From 0e6af5c0ea6db5a69e047274b029fb937c1adebc Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 15 Jan 2013 06:45:47 +0000 Subject: [PATCH 304/538] Fix cstype typemap lookup for member variables so that a fully qualified variable name matches --- CHANGES.current | 8 +++++++ Examples/test-suite/csharp_typemaps.i | 19 +++++++++++++++ Source/Modules/csharp.cxx | 33 +++++++++++++++------------ 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 0d6a69959..8e17e2d44 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,14 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-15: wsfulton + [C#] Fix cstype typemap lookup for member variables so that a fully qualified variable name + matches. For example: + %typemap(cstype) bool MVar::mvar "MyBool" + struct MVar { + bool mvar; + }; + 2013-01-11: Brant Kyser [Java, C#, D] SF Bug #1299 - Fix generated names for when %nspace is used on classes with the same name in two different namespaces. diff --git a/Examples/test-suite/csharp_typemaps.i b/Examples/test-suite/csharp_typemaps.i index 18896456e..83097f663 100644 --- a/Examples/test-suite/csharp_typemaps.i +++ b/Examples/test-suite/csharp_typemaps.i @@ -117,3 +117,22 @@ void hoop(WasCrashing was) {} enum BigNumbers { big=0x80000000, bigger }; %} +// Member variable qualification +%typemap(cstype) bool "badtype1" +%typemap(cstype) bool mvar "badtype2" +%typemap(cstype) bool svar "badtype4" +%typemap(cstype) bool gvar "badtype5" +%typemap(cstype) bool MVar::mvar "bool" +%typemap(cstype) bool MVar::svar "bool" +%typemap(cstype) bool Glob::gvar "bool" +%inline %{ +struct MVar { + bool mvar; + static bool svar; +}; +namespace Glob { + bool gvar; +} +bool MVar::svar = false; +%} + diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 88cd679b9..0d15a9c1d 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -2310,15 +2310,18 @@ public: // Get the C# variable type - obtained differently depending on whether a setter is required. String *variable_type = return_type; if (setter_flag) { - assert(last_parm); - p = last_parm; // (last parameter is the only parameter for properties) - SwigType *pt = Getattr(p, "type"); - if ((tm = Getattr(p, "tmap:cstype"))) { - substituteClassname(pt, tm); - String *cstypeout = Getattr(p, "tmap:cstype:out"); // the type in the cstype typemap's out attribute overrides the type in the typemap - variable_type = cstypeout ? cstypeout : tm; + assert(last_parm); // (last parameter is the only parameter for properties) + /* Get variable type - ensure the variable name is fully resolved during typemap lookup via the symbol table set in NewParmNode */ + SwigType *cvariable_type = Getattr(last_parm, "type"); + Parm *variable_parm = NewParmNode(cvariable_type, n); + if ((tm = Swig_typemap_lookup("cstype", variable_parm, "", 0))) { + String *cstypeout = Getattr(variable_parm, "tmap:cstype:out"); // the type in the cstype typemap's out attribute overrides the type in the typemap + if (cstypeout) + tm = cstypeout; + substituteClassname(cvariable_type, tm); + variable_type = tm; } else { - Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(pt, 0)); + Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No cstype typemap defined for %s\n", SwigType_str(cvariable_type, 0)); } } const String *csattributes = Getattr(n, "feature:cs:attributes"); @@ -2333,17 +2336,17 @@ public: if (setter_flag) { // Setter method - assert(last_parm); - p = last_parm; // (last parameter is the only parameter for properties) - SwigType *pt = Getattr(p, "type"); - if ((tm = Getattr(p, "tmap:csvarin"))) { - substituteClassname(pt, tm); + assert(last_parm); // (last parameter is the only parameter for properties) + SwigType *cvariable_type = Getattr(last_parm, "type"); + Parm *variable_parm = NewParmNode(cvariable_type, n); + if ((tm = Swig_typemap_lookup("csvarin", variable_parm, "", 0))) { + substituteClassname(cvariable_type, tm); Replaceall(tm, "$csinput", "value"); Replaceall(tm, "$imcall", imcall); - excodeSubstitute(n, tm, "csvarin", p); + excodeSubstitute(n, tm, "csvarin", variable_parm); Printf(proxy_class_code, "%s", tm); } else { - Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(pt, 0)); + Swig_warning(WARN_CSHARP_TYPEMAP_CSOUT_UNDEF, input_file, line_number, "No csvarin typemap defined for %s\n", SwigType_str(cvariable_type, 0)); } } else { // Getter method From 78cd350fe98581d1353425eb9898a1e0a1d5ef6e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 15 Jan 2013 07:18:20 +0000 Subject: [PATCH 305/538] Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces. --- CHANGES.current | 3 +++ Examples/java/class/example.dsp | 4 ++-- Examples/java/multimap/example.dsp | 4 ++-- Examples/java/simple/example.dsp | 4 ++-- Examples/perl5/class/example.dsp | 4 ++-- Examples/perl5/import/bar.dsp | 4 ++-- Examples/perl5/import/base.dsp | 4 ++-- Examples/perl5/import/foo.dsp | 4 ++-- Examples/perl5/import/spam.dsp | 4 ++-- Examples/perl5/multimap/example.dsp | 4 ++-- Examples/perl5/simple/example.dsp | 4 ++-- Examples/python/class/example.dsp | 4 ++-- Examples/python/contract/example.dsp | 4 ++-- Examples/python/import/bar.dsp | 4 ++-- Examples/python/import/base.dsp | 4 ++-- Examples/python/import/foo.dsp | 4 ++-- Examples/python/import/spam.dsp | 4 ++-- Examples/python/multimap/example.dsp | 4 ++-- Examples/python/simple/example.dsp | 4 ++-- Examples/r/class/example.dsp | 4 ++-- Examples/r/simple/example.dsp | 4 ++-- Examples/ruby/class/example.dsp | 4 ++-- Examples/ruby/free_function/example.dsp | 4 ++-- Examples/ruby/import/bar.dsp | 4 ++-- Examples/ruby/import/base.dsp | 4 ++-- Examples/ruby/import/foo.dsp | 4 ++-- Examples/ruby/import/spam.dsp | 4 ++-- Examples/ruby/mark_function/example.dsp | 4 ++-- Examples/ruby/multimap/example.dsp | 4 ++-- Examples/ruby/simple/example.dsp | 4 ++-- Examples/tcl/class/example.dsp | 4 ++-- Examples/tcl/contract/example.dsp | 4 ++-- Examples/tcl/import/bar.dsp | 4 ++-- Examples/tcl/import/base.dsp | 4 ++-- Examples/tcl/import/foo.dsp | 4 ++-- Examples/tcl/import/spam.dsp | 4 ++-- Examples/tcl/multimap/example.dsp | 4 ++-- Examples/tcl/simple/example.dsp | 4 ++-- 38 files changed, 77 insertions(+), 74 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 8e17e2d44..f8391a635 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-15: wsfulton + Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces. + 2013-01-15: wsfulton [C#] Fix cstype typemap lookup for member variables so that a fully qualified variable name matches. For example: diff --git a/Examples/java/class/example.dsp b/Examples/java/class/example.dsp index fbe87e7a4..f52544b95 100644 --- a/Examples/java/class/example.dsp +++ b/Examples/java/class/example.dsp @@ -136,7 +136,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -c++ -java $(InputPath) + ..\..\..\swig.exe -c++ -java "$(InputPath)" # End Custom Build @@ -151,7 +151,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -c++ -java $(InputPath) + ..\..\..\swig.exe -c++ -java "$(InputPath)" # End Custom Build diff --git a/Examples/java/multimap/example.dsp b/Examples/java/multimap/example.dsp index 8e1f8415e..551866fd6 100644 --- a/Examples/java/multimap/example.dsp +++ b/Examples/java/multimap/example.dsp @@ -132,7 +132,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -java $(InputPath) + ..\..\..\swig.exe -java "$(InputPath)" # End Custom Build @@ -147,7 +147,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -java $(InputPath) + ..\..\..\swig.exe -java "$(InputPath)" # End Custom Build diff --git a/Examples/java/simple/example.dsp b/Examples/java/simple/example.dsp index 8e1f8415e..551866fd6 100644 --- a/Examples/java/simple/example.dsp +++ b/Examples/java/simple/example.dsp @@ -132,7 +132,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -java $(InputPath) + ..\..\..\swig.exe -java "$(InputPath)" # End Custom Build @@ -147,7 +147,7 @@ InputName=example echo JAVA_INCLUDE: %JAVA_INCLUDE% echo JAVA_BIN: %JAVA_BIN% echo on - ..\..\..\swig.exe -java $(InputPath) + ..\..\..\swig.exe -java "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/class/example.dsp b/Examples/perl5/class/example.dsp index b5ccd1928..3aef4e24e 100644 --- a/Examples/perl5/class/example.dsp +++ b/Examples/perl5/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/import/bar.dsp b/Examples/perl5/import/bar.dsp index 64786b8f6..a329898ee 100644 --- a/Examples/perl5/import/bar.dsp +++ b/Examples/perl5/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/import/base.dsp b/Examples/perl5/import/base.dsp index 920891cbf..f52f1e956 100644 --- a/Examples/perl5/import/base.dsp +++ b/Examples/perl5/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/import/foo.dsp b/Examples/perl5/import/foo.dsp index d519a5316..e959e9f92 100644 --- a/Examples/perl5/import/foo.dsp +++ b/Examples/perl5/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/import/spam.dsp b/Examples/perl5/import/spam.dsp index e5c8046eb..875efac89 100644 --- a/Examples/perl5/import/spam.dsp +++ b/Examples/perl5/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -c++ -perl5 $(InputPath) + ..\..\..\swig.exe -c++ -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/multimap/example.dsp b/Examples/perl5/multimap/example.dsp index be8a0070e..21bdf8dca 100644 --- a/Examples/perl5/multimap/example.dsp +++ b/Examples/perl5/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/perl5/simple/example.dsp b/Examples/perl5/simple/example.dsp index be8a0070e..21bdf8dca 100644 --- a/Examples/perl5/simple/example.dsp +++ b/Examples/perl5/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PERL5_INCLUDE: %PERL5_INCLUDE% echo PERL5_LIB: %PERL5_LIB% echo on - ..\..\..\swig.exe -perl5 $(InputPath) + ..\..\..\swig.exe -perl5 "$(InputPath)" # End Custom Build diff --git a/Examples/python/class/example.dsp b/Examples/python/class/example.dsp index fd7bf8c06..b75bd9ee2 100644 --- a/Examples/python/class/example.dsp +++ b/Examples/python/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/contract/example.dsp b/Examples/python/contract/example.dsp index 32845e0e8..68f79c7a6 100644 --- a/Examples/python/contract/example.dsp +++ b/Examples/python/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/import/bar.dsp b/Examples/python/import/bar.dsp index 17b05cc39..df4d03e1c 100644 --- a/Examples/python/import/bar.dsp +++ b/Examples/python/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/import/base.dsp b/Examples/python/import/base.dsp index 2bc9736d1..5f2c4c503 100644 --- a/Examples/python/import/base.dsp +++ b/Examples/python/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/import/foo.dsp b/Examples/python/import/foo.dsp index 9a92c4b85..fc7a94b14 100644 --- a/Examples/python/import/foo.dsp +++ b/Examples/python/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/import/spam.dsp b/Examples/python/import/spam.dsp index 0a6595bfe..6fa4713ee 100644 --- a/Examples/python/import/spam.dsp +++ b/Examples/python/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -c++ -python $(InputPath) + ..\..\..\swig.exe -c++ -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/multimap/example.dsp b/Examples/python/multimap/example.dsp index 32845e0e8..68f79c7a6 100644 --- a/Examples/python/multimap/example.dsp +++ b/Examples/python/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build diff --git a/Examples/python/simple/example.dsp b/Examples/python/simple/example.dsp index 32845e0e8..68f79c7a6 100644 --- a/Examples/python/simple/example.dsp +++ b/Examples/python/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo PYTHON_INCLUDE: %PYTHON_INCLUDE% echo PYTHON_LIB: %PYTHON_LIB% echo on - ..\..\..\swig.exe -python $(InputPath) + ..\..\..\swig.exe -python "$(InputPath)" # End Custom Build diff --git a/Examples/r/class/example.dsp b/Examples/r/class/example.dsp index b831989cc..aea02b2fa 100644 --- a/Examples/r/class/example.dsp +++ b/Examples/r/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig.exe -c++ -r -o example_wrap.cpp "$(InputPath)" # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -c++ -r -o example_wrap.cpp $(InputPath) + ..\..\..\swig.exe -c++ -r -o example_wrap.cpp "$(InputPath)" # End Custom Build diff --git a/Examples/r/simple/example.dsp b/Examples/r/simple/example.dsp index 356815d19..105392bbd 100644 --- a/Examples/r/simple/example.dsp +++ b/Examples/r/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -r $(InputPath) + ..\..\..\swig.exe -r "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo R_INCLUDE: %R_INCLUDE% echo R_LIB: %R_LIB% echo on - ..\..\..\swig.exe -r $(InputPath) + ..\..\..\swig.exe -r "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/class/example.dsp b/Examples/ruby/class/example.dsp index 2adab787a..8c1786c10 100644 --- a/Examples/ruby/class/example.dsp +++ b/Examples/ruby/class/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/free_function/example.dsp b/Examples/ruby/free_function/example.dsp index 2adab787a..8c1786c10 100644 --- a/Examples/ruby/free_function/example.dsp +++ b/Examples/ruby/free_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp index 29d9abf2f..678dd3792 100644 --- a/Examples/ruby/import/bar.dsp +++ b/Examples/ruby/import/bar.dsp @@ -120,7 +120,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -135,7 +135,7 @@ InputName=bar echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp index 174afef3e..4b9e2ea3f 100644 --- a/Examples/ruby/import/base.dsp +++ b/Examples/ruby/import/base.dsp @@ -120,7 +120,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -135,7 +135,7 @@ InputName=base echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp index 7f4754915..1d56ec375 100644 --- a/Examples/ruby/import/foo.dsp +++ b/Examples/ruby/import/foo.dsp @@ -120,7 +120,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -135,7 +135,7 @@ InputName=foo echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp index 72729f290..3cc700864 100644 --- a/Examples/ruby/import/spam.dsp +++ b/Examples/ruby/import/spam.dsp @@ -120,7 +120,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -135,7 +135,7 @@ InputName=spam echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/mark_function/example.dsp b/Examples/ruby/mark_function/example.dsp index 2adab787a..8c1786c10 100644 --- a/Examples/ruby/mark_function/example.dsp +++ b/Examples/ruby/mark_function/example.dsp @@ -128,7 +128,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build @@ -143,7 +143,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -c++ -ruby $(InputPath) + ..\..\..\swig.exe -c++ -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/multimap/example.dsp b/Examples/ruby/multimap/example.dsp index 4888299f5..de66ca0cf 100644 --- a/Examples/ruby/multimap/example.dsp +++ b/Examples/ruby/multimap/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig.exe -ruby "$(InputPath)" # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig.exe -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/ruby/simple/example.dsp b/Examples/ruby/simple/example.dsp index 4888299f5..de66ca0cf 100644 --- a/Examples/ruby/simple/example.dsp +++ b/Examples/ruby/simple/example.dsp @@ -124,7 +124,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig.exe -ruby "$(InputPath)" # End Custom Build @@ -139,7 +139,7 @@ InputName=example echo RUBY_INCLUDE: %RUBY_INCLUDE% echo RUBY_LIB: %RUBY_LIB% echo on - ..\..\..\swig.exe -ruby $(InputPath) + ..\..\..\swig.exe -ruby "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/class/example.dsp b/Examples/tcl/class/example.dsp index 0ff54829f..5a8c6a0bb 100644 --- a/Examples/tcl/class/example.dsp +++ b/Examples/tcl/class/example.dsp @@ -126,7 +126,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build @@ -141,7 +141,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/contract/example.dsp b/Examples/tcl/contract/example.dsp index c1568f2c5..e7b293579 100644 --- a/Examples/tcl/contract/example.dsp +++ b/Examples/tcl/contract/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/import/bar.dsp b/Examples/tcl/import/bar.dsp index d22b6a6fa..a06b54a8c 100644 --- a/Examples/tcl/import/bar.dsp +++ b/Examples/tcl/import/bar.dsp @@ -118,7 +118,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=bar echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/import/base.dsp b/Examples/tcl/import/base.dsp index b27bbfdb6..6c4b40c9e 100644 --- a/Examples/tcl/import/base.dsp +++ b/Examples/tcl/import/base.dsp @@ -118,7 +118,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=base echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/import/foo.dsp b/Examples/tcl/import/foo.dsp index 4d3765bd7..44bfa945c 100644 --- a/Examples/tcl/import/foo.dsp +++ b/Examples/tcl/import/foo.dsp @@ -118,7 +118,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=foo echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/import/spam.dsp b/Examples/tcl/import/spam.dsp index 5674c4373..4735d1469 100644 --- a/Examples/tcl/import/spam.dsp +++ b/Examples/tcl/import/spam.dsp @@ -118,7 +118,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build @@ -133,7 +133,7 @@ InputName=spam echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -c++ -tcl8 $(InputPath) + ..\..\..\swig.exe -c++ -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/multimap/example.dsp b/Examples/tcl/multimap/example.dsp index c1568f2c5..e7b293579 100644 --- a/Examples/tcl/multimap/example.dsp +++ b/Examples/tcl/multimap/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build diff --git a/Examples/tcl/simple/example.dsp b/Examples/tcl/simple/example.dsp index c1568f2c5..e7b293579 100644 --- a/Examples/tcl/simple/example.dsp +++ b/Examples/tcl/simple/example.dsp @@ -122,7 +122,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build @@ -137,7 +137,7 @@ InputName=example echo TCL_INCLUDE: %TCL_INCLUDE% echo TCL_LIB: %TCL_LIB% echo on - ..\..\..\swig.exe -tcl8 $(InputPath) + ..\..\..\swig.exe -tcl8 "$(InputPath)" # End Custom Build From dba0adce71def7257f6acdc1cb790be5f18c5c39 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 17 Jan 2013 07:48:16 +0000 Subject: [PATCH 306/538] Minor update to test-suite README help files --- Examples/test-suite/README | 10 ++++++++++ Examples/test-suite/testdir/README | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 Examples/test-suite/testdir/README diff --git a/Examples/test-suite/README b/Examples/test-suite/README index 96dea942c..aac7636c6 100644 --- a/Examples/test-suite/README +++ b/Examples/test-suite/README @@ -40,3 +40,13 @@ is an error in which case stderr is suggested. Please set the name of the module to the same name as the testcase, otherwise modules will not be found. +There is a special directory called testdir for testcases requiring +inputs from subdirectories or multiple directories. See the +testdir/README file. + +Further Documentation +--------------------- + +There is documentation about the test-suite and how to use use it in +the SWIG documentation - Doc/Manual/Extending.html#Extending_test_suite. + diff --git a/Examples/test-suite/testdir/README b/Examples/test-suite/testdir/README new file mode 100644 index 000000000..2aaabf377 --- /dev/null +++ b/Examples/test-suite/testdir/README @@ -0,0 +1,3 @@ +This is a special directory for testcases that require inputs using subdirectories. +Each subdirectory should be named after the testcase. Any desired subdirectory +structure can be put under the testcase subdirectory. From 3bdcb14117eec448bf2f77897d5706ebe0b555d3 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Thu, 10 Jan 2013 13:28:37 -0600 Subject: [PATCH 307/538] Add jniclasspackage pragma & change error regarding use of nspace without -package to warning. --- Source/Include/swigwarn.h | 1 + Source/Modules/java.cxx | 41 ++++++++++++++++++++++++++++++--------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index 1aae86fdd..76f61ea93 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -241,6 +241,7 @@ #define WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF 823 #define WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC 824 #define WARN_JAVA_NO_DIRECTORCONNECT_ATTR 825 +#define WARN_JAVA_NSPACE_WITHOUT_PACKAGE 826 /* please leave 810-829 free for Java */ diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 57ac7ca52..e9b6f813c 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -67,6 +67,7 @@ class JAVA:public Language { String *imclass_imports; //intermediary class imports from %pragma String *module_imports; //module imports from %pragma String *imclass_baseclass; //inheritance for intermediary class class from %pragma + String *imclass_class_package; //package in which to generate the jni class String *module_baseclass; //inheritance for module class from %pragma String *imclass_interfaces; //interfaces for intermediary class class from %pragma String *module_interfaces; //interfaces for module class from %pragma @@ -364,6 +365,7 @@ public: proxy_class_code = NewString(""); module_class_constants_code = NewString(""); imclass_baseclass = NewString(""); + imclass_class_package = NewString(""); imclass_interfaces = NewString(""); imclass_class_modifiers = NewString(""); module_class_code = NewString(""); @@ -444,7 +446,7 @@ public: } // Generate the intermediary class { - String *filen = NewStringf("%s%s.java", SWIG_output_directory(), imclass_name); + String *filen = NewStringf("%s%s/%s.java", SWIG_output_directory(), imclass_class_package, imclass_name); File *f_im = NewFile(filen, "w", SWIG_output_files()); if (!f_im) { FileErrorDisplay(filen); @@ -457,8 +459,10 @@ public: // Start writing out the intermediary class file emitBanner(f_im); - if (package) - Printf(f_im, "package %s;\n", package); + if (Len(imclass_class_package)) + Printf(f_im, "package %s;", imclass_class_package); + else if (package) + Printf(f_im, "package %s;\n", package); if (imclass_imports) Printf(f_im, "%s\n", imclass_imports); @@ -625,6 +629,8 @@ public: module_class_constants_code = NULL; Delete(imclass_baseclass); imclass_baseclass = NULL; + Delete(imclass_class_package); + imclass_class_package = NULL; Delete(imclass_interfaces); imclass_interfaces = NULL; Delete(imclass_class_modifiers); @@ -1186,8 +1192,7 @@ public: full_imclass_name = NewStringf("%s.%s", package, imclass_name); } else { String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); - Swig_error(Getfile(n), Getline(n), "The nspace feature used on '%s' is not supported unless a package is specified with -package - Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); - SWIG_exit(EXIT_FAILURE); + Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); } } } @@ -1574,7 +1579,8 @@ public: * pragmaDirective() * * Valid Pragmas: - * jniclassbase - base (extends) for the intermediary class + * jniclassbase - base (extends) for the intermediary + * jniclasspackage - package in which to generate the jni class * jniclassclassmodifiers - class modifiers for the intermediary class * jniclasscode - text (java code) is copied verbatim to the intermediary class * jniclassimports - import statements for the intermediary class @@ -1602,7 +1608,25 @@ public: if (Strcmp(code, "jniclassbase") == 0) { Delete(imclass_baseclass); imclass_baseclass = Copy(strvalue); - } else if (Strcmp(code, "jniclassclassmodifiers") == 0) { + } else if (Strcmp(code, "jniclasspackage") == 0) { + Delete(imclass_class_package); + imclass_class_package = Copy(strvalue); + String *imclass_class_package_jniname = makeValidJniName(imclass_class_package); + Printv(jnipackage, imclass_class_package_jniname, NIL); + Delete(imclass_class_package_jniname); + Replaceall(jnipackage, NSPACE_SEPARATOR, "_"); + Append(jnipackage, "_"); + + String *wrapper_name = NewString(""); + String *imclass_class_jniname = makeValidJniName(imclass_name); + Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname); + Delete(imclass_class_jniname); + + Swig_name_unregister("wrapper"); + Swig_name_register("wrapper", Char(wrapper_name)); + + Delete(wrapper_name); + } else if (Strcmp(code, "jniclassclassmodifiers") == 0) { Delete(imclass_class_modifiers); imclass_class_modifiers = Copy(strvalue); } else if (Strcmp(code, "jniclasscode") == 0) { @@ -1894,8 +1918,7 @@ public: full_imclass_name = NewStringf("%s.%s", package, imclass_name); } else { String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); - Swig_error(Getfile(n), Getline(n), "The nspace feature used on '%s' is not supported unless a package is specified with -package - Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); - SWIG_exit(EXIT_FAILURE); + Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); } } From 9855e4d0644845474f78385c59fdbafeaab4476e Mon Sep 17 00:00:00 2001 From: marvingreenberg Date: Fri, 11 Jan 2013 10:08:09 -0500 Subject: [PATCH 308/538] Allow certain tests to compile without -package option --- Examples/test-suite/java/Makefile.in | 52 ++++++++++++++++++---------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index f8da8e6cc..a69c65ff6 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -15,7 +15,16 @@ C_TEST_CASES = \ java_lib_arrays \ java_lib_various -CPP_TEST_CASES = \ +# Use a different JAVA_PACKAGE set internally in the testcase. This must match +# what is internally in the test .i files (does swig support multiple package levels?) +# Make sure that the pragma dir DOES NOT exist (since test should create) +PRAGMATEST_PACKAGE = pragmajavapackage +PRAGMATEST_DIRSETUP = rm -rf $(PACKAGE_DIR) + +CPP_TEST_CASES_PKGPRAGMA = \ + java_test_of_package_pragma + +CPP_TEST_CASES_PKGOPT = \ enum_thorough_proper \ enum_thorough_simple \ enum_thorough_typeunsafe \ @@ -36,11 +45,20 @@ CPP_TEST_CASES = \ java_typemaps_typewrapper # li_boost_intrusive_ptr +CPP_TEST_CASES = $(CPP_TEST_CASES_PKGOPT) $(CPP_TEST_CASES_PKGPRAGMA) include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* -SWIGOPT += -package $(JAVA_PACKAGE) +PKGDIRSETUP = [ -d "$(JAVA_PACKAGE) ] || mkdir -p $(JAVA_PACKAGE); + +# Add '-package' swigopt for ALL tests except for CPP_TEST_CASES_PKGPRAGMA +TEST_CASES_WITH_PKGOPT := $(filterout $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) +$(TEST_CASES_WITH_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) + +# Set JAVA_PACKAGE differently for the one test using a pragma javapackage +$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): JAVA_PACKAGE=$(PKGPRAGMA_PACKAGE) +$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): PKGDIRSETUP=$(PKGPRAGMA_DIRSETUP) # Custom tests - tests with additional commandline options nspace.%: JAVA_PACKAGE = $*Package @@ -51,31 +69,27 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests %.cpptest: $(setup) - +(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) - $(run_testcase) + $(PKGDIRSETUP) + +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) + $echo $@ (run_testcase) %.ctest: $(setup) - +(cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) - $(run_testcase) + $(PKGDIRSETUP) + +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) + $echo $@ (run_testcase) %.multicpptest: $(setup) - +(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) - $(run_testcase) + $(PKGDIRSETUP) + +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) + $echo $@ (run_testcase) -# Makes a directory for the testcase if it does not exist -setup = \ - if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ - else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ - fi; \ - if [ ! -d $(JAVA_PACKAGE) ]; then \ - mkdir $(JAVA_PACKAGE); \ - fi +# don't duplicate $(setup), just add explicit $(PKGDIRSETUP) +# This doesn't work yet since for PKGPRAGMA test, PKGDIRSETUP deletes +# JAVA_PACKAGE, but next line tries to cd there. -# Compiles java files then runs the testcase. A testcase is only run if +# COMPILES java files then runs the testcase. A testcase is only run if # a file is found which has _runme.java appended after the testcase name. # Note Java uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows, SHLIB_PATH on HPUX and DYLD_LIBRARY_PATH on Mac OS X. run_testcase = \ From 30b1eafd96f50174ab20159f2a233d5f1758fc39 Mon Sep 17 00:00:00 2001 From: marvingreenberg Date: Fri, 11 Jan 2013 17:40:18 -0500 Subject: [PATCH 309/538] fix variable names and makefile logic to correctly set PKGDIRSETUP and SWIGOPT for different cases --- Examples/test-suite/java/Makefile.in | 46 +++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index a69c65ff6..11d7fd3ef 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -15,14 +15,9 @@ C_TEST_CASES = \ java_lib_arrays \ java_lib_various -# Use a different JAVA_PACKAGE set internally in the testcase. This must match -# what is internally in the test .i files (does swig support multiple package levels?) -# Make sure that the pragma dir DOES NOT exist (since test should create) -PRAGMATEST_PACKAGE = pragmajavapackage -PRAGMATEST_DIRSETUP = rm -rf $(PACKAGE_DIR) - CPP_TEST_CASES_PKGPRAGMA = \ - java_test_of_package_pragma + internal_pkgpragma_test + CPP_TEST_CASES_PKGOPT = \ enum_thorough_proper \ @@ -50,15 +45,21 @@ include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* -PKGDIRSETUP = [ -d "$(JAVA_PACKAGE) ] || mkdir -p $(JAVA_PACKAGE); + +ALL_PKGOPT := $(filter-out $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) +ALL_PKGPRAGMA := $(filter $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) # Add '-package' swigopt for ALL tests except for CPP_TEST_CASES_PKGPRAGMA -TEST_CASES_WITH_PKGOPT := $(filterout $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) -$(TEST_CASES_WITH_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) +# PKGDIRSETUP should leave 0 exitcode when successful +$(ALL_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) +$(ALL_PKGOPT): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" -# Set JAVA_PACKAGE differently for the one test using a pragma javapackage -$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): JAVA_PACKAGE=$(PKGPRAGMA_PACKAGE) -$(CPP_TEST_CASES_PKGPRAGMA:=.cpptest): PKGDIRSETUP=$(PKGPRAGMA_DIRSETUP) +# Set JAVA_PACKAGE differently for the tests using internally coded pragma javapackage +# (and must match what is in the test .i file) +# Make sure that the pragma dir DOES NOT exist (since test should create) +# This may not find all the generated java to compile... +$(ALL_PKGPRAGMA): JAVA_PACKAGE = MyExplicitPragmaJavaPackage +$(ALL_PKGPRAGMA): PKGDIRSETUP = rm -rf $(JAVA_PACKAGE) # Custom tests - tests with additional commandline options nspace.%: JAVA_PACKAGE = $*Package @@ -67,23 +68,20 @@ director_nspace.%: JAVA_PACKAGE = $*Package director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests -%.cpptest: +%.cpptest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_cpp))" + echo "$@ $(run_testcase)" %.ctest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_c))" + echo "$@ $(run_testcase)" -%.multicpptest: +%.multicpptest: $(setup) - $(PKGDIRSETUP) - +echo $@ (cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) - $echo $@ (run_testcase) + +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp))" + echo "$@ $(run_testcase)" # don't duplicate $(setup), just add explicit $(PKGDIRSETUP) # This doesn't work yet since for PKGPRAGMA test, PKGDIRSETUP deletes From 988952af6526c0ca8fa2fb20fc49d3155466e1fc Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 12 Jan 2013 00:48:49 -0600 Subject: [PATCH 310/538] Add test case for using nspace without -package. TODO: Fix Makefile.in to actually not use -package when invoking swig. --- Examples/test-suite/java/Makefile.in | 1 + .../test-suite/java_nspacewithoutpackage.i | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 Examples/test-suite/java_nspacewithoutpackage.i diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 11d7fd3ef..df097c61b 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -32,6 +32,7 @@ CPP_TEST_CASES_PKGOPT = \ java_lib_arrays_dimensionless \ java_lib_various \ java_jnitypes \ + java_nspacewithoutpackage \ java_pgcpp \ java_pragmas \ java_prepost \ diff --git a/Examples/test-suite/java_nspacewithoutpackage.i b/Examples/test-suite/java_nspacewithoutpackage.i new file mode 100644 index 000000000..4fa1a951f --- /dev/null +++ b/Examples/test-suite/java_nspacewithoutpackage.i @@ -0,0 +1,34 @@ +%module java_nspacewithoutpackage + +%pragma(java) jniclasspackage="PragmaDefinedPackage" + +SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) +SWIG_JAVABODY_TYPEWRAPPER(public, public, public, SWIGTYPE) + +%include + +%nspace TopLevel::Foo; +%nspace TopLevel::Bar; + +%{ + #include +%} + +%inline %{ + +namespace TopLevel +{ + class Foo { + public: + virtual ~Foo() {} + virtual std::string ping() { return "TopLevel::Foo::ping()"; } + }; + + class Bar { + public: + virtual ~Bar() {} + virtual std::string pong() { return "TopLevel::Bar::pong()"; } + }; +} + +%} \ No newline at end of file From 862d27f05a6b768ed37203bd7447b02e419d834c Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 12 Jan 2013 00:50:23 -0600 Subject: [PATCH 311/538] Fix issue of package directory not being created when using jniclasspackage pragma. General cleanup of implementation. --- Source/Modules/java.cxx | 85 ++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index e9b6f813c..f5deecb27 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -160,6 +160,30 @@ public: director_language = 1; } + /* ----------------------------------------------------------------------------- + * constructIntermediateClassName() + * + * Construct the fully qualified name of the intermidiate class and set + * the full_imclass_name attribute accordingly. + * ----------------------------------------------------------------------------- */ + void constructIntermediateClassName(Node *n) { + String *nspace = Getattr(n, "sym:nspace"); + + if (imclass_class_package && package) + full_imclass_name = NewStringf("%s.%s.%s", package, imclass_class_package, imclass_name); + else if (package && nspace) + full_imclass_name = NewStringf("%s.%s", package, imclass_name); + else if (imclass_class_package) + full_imclass_name = NewStringf("%s.%s", imclass_class_package, imclass_name); + else + full_imclass_name = NewStringf("%s", imclass_name); + + if (nspace && !package) { + String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); + Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); + } + } + /* ----------------------------------------------------------------------------- * getProxyName() * @@ -365,7 +389,7 @@ public: proxy_class_code = NewString(""); module_class_constants_code = NewString(""); imclass_baseclass = NewString(""); - imclass_class_package = NewString(""); + imclass_class_package = NULL; imclass_interfaces = NewString(""); imclass_class_modifiers = NewString(""); module_class_code = NewString(""); @@ -446,7 +470,7 @@ public: } // Generate the intermediary class { - String *filen = NewStringf("%s%s/%s.java", SWIG_output_directory(), imclass_class_package, imclass_name); + String *filen = NewStringf("%s%s.java", outputDirectory(imclass_class_package), imclass_name); File *f_im = NewFile(filen, "w", SWIG_output_files()); if (!f_im) { FileErrorDisplay(filen); @@ -459,7 +483,9 @@ public: // Start writing out the intermediary class file emitBanner(f_im); - if (Len(imclass_class_package)) + if (imclass_class_package && package) + Printf(f_im, "package %s.%s;", package, imclass_class_package); + else if (imclass_class_package) Printf(f_im, "package %s;", imclass_class_package); else if (package) Printf(f_im, "package %s;\n", package); @@ -1182,19 +1208,9 @@ public: String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call if (proxy_flag && !is_wrapping_class()) { - // Global enums / enums in a namespace - assert(!full_imclass_name); - - if (!nspace) { - full_imclass_name = NewStringf("%s", imclass_name); - } else { - if (package) { - full_imclass_name = NewStringf("%s.%s", package, imclass_name); - } else { - String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); - Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); - } - } + // Global enums / enums in a namespace + assert(!full_imclass_name); + constructIntermediateClassName(n); } enum_code = NewString(""); @@ -1899,38 +1915,35 @@ public: if (proxy_flag) { proxy_class_name = NewString(Getattr(n, "sym:name")); String *nspace = getNSpace(); + constructIntermediateClassName(n); if (!nspace) { - full_proxy_class_name = NewStringf("%s", proxy_class_name); - full_imclass_name = NewStringf("%s", imclass_name); - if (Cmp(proxy_class_name, imclass_name) == 0) { - Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name); - SWIG_exit(EXIT_FAILURE); - } + full_proxy_class_name = NewStringf("%s", proxy_class_name); - if (Cmp(proxy_class_name, module_class_name) == 0) { - Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name); - SWIG_exit(EXIT_FAILURE); - } + if (Cmp(proxy_class_name, imclass_name) == 0) { + Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name); + SWIG_exit(EXIT_FAILURE); + } + + if (Cmp(proxy_class_name, module_class_name) == 0) { + Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name); + SWIG_exit(EXIT_FAILURE); + } } else { - if (package) { - full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); - full_imclass_name = NewStringf("%s.%s", package, imclass_name); - } else { - String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); - Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); - } + if (package) { + full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); + } } if (!addSymbol(proxy_class_name, n, nspace)) - return SWIG_ERROR; + return SWIG_ERROR; String *output_directory = outputDirectory(nspace); String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name); f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { - FileErrorDisplay(filen); - SWIG_exit(EXIT_FAILURE); + FileErrorDisplay(filen); + SWIG_exit(EXIT_FAILURE); } Append(filenames_list, Copy(filen)); Delete(filen); From 28da117186d198d699d399bedfbb7f49198f6280 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 12 Jan 2013 01:48:13 -0600 Subject: [PATCH 312/538] Modify java test-suite Makefile to run the java_nspacewithoutpackage test without the -package option. --- Examples/test-suite/java/Makefile.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index df097c61b..29ba2f36b 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -16,7 +16,7 @@ C_TEST_CASES = \ java_lib_various CPP_TEST_CASES_PKGPRAGMA = \ - internal_pkgpragma_test + java_nspacewithoutpackage CPP_TEST_CASES_PKGOPT = \ @@ -32,7 +32,6 @@ CPP_TEST_CASES_PKGOPT = \ java_lib_arrays_dimensionless \ java_lib_various \ java_jnitypes \ - java_nspacewithoutpackage \ java_pgcpp \ java_pragmas \ java_prepost \ @@ -55,12 +54,14 @@ ALL_PKGPRAGMA := $(filter $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TES $(ALL_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) $(ALL_PKGOPT): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" -# Set JAVA_PACKAGE differently for the tests using internally coded pragma javapackage +# Set JNI_PACKAGE for the tests using internally coded pragma javapackage # (and must match what is in the test .i file) # Make sure that the pragma dir DOES NOT exist (since test should create) # This may not find all the generated java to compile... -$(ALL_PKGPRAGMA): JAVA_PACKAGE = MyExplicitPragmaJavaPackage -$(ALL_PKGPRAGMA): PKGDIRSETUP = rm -rf $(JAVA_PACKAGE) +# NOTE: The variable JAVA_PACKAGE has nothing to do wih a package in this case, but +# needs to remain named the same so other targets work +$(ALL_PKGPRAGMA): JNI_PACKAGE = PragmaDefinedPackage +$(ALL_PKGPRAGMA): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" &&rm -rf $(JAVA_PACKAGE)/$(JNI_PACKAGE) # Custom tests - tests with additional commandline options nspace.%: JAVA_PACKAGE = $*Package @@ -71,18 +72,18 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests %.cpptest: $(setup) - +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_cpp))" - echo "$@ $(run_testcase)" + +($(PKGDIRSETUP) && $(swig_and_compile_cpp)) + $(run_testcase) %.ctest: $(setup) - +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_c))" - echo "$@ $(run_testcase)" + +($(PKGDIRSETUP) && $(swig_and_compile_c)) + $(run_testcase) %.multicpptest: $(setup) - +echo "$@ ($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp))" - echo "$@ $(run_testcase)" + +($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp)) + $(run_testcase) # don't duplicate $(setup), just add explicit $(PKGDIRSETUP) # This doesn't work yet since for PKGPRAGMA test, PKGDIRSETUP deletes From 43ad8e611aca7364d4c37ce2dc24fcfd65fdcbf3 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 12 Jan 2013 01:55:11 -0600 Subject: [PATCH 313/538] Remove comment about previously outstanding TODO that has been cleaned up. --- Examples/test-suite/java/Makefile.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 29ba2f36b..72fad777d 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -85,10 +85,6 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package +($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp)) $(run_testcase) -# don't duplicate $(setup), just add explicit $(PKGDIRSETUP) -# This doesn't work yet since for PKGPRAGMA test, PKGDIRSETUP deletes -# JAVA_PACKAGE, but next line tries to cd there. - # COMPILES java files then runs the testcase. A testcase is only run if # a file is found which has _runme.java appended after the testcase name. # Note Java uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows, SHLIB_PATH on HPUX and DYLD_LIBRARY_PATH on Mac OS X. From 7104b20d0d805972d59c5acc89dfb6d42b2e7ffa Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Sat, 12 Jan 2013 02:10:27 -0600 Subject: [PATCH 314/538] imclass_class_package variable names seems to have class in it one too many times... renamed to imclass_package. --- Source/Modules/java.cxx | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index f5deecb27..df1f6dd78 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -67,7 +67,7 @@ class JAVA:public Language { String *imclass_imports; //intermediary class imports from %pragma String *module_imports; //module imports from %pragma String *imclass_baseclass; //inheritance for intermediary class class from %pragma - String *imclass_class_package; //package in which to generate the jni class + String *imclass_package; //package in which to generate the jni class String *module_baseclass; //inheritance for module class from %pragma String *imclass_interfaces; //interfaces for intermediary class class from %pragma String *module_interfaces; //interfaces for module class from %pragma @@ -169,12 +169,12 @@ public: void constructIntermediateClassName(Node *n) { String *nspace = Getattr(n, "sym:nspace"); - if (imclass_class_package && package) - full_imclass_name = NewStringf("%s.%s.%s", package, imclass_class_package, imclass_name); + if (imclass_package && package) + full_imclass_name = NewStringf("%s.%s.%s", package, imclass_package, imclass_name); else if (package && nspace) full_imclass_name = NewStringf("%s.%s", package, imclass_name); - else if (imclass_class_package) - full_imclass_name = NewStringf("%s.%s", imclass_class_package, imclass_name); + else if (imclass_package) + full_imclass_name = NewStringf("%s.%s", imclass_package, imclass_name); else full_imclass_name = NewStringf("%s", imclass_name); @@ -389,7 +389,7 @@ public: proxy_class_code = NewString(""); module_class_constants_code = NewString(""); imclass_baseclass = NewString(""); - imclass_class_package = NULL; + imclass_package = NULL; imclass_interfaces = NewString(""); imclass_class_modifiers = NewString(""); module_class_code = NewString(""); @@ -470,7 +470,7 @@ public: } // Generate the intermediary class { - String *filen = NewStringf("%s%s.java", outputDirectory(imclass_class_package), imclass_name); + String *filen = NewStringf("%s%s.java", outputDirectory(imclass_package), imclass_name); File *f_im = NewFile(filen, "w", SWIG_output_files()); if (!f_im) { FileErrorDisplay(filen); @@ -483,10 +483,10 @@ public: // Start writing out the intermediary class file emitBanner(f_im); - if (imclass_class_package && package) - Printf(f_im, "package %s.%s;", package, imclass_class_package); - else if (imclass_class_package) - Printf(f_im, "package %s;", imclass_class_package); + if (imclass_package && package) + Printf(f_im, "package %s.%s;", package, imclass_package); + else if (imclass_package) + Printf(f_im, "package %s;", imclass_package); else if (package) Printf(f_im, "package %s;\n", package); @@ -655,8 +655,8 @@ public: module_class_constants_code = NULL; Delete(imclass_baseclass); imclass_baseclass = NULL; - Delete(imclass_class_package); - imclass_class_package = NULL; + Delete(imclass_package); + imclass_package = NULL; Delete(imclass_interfaces); imclass_interfaces = NULL; Delete(imclass_class_modifiers); @@ -1625,9 +1625,9 @@ public: Delete(imclass_baseclass); imclass_baseclass = Copy(strvalue); } else if (Strcmp(code, "jniclasspackage") == 0) { - Delete(imclass_class_package); - imclass_class_package = Copy(strvalue); - String *imclass_class_package_jniname = makeValidJniName(imclass_class_package); + Delete(imclass_package); + imclass_package = Copy(strvalue); + String *imclass_class_package_jniname = makeValidJniName(imclass_package); Printv(jnipackage, imclass_class_package_jniname, NIL); Delete(imclass_class_package_jniname); Replaceall(jnipackage, NSPACE_SEPARATOR, "_"); From 20ce05f9548e1bc69bdd2a45f3032e45288f8075 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Mon, 14 Jan 2013 13:11:42 -0600 Subject: [PATCH 315/538] Update documentation regarding the use of the nspace feature in java without the -package commandline option. --- Doc/Manual/Java.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 858342c43..e8777fbe3 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -1923,19 +1923,10 @@ The default behaviour described above can be improved via the -

    -example.i:16: Error: The nspace feature used on 'MyWorld::Material::Color' is not supported unless
-a package is specified
-with -package - Java does not support types declared in a named package accessing types declared
-in an unnamed package.
-
    - -

    If the resulting use of the nspace feature and hence packages results in a proxy class in one package deriving or using a proxy class from another package, you will need to open up the visibility for the pointer constructor and getCPtr method from the default 'protected' to 'public' with the SWIG_JAVABODY_PROXY macro. See Java code typemaps. @@ -2225,6 +2216,9 @@ The intermediary JNI class can be tailored through the use of pragmas, but is no jniclassbase Base class for the intermediary JNI class + + jniclasspackage Package in which to place the intermediary JNI class + jniclassclassmodifiers Class modifiers and class type for the intermediary JNI class From ace33bbf41e3cd40bf252fefb236883af6d8be2e Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Mon, 14 Jan 2013 16:31:53 -0600 Subject: [PATCH 316/538] Fix issue with using directors with the nspace feature without the -package commandline argument. --- Source/Modules/java.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index df1f6dd78..18043e1a4 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -1930,9 +1930,10 @@ public: SWIG_exit(EXIT_FAILURE); } } else { - if (package) { + if (package) full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); - } + else + full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name); } if (!addSymbol(proxy_class_name, n, nspace)) @@ -3592,8 +3593,11 @@ public: String *qualified_classname = Copy(classname); String *nspace = getNSpace(); - if (nspace) + if (nspace && package) Insert(qualified_classname, 0, NewStringf("%s.%s.", package, nspace)); + else if(nspace) + Insert(qualified_classname, 0, NewStringf("%s.", nspace)); + // Kludge Alert: functionWrapper sets sym:overload properly, but it // isn't at this point, so we have to manufacture it ourselves. At least From f7e27ec7a966e05c6f8bc4336f0270f61c12b0d7 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Tue, 15 Jan 2013 13:09:01 -0600 Subject: [PATCH 317/538] Fix issue with using directors with the nspace feature without the -package commandline argument. --- Source/Modules/java.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 18043e1a4..5cb194605 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -4294,19 +4294,19 @@ public: Wrapper *w = NewWrapper(); - if (Len(package_path) > 0) - if (Len(getNSpace()) > 0) { - internal_classname = NewStringf("%s/%s/%s", package_path, getNSpace(), classname); - - // If the namespace is multiple levels, the result of getNSpace() will have inserted - // .'s to delimit namespaces, so we need to replace those with /'s - Replace(internal_classname, ".", "/", DOH_REPLACE_ANY); - } - else - internal_classname = NewStringf("%s/%s", package_path, classname); + if (Len(package_path) > 0 && Len(getNSpace()) > 0) + internal_classname = NewStringf("%s/%s/%s", package_path, getNSpace(), classname); + else if (Len(package_path) > 0) + internal_classname = NewStringf("%s/%s", package_path, classname); + else if (Len(getNSpace()) > 0) + internal_classname = NewStringf("%s/%s", getNSpace(), classname); else internal_classname = NewStringf("%s", classname); + // If the namespace is multiple levels, the result of getNSpace() will have inserted + // .'s to delimit namespaces, so we need to replace those with /'s + Replace(internal_classname, ".", "/", DOH_REPLACE_ANY); + Wrapper_add_localv(w, "baseclass", "static jclass baseclass", "= 0", NIL); Printf(w->def, "void %s::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {", director_classname); From 9318ece01ffa6d1de64e5930217ef42de24cc411 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Tue, 15 Jan 2013 13:11:21 -0600 Subject: [PATCH 318/538] Use NSPACE_SEPARATOR rather than literal. --- Source/Modules/java.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 5cb194605..03dae577d 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -4305,7 +4305,7 @@ public: // If the namespace is multiple levels, the result of getNSpace() will have inserted // .'s to delimit namespaces, so we need to replace those with /'s - Replace(internal_classname, ".", "/", DOH_REPLACE_ANY); + Replace(internal_classname, NSPACE_SEPARATOR, "/", DOH_REPLACE_ANY); Wrapper_add_localv(w, "baseclass", "static jclass baseclass", "= 0", NIL); Printf(w->def, "void %s::swig_connect_director(JNIEnv *jenv, jobject jself, jclass jcls, bool swig_mem_own, bool weak_global) {", director_classname); From 0e32be246500e78089327f323794f1e5d7af879b Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Thu, 17 Jan 2013 16:54:54 +0100 Subject: [PATCH 319/538] Prefer $MAKE if specified in environment Sometimes gmake is the only one available. --- Tools/pcre-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh index 68ffe0b03..4af7deca3 100755 --- a/Tools/pcre-build.sh +++ b/Tools/pcre-build.sh @@ -48,8 +48,8 @@ echo "Configuring PCRE in directory: pcre" mv $pcre_dir pcre || bail "Could not create pcre directory" cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed" echo "Building PCRE..." -make -s || bail "Could not build PCRE" +${MAKE:make} -s || bail "Could not build PCRE" echo "Installing PCRE locally to $pcre_install_dir..." -make -s install || bail "Could not install PCRE" +${MAKE:make} -s install || bail "Could not install PCRE" echo "" echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config." From 219555ebea24513fd1385805cb4a7d7546595c7b Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Thu, 17 Jan 2013 19:07:30 +0100 Subject: [PATCH 320/538] use executables path set at ./configure time --- Examples/test-suite/java/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index f8da8e6cc..24f6a213c 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -3,8 +3,8 @@ ####################################################################### LANGUAGE = java -JAVA = java -JAVAC = javac +JAVA = @JAVA@ +JAVAC = @JAVAC@ JAVAFLAGS = -Xcheck:jni SCRIPTSUFFIX = _runme.java srcdir = @srcdir@ From 55f4bfec8e3ce00207c5d1e8bec2ac48b8ac62f8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 18 Jan 2013 23:47:23 +0000 Subject: [PATCH 321/538] Revert Java test-suite makefile to adf51b5249e6b1a7a11fc3adcc01ed196d6c9135 --- Examples/test-suite/java/Makefile.in | 48 +++++++++++----------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 72fad777d..f8da8e6cc 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -15,11 +15,7 @@ C_TEST_CASES = \ java_lib_arrays \ java_lib_various -CPP_TEST_CASES_PKGPRAGMA = \ - java_nspacewithoutpackage - - -CPP_TEST_CASES_PKGOPT = \ +CPP_TEST_CASES = \ enum_thorough_proper \ enum_thorough_simple \ enum_thorough_typeunsafe \ @@ -40,28 +36,11 @@ CPP_TEST_CASES_PKGOPT = \ java_typemaps_typewrapper # li_boost_intrusive_ptr -CPP_TEST_CASES = $(CPP_TEST_CASES_PKGOPT) $(CPP_TEST_CASES_PKGPRAGMA) include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* - -ALL_PKGOPT := $(filter-out $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) -ALL_PKGPRAGMA := $(filter $(CPP_TEST_CASES_PKGPRAGMA:=.cpptest),$(NOT_BROKEN_TEST_CASES)) - -# Add '-package' swigopt for ALL tests except for CPP_TEST_CASES_PKGPRAGMA -# PKGDIRSETUP should leave 0 exitcode when successful -$(ALL_PKGOPT): SWIGOPT += -package $(JAVA_PACKAGE) -$(ALL_PKGOPT): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" - -# Set JNI_PACKAGE for the tests using internally coded pragma javapackage -# (and must match what is in the test .i file) -# Make sure that the pragma dir DOES NOT exist (since test should create) -# This may not find all the generated java to compile... -# NOTE: The variable JAVA_PACKAGE has nothing to do wih a package in this case, but -# needs to remain named the same so other targets work -$(ALL_PKGPRAGMA): JNI_PACKAGE = PragmaDefinedPackage -$(ALL_PKGPRAGMA): PKGDIRSETUP = [ -d "$(JAVA_PACKAGE)" ] || mkdir -p "$(JAVA_PACKAGE)" && cd "$(JAVA_PACKAGE)" &&rm -rf $(JAVA_PACKAGE)/$(JNI_PACKAGE) +SWIGOPT += -package $(JAVA_PACKAGE) # Custom tests - tests with additional commandline options nspace.%: JAVA_PACKAGE = $*Package @@ -70,22 +49,33 @@ director_nspace.%: JAVA_PACKAGE = $*Package director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests -%.cpptest: +%.cpptest: $(setup) - +($(PKGDIRSETUP) && $(swig_and_compile_cpp)) + +(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) $(run_testcase) %.ctest: $(setup) - +($(PKGDIRSETUP) && $(swig_and_compile_c)) + +(cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) $(run_testcase) -%.multicpptest: +%.multicpptest: $(setup) - +($(PKGDIRSETUP) && $(swig_and_compile_multi_cpp)) + +(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) $(run_testcase) -# COMPILES java files then runs the testcase. A testcase is only run if +# Makes a directory for the testcase if it does not exist +setup = \ + if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ + else \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ + fi; \ + if [ ! -d $(JAVA_PACKAGE) ]; then \ + mkdir $(JAVA_PACKAGE); \ + fi + +# Compiles java files then runs the testcase. A testcase is only run if # a file is found which has _runme.java appended after the testcase name. # Note Java uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows, SHLIB_PATH on HPUX and DYLD_LIBRARY_PATH on Mac OS X. run_testcase = \ From 95b176b6b300114abd2514599d8fc71de40e3ac7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 18 Jan 2013 23:52:48 +0000 Subject: [PATCH 322/538] Java test-suite change to make it possible to not specify a namespace. Re-add java_nspacewithoutpackage testcase --- Examples/test-suite/java/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index f8da8e6cc..1ada28e84 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -28,6 +28,7 @@ CPP_TEST_CASES = \ java_lib_arrays_dimensionless \ java_lib_various \ java_jnitypes \ + java_nspacewithoutpackage \ java_pgcpp \ java_pragmas \ java_prepost \ @@ -40,9 +41,11 @@ include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* -SWIGOPT += -package $(JAVA_PACKAGE) +JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE) +SWIGOPT += $(JAVA_PACKAGEOPT) # Custom tests - tests with additional commandline options +java_nspacewithoutpackage.%: JAVA_PACKAGEOPT = nspace.%: JAVA_PACKAGE = $*Package nspace_extend.%: JAVA_PACKAGE = $*Package director_nspace.%: JAVA_PACKAGE = $*Package From 36ce54da8d46b340947940c202dd87a343153b63 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 19 Jan 2013 00:34:05 +0000 Subject: [PATCH 323/538] Whitespace fixup --- Source/Modules/java.cxx | 68 ++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 03dae577d..b86dd3259 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -67,7 +67,7 @@ class JAVA:public Language { String *imclass_imports; //intermediary class imports from %pragma String *module_imports; //module imports from %pragma String *imclass_baseclass; //inheritance for intermediary class class from %pragma - String *imclass_package; //package in which to generate the jni class + String *imclass_package; //package in which to generate the jni class String *module_baseclass; //inheritance for module class from %pragma String *imclass_interfaces; //interfaces for intermediary class class from %pragma String *module_interfaces; //interfaces for module class from %pragma @@ -1208,9 +1208,9 @@ public: String *nspace = Getattr(n, "sym:nspace"); // NSpace/getNSpace() only works during Language::enumDeclaration call if (proxy_flag && !is_wrapping_class()) { - // Global enums / enums in a namespace - assert(!full_imclass_name); - constructIntermediateClassName(n); + // Global enums / enums in a namespace + assert(!full_imclass_name); + constructIntermediateClassName(n); } enum_code = NewString(""); @@ -1625,24 +1625,24 @@ public: Delete(imclass_baseclass); imclass_baseclass = Copy(strvalue); } else if (Strcmp(code, "jniclasspackage") == 0) { - Delete(imclass_package); - imclass_package = Copy(strvalue); - String *imclass_class_package_jniname = makeValidJniName(imclass_package); - Printv(jnipackage, imclass_class_package_jniname, NIL); - Delete(imclass_class_package_jniname); - Replaceall(jnipackage, NSPACE_SEPARATOR, "_"); - Append(jnipackage, "_"); + Delete(imclass_package); + imclass_package = Copy(strvalue); + String *imclass_class_package_jniname = makeValidJniName(imclass_package); + Printv(jnipackage, imclass_class_package_jniname, NIL); + Delete(imclass_class_package_jniname); + Replaceall(jnipackage, NSPACE_SEPARATOR, "_"); + Append(jnipackage, "_"); - String *wrapper_name = NewString(""); - String *imclass_class_jniname = makeValidJniName(imclass_name); - Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname); - Delete(imclass_class_jniname); + String *wrapper_name = NewString(""); + String *imclass_class_jniname = makeValidJniName(imclass_name); + Printf(wrapper_name, "Java_%s%s_%%f", jnipackage, imclass_class_jniname); + Delete(imclass_class_jniname); - Swig_name_unregister("wrapper"); - Swig_name_register("wrapper", Char(wrapper_name)); + Swig_name_unregister("wrapper"); + Swig_name_register("wrapper", Char(wrapper_name)); - Delete(wrapper_name); - } else if (Strcmp(code, "jniclassclassmodifiers") == 0) { + Delete(wrapper_name); + } else if (Strcmp(code, "jniclassclassmodifiers") == 0) { Delete(imclass_class_modifiers); imclass_class_modifiers = Copy(strvalue); } else if (Strcmp(code, "jniclasscode") == 0) { @@ -1918,22 +1918,22 @@ public: constructIntermediateClassName(n); if (!nspace) { - full_proxy_class_name = NewStringf("%s", proxy_class_name); + full_proxy_class_name = NewStringf("%s", proxy_class_name); - if (Cmp(proxy_class_name, imclass_name) == 0) { - Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name); - SWIG_exit(EXIT_FAILURE); - } + if (Cmp(proxy_class_name, imclass_name) == 0) { + Printf(stderr, "Class name cannot be equal to intermediary class name: %s\n", proxy_class_name); + SWIG_exit(EXIT_FAILURE); + } - if (Cmp(proxy_class_name, module_class_name) == 0) { - Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name); - SWIG_exit(EXIT_FAILURE); - } + if (Cmp(proxy_class_name, module_class_name) == 0) { + Printf(stderr, "Class name cannot be equal to module class name: %s\n", proxy_class_name); + SWIG_exit(EXIT_FAILURE); + } } else { - if (package) - full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); - else - full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name); + if (package) + full_proxy_class_name = NewStringf("%s.%s.%s", package, nspace, proxy_class_name); + else + full_proxy_class_name = NewStringf("%s.%s", nspace, proxy_class_name); } if (!addSymbol(proxy_class_name, n, nspace)) @@ -1943,8 +1943,8 @@ public: String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name); f_proxy = NewFile(filen, "w", SWIG_output_files()); if (!f_proxy) { - FileErrorDisplay(filen); - SWIG_exit(EXIT_FAILURE); + FileErrorDisplay(filen); + SWIG_exit(EXIT_FAILURE); } Append(filenames_list, Copy(filen)); Delete(filen); From bd3e93ae61fb74d5a338eac884c1e61eb64d6234 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 19 Jan 2013 00:58:56 +0000 Subject: [PATCH 324/538] Tidy up last few commits for Java new jniclasspackage pragma --- CHANGES.current | 5 +++++ Doc/Manual/Java.html | 16 +++++++++++++++- Doc/Manual/Warnings.html | 2 ++ Source/Modules/java.cxx | 12 +++++++----- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index f8391a635..ad2f1e764 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-18: Brant Kyser + [Java] Patch #15 - Allow the use of the nspace feature without the -package commandline option. + This works as long and the new jniclasspackage pragma is used to place the JNI intermediate class + into a package and the nspace feature is used to place all exposed types into a package. + 2013-01-15: wsfulton Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces. diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index e8777fbe3..8245d46eb 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -1924,7 +1924,21 @@ Note that it only works for classes, structs, unions and enums declared within a When the nspace feature is used, the C++ namespaces are converted into Java packages of the same name. Proxy classes are thus declared within a package and this proxy makes numerous calls to the JNI intermediary class which is declared in the unnamed package by default. As Java does not support types declared in a named package accessing types declared in an unnamed package, the -package commandline option described earlier generally should be used to provide a parent package. -So if SWIG is run using the -package com.myco option, a wrapped class, MyWorld::Material::Color, can then be accessed as com.myco.MyWorld.Material.Color. If you don't specify a package, you will get a warning 186. If it is undesirable to have a single top level package, the nspace feature may be used without the -package commandline option (and the resulting warning ignored) if all of the types exposed using Swig are placed in a package using the nspace feature and the jniclasspackage pragma is used to specify a package for the JNI intermediate class. +So if SWIG is run using the -package com.myco option, a wrapped class, MyWorld::Material::Color, can then be accessed as com.myco.MyWorld.Material.Color. +If you don't specify a package, you will get the following warning: +

    + +
    +
    +example.i:16: Warning 826: The nspace feature is used on 'MyWorld::Material::Color' without -package. The generated code 
+may not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.
+
    +
    + +

    +If it is undesirable to have a single top level package, the nspace feature may be used without the -package commandline option +(and the resulting warning ignored) if all of the types exposed using SWIG are placed in a package using the nspace feature and the +'jniclasspackage' pragma is used to specify a package for the JNI intermediary class.

    diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html index 2a3ce560d..1571146f1 100644 --- a/Doc/Manual/Warnings.html +++ b/Doc/Manual/Warnings.html @@ -551,6 +551,8 @@ example.i(4) : Syntax error in input.

  • 822. Covariant return types not supported in Java. Proxy method will return basetype (Java).
  • 823. No javaconstruct typemap defined for type (Java).
  • 824. Missing JNI descriptor in directorin typemap defined for type (Java). +
  • 825. "directorconnect" attribute missing in type "javaconstruct" typemap. (Java). +
  • 826. The nspace feature is used on 'type' without -package. The generated code may not compile as Java does not support types declared in a named package accessing types declared in an unnamed package. (Java).
      diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index b86dd3259..5b861ee0f 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -67,7 +67,7 @@ class JAVA:public Language { String *imclass_imports; //intermediary class imports from %pragma String *module_imports; //module imports from %pragma String *imclass_baseclass; //inheritance for intermediary class class from %pragma - String *imclass_package; //package in which to generate the jni class + String *imclass_package; //package in which to generate the intermediary class String *module_baseclass; //inheritance for module class from %pragma String *imclass_interfaces; //interfaces for intermediary class class from %pragma String *module_interfaces; //interfaces for module class from %pragma @@ -180,7 +180,9 @@ public: if (nspace && !package) { String *name = Getattr(n, "name") ? Getattr(n, "name") : NewString(""); - Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), "The nspace feature is used on '%s' without a package is specified with -package - This may result in generated code that does not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); + Swig_warning(WARN_JAVA_NSPACE_WITHOUT_PACKAGE, Getfile(n), Getline(n), + "The nspace feature is used on '%s' without -package. " + "The generated code may not compile as Java does not support types declared in a named package accessing types declared in an unnamed package.\n", name); } } @@ -1595,8 +1597,8 @@ public: * pragmaDirective() * * Valid Pragmas: - * jniclassbase - base (extends) for the intermediary - * jniclasspackage - package in which to generate the jni class + * jniclassbase - base (extends) for the intermediary class + * jniclasspackage - package in which to generate the intermediary class * jniclassclassmodifiers - class modifiers for the intermediary class * jniclasscode - text (java code) is copied verbatim to the intermediary class * jniclassimports - import statements for the intermediary class @@ -1937,7 +1939,7 @@ public: } if (!addSymbol(proxy_class_name, n, nspace)) - return SWIG_ERROR; + return SWIG_ERROR; String *output_directory = outputDirectory(nspace); String *filen = NewStringf("%s%s.java", output_directory, proxy_class_name); From bda67e1d780b1d4363db058c294b5eb714f7bedd Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 19 Jan 2013 01:06:01 +0000 Subject: [PATCH 325/538] Cosmetic makefile change --- Examples/test-suite/java/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 1ada28e84..c62dfa595 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -25,10 +25,10 @@ CPP_TEST_CASES = \ java_director \ java_director_assumeoverride \ java_enums \ + java_jnitypes \ java_lib_arrays_dimensionless \ java_lib_various \ - java_jnitypes \ - java_nspacewithoutpackage \ + java_nspacewithoutpackage \ java_pgcpp \ java_pragmas \ java_prepost \ From 3654031d4f273caf5cb0338192b7563318b5236b Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Fri, 18 Jan 2013 15:06:15 -0600 Subject: [PATCH 326/538] Repair typo from previous commit. --- Source/Modules/java.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 5b861ee0f..987b6ddf6 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -2027,7 +2027,7 @@ public: Printf(dcast_wrap->code, " jobject jresult = (jobject) 0;\n"); Printf(dcast_wrap->code, " %s *obj = *((%s **)&jCPtrBase);\n", norm_name, norm_name); Printf(dcast_wrap->code, " if (obj) director = dynamic_cast(obj);\n"); - Printf(dcast_wrap->code, " if (director) jresult = director->swig_get_self);\n"); + Printf(dcast_wrap->code, " if (director) jresult = director->swig_get_self(jenv);\n"); Printf(dcast_wrap->code, " return jresult;\n"); Printf(dcast_wrap->code, "}\n"); From 751bedf5e5a95b104ca37a7baef71e188127016d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 19 Jan 2013 01:28:55 +0000 Subject: [PATCH 327/538] Suppress warning in testcase --- Examples/test-suite/java_nspacewithoutpackage.i | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/java_nspacewithoutpackage.i b/Examples/test-suite/java_nspacewithoutpackage.i index 4fa1a951f..24458ec36 100644 --- a/Examples/test-suite/java_nspacewithoutpackage.i +++ b/Examples/test-suite/java_nspacewithoutpackage.i @@ -1,5 +1,8 @@ %module java_nspacewithoutpackage +%warnfilter(SWIGWARN_JAVA_NSPACE_WITHOUT_PACKAGE) TopLevel::Foo; +%warnfilter(SWIGWARN_JAVA_NSPACE_WITHOUT_PACKAGE) TopLevel::Bar; + %pragma(java) jniclasspackage="PragmaDefinedPackage" SWIG_JAVABODY_PROXY(public, public, SWIGTYPE) @@ -31,4 +34,4 @@ namespace TopLevel }; } -%} \ No newline at end of file +%} From 38d454a1022f65d76e292fd13d699da896c0c2cf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 25 Jan 2013 19:18:12 +0100 Subject: [PATCH 328/538] Fix MAKE variable expansion in pcre-build.sh. Correct the syntax used in 0e32be2, it's ${var:-fallback}. --- Tools/pcre-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh index 4af7deca3..92f645da2 100755 --- a/Tools/pcre-build.sh +++ b/Tools/pcre-build.sh @@ -48,8 +48,8 @@ echo "Configuring PCRE in directory: pcre" mv $pcre_dir pcre || bail "Could not create pcre directory" cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed" echo "Building PCRE..." -${MAKE:make} -s || bail "Could not build PCRE" +${MAKE:-make} -s || bail "Could not build PCRE" echo "Installing PCRE locally to $pcre_install_dir..." -${MAKE:make} -s install || bail "Could not install PCRE" +${MAKE:-make} -s install || bail "Could not install PCRE" echo "" echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config." From 38f37ef5ae7026dd7c04ac8c39cb2aec4bf90838 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 29 Jan 2013 06:55:22 +0000 Subject: [PATCH 329/538] Apply patch SF #335 - Truly ignore constructors in directors with %ignore and correct testcase that tests this --- CHANGES.current | 3 ++ Examples/test-suite/director_ignore.i | 49 +++++++++++++++++++-------- Source/Modules/lang.cxx | 3 ++ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index ad2f1e764..9c014aa82 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-28: William + [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore. + 2013-01-18: Brant Kyser [Java] Patch #15 - Allow the use of the nspace feature without the -package commandline option. This works as long and the new jniclasspackage pragma is used to place the JNI intermediate class diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i index 05ba17ce1..57cbc13d8 100644 --- a/Examples/test-suite/director_ignore.i +++ b/Examples/test-suite/director_ignore.i @@ -68,21 +68,6 @@ class DAbstractIgnores virtual double OverloadedProtectedMethod() = 0; }; -class DIgnoreConstructor -{ - public: - virtual ~DIgnoreConstructor() {} - DIgnoreConstructor(std::string s, int i) {} - DIgnoreConstructor(bool b) {} -}; - -class DIgnoreOnlyConstructor -{ - public: - virtual ~DIgnoreOnlyConstructor() {} - DIgnoreOnlyConstructor(bool b) {} -}; - template class DTemplateAbstractIgnores { T t; @@ -101,3 +86,37 @@ template class DTemplateAbstractIgnores %template(DTemplateAbstractIgnoresInt) DTemplateAbstractIgnores; +class DIgnoreConstructor +{ + public: + virtual ~DIgnoreConstructor() {} + DIgnoreConstructor(std::string s, int i) {} + DIgnoreConstructor(bool b) {} +}; + +class DIgnoreOnlyConstructor +{ + public: + virtual ~DIgnoreOnlyConstructor() {} + DIgnoreOnlyConstructor(bool b) {} +}; + +%{ +class DIgnoreConstructor +{ + public: + virtual ~DIgnoreConstructor() {} + DIgnoreConstructor(std::string s, int i) {} + private: // Hide constructor + DIgnoreConstructor(bool b) {} +}; + +class DIgnoreOnlyConstructor +{ + public: + virtual ~DIgnoreOnlyConstructor() {} + private: // Hide constructor + DIgnoreOnlyConstructor(bool b) {} +}; +%} + diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 4f1657825..69df79271 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -1995,6 +1995,9 @@ int Language::classDirectorConstructors(Node *n) { for (ni = Getattr(n, "firstChild"); ni; ni = nextSibling(ni)) { nodeType = Getattr(ni, "nodeType"); if (Cmp(nodeType, "constructor") == 0) { + if (GetFlag(ni, "feature:ignore")) + continue; + Parm *parms = Getattr(ni, "parms"); if (is_public(ni)) { /* emit public constructor */ From d172e3d0ed96e1f242ebaa4066f556a8abe0e764 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 29 Jan 2013 07:28:32 +0000 Subject: [PATCH 330/538] Apply patch SF #334 - Fix Python default value conversions TRUE->True, FALSE->False. --- CHANGES.current | 3 +++ Source/Modules/octave.cxx | 6 +----- Source/Modules/python.cxx | 2 +- Source/Modules/ruby.cxx | 6 +----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 9c014aa82..1d09ab875 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-28: William + [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False. + 2013-01-28: William [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore. diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 5584176a1..bbe442b7e 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -524,11 +524,7 @@ public: } if (Strcmp(v, "NULL") == 0) return SwigType_ispointer(t) ? NewString("nil") : NewString("0"); - else if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0) - return NewString("true"); - else if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0) - return NewString("false"); - if (Strcmp(v, "true") == 0 || Strcmp(v, "FALSE") == 0) + if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0) return NewString("true"); if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0) return NewString("false"); diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx index 280a36923..e3d8c7d50 100644 --- a/Source/Modules/python.cxx +++ b/Source/Modules/python.cxx @@ -1556,7 +1556,7 @@ public: else return v; } - if (Strcmp(v, "true") == 0 || Strcmp(v, "FALSE") == 0) + if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0) return NewString("True"); if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0) return NewString("False"); diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx index eaec0e185..48680e803 100644 --- a/Source/Modules/ruby.cxx +++ b/Source/Modules/ruby.cxx @@ -790,11 +790,7 @@ private: } if (Strcmp(v, "NULL") == 0) return SwigType_ispointer(t) ? NewString("nil") : NewString("0"); - else if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0) - return NewString("true"); - else if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0) - return NewString("false"); - if (Strcmp(v, "true") == 0 || Strcmp(v, "FALSE") == 0) + if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0) return NewString("True"); if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0) return NewString("False"); From 397409fbb1336690c99e77f4f23043626e495d98 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 30 Jan 2013 22:18:13 +0000 Subject: [PATCH 331/538] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5 --- CHANGES.current | 3 +++ Doc/Manual/Java.html | 7 ++++--- Source/Modules/java.cxx | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 1d09ab875..e6aebdb06 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-01-29: William + [Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5. + 2013-01-28: William [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False. diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index 8245d46eb..0024d602a 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5662,7 +5662,7 @@ to make the method and constructor public:

      The Java directors feature requires the "javadirectorin", "javadirectorout", "directorin" and the "directorout" typemaps in order to work properly. -The "javapackage" typemap is an optional typemap used to identify the Java package path for individual SWIG generated proxy classes. +The "javapackage" typemap is an optional typemap used to identify the Java package path for individual SWIG generated proxy classes used in director methods.

      %typemap(directorin)

      @@ -5803,6 +5803,7 @@ The target method is the method in the Java proxy class which overrides the virt

      The "javapackage" typemap is optional; it serves to identify a class's Java package. This typemap should be used in conjunction with classes that are defined outside of the current SWIG interface file. +The typemap is only used if the type is used in a director method, that is, in a virtual method in a director class. For example:

      @@ -5819,7 +5820,7 @@ For example: class Example { public: virtual ~Example(); - void ping(Foo *arg1, Bar *arg2); + virtual void ping(Foo *arg1, Bar *arg2); }; } @@ -5844,7 +5845,7 @@ The corrected interface file looks like: class Example { public: virtual ~Example(); - void ping(Foo *arg1, Bar *arg2); + virtual void ping(Foo *arg1, Bar *arg2); }; } diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 987b6ddf6..2fb21eca8 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3527,7 +3527,7 @@ public: String *pkg_path = Swig_typemap_lookup("javapackage", p, "", 0); SwigType *type = Getattr(p, "type"); - if (pkg_path || Len(pkg_path) == 0) + if (!pkg_path || Len(pkg_path) == 0) pkg_path = package_path; String *descriptor_out = Copy(descriptor_in); From 9193b3ed77b54ac46bde5af1de148a9e014daa6e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 4 Feb 2013 20:10:02 +0000 Subject: [PATCH 332/538] Remove unnecessary file/line setting in parser --- Source/CParse/parser.y | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index c93f44cd0..36adf5a09 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1158,8 +1158,6 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S if (sname) { /* Add forward declaration of the nested type */ Node *n = new_node("classforward"); - Setfile(n, cparse_file); - Setline(n, cparse_line); Setattr(n, "kind", kind); Setattr(n, "name", sname); Setattr(n, "storage", storage); @@ -3832,8 +3830,6 @@ cpp_forward_class_decl : storage_class cpptype idcolon SEMI { $$ = 0; } else { $$ = new_node("classforward"); - Setfile($$,cparse_file); - Setline($$,cparse_line); Setattr($$,"kind",$2); Setattr($$,"name",$3); Setattr($$,"sym:weak", "1"); From 054f9dba1a6f2914d1ed69042162aa4f9d72e0ef Mon Sep 17 00:00:00 2001 From: tpapp Date: Sat, 9 Feb 2013 13:46:46 +0100 Subject: [PATCH 333/538] CFFI - Fix missing package before &body - patch #22 Should fix https://github.com/swig/swig/issues/21. --- CHANGES.current | 9 ++++++--- Lib/cffi/cffi.swg | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index e6aebdb06..9436c29e7 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,13 +5,16 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ -2013-01-29: William +2013-02-09: wsfulton + [CFFI] Apply patch #22 - Fix missing package before &body + +2013-01-29: wsfulton [Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5. -2013-01-28: William +2013-01-28: wsfulton [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False. -2013-01-28: William +2013-01-28: wsfulton [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore. 2013-01-18: Brant Kyser diff --git a/Lib/cffi/cffi.swg b/Lib/cffi/cffi.swg index 6ac82f45e..427a8dc17 100644 --- a/Lib/cffi/cffi.swg +++ b/Lib/cffi/cffi.swg @@ -152,7 +152,7 @@ %insert("swiglisp") %{ ;;;SWIG wrapper code starts here -(cl:defmacro defanonenum (&body enums) +(cl:defmacro defanonenum (cl:&body enums) "Converts anonymous enums to defconstants." `(cl:progn ,@(cl:loop for value in enums for index = 0 then (cl:1+ index) From b80f4dc5e257a343381e3dbeebb206c1376e3ca3 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 18 Feb 2013 19:53:37 +0000 Subject: [PATCH 334/538] Restrict the name used in %extend to be just the struct/class name and not a typedef to a class/struct. Typedefs were only partially working anyway. Anonymous struct typedefs excluded. Deprecate with a warning for now. --- CHANGES.current | 19 ++++++++ Doc/Manual/SWIG.html | 43 ++++++++++++++++--- Doc/Manual/Warnings.html | 3 +- Examples/test-suite/errors/expected.log | 4 ++ Examples/test-suite/errors/make.sh | 1 + Examples/test-suite/errors/swig_extend.i | 35 +++++++++++++++ .../extend_constructor_destructor.i | 3 ++ Examples/test-suite/extend_typedef_class.i | 3 ++ Source/CParse/parser.y | 42 ++++++++++++------ Source/Include/swigwarn.h | 1 + 10 files changed, 134 insertions(+), 20 deletions(-) create mode 100644 Examples/test-suite/errors/swig_extend.i diff --git a/CHANGES.current b/CHANGES.current index 9436c29e7..a111818d9 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,25 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-02-15: wsfulton + Deprecate typedef names used in %extend that are not the real class/struct name. For example: + + typedef struct StructBName { + int myint; + } StructB; + + %extend StructB { + void method() {} + } + + will now trigger a warning: + + swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name StructBName + should be used instead of the typedef name StructB. + + This is only partially working anyway (the %extend only worked if placed after the class + definition). + 2013-02-09: wsfulton [CFFI] Apply patch #22 - Fix missing package before &body diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index 58a3c8e55..25dc899de 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -2699,7 +2699,7 @@ the following declaration :

       /* file : vector.h */
 ...
-typedef struct {
+typedef struct Vector {
 	double x,y,z;
 } Vector;
 
@@ -2772,7 +2772,7 @@ of the Vector structure. For example:
      
 #include "vector.h"
 %}
 
-typedef struct {
+typedef struct Vector {
 	double x,y,z;
 	%extend {
 		Vector(double x, double y, double z) { ... }
@@ -2783,7 +2783,7 @@ typedef struct {

      -Finally, %extend can be used to access externally written +Note that %extend can be used to access externally written functions provided they follow the naming convention used in this example :

      @@ -2814,7 +2814,7 @@ double Vector_magnitude(Vector *v) { #include "vector.h" %} -typedef struct { +typedef struct Vector { double x,y,z; %extend { Vector(int,int,int); // This calls new_Vector() @@ -2826,6 +2826,37 @@ typedef struct { +

      +The name used for %extend should be the name of the struct and not the name of any typedef to the struct. +For example: +

      + +
      +typedef struct Integer {
+	int value;
+} Int;
+%extend Integer { ...  } /* Correct name */
+%extend Int { ...  } /* Incorrect name */
+
+struct Float {
+	float value;
+};
+typedef struct Float FloatValue;
+%extend Float { ...  } /* Correct name */
+%extend FloatValue { ...  } /* Incorrect name */
+
      + +

      +There is one exception to this rule and that is when the struct is anonymously named such as: +

      + +
      +typedef struct {
+	double value;
+} Double;
+%extend Double { ...  } /* Okay */
+
      +

      A little known feature of the %extend directive is that it can also be used to add synthesized attributes or to modify the @@ -2862,7 +2893,7 @@ For example, consider this interface: 

      -typedef struct {
+typedef struct Person {
   char name[50];
   ...
 } Person;
@@ -2876,7 +2907,7 @@ the interface as follows to ensure this occurs whenever a name is read or writte
 
 
      
 
      -typedef struct {
+typedef struct Person {
   %extend {
     char name[50];
   }
diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 1571146f1..ccb1751d5 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -423,7 +423,8 @@ example.i(4) : Syntax error in input.
 
    • 322. Redundant redeclaration of 'name'.
 
    • 323. Recursive scope inheritance of 'name'.
 
    • 324. Named nested template instantiations not supported. Processing as if no name was given to %template().
-
    • 325. Nested class not currently supported (name ignored).
+
    • 325. Nested kind not currently supported (name ignored).
+
    • 326. Deprecated %extend name used - the kind name 'name' should be used instead of the typedef name 'name'.
 
    • 350. operator new ignored.
 
    • 351. operator delete ignored.
 
    • 352. operator+ ignored.
diff --git a/Examples/test-suite/errors/expected.log b/Examples/test-suite/errors/expected.log
index 9d4e5db77..d344d076b 100644
--- a/Examples/test-suite/errors/expected.log
+++ b/Examples/test-suite/errors/expected.log
@@ -188,6 +188,10 @@ pp_variable_args.i:6: Error: Variable length macro argument must be last paramet
 :::::::::::::::::::::::::::::::: swig_apply_nargs.i :::::::::::::::::::::::::::::::::::
 swig_apply_nargs.i:6: Error: Can't apply (char *str,int len) to (int x).  Number of arguments don't match.
 
+:::::::::::::::::::::::::::::::: swig_extend.i :::::::::::::::::::::::::::::::::::
+swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name 'StructBName' should be used instead of the typedef name 'StructB'.
+swig_extend.i:34: Warning 303: %extend defined for an undeclared class StructDName.
+
 :::::::::::::::::::::::::::::::: swig_identifier.i :::::::::::::::::::::::::::::::::::
 swig_identifier.i:5: Warning 503: Can't wrap 'foo bar' unless renamed to a valid identifier.
 
diff --git a/Examples/test-suite/errors/make.sh b/Examples/test-suite/errors/make.sh
index 90f17a92a..b194299c9 100755
--- a/Examples/test-suite/errors/make.sh
+++ b/Examples/test-suite/errors/make.sh
@@ -54,6 +54,7 @@ pp_unterm_comment
 pp_unterm_string
 pp_variable_args
 swig_apply_nargs
+swig_extend
 swig_identifier
 swig_insert_bad
 swig_typemap_copy
diff --git a/Examples/test-suite/errors/swig_extend.i b/Examples/test-suite/errors/swig_extend.i
new file mode 100644
index 000000000..ef0652320
--- /dev/null
+++ b/Examples/test-suite/errors/swig_extend.i
@@ -0,0 +1,35 @@
+%module xxx
+
+typedef struct {
+  int myint;
+} StructA;
+
+typedef struct StructBName {
+  int myint;
+} StructB;
+
+typedef struct StructC {
+  int myint;
+} StructC;
+
+%extend StructA {
+  void method() {}
+}
+
+%extend StructB {
+  void method() {}
+}
+
+%extend StructC {
+  void method() {}
+}
+
+struct StructD {
+  int myint;
+};
+typedef struct StructD StructDName;
+
+%extend StructDName {
+  void method() {}
+}
+
diff --git a/Examples/test-suite/extend_constructor_destructor.i b/Examples/test-suite/extend_constructor_destructor.i
index a0ab1a0f6..95b48a6c5 100644
--- a/Examples/test-suite/extend_constructor_destructor.i
+++ b/Examples/test-suite/extend_constructor_destructor.i
@@ -1,5 +1,8 @@
 %module extend_constructor_destructor
 
+%warnfilter(SWIGWARN_PARSE_EXTEND_NAME) Space::tagCStruct;
+%warnfilter(SWIGWARN_PARSE_EXTEND_NAME) tagEStruct;
+
 %inline %{
 int globalVar = 0;
 
diff --git a/Examples/test-suite/extend_typedef_class.i b/Examples/test-suite/extend_typedef_class.i
index 731802573..2b8c38351 100644
--- a/Examples/test-suite/extend_typedef_class.i
+++ b/Examples/test-suite/extend_typedef_class.i
@@ -1,5 +1,8 @@
 %module extend_typedef_class
 
+%warnfilter(SWIGWARN_PARSE_EXTEND_NAME) tagCClass;
+%warnfilter(SWIGWARN_PARSE_EXTEND_NAME) tagCStruct;
+
 // classes in global namespace
 %inline %{
   typedef struct tagAClass {
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 36adf5a09..74d41079c 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -38,6 +38,7 @@ static Node    *top = 0;      /* Top of the generated parse tree */
 static int      unnamed = 0;  /* Unnamed datatype counter */
 static Hash    *extendhash = 0;     /* Hash table of added methods */
 static Hash    *classes = 0;        /* Hash table of classes */
+static Hash    *classes_typedefs = 0; /* Hash table of typedef classes: typedef struct X {...} Y; */
 static Symtab  *prev_symtab = 0;
 static Node    *current_class = 0;
 String  *ModuleName = 0;
@@ -718,7 +719,7 @@ static void check_extensions() {
   for (ki = First(extendhash); ki.key; ki = Next(ki)) {
     if (!Strchr(ki.key,'<')) {
       SWIG_WARN_NODE_BEGIN(ki.item);
-      Swig_warning(WARN_PARSE_EXTEND_UNDEF,Getfile(ki.item), Getline(ki.item), "%%extend defined for an undeclared class %s.\n", ki.key);
+      Swig_warning(WARN_PARSE_EXTEND_UNDEF,Getfile(ki.item), Getline(ki.item), "%%extend defined for an undeclared class %s.\n", SwigType_namestr(ki.key));
       SWIG_WARN_NODE_END(ki.item);
     }
   }
@@ -1909,20 +1910,34 @@ extend_directive : EXTEND options idcolon LBRACE {
 	       String *clsname;
 	       cplus_mode = CPLUS_PUBLIC;
 	       if (!classes) classes = NewHash();
+	       if (!classes_typedefs) classes_typedefs = NewHash();
 	       if (!extendhash) extendhash = NewHash();
 	       clsname = make_class_name($3);
 	       cls = Getattr(classes,clsname);
 	       if (!cls) {
-		 /* No previous definition. Create a new scope */
-		 Node *am = Getattr(extendhash,clsname);
-		 if (!am) {
-		   Swig_symbol_newscope();
-		   Swig_symbol_setscopename($3);
-		   prev_symtab = 0;
+	         cls = Getattr(classes_typedefs, clsname);
+		 if (!cls) {
+		   /* No previous definition. Create a new scope */
+		   Node *am = Getattr(extendhash,clsname);
+		   if (!am) {
+		     Swig_symbol_newscope();
+		     Swig_symbol_setscopename($3);
+		     prev_symtab = 0;
+		   } else {
+		     prev_symtab = Swig_symbol_setscope(Getattr(am,"symtab"));
+		   }
+		   current_class = 0;
 		 } else {
-		   prev_symtab = Swig_symbol_setscope(Getattr(am,"symtab"));
+		   /* Previous typedef class definition.  Use its symbol table.
+		      Deprecated, just the real name should be used. 
+		      Note that %extend before the class typedef never worked, only %extend after the class typdef. */
+		   prev_symtab = Swig_symbol_setscope(Getattr(cls, "symtab"));
+		   current_class = cls;
+		   extendmode = 1;
+		   SWIG_WARN_NODE_BEGIN(cls);
+		   Swig_warning(WARN_PARSE_EXTEND_NAME, cparse_file, cparse_line, "Deprecated %%extend name used - the %s name '%s' should be used instead of the typedef name '%s'.\n", Getattr(cls, "kind"), SwigType_namestr(Getattr(cls, "name")), $3);
+		   SWIG_WARN_NODE_END(cls);
 		 }
-		 current_class = 0;
 	       } else {
 		 /* Previous class definition.  Use its symbol table */
 		 prev_symtab = Swig_symbol_setscope(Getattr(cls,"symtab"));
@@ -3585,7 +3600,6 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 		   if (!classes) classes = NewHash();
 		   scpname = Swig_symbol_qualifiedscopename(0);
 		   Setattr(classes,scpname,$$);
-		   Delete(scpname);
 
 		   appendChild($$,$7);
 		   
@@ -3606,7 +3620,7 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 		     Setattr(p,"type",ty);
 		     p = nextSibling(p);
 		   }
-		   /* Dump nested classes */
+		   /* Class typedefs */
 		   {
 		     String *name = $3;
 		     if ($9) {
@@ -3626,8 +3640,9 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 			     Delete(class_rename);
 			     class_rename = NewString(name);
 			   }
-			   if (!Getattr(classes,tdscopename)) {
-			     Setattr(classes,tdscopename,$$);
+			   if (!classes_typedefs) classes_typedefs = NewHash();
+			   if (!Equal(scpname, tdscopename) && !Getattr(classes_typedefs, tdscopename)) {
+			     Setattr(classes_typedefs, tdscopename, $$);
 			   }
 			   Setattr($$,"decl",decltype);
 			   Delete(class_scope);
@@ -3638,6 +3653,7 @@ cpp_class_decl  : storage_class cpptype idcolon inherit LBRACE {
 		     }
 		     appendChild($$,dump_nested(Char(name)));
 		   }
+		   Delete(scpname);
 
 		   if (cplus_mode != CPLUS_PUBLIC) {
 		   /* we 'open' the class at the end, to allow %template
diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h
index 76f61ea93..a3fb31012 100644
--- a/Source/Include/swigwarn.h
+++ b/Source/Include/swigwarn.h
@@ -89,6 +89,7 @@
 #define WARN_PARSE_REC_INHERITANCE    323
 #define WARN_PARSE_NESTED_TEMPLATE    324
 #define WARN_PARSE_NAMED_NESTED_CLASS 325
+#define WARN_PARSE_EXTEND_NAME        326
 
 #define WARN_IGNORE_OPERATOR_NEW        350	/* new */
 #define WARN_IGNORE_OPERATOR_DELETE     351	/* delete */

From 70cd52f44d4e61460524105dabbe1ac7f29dc6f2 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Mon, 18 Feb 2013 10:31:23 +0100
Subject: [PATCH 335/538] Use "(void)" instead of "()" when wrapping
 no-argument extension functions.

---
 CHANGES.current     | 39 +++++++++++++++++++++++++++++++++++++++
 Source/Swig/cwrap.c |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index a111818d9..4f2477b02 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,45 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-02-18: wsfulton
+            Deprecate typedef names used as constructor and destructor names in %extend. The real
+            class/struct name should be used.
+
+              typedef struct tagEStruct {
+                int ivar;
+              } EStruct;
+
+              %extend tagEStruct {
+                EStruct() // illegal name, should be tagEStruct()
+                {
+                  EStruct *s = new EStruct();
+                  s->ivar = ivar0;
+                  return s;
+                }
+                ~EStruct() // illegal name, should be ~tagEStruct()
+                {
+                  delete $self;
+                }
+              }
+
+            For now these trigger a warning:
+
+              extend_constructor_destructor.i:107: Warning 522: Use of an illegal constructor name 'EStruct' in
+              %extend is deprecated, the constructor name should be 'tagEStruct'.
+              extend_constructor_destructor.i:111: Warning 523: Use of an illegal destructor name 'EStruct' in
+              %extend is deprecated, the destructor name should be 'tagEStruct'.
+
+            These %extend destructor and constructor names were valid up to swig-2.0.4, however swig-2.0.5 ignored
+            them altogether for C code as reported in SF bug #1306. The old behaviour of using them has been
+            restored for now, but is officially deprecated. This does not apply to anonymously defined typedef
+            classes/structs such as:
+
+              typedef struct {...} X;
+
+2013-02-17: kwwette
+            When generating functions which wrap C extension code, use "(void)" for no-argument functions
+            instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
+
 2013-02-15: wsfulton
             Deprecate typedef names used in %extend that are not the real class/struct name. For example:
 
diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c
index 8cd48e94e..c7e101842 100644
--- a/Source/Swig/cwrap.c
+++ b/Source/Swig/cwrap.c
@@ -807,7 +807,7 @@ void Swig_replace_special_variables(Node *n, Node *parentnode, String *code) {
  * ----------------------------------------------------------------------------- */
 static String *extension_code(Node *n, const String *function_name, ParmList *parms, SwigType *return_type, const String *code, int cplusplus, const String *self) {
   String *parms_str = cplusplus ? ParmList_str_defaultargs(parms) : ParmList_str(parms);
-  String *sig = NewStringf("%s(%s)", function_name, parms_str);
+  String *sig = NewStringf("%s(%s)", function_name, (cplusplus || Len(parms_str)) ? parms_str : "void");
   String *rt_sig = SwigType_str(return_type, sig);
   String *body = NewStringf("SWIGINTERN %s", rt_sig);
   Printv(body, code, "\n", NIL);

From 2435b98a24f0be0abee1573948bb5d1f20d4b711 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 18 Feb 2013 22:37:43 +0000
Subject: [PATCH 336/538] Tweak to changes note

---
 CHANGES.current | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 4f2477b02..0b65717ff 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -41,7 +41,7 @@ Version 2.0.10 (in progress)
               typedef struct {...} X;
 
 2013-02-17: kwwette
-            When generating functions which wrap C extension code, use "(void)" for no-argument functions
+            When generating functions provided by %extend, use "(void)" for no-argument functions
             instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
 
 2013-02-15: wsfulton

From d1b40b468b607c4c71f424a1a2d36c5b240ca975 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 18 Feb 2013 08:40:20 +0000
Subject: [PATCH 337/538] Fix C code where a typedef name was used for
 constructor and destructor names in %extend. Deprecate use of typedef names
 for constructor and destructor names going forwards.

---
 Doc/Manual/Warnings.html                      |  2 ++
 Examples/test-suite/errors/expected.log       |  6 ++++
 Examples/test-suite/errors/swig_extend.i      | 25 +++++++++++++++++
 .../extend_constructor_destructor.i           |  4 +++
 Source/Include/swigwarn.h                     |  2 ++
 Source/Modules/lang.cxx                       | 28 +++++++++++++++++--
 6 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index ccb1751d5..cf4c38d7e 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -527,6 +527,8 @@ example.i(4) : Syntax error in input.
 
    • 519. %template() contains no name. Template method ignored: declaration
 
    • 520. Base/Derived class 'classname1' of 'classname2' is not similarly marked as a smart pointer.
 
    • 521. Illegal destructor name name. Ignored.
+
    • 522. Use of an illegal constructor name 'name' in %extend is deprecated, the constructor name should be 'name'.
+
    • 523. Use of an illegal destructor name 'name' in %extend is deprecated, the destructor name should be 'name'.

    14.9.6 Language module specific (700-899)

    diff --git a/Examples/test-suite/errors/expected.log b/Examples/test-suite/errors/expected.log index d344d076b..2db3d8cbc 100644 --- a/Examples/test-suite/errors/expected.log +++ b/Examples/test-suite/errors/expected.log @@ -190,7 +190,13 @@ swig_apply_nargs.i:6: Error: Can't apply (char *str,int len) to (int x). Number :::::::::::::::::::::::::::::::: swig_extend.i ::::::::::::::::::::::::::::::::::: swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name 'StructBName' should be used instead of the typedef name 'StructB'. +swig_extend.i:45: Warning 326: Deprecated %extend name used - the struct name 'stru_struct' should be used instead of the typedef name 'stru'. +swig_extend.i:56: Warning 326: Deprecated %extend name used - the union name 'uni_union' should be used instead of the typedef name 'uni'. swig_extend.i:34: Warning 303: %extend defined for an undeclared class StructDName. +swig_extend.i:50: Warning 522: Use of an illegal constructor name 'stru' in %extend is deprecated, the constructor name should be 'stru_struct'. +swig_extend.i:53: Warning 523: Use of an illegal destructor name 'stru' in %extend is deprecated, the destructor name should be 'stru_struct'. +swig_extend.i:57: Warning 522: Use of an illegal constructor name 'uni' in %extend is deprecated, the constructor name should be 'uni_union'. +swig_extend.i:58: Warning 523: Use of an illegal destructor name 'uni' in %extend is deprecated, the destructor name should be 'uni_union'. :::::::::::::::::::::::::::::::: swig_identifier.i ::::::::::::::::::::::::::::::::::: swig_identifier.i:5: Warning 503: Can't wrap 'foo bar' unless renamed to a valid identifier. diff --git a/Examples/test-suite/errors/swig_extend.i b/Examples/test-suite/errors/swig_extend.i index ef0652320..3f8d9a787 100644 --- a/Examples/test-suite/errors/swig_extend.i +++ b/Examples/test-suite/errors/swig_extend.i @@ -33,3 +33,28 @@ typedef struct StructD StructDName; void method() {} } + +typedef struct stru_struct { + int bar; +} stru; +typedef union uni_union { + int un1; + double un2; +} uni; + +%extend stru { + stru() { + stru* s = (stru*)malloc(sizeof(stru)); + s->bar = 11; + return s; + } + ~stru() { + free($self); + } +} + +%extend uni { + uni() { return 0; } + ~uni() { free($self); } +} + diff --git a/Examples/test-suite/extend_constructor_destructor.i b/Examples/test-suite/extend_constructor_destructor.i index 95b48a6c5..c25b81b03 100644 --- a/Examples/test-suite/extend_constructor_destructor.i +++ b/Examples/test-suite/extend_constructor_destructor.i @@ -2,6 +2,10 @@ %warnfilter(SWIGWARN_PARSE_EXTEND_NAME) Space::tagCStruct; %warnfilter(SWIGWARN_PARSE_EXTEND_NAME) tagEStruct; +%warnfilter(SWIGWARN_LANG_EXTEND_CONSTRUCTOR) Space::tagCStruct::CStruct; +%warnfilter(SWIGWARN_LANG_EXTEND_DESTRUCTOR) Space::tagCStruct::~CStruct; +%warnfilter(SWIGWARN_LANG_EXTEND_CONSTRUCTOR) tagEStruct::EStruct; +%warnfilter(SWIGWARN_LANG_EXTEND_DESTRUCTOR) tagEStruct::~EStruct; %inline %{ int globalVar = 0; diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index a3fb31012..daf8b1791 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -197,6 +197,8 @@ #define WARN_LANG_TEMPLATE_METHOD_IGNORE 519 #define WARN_LANG_SMARTPTR_MISSING 520 #define WARN_LANG_ILLEGAL_DESTRUCTOR 521 +#define WARN_LANG_EXTEND_CONSTRUCTOR 522 +#define WARN_LANG_EXTEND_DESTRUCTOR 523 /* -- Reserved (600-799) -- */ diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 69df79271..4d1cefc69 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -2631,10 +2631,22 @@ int Language::constructorDeclaration(Node *n) { if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) { bool illegal_name = true; if (Extend) { - // SWIG extension - allow typedef names as destructor name in %extend - an unnamed struct declared with a typedef can thus be given a 'destructor'. + // Check for typedef names used as a constructor name in %extend. This is deprecated except for anonymous + // typedef structs which have had their symbol names adjusted to the typedef name in the parser. SwigType *name_resolved = SwigType_typedef_resolve_all(actual_name); SwigType *expected_name_resolved = SwigType_typedef_resolve_all(expected_name); + + if (!CPlusPlus) { + if (Strncmp(name_resolved, "struct ", 7) == 0) + Replace(name_resolved, "struct ", "", DOH_REPLACE_FIRST); + else if (Strncmp(name_resolved, "union ", 6) == 0) + Replace(name_resolved, "union ", "", DOH_REPLACE_FIRST); + } + illegal_name = !Equal(name_resolved, expected_name_resolved); + if (!illegal_name) + Swig_warning(WARN_LANG_EXTEND_CONSTRUCTOR, input_file, line_number, "Use of an illegal constructor name '%s' in %%extend is deprecated, the constructor name should be '%s'.\n", + SwigType_str(Swig_scopename_last(actual_name), 0), SwigType_str(Swig_scopename_last(expected_name), 0)); Delete(name_resolved); Delete(expected_name_resolved); } @@ -2770,10 +2782,22 @@ int Language::destructorDeclaration(Node *n) { if (!Equal(actual_name, expected_name) && !(Getattr(n, "template"))) { bool illegal_name = true; if (Extend) { - // SWIG extension - allow typedef names as destructor name in %extend - an unnamed struct declared with a typedef can thus be given a 'destructor'. + // Check for typedef names used as a destructor name in %extend. This is deprecated except for anonymous + // typedef structs which have had their symbol names adjusted to the typedef name in the parser. SwigType *name_resolved = SwigType_typedef_resolve_all(actual_name); SwigType *expected_name_resolved = SwigType_typedef_resolve_all(expected_name); + + if (!CPlusPlus) { + if (Strncmp(name_resolved, "struct ", 7) == 0) + Replace(name_resolved, "struct ", "", DOH_REPLACE_FIRST); + else if (Strncmp(name_resolved, "union ", 6) == 0) + Replace(name_resolved, "union ", "", DOH_REPLACE_FIRST); + } + illegal_name = !Equal(name_resolved, expected_name_resolved); + if (!illegal_name) + Swig_warning(WARN_LANG_EXTEND_DESTRUCTOR, input_file, line_number, "Use of an illegal destructor name '%s' in %%extend is deprecated, the destructor name should be '%s'.\n", + SwigType_str(Swig_scopename_last(actual_name), 0), SwigType_str(Swig_scopename_last(expected_name), 0)); Delete(name_resolved); Delete(expected_name_resolved); } From 9d330a99703f079bdff5a8d7945cc1d2d7c56f53 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 19 Feb 2013 11:46:27 +0100 Subject: [PATCH 338/538] Fix qualifier parsing in SwigType_add_qualifier() - use list to ensure qualifiers are unique and sorted - now allows 'qual' to contain multiple qualifiers --- Source/Swig/typeobj.c | 78 +++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 20caa9ec9..cb9327dc7 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -16,6 +16,7 @@ #include "swig.h" #include +#include /* ----------------------------------------------------------------------------- * Synopsis @@ -425,61 +426,66 @@ int SwigType_isreference(const SwigType *t) { * Repeated qualifications have no effect. Moreover, the order of qualifications * is alphabetical---meaning that "const volatile" and "volatile const" are * stored in exactly the same way as "q(const volatile)". + * 'qual' can be a list of multiple qualifiers in any order, separated by spaces. * ----------------------------------------------------------------------------- */ -SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { - String *newq; - int sz, added = 0; - char *q, *cqual; +/* Helper function to sort the mangled list */ +static int SwigType_compare_qualifiers(const DOH *a, const DOH *b) { + return strcmp(Char(a), Char(b)); +} - char *c = Char(t); +SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { + List *qlist; + String *allq, *newq, *q; + int i, sz; + char *c, *cqual, *cq, *cqprev; + c = Char(t); cqual = Char(qual); - if (!(strncmp(c, "q(", 2) == 0)) { + /* if 't' has no qualifiers and 'qual' is a single qualifier, simply add it */ + if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == NULL)) { String *temp = NewStringf("q(%s).", cqual); Insert(t, 0, temp); Delete(temp); return t; } - /* The type already has a qualifier on it. In this case, we first check to - see if the qualifier is already specified. In that case do nothing. - If it is a new qualifier, we add it to the qualifier list in alphabetical - order */ - - sz = element_size(c); - - if (strstr(c, cqual)) { - /* Qualifier already added */ - return t; + /* create string of all qualifiers */ + if (strncmp(c, "q(", 2) == 0) { + allq = SwigType_parm(t); + Append(allq, " "); + SwigType_del_element(t); /* delete old qualifier list from 't' */ + } else { + allq = NewStringEmpty(); } + Append(allq, qual); - /* Add the qualifier to the existing list. */ + /* create list of all qualifiers from string */ + qlist = Split(allq, ' ', INT_MAX); + Delete(allq); + /* sort list */ + SortList(qlist, SwigType_compare_qualifiers); + + /* create new qualifier string from unique elements of list */ + sz = Len(qlist); newq = NewString("q("); - q = c + 2; - q = strtok(q, " )."); - while (q) { - if (strcmp(cqual, q) < 0) { - /* New qualifier is less that current qualifier. We need to insert it */ - Append(newq, cqual); - Append(newq, " "); - Append(newq, q); - added = 1; - } else { + cqprev = NULL; + for (i = 0; i < sz; ++i) { + q = Getitem(qlist, i); + cq = Char(q); + if (cqprev == NULL || strcmp(cqprev, cq) != 0) { + if (i > 0) { + Append(newq, " "); + } Append(newq, q); + cqprev = cq; } - q = strtok(NULL, " )."); - if (q) { - Append(newq, " "); - } - } - if (!added) { - Append(newq, " "); - Append(newq, cqual); } Append(newq, ")."); - Delslice(t, 0, sz); + Delete(qlist); + + /* replace qualifier string with new one */ Insert(t, 0, newq); Delete(newq); return t; From ee2b46abe0b747bc949538f51c9e2a989a867da9 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 18 Feb 2013 09:48:42 +0100 Subject: [PATCH 339/538] Fix SWIG's handling of qualified (e.g. const) variables of array type --- CHANGES.current | 12 +++ Examples/test-suite/common.mk | 1 + .../test-suite/typemap_array_qualifiers.i | 79 +++++++++++++++++++ Source/Swig/typesys.c | 61 ++++++++++++++ 4 files changed, 153 insertions(+) create mode 100644 Examples/test-suite/typemap_array_qualifiers.i diff --git a/CHANGES.current b/CHANGES.current index 0b65717ff..779e20528 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,18 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-02-19: kwwette + Fix bug in SWIG's handling of qualified (e.g. const) variables of array type. Given the typedef + a(7).q(volatile).double myarray // typedef volatile double[7] myarray; + the type + q(const).myarray // const myarray + becomes + a(7).q(const volatile).double // const volatile double[7] + Previously, SwigType_typedef_resolve() produces the type + q(const).a(7).q(volatile).double // non-sensical type + which would never match %typemap declarations, whose types were parsed correctly. + Add typemap_array_qualifiers.i to the test suite which checks for the correct behaviour. + 2013-02-18: wsfulton Deprecate typedef names used as constructor and destructor names in %extend. The real class/struct name should be used. diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 173e9b287..83be90d2d 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -433,6 +433,7 @@ CPP_TEST_CASES += \ typedef_sizet \ typedef_struct \ typemap_arrays \ + typemap_array_qualifiers \ typemap_delete \ typemap_directorout \ typemap_global_scope \ diff --git a/Examples/test-suite/typemap_array_qualifiers.i b/Examples/test-suite/typemap_array_qualifiers.i new file mode 100644 index 000000000..947721402 --- /dev/null +++ b/Examples/test-suite/typemap_array_qualifiers.i @@ -0,0 +1,79 @@ +%module typemap_array_qualifiers + +%define CLEAR_SWIGTYPE_TYPEMAPS +%typemap(in) + SWIGTYPE, + SWIGTYPE *, + SWIGTYPE *const, + SWIGTYPE *const&, + const SWIGTYPE *, + const SWIGTYPE *const, + const SWIGTYPE *const&, + const volatile SWIGTYPE *, + const volatile SWIGTYPE *const, + const volatile SWIGTYPE *const&, + SWIGTYPE [], + SWIGTYPE [ANY], + const SWIGTYPE [], + const SWIGTYPE [ANY], + const volatile SWIGTYPE [], + const volatile SWIGTYPE [ANY], + SWIGTYPE &, + const SWIGTYPE &, + const volatile SWIGTYPE & +{ +%#error Incorrect typemap for $symname: $type +} +%enddef + +%inline %{ + typedef struct { + int a; + } SomeType; + typedef SomeType myarray[3]; + typedef const SomeType myconstarray[4]; + typedef volatile SomeType ** mycrazyarray[5]; + typedef volatile SomeType (mycrazyfunc)(SomeType); + typedef volatile SomeType (*mycrazyfuncptr)(SomeType); +%} + +CLEAR_SWIGTYPE_TYPEMAPS; +%typemap(in) SWIGTYPE [ANY] { +/* Correct typemap for $symname: $type */ +} +%inline %{ + void func1a(myarray x) {}; + void func1b(volatile myarray x) {}; +%} + +CLEAR_SWIGTYPE_TYPEMAPS; +%typemap(in) const SWIGTYPE [ANY] { +/* Correct typemap for $symname: $type */ +} +%typemap(in) const volatile SWIGTYPE [ANY] { +/* Correct typemap for $symname: $type */ +} +%inline %{ + void func2a(const myarray x) {}; + void func2b(const myconstarray x) {}; + void func2c(const volatile myconstarray x) {}; +%} + +CLEAR_SWIGTYPE_TYPEMAPS; +%typemap(in) volatile SWIGTYPE **const [ANY] { +/* Correct typemap for $symname: $type */ +} +%typemap(in) volatile SWIGTYPE **const [ANY][ANY] { +/* Correct typemap for $symname: $type */ +} +%inline %{ + void func3a(const mycrazyarray x, const mycrazyarray y[7]) {}; +%} + +CLEAR_SWIGTYPE_TYPEMAPS; +%typemap(in) SWIGTYPE (*const) (ANY) { +/* Correct typemap for $symname: $type */ +} +%inline %{ + void func4a(mycrazyfunc *const x, const mycrazyfuncptr y) {}; +%} diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index d12d70543..372ac3f65 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -792,6 +792,67 @@ SwigType *SwigType_typedef_resolve(const SwigType *t) { goto return_result; } Delete(base); + + /* If 'type' is an array, then the right-most qualifier in 'r' should + be added to 'type' after the array qualifier, so that given + a(7).q(volatile).double myarray // typedef volatile double[7] myarray; + the type + q(const).myarray // const myarray + becomes + a(7).q(const volatile).double // const volatile double[7] + and NOT + q(const).a(7).q(volatile).double // non-sensical type + */ + if (r && Len(r) && SwigType_isarray(type)) { + List *r_elem; + String *r_qual; + int r_sz; + r_elem = SwigType_split(r); + r_sz = Len(r_elem); + r_qual = Getitem(r_elem, r_sz-1); + if (SwigType_isqualifier(r_qual)) { + String *new_r; + String *new_type; + List *type_elem; + String *type_qual; + String *r_qual_arg; + int i, type_sz; + + type_elem = SwigType_split(type); + type_sz = Len(type_elem); + i = 0; + for (i = 0; i < type_sz; ++i) { + String *e = Getitem(type_elem, i); + if (!SwigType_isarray(e)) + break; + } + type_qual = Copy(Getitem(type_elem, i)); + r_qual_arg = SwigType_parm(r_qual); + SwigType_add_qualifier(type_qual, r_qual_arg); + Delete(r_qual_arg); + Setitem(type_elem, i, type_qual); + + new_r = NewStringEmpty(); + for (i = 0; i < r_sz-1; ++i) { + Append(new_r, Getitem(r_elem, i)); + } + new_type = NewStringEmpty(); + for (i = 0; i < type_sz; ++i) { + Append(new_type, Getitem(type_elem, i)); + } +#ifdef SWIG_DEBUG + Printf(stdout, "r+type='%s%s' new_r+new_type='%s%s'\n", r, type, new_r, new_type); +#endif + + Delete(r); + r = new_r; + newtype = 1; + type = new_type; + Delete(type_elem); + } + Delete(r_elem); + } + Append(r, type); if (newtype) { Delete(type); From cfd8497f3edd85c2cbaab86365586cd773b12e17 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 21 Feb 2013 07:00:25 +0000 Subject: [PATCH 340/538] Cosmetic changes in SwigType_add_qualifier --- Source/Swig/typeobj.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index cb9327dc7..1fe63ff27 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -429,21 +429,16 @@ int SwigType_isreference(const SwigType *t) { * 'qual' can be a list of multiple qualifiers in any order, separated by spaces. * ----------------------------------------------------------------------------- */ -/* Helper function to sort the mangled list */ -static int SwigType_compare_qualifiers(const DOH *a, const DOH *b) { - return strcmp(Char(a), Char(b)); -} - SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { List *qlist; - String *allq, *newq, *q; + String *allq, *newq; int i, sz; - char *c, *cqual, *cq, *cqprev; - c = Char(t); - cqual = Char(qual); + const char *cqprev = 0; + const char *c = Char(t); + const char *cqual = Char(qual); /* if 't' has no qualifiers and 'qual' is a single qualifier, simply add it */ - if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == NULL)) { + if ((strncmp(c, "q(", 2) != 0) && (strstr(cqual, " ") == 0)) { String *temp = NewStringf("q(%s).", cqual); Insert(t, 0, temp); Delete(temp); @@ -464,17 +459,16 @@ SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) { qlist = Split(allq, ' ', INT_MAX); Delete(allq); - /* sort list */ - SortList(qlist, SwigType_compare_qualifiers); + /* sort in alphabetical order */ + SortList(qlist, Strcmp); /* create new qualifier string from unique elements of list */ sz = Len(qlist); newq = NewString("q("); - cqprev = NULL; for (i = 0; i < sz; ++i) { - q = Getitem(qlist, i); - cq = Char(q); - if (cqprev == NULL || strcmp(cqprev, cq) != 0) { + String *q = Getitem(qlist, i); + const char *cq = Char(q); + if (cqprev == 0 || strcmp(cqprev, cq) != 0) { if (i > 0) { Append(newq, " "); } From de136ad6cf64c369f4d6551cd5185ac87c1410ba Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 21 Feb 2013 07:09:27 +0000 Subject: [PATCH 341/538] Uncomment testing of overloading of const char arrays which was fixed in svn r12541 for swig-2.0.3. --- Examples/test-suite/arrays_global.i | 2 -- 1 file changed, 2 deletions(-) diff --git a/Examples/test-suite/arrays_global.i b/Examples/test-suite/arrays_global.i index 10d29b6dc..fd53a224e 100644 --- a/Examples/test-suite/arrays_global.i +++ b/Examples/test-suite/arrays_global.i @@ -61,7 +61,6 @@ char* test_b(name a, const namea b) { return a; } -#if 0 int test_a(int a) { return a; } @@ -70,7 +69,6 @@ int test_b(int a) { return a; } -#endif %} From 8e340c158c41ee053fd2be2f30b47e9a060515c9 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Fri, 22 Feb 2013 10:11:50 +0100 Subject: [PATCH 342/538] Fixed #1300 clang warning in SWIG_Python_ConvertPtrAndOwn. --- Lib/python/pyrun.swg | 4 ++-- Lib/swigrun.swg | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index 3585e7a3f..cbb993064 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -1231,10 +1231,10 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int *ptr = vptr; /* transfer the ownership to 'ptr' */ iobj->own = 0; - res = SWIG_AddCast(res); + SWIG_AddCastInplace(&res); res = SWIG_AddNewMask(res); } else { - res = SWIG_AddCast(res); + SWIG_AddCastInplace(&res); } } } diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index e5afb62c4..3f68d66d6 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -161,13 +161,20 @@ # endif # define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) # define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) -SWIGINTERNINLINE int SWIG_AddCast(int r) { - return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; +SWIGINTERNINLINE int SWIG_AddCastInplace(int *r) { + if (SWIG_IsOK(*r)) { + *r = (SWIG_CastRank(*r) < SWIG_MAXCASTRANK) ? (*r + 1) : SWIG_ERROR; + } +} +SWIGINTERNINLINE int SWIG_AddCast(int r) { + SWIG_AddCastInplace(&r); + return r; } SWIGINTERNINLINE int SWIG_CheckState(int r) { return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; } #else /* no cast-rank mode */ +# define SWIG_AddCastInplace(r) # define SWIG_AddCast # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) #endif From 7acf6b5fef128de8e9ded023870006b10b4a39a8 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Mon, 25 Feb 2013 09:53:45 +0100 Subject: [PATCH 343/538] Revert "Fixed #1300 clang warning in SWIG_Python_ConvertPtrAndOwn." This reverts commit 8e340c158c41ee053fd2be2f30b47e9a060515c9. --- Lib/python/pyrun.swg | 4 ++-- Lib/swigrun.swg | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index cbb993064..3585e7a3f 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -1231,10 +1231,10 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int *ptr = vptr; /* transfer the ownership to 'ptr' */ iobj->own = 0; - SWIG_AddCastInplace(&res); + res = SWIG_AddCast(res); res = SWIG_AddNewMask(res); } else { - SWIG_AddCastInplace(&res); + res = SWIG_AddCast(res); } } } diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index 3f68d66d6..e5afb62c4 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -161,20 +161,13 @@ # endif # define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) # define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) -SWIGINTERNINLINE int SWIG_AddCastInplace(int *r) { - if (SWIG_IsOK(*r)) { - *r = (SWIG_CastRank(*r) < SWIG_MAXCASTRANK) ? (*r + 1) : SWIG_ERROR; - } -} -SWIGINTERNINLINE int SWIG_AddCast(int r) { - SWIG_AddCastInplace(&r); - return r; +SWIGINTERNINLINE int SWIG_AddCast(int r) { + return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; } SWIGINTERNINLINE int SWIG_CheckState(int r) { return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; } #else /* no cast-rank mode */ -# define SWIG_AddCastInplace(r) # define SWIG_AddCast # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) #endif From c23b7606cf665ce1a4e0f666f6926282971d108f Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Mon, 25 Feb 2013 11:07:42 +0100 Subject: [PATCH 344/538] MOdified only no-cast-rank version of SWIG_AddCast. --- Lib/swigrun.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index e5afb62c4..b3c11c136 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -168,7 +168,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) { return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; } #else /* no cast-rank mode */ -# define SWIG_AddCast +# define SWIG_AddCast(r) ((r)+0) # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) #endif From 8155e145799728eba648f63a5e3da6ab513ed63b Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Tue, 26 Feb 2013 09:26:13 +0100 Subject: [PATCH 345/538] Macro expansion to self assign is effectively ignored. --- Lib/swigrun.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index b3c11c136..999c87333 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -168,7 +168,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) { return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; } #else /* no cast-rank mode */ -# define SWIG_AddCast(r) ((r)+0) +# define SWIG_AddCast(r) (r) # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) #endif From 670962cfe8d951004f927c803e505f23ee373d3a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 4 Mar 2013 07:32:40 +0000 Subject: [PATCH 346/538] SWIG_TypeCompare was not working as commented - return values were 0,1 and not 1,0,-1. Although undocumented and not used anywhere within SWIG, it has been replaced with SWIG_TypeCmp to work as commented. --- Lib/swigrun.swg | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/Lib/swigrun.swg b/Lib/swigrun.swg index 999c87333..21f0a5c14 100644 --- a/Lib/swigrun.swg +++ b/Lib/swigrun.swg @@ -232,18 +232,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1, /* Check type equivalence in a name list like ||... - Return 0 if not equal, 1 if equal + Return 0 if equal, -1 if nb < tb, 1 if nb > tb */ SWIGRUNTIME int -SWIG_TypeEquiv(const char *nb, const char *tb) { - int equiv = 0; +SWIG_TypeCmp(const char *nb, const char *tb) { + int equiv = 1; const char* te = tb + strlen(tb); const char* ne = nb; - while (!equiv && *ne) { + while (equiv != 0 && *ne) { for (nb = ne; *ne; ++ne) { if (*ne == '|') break; } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; + equiv = SWIG_TypeNameComp(nb, ne, tb, te); if (*ne) ++ne; } return equiv; @@ -251,24 +251,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) { /* Check type equivalence in a name list like ||... - Return 0 if equal, -1 if nb < tb, 1 if nb > tb + Return 0 if not equal, 1 if equal */ SWIGRUNTIME int -SWIG_TypeCompare(const char *nb, const char *tb) { - int equiv = 0; - const char* te = tb + strlen(tb); - const char* ne = nb; - while (!equiv && *ne) { - for (nb = ne; *ne; ++ne) { - if (*ne == '|') break; - } - equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0; - if (*ne) ++ne; - } - return equiv; +SWIG_TypeEquiv(const char *nb, const char *tb) { + return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0; } - /* Check the typename */ From e0b14786d6d22276dda85354babbfeffdfd78072 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Mar 2013 18:17:50 +0100 Subject: [PATCH 347/538] Fix some useless code detected by scan-build (LLVM/Clang) --- Source/CParse/templ.c | 7 +------ Source/Modules/ocaml.cxx | 3 --- Source/Modules/octave.cxx | 1 - Source/Modules/perl5.cxx | 1 - Source/Modules/php.cxx | 2 -- Source/Swig/typeobj.c | 2 -- Source/Swig/typesys.c | 2 +- 7 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c index ed6acfc8c..48bdf4faa 100644 --- a/Source/CParse/templ.c +++ b/Source/CParse/templ.c @@ -317,14 +317,13 @@ int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab if (tp) { Symtab *tsdecl = Getattr(n, "sym:symtab"); while (p && tp) { - String *name, *value, *valuestr, *tydef, *tmp, *tmpr; + String *name, *value, *valuestr, *tmp, *tmpr; int sz, i; String *dvalue = 0; String *qvalue = 0; name = Getattr(tp, "name"); value = Getattr(p, "value"); - tydef = Getattr(p, "typedef"); if (name) { if (!value) @@ -365,9 +364,6 @@ int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab /* Printf(stdout,"'%s'\n", s); */ } - if (!tydef) { - tydef = dvalue; - } tmp = NewStringf("#%s", name); tmpr = NewStringf("\"%s\"", valuestr); @@ -375,7 +371,6 @@ int Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab for (i = 0; i < sz; i++) { String *s = Getitem(cpatchlist, i); Replace(s, tmp, tmpr, DOH_REPLACE_ID); - /* Replace(s,name,tydef, DOH_REPLACE_ID); */ Replace(s, name, valuestr, DOH_REPLACE_ID); } Delete(tmp); diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx index 34c8975c5..c5fcf69dd 100644 --- a/Source/Modules/ocaml.cxx +++ b/Source/Modules/ocaml.cxx @@ -1583,8 +1583,6 @@ public: String *cleanup = NewString(""); String *outarg = NewString(""); - idx = 0; - tm = Swig_typemap_lookup("directorout", n, "c_result", w); if (tm != 0) { Replaceall(tm, "$input", "swig_result"); @@ -1742,7 +1740,6 @@ public: p = NewParm(type, NewString("self"), n); q = Copy(p); set_nextSibling(p, parms); - parms = p; { Wrapper *w = NewWrapper(); diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index bbe442b7e..6f6e5b8ae 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -1371,7 +1371,6 @@ public: outputs++; // build argument list and type conversion string - idx = 0; p = l; while (p) { if (checkAttribute(p, "tmap:in:numinputs", "0")) { diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx index 7147e67c1..09500b23b 100644 --- a/Source/Modules/perl5.cxx +++ b/Source/Modules/perl5.cxx @@ -610,7 +610,6 @@ public: Printf(f->code, "}\n"); /* Write code to extract parameters. */ - i = 0; for (i = 0, p = l; i < num_arguments; i++) { /* Skip ignored arguments */ diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index 292f979ba..fdd335993 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -787,7 +787,6 @@ public: } f = NewWrapper(); - numopt = 0; String *outarg = NewStringEmpty(); String *cleanup = NewStringEmpty(); @@ -1736,7 +1735,6 @@ public: if (!class_node) { /* This is needed when we're returning a pointer to a type * rather than returning the type by value or reference. */ - class_node = current_class; Delete(mangled); mangled = NewString(SwigType_manglestr(ret_type)); class_node = Getattr(zend_types, mangled); diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c index 1fe63ff27..56892f3f8 100644 --- a/Source/Swig/typeobj.c +++ b/Source/Swig/typeobj.c @@ -746,7 +746,6 @@ SwigType *SwigType_add_function(SwigType *t, ParmList *parms) { Insert(t, 0, ")."); pstr = NewString("f("); - p = parms; for (p = parms; p; p = nextSibling(p)) { if (p != parms) Putc(',', pstr); @@ -844,7 +843,6 @@ SwigType *SwigType_add_template(SwigType *t, ParmList *parms) { Parm *p; Append(t, "<("); - p = parms; for (p = parms; p; p = nextSibling(p)) { String *v; if (Getattr(p, "default")) diff --git a/Source/Swig/typesys.c b/Source/Swig/typesys.c index 372ac3f65..c10ffbfb5 100644 --- a/Source/Swig/typesys.c +++ b/Source/Swig/typesys.c @@ -820,7 +820,7 @@ SwigType *SwigType_typedef_resolve(const SwigType *t) { type_elem = SwigType_split(type); type_sz = Len(type_elem); - i = 0; + for (i = 0; i < type_sz; ++i) { String *e = Getitem(type_elem, i); if (!SwigType_isarray(e)) From fdea8a8f51a3734989729ea928b720083b32928f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 8 Mar 2013 22:19:07 +0000 Subject: [PATCH 348/538] More useless code removal as detected by scan-build (LLVM/Clang) using scan-build ./configure && scan-build make --- Source/Swig/scanner.c | 2 +- Source/Swig/stype.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c index 52e21dc0a..ed2d43b51 100644 --- a/Source/Swig/scanner.c +++ b/Source/Swig/scanner.c @@ -1141,7 +1141,7 @@ void Scanner_skip_line(Scanner * s) { if ((c = nextchar(s)) == 0) return; if (c == '\\') { - c = nextchar(s); + nextchar(s); } else if (c == '\n') { done = 1; } diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c index 8dc189725..fcaf54093 100644 --- a/Source/Swig/stype.c +++ b/Source/Swig/stype.c @@ -640,7 +640,6 @@ SwigType *SwigType_ltype(const SwigType *s) { if (td && (SwigType_isconst(td) || SwigType_isarray(td) || SwigType_isreference(td))) { /* We need to use the typedef type */ Delete(tt); - tt = td; break; } else if (td) { Delete(tt); From 52c754a22d4556795a3927706256bfae4624ccc4 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Sun, 17 Feb 2013 15:56:25 +0100 Subject: [PATCH 349/538] Minor fix to Octave autodoc generation for functions returning structs Patch #27 - see also git commit 72ffdb930dcbbe0ae2a1cf7164a7ca4b632b1fee --- CHANGES.current | 3 +++ Source/Modules/octave.cxx | 10 +++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 779e20528..90389d812 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -56,6 +56,9 @@ Version 2.0.10 (in progress) When generating functions provided by %extend, use "(void)" for no-argument functions instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes". +2013-02-17: kwwette + [Octave] Minor fix to autodoc generation: get the right type for functions returning structs. + 2013-02-15: wsfulton Deprecate typedef names used in %extend that are not the real class/struct name. For example: diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index 6f6e5b8ae..a9be76fc2 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -355,14 +355,10 @@ public: SwigType *type = Getattr(n, "type"); if (type && Strcmp(type, "void")) { - type = SwigType_base(type); - Node *lookup = Swig_symbol_clookup(type, 0); - if (lookup) - type = Getattr(lookup, "sym:name"); + Node *nn = classLookup(Getattr(n, "type")); + String *type_str = nn ? Copy(Getattr(nn, "sym:name")) : SwigType_str(type, 0); Append(decl_info, "@var{retval} = "); - String *type_str = NewString(""); - Printf(type_str, "@var{retval} is of type %s. ", type); - Append(args_str, type_str); + Printf(args_str, "%s@var{retval} is of type %s. ", args_str, type_str); Delete(type_str); } From 92276044248ca3a9b48c13afa85bc1175c4a3e21 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 16 Mar 2013 17:43:08 +0000 Subject: [PATCH 350/538] First attempt at Travis Continuous integration builds --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..ecd39ab85 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: cpp +compiler: + - gcc + - clang +script: ./autogen.sh && ./configure && make From 46523a074ff6ae1f9d8c52e270f0c3e13e2d7671 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 17 Mar 2013 19:44:28 +0000 Subject: [PATCH 351/538] Travis CI only on master and silent builds --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecd39ab85..c41027bc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,7 @@ language: cpp compiler: - gcc - clang -script: ./autogen.sh && ./configure && make +script: ./autogen.sh && ./configure && make -s +branches: + only: + - master From d2551e22e275780f9c6c5bf30d0b24a3ef556532 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 17 Mar 2013 20:32:03 +0000 Subject: [PATCH 352/538] Try Python test-suite on Travis --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c41027bc0..ee7ded0de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,13 @@ language: cpp compiler: - gcc - clang -script: ./autogen.sh && ./configure && make -s +python: + - "2.7" + - "3.3" +before_install: + - sudo apt-get update -qq + - sudo apt-get install libboost-dev -qq +script: ./autogen.sh && ./configure && make -s && make -k check-python-test-suite branches: only: - master From 4003f65a94092d73b8b6e512097a45e8e9bc260b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 17 Mar 2013 21:40:44 +0000 Subject: [PATCH 353/538] Try combinations of Java and Python Travis builds --- .travis.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ee7ded0de..2ac250a4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,31 @@ language: cpp compiler: - gcc - - clang +# - clang python: - "2.7" - "3.3" +jdk: + - oraclejdk7 + - openjdk6 +env: + - SWIGLANG=python +matrix: + include: + - python: "2.7" + - compiler: gcc + - env: SWIGLANG=python + include: + - jdk: oraclejdk7 + - compiler: gcc + - env: SWIGLANG=java before_install: - - sudo apt-get update -qq - sudo apt-get install libboost-dev -qq -script: ./autogen.sh && ./configure && make -s && make -k check-python-test-suite +script: + - set + - ./autogen.sh && ./configure + - make -s + - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite branches: only: - master From 7c80f007c471302f0d6d07cf78846edd6fd9b493 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 19 Mar 2013 18:38:45 +1300 Subject: [PATCH 354/538] Fix typo in Python docstring for acquire method --- Lib/python/pyrun.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg index 3585e7a3f..7cf9c41fa 100644 --- a/Lib/python/pyrun.swg +++ b/Lib/python/pyrun.swg @@ -668,7 +668,7 @@ SwigPyObject_own(PyObject *v, PyObject *args) static PyMethodDef swigobject_methods[] = { {(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"}, - {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"aquires ownership of the pointer"}, + {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"acquires ownership of the pointer"}, {(char *)"own", (PyCFunction)SwigPyObject_own, METH_VARARGS, (char *)"returns/sets ownership of the pointer"}, {(char *)"append", (PyCFunction)SwigPyObject_append, METH_O, (char *)"appends another 'this' object"}, {(char *)"next", (PyCFunction)SwigPyObject_next, METH_NOARGS, (char *)"returns the next 'this' object"}, From 7b50640c055b45c17c40bde1f72ab932d55795c6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 19 Mar 2013 19:45:35 +0000 Subject: [PATCH 355/538] More Travis attempts at controlling what is built --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ac250a4e..92402d346 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,4 @@ language: cpp -compiler: - - gcc -# - clang -python: - - "2.7" - - "3.3" -jdk: - - oraclejdk7 - - openjdk6 -env: - - SWIGLANG=python matrix: include: - python: "2.7" From 9d0b20916f1aa709efcdd0d1f1a3985f205bf0a0 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 18 Mar 2013 19:49:46 +0000 Subject: [PATCH 356/538] Add ability to suppress some director warnings by their method name, not just the containing class name --- Examples/test-suite/director_basic.i | 5 +++-- Examples/test-suite/director_classes.i | 3 ++- .../test-suite/java_director_assumeoverride.i | 1 - Source/Modules/lang.cxx | 15 +++++++++------ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Examples/test-suite/director_basic.i b/Examples/test-suite/director_basic.i index 56864f4a7..4c258b097 100644 --- a/Examples/test-suite/director_basic.i +++ b/Examples/test-suite/director_basic.i @@ -1,5 +1,6 @@ - %module(directors="1") director_basic - #pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR +%module(directors="1") director_basic + +%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) MyClass::pmethod; %{ #include diff --git a/Examples/test-suite/director_classes.i b/Examples/test-suite/director_classes.i index 7183e3d0a..98c29e88c 100644 --- a/Examples/test-suite/director_classes.i +++ b/Examples/test-suite/director_classes.i @@ -1,7 +1,8 @@ // Tests classes passed by value, pointer and reference // Note: C# module has a large runtime test -#pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR +%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) Base::Ref; +%warnfilter(SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR) Base::Ptr; %module(directors="1") director_classes diff --git a/Examples/test-suite/java_director_assumeoverride.i b/Examples/test-suite/java_director_assumeoverride.i index 7364a3d58..cddebb4d7 100644 --- a/Examples/test-suite/java_director_assumeoverride.i +++ b/Examples/test-suite/java_director_assumeoverride.i @@ -1,5 +1,4 @@ %module(directors="1") java_director_assumeoverride -#pragma SWIG nowarn=SWIGWARN_TYPEMAP_THREAD_UNSAFE,SWIGWARN_TYPEMAP_DIRECTOROUT_PTR %{ class OverrideMe { diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx index 4d1cefc69..eb7d49480 100644 --- a/Source/Modules/lang.cxx +++ b/Source/Modules/lang.cxx @@ -88,7 +88,6 @@ extern int AddExtern; * ---------------------------------------------------------------------- */ int Dispatcher::emit_one(Node *n) { - String *wrn; int ret = SWIG_OK; char *tag = Char(nodeType(n)); @@ -104,10 +103,9 @@ int Dispatcher::emit_one(Node *n) { return SWIG_OK; /* Look for warnings */ - wrn = Getattr(n, "feature:warnfilter"); - if (wrn) { + String *wrn = Getattr(n, "feature:warnfilter"); + if (wrn) Swig_warnfilter(wrn, 1); - } /* ============================================================ * C/C++ parsing @@ -181,9 +179,8 @@ int Dispatcher::emit_one(Node *n) { Swig_error(input_file, line_number, "Unrecognized parse tree node type '%s'\n", tag); ret = SWIG_ERROR; } - if (wrn) { + if (wrn) Swig_warnfilter(wrn, 0); - } return ret; } @@ -2063,6 +2060,10 @@ int Language::classDirectorMethods(Node *n) { if (GetFlag(method, "feature:nodirector")) continue; + String *wrn = Getattr(method, "feature:warnfilter"); + if (wrn) + Swig_warnfilter(wrn, 1); + String *type = Getattr(method, "nodeType"); if (!Cmp(type, "destructor")) { classDirectorDestructor(method); @@ -2074,6 +2075,8 @@ int Language::classDirectorMethods(Node *n) { SetFlag(item, "director"); Swig_restore(method); } + if (wrn) + Swig_warnfilter(wrn, 0); } return SWIG_OK; From e182b4844cc575da2f5e0321f4356783e1b63932 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 19 Mar 2013 18:34:06 +0000 Subject: [PATCH 357/538] Fix seg fault in SWIG using directors when class and virtual method names are the same except being in different namespaces when the %nspace feature is not being used. --- CHANGES.current | 4 ++++ Source/Modules/csharp.cxx | 13 ++----------- Source/Modules/d.cxx | 13 ++----------- Source/Modules/java.cxx | 16 +++------------- 4 files changed, 11 insertions(+), 35 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 90389d812..6547a88be 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-03-19: wsfulton + [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are + the same except being in different namespaces when the %nspace feature is not being used. + 2013-02-19: kwwette Fix bug in SWIG's handling of qualified (e.g. const) variables of array type. Given the typedef a(7).q(volatile).double myarray // typedef volatile double[7] myarray; diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 0d15a9c1d..4ef62d2cc 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -630,23 +630,14 @@ public: *----------------------------------------------------------------------*/ UpcallData *addUpcallMethod(String *imclass_method, String *class_method, String *decl, String *overloaded_name) { - UpcallData *udata; - String *class_methodidx; - Hash *new_udata; String *key = NewStringf("%s|%s", imclass_method, decl); ++curr_class_dmethod; - /* Do we know about this director class already? */ - if ((udata = Getattr(dmethods_table, key))) { - Delete(key); - return Getattr(udata, "methodoff"); - } - - class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); + String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); n_dmethods++; - new_udata = NewHash(); + Hash *new_udata = NewHash(); Append(dmethods_seq, new_udata); Setattr(dmethods_table, key, new_udata); diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index 88c3ccfff..e09e253f8 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -3704,23 +3704,14 @@ private: UpcallData *addUpcallMethod(String *imclass_method, String *class_method, String *decl, String *overloaded_name, String *return_type, String *param_list) { - UpcallData *udata; - String *class_methodidx; - Hash *new_udata; String *key = NewStringf("%s|%s", imclass_method, decl); ++curr_class_dmethod; - /* Do we know about this director class already? */ - if ((udata = Getattr(dmethods_table, key))) { - Delete(key); - return Getattr(udata, "methodoff"); - } - - class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); + String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); n_dmethods++; - new_udata = NewHash(); + Hash *new_udata = NewHash(); Append(dmethods_seq, new_udata); Setattr(dmethods_table, key, new_udata); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 2fb21eca8..f351c91a3 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -741,25 +741,15 @@ public: *----------------------------------------------------------------------*/ UpcallData *addUpcallMethod(String *imclass_method, String *class_method, String *imclass_desc, String *class_desc, String *decl) { - UpcallData *udata; - String *imclass_methodidx; - String *class_methodidx; - Hash *new_udata; String *key = NewStringf("%s|%s", imclass_method, decl); ++curr_class_dmethod; - /* Do we know about this director class already? */ - if ((udata = Getattr(dmethods_table, key))) { - Delete(key); - return Getattr(udata, "methodoff"); - } - - imclass_methodidx = NewStringf("%d", n_dmethods); - class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); + String *imclass_methodidx = NewStringf("%d", n_dmethods); + String *class_methodidx = NewStringf("%d", n_dmethods - first_class_dmethod); n_dmethods++; - new_udata = NewHash(); + Hash *new_udata = NewHash(); Append(dmethods_seq, new_udata); Setattr(dmethods_table, key, new_udata); From 6fecb05379da3dd3e7a2dd2711d18b89db3dea28 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 19 Mar 2013 19:44:42 +0000 Subject: [PATCH 358/538] Fix director_nspace_director_name_collision test for languages that don't support %nspace --- Examples/test-suite/director_nspace_director_name_collision.i | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/test-suite/director_nspace_director_name_collision.i b/Examples/test-suite/director_nspace_director_name_collision.i index 5ef2509f8..e7abffcb1 100644 --- a/Examples/test-suite/director_nspace_director_name_collision.i +++ b/Examples/test-suite/director_nspace_director_name_collision.i @@ -39,6 +39,7 @@ namespace TopLevel %nspace TopLevel::B::Foo; #else #warning nspace feature not yet supported in this target language +%ignore TopLevel::B::Foo; #endif %feature("director") TopLevel::A::Foo; From 12ee3e9c4c1d9be3bb51ec6ce12e4aabc11fa388 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 19 Mar 2013 22:15:07 +0000 Subject: [PATCH 359/538] Fix Travis matrix --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92402d346..1f8255df2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,14 @@ language: cpp matrix: include: - python: "2.7" - - compiler: gcc - - env: SWIGLANG=python - include: + compiler: gcc + env: SWIGLANG=python - jdk: oraclejdk7 - - compiler: gcc - - env: SWIGLANG=java + compiler: gcc + env: SWIGLANG=java before_install: - sudo apt-get install libboost-dev -qq script: - - set - ./autogen.sh && ./configure - make -s - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite From 7d083890e66c5d5f9237926b0ab81d963057a3af Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 19 Mar 2013 22:41:04 +0000 Subject: [PATCH 360/538] More Travis build experiments --- .travis.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f8255df2..78205c848 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,31 @@ language: cpp +compiler: + - gcc + - clang matrix: include: - python: "2.7" compiler: gcc env: SWIGLANG=python + - jdk: oraclejdk6 + compiler: gcc + env: SWIGLANG=java - jdk: oraclejdk7 compiler: gcc env: SWIGLANG=java + - perl: "5.10" + compiler: gcc + env: SWIGLANG=perl + - rvm: 1.8.7 + compiler: gcc + env: SWIGLANG=ruby before_install: - sudo apt-get install libboost-dev -qq script: - ./autogen.sh && ./configure - make -s - - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite + - echo "SWIGLANG: $SWIGLANG" +# - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite branches: only: - master From b72aca1d0739c66ff3bc3dc54385f296e662082b Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 20 Mar 2013 15:39:03 +1300 Subject: [PATCH 361/538] Fix typo in comment (swift->swig) --- Lib/python/director.swg | 2 +- Lib/ruby/director.swg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/python/director.swg b/Lib/python/director.swg index ca46f6dab..97edc7ef0 100644 --- a/Lib/python/director.swg +++ b/Lib/python/director.swg @@ -33,7 +33,7 @@ /* Use -DSWIG_DIRECTOR_NO_UEH if you prefer to avoid the use of the - Undefined Exception Handler provided by swift + Undefined Exception Handler provided by swig. */ #ifndef SWIG_DIRECTOR_NO_UEH #ifndef SWIG_DIRECTOR_UEH diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg index 9807b11bb..a5daf2176 100644 --- a/Lib/ruby/director.swg +++ b/Lib/ruby/director.swg @@ -7,7 +7,7 @@ /* Use -DSWIG_DIRECTOR_NOUEH if you prefer to avoid the use of the - Undefined Exception Handler provided by swift + Undefined Exception Handler provided by swig. */ #ifndef SWIG_DIRECTOR_NOUEH #ifndef SWIG_DIRECTOR_UEH From 23bcc1c66b5f0c02960eacc8db975d110f2c1d8a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Wed, 20 Mar 2013 16:45:24 +1300 Subject: [PATCH 362/538] Remove lingering relic of PHP4 support --- Lib/exception.i | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Lib/exception.i b/Lib/exception.i index 8d8df33dd..dc3a7f462 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -14,12 +14,8 @@ #ifdef SWIGPHP %{ -#if PHP_MAJOR_VERSION < 5 -# define SWIG_exception(code, msg) { zend_error(E_ERROR, msg); } -#else -# include "zend_exceptions.h" -# define SWIG_exception(code, msg) { zend_throw_exception(NULL, (char*)msg, code TSRMLS_CC); } -#endif +#include "zend_exceptions.h" +#define SWIG_exception(code, msg) { zend_throw_exception(NULL, (char*)msg, code TSRMLS_CC); } %} #endif From b132992b8aa9d3afcbc45d6a6d15fe9f60c559e5 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 21 Mar 2013 14:25:14 +1300 Subject: [PATCH 363/538] Stop claiming that SWIG_exception() can be used in helper functions --- Doc/Manual/Customization.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Doc/Manual/Customization.html b/Doc/Manual/Customization.html index b75eda9c4..f420f42d6 100644 --- a/Doc/Manual/Customization.html +++ b/Doc/Manual/Customization.html @@ -592,9 +592,7 @@ SWIG_NullReferenceError

    -Since the SWIG_exception() function is defined at the C-level -it can be used elsewhere in SWIG. This includes typemaps and helper -functions. +The SWIG_exception() function can also be used in typemaps.

    11.2 Object ownership and %newobject

    From 481ed3c57853463b01f7e3928491c7f0679d7776 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Thu, 21 Mar 2013 14:41:09 +1300 Subject: [PATCH 364/538] Update lingering configure.in references to say configure.ac --- Doc/Manual/Extending.html | 4 ++-- Examples/php/check.list | 2 +- Makefile.in | 4 ++-- configure.ac | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index 059388717..5ea4e51f4 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -3101,7 +3101,7 @@ As you can see, most usages are direct.
    -
    configure.in +
    configure.ac
    This file is processed by

    @@ -3551,7 +3551,7 @@ details being outlined earlier on. a runtime test, see for example Examples/python/class.

  • - Modify configure.in, Makefile.in and Examples/Makefile.in to run + Modify configure.ac, Makefile.in and Examples/Makefile.in to run these examples. Please make sure that if the new language is not installed properly on a box, make -k check should still work by skipping the tests and examples for the new language module. diff --git a/Examples/php/check.list b/Examples/php/check.list index 28c7a619f..fef3feba6 100644 --- a/Examples/php/check.list +++ b/Examples/php/check.list @@ -1,5 +1,5 @@ # see top-level Makefile.in -# (see also top-level configure.in kludge) +# (see also top-level configure.ac kludge) callback class constants diff --git a/Makefile.in b/Makefile.in index c6259916b..7ecbfa251 100644 --- a/Makefile.in +++ b/Makefile.in @@ -514,11 +514,11 @@ configfiles: Makefile: $(srcdir)/Makefile.in config.status $(SHELL) ./config.status -# This target is usually called from Source/Makefile when configure.in has +# This target is usually called from Source/Makefile when configure.ac has # changed. am--refresh: $(srcdir)/configure -$(srcdir)/configure: $(srcdir)/configure.in +$(srcdir)/configure: $(srcdir)/configure.ac @echo "Build system is out of date. If the following commands fail, please reconfigure by hand (rerun: ./autogen.sh && ./configure)" cd $(srcdir) && ./autogen.sh $(SHELL) ./config.status --recheck diff --git a/configure.ac b/configure.ac index 0e8ad5bb1..e205138e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2482,4 +2482,4 @@ AC_CONFIG_FILES([preinst-swig], [chmod +x preinst-swig]) AC_CONFIG_FILES([CCache/ccache_swig_config.h]) AC_OUTPUT -dnl configure.in ends here +dnl configure.ac ends here From 9fbf771a006b50e58a8ec758bce7af4eacb2770f Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 Mar 2013 09:21:07 +1300 Subject: [PATCH 365/538] Fix lack of indentation in ocaml and pike sections --- configure.ac | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index e205138e7..77e2b98bf 100644 --- a/configure.ac +++ b/configure.ac @@ -1504,47 +1504,47 @@ AC_ARG_WITH(ocamlmktop,[ --with-ocamlmktop=path Set location of ocamlmktop exe # First, check for "--without-ocaml" or "--with-ocaml=no". if test x"${OCAMLBIN}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling OCaml]) -OCAMLBIN= + AC_MSG_NOTICE([Disabling OCaml]) + OCAMLBIN= else -AC_MSG_CHECKING(for Ocaml DL load generator) -if test -z "$OCAMLDLGEN"; then -AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen, :) -else -OCAMLDLGEN="$OCAMLDLGEN" -fi + AC_MSG_CHECKING(for Ocaml DL load generator) + if test -z "$OCAMLDLGEN"; then + AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen, :) + else + OCAMLDLGEN="$OCAMLDLGEN" + fi -AC_MSG_CHECKING(for Ocaml package tool) -if test -z "$OCAMLFIND"; then -AC_CHECK_PROGS(OCAMLFIND, ocamlfind, :) -else -OCAMLFIND="$OCAMLFIND" -fi + AC_MSG_CHECKING(for Ocaml package tool) + if test -z "$OCAMLFIND"; then + AC_CHECK_PROGS(OCAMLFIND, ocamlfind, :) + else + OCAMLFIND="$OCAMLFIND" + fi -AC_MSG_CHECKING(for Ocaml compiler) -if test -z "$OCAMLC"; then -AC_CHECK_PROGS(OCAMLC, ocamlc, :) -else -OCAMLC="$OCAMLC" -fi + AC_MSG_CHECKING(for Ocaml compiler) + if test -z "$OCAMLC"; then + AC_CHECK_PROGS(OCAMLC, ocamlc, :) + else + OCAMLC="$OCAMLC" + fi -AC_MSG_CHECKING(for Ocaml interpreter) -if test "x$OCAMLBIN" = xyes; then -AC_CHECK_PROGS(OCAMLBIN, ocaml, :) -else -OCAMLBIN="$OCAMLBIN" -fi + AC_MSG_CHECKING(for Ocaml interpreter) + if test "x$OCAMLBIN" = xyes; then + AC_CHECK_PROGS(OCAMLBIN, ocaml, :) + else + OCAMLBIN="$OCAMLBIN" + fi -AC_MSG_CHECKING(for Ocaml toplevel creator) -if test -z "$OCAMLMKTOP"; then -AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :) -else -OCAMLMKTOP="$OCAMLMKTOP" -fi + AC_MSG_CHECKING(for Ocaml toplevel creator) + if test -z "$OCAMLMKTOP"; then + AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :) + else + OCAMLMKTOP="$OCAMLMKTOP" + fi -OCAMLLOC=loc -if test "$OCAMLC" != ":" ; then + OCAMLLOC=loc + if test "$OCAMLC" != ":" ; then AC_MSG_CHECKING(for Ocaml header files) dirs="/usr/lib/ocaml/caml /usr/local/lib/ocaml/caml" dir="`$OCAMLC -where 2>/dev/null`" @@ -1567,7 +1567,7 @@ if test "$OCAMLC" != ":" ; then OCAMLVER=`$OCAMLC -version | sed -e 's/.*version //g'` AC_COMPARE_VERSION([$OCAMLVER],[3.08.2],[:],[:],[OCAMLLOC=_loc]) AC_MSG_RESULT($OCAMLVER) -fi + fi fi # Disabling ocaml export OCAMLLOC @@ -1600,8 +1600,8 @@ AS_HELP_STRING([--with-pike=path], [Set location of Pike executable]),[PIKEBIN=" # First, check for "--without-pike" or "--with-pike=no". if test x"${PIKEBIN}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling Pike]) -PIKEBIN= + AC_MSG_NOTICE([Disabling Pike]) + PIKEBIN= else if test "x$PIKEBIN" = xyes; then From 2bbc52302c2c18f81e9e2b02f24a63e2097da94a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 Mar 2013 09:37:02 +1300 Subject: [PATCH 366/538] Remove pointless assignments of variables to themselves --- configure.ac | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 77e2b98bf..d34f4fad7 100644 --- a/configure.ac +++ b/configure.ac @@ -713,8 +713,9 @@ else # Cygwin (Windows) needs the library for dynamic linking case $host in - *-*-cygwin* | *-*-mingw*) PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK" - DEFS="-DUSE_DL_IMPORT $DEFS" PYINCLUDE="$PYINCLUDE" + *-*-cygwin* | *-*-mingw*) + PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK" + DEFS="-DUSE_DL_IMPORT $DEFS" ;; *)PYTHONDYNAMICLINKING="";; esac @@ -808,8 +809,9 @@ else # Cygwin (Windows) needs the library for dynamic linking case $host in - *-*-cygwin* | *-*-mingw*) PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK" - DEFS="-DUSE_DL_IMPORT $DEFS" PY3INCLUDE="$PY3INCLUDE" + *-*-cygwin* | *-*-mingw*) + PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK" + DEFS="-DUSE_DL_IMPORT $DEFS" ;; *)PYTHON3DYNAMICLINKING="";; esac @@ -1300,7 +1302,7 @@ else AC_MSG_CHECKING(for MzScheme dynext object) MZDYNOBJ=`$MZSCHEME --eval '(begin (require dynext/link) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (printf "~a" x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` if test -f "$MZDYNOBJ"; then - MZDYNOBJ="$MZDYNOBJ" + : else # older versions (3.72 approx and earlier) MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` @@ -1511,36 +1513,26 @@ else AC_MSG_CHECKING(for Ocaml DL load generator) if test -z "$OCAMLDLGEN"; then AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen, :) - else - OCAMLDLGEN="$OCAMLDLGEN" fi AC_MSG_CHECKING(for Ocaml package tool) if test -z "$OCAMLFIND"; then AC_CHECK_PROGS(OCAMLFIND, ocamlfind, :) - else - OCAMLFIND="$OCAMLFIND" fi AC_MSG_CHECKING(for Ocaml compiler) if test -z "$OCAMLC"; then AC_CHECK_PROGS(OCAMLC, ocamlc, :) - else - OCAMLC="$OCAMLC" fi AC_MSG_CHECKING(for Ocaml interpreter) if test "x$OCAMLBIN" = xyes; then AC_CHECK_PROGS(OCAMLBIN, ocaml, :) - else - OCAMLBIN="$OCAMLBIN" fi AC_MSG_CHECKING(for Ocaml toplevel creator) if test -z "$OCAMLMKTOP"; then AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :) - else - OCAMLMKTOP="$OCAMLMKTOP" fi OCAMLLOC=loc From 250760daf498c339d2dd554f417b3390b02503ae Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 Mar 2013 10:43:19 +1300 Subject: [PATCH 367/538] Remove superfluous trailing semicolons --- configure.ac | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index d34f4fad7..820cf3691 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,7 @@ then *-*-next*) if test "$ns_dyld" then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind' - else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r'; + else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r' fi if test "$with_next_framework" ; then LDSHARED="$LDSHARED \$(LDLIBRARY)" @@ -243,9 +243,9 @@ AC_MSG_CHECKING(TRYLINKINGWITHCXX) if test -z "$TRYLINKINGWITHCXX" then case $host in - *-*-solaris*) if test "$GCC" = yes; - then TRYLINKINGWITHCXX="CXXSHARED= $CXX -Wl,-G"; - else TRYLINKINGWITHCXX="CXXSHARED= $CXX -G -L/opt/SUNWspro/lib -lCrun -lCstd"; + *-*-solaris*) if test "$GCC" = yes + then TRYLINKINGWITHCXX="CXXSHARED= $CXX -Wl,-G" + else TRYLINKINGWITHCXX="CXXSHARED= $CXX -G -L/opt/SUNWspro/lib -lCrun -lCstd" fi;; *-*-hp*) TRYLINKINGWITHCXX="CXXSHARED= $CXX +z ";; *-*-darwin*) TRYLINKINGWITHCXX="CXXSHARED= $CXX -bundle -undefined suppress -flat_namespace";; @@ -270,9 +270,9 @@ AC_MSG_CHECKING(CCSHARED) if test -z "$CCSHARED" then case $host in - *-*-hp*) if test "$GCC" = yes; - then CCSHARED="-fpic"; - else CCSHARED="+z"; + *-*-hp*) if test "$GCC" = yes + then CCSHARED="-fpic" + else CCSHARED="+z" fi;; *-*-linux*) CCSHARED="-fpic";; *-*-freebsd* | *-*-openbsd*) CCSHARED="-fpic";; @@ -320,7 +320,7 @@ AC_MSG_RESULT($LINKFORSHARED) # Optional CFLAGS used to silence/enhance compiler warnings on some platforms. AC_MSG_CHECKING(PLATFLAGS) case $host in - *-*-solaris*) if test "$GCC" = yes; + *-*-solaris*) if test "$GCC" = yes then PLATFLAGS= else PLATFLAGS= # else PLATFLAGS="-errtags=yes" # Need more work as C examples use ld for linking @@ -859,7 +859,7 @@ if test -n "$PERL"; then if test -r $i/perl.h; then AC_MSG_RESULT($i) PERL5EXT="$i" - break; + break fi done if test "$PERL5EXT" = none; then @@ -1356,7 +1356,7 @@ if test -n "$RUBY"; then if test -r $i/ruby.h; then AC_MSG_RESULT($i) RUBYINCLUDE="-I$i" - break; + break fi done if test x"$RUBYARCH" != x""; then @@ -1406,7 +1406,7 @@ if test -n "$RUBY"; then for i in $dirs; do if (test -r $i/$rb_libruby;) then RUBYLIB="$i" - break; + break fi done fi @@ -1548,7 +1548,7 @@ else AC_MSG_RESULT($i) OCAMLEXT="$i" OCAMLINC="-I$OCAMLEXT" - break; + break fi done if test -z "$OCAMLINC"; then @@ -1794,7 +1794,7 @@ if test -z "$CSHARPBIN" ; then # The Mono compiler should emit: Mono C# compiler version a.b.c.d csharp_version_raw=`(mcs --version) 2>/dev/null` csharp_version_searched=`(mcs --version | sed -e "/C#/b" -e "/Mono/b" -e d) 2>/dev/null` # return string if contains 'Mono' or 'C#' - CSHARPCOMPILER=""; + CSHARPCOMPILER="" if test -n "$csharp_version_raw" ; then if test "$csharp_version_raw" = "$csharp_version_searched" ; then CSHARPCOMPILER="mcs" @@ -1951,7 +1951,7 @@ else if test -r $i/lua.h; then AC_MSG_RESULT($i/lua.h) LUAFLAGS="$ISYSTEM$i" - break; + break fi done if test -z "$LUAFLAGS"; then From f85a3b7756650e355374404c07ff8a08bc1fdea2 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 Mar 2013 10:46:44 +1300 Subject: [PATCH 368/538] Remove handling for Python <1.5 - we only support >=2.0 now --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 820cf3691..f57a65fda 100644 --- a/configure.ac +++ b/configure.ac @@ -703,12 +703,7 @@ else AC_MSG_RESULT($PYLIB) fi - # Check for really old versions - if test -r $PYLIB/libPython.a; then - PYLINK="-lModules -lPython -lObjects -lParser" - else - PYLINK="-l$PYVERSION" - fi + PYLINK="-l$PYVERSION" fi # Cygwin (Windows) needs the library for dynamic linking From 5199a9002fbf4e3c8f50372d965bbbcf25c577db Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 22 Mar 2013 11:16:48 +1300 Subject: [PATCH 369/538] Correct comment about sys.lib --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f57a65fda..cfbc09426 100644 --- a/configure.ac +++ b/configure.ac @@ -670,7 +670,7 @@ else AC_MSG_CHECKING(for Python lib dir) PYLIBDIR=`($PYTHON -c "import sys; print sys.lib") 2>/dev/null` if test -z "$PYLIBDIR"; then - # older versions don't have sys.lib so the best we can do is assume lib + # Fedora patch Python to add sys.lib, for other distros we assume "lib". PYLIBDIR="lib" fi AC_MSG_RESULT($PYLIBDIR) From 3abe3517f8bc84147aaf28bf207773fb6d5a8c50 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 21 Mar 2013 19:41:59 +0000 Subject: [PATCH 370/538] Don't test shared_ptr for languages that don't have support for shared_ptr --- Examples/test-suite/director_smartptr.i | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/director_smartptr.i b/Examples/test-suite/director_smartptr.i index 0d78c2775..13eb745b6 100644 --- a/Examples/test-suite/director_smartptr.i +++ b/Examples/test-suite/director_smartptr.i @@ -32,6 +32,12 @@ public: %} +#if defined(SWIGJAVA) || defined(SWIGCSHARP) || defined(SWIGPYTHON) || defined(SWIGD) +#define SHARED_PTR_WRAPPERS_IMPLEMENTED +#endif + +#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) + %include %include @@ -60,4 +66,7 @@ public: virtual FooBar makeFooBar(); static Foo* get_self(Foo *self_); -}; \ No newline at end of file +}; + +#endif + From 1e00ce6bf963d501d1e056abcd70ae66be5fed94 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 26 Mar 2013 15:07:16 +1300 Subject: [PATCH 371/538] Fix comment typo in typemap --- Examples/test-suite/primitive_types.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/primitive_types.i b/Examples/test-suite/primitive_types.i index f912bd77c..9425cc1a0 100644 --- a/Examples/test-suite/primitive_types.i +++ b/Examples/test-suite/primitive_types.i @@ -48,7 +48,7 @@ const double & ($basetype temp) %{ temp = ($basetype)$input; $1 = &temp; %} - the other tipical change is to add the enum SWIGTYPE to the + the other typical change is to add the enum SWIGTYPE to the integer throws typemaps: %typemap(throws) int, From b504b68a62e003f39d6bab810842d6a2b684a51c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 23 Mar 2013 16:52:30 +0000 Subject: [PATCH 372/538] Fix erratically failing threads_exception python test --- Examples/test-suite/python/threads_exception_runme.py | 10 ++++++---- Examples/test-suite/threads_exception.i | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Examples/test-suite/python/threads_exception_runme.py b/Examples/test-suite/python/threads_exception_runme.py index 12202e3d3..d4b8855fc 100644 --- a/Examples/test-suite/python/threads_exception_runme.py +++ b/Examples/test-suite/python/threads_exception_runme.py @@ -23,10 +23,12 @@ except RuntimeError,e: try: t.hosed() except threads_exception.Exc,e: - if e.code != 42: - raise RuntimeError - if e.msg != "Hosed": - raise RuntimeError, "bad... msg: %s" % e.msg + code = e.code + if code != 42: + raise RuntimeError, "bad... code: %d" % code + msg = e.msg + if msg != "Hosed": + raise RuntimeError, "bad... msg: '%s' len: %d" % (msg, len(msg)) for i in range(1,4): try: diff --git a/Examples/test-suite/threads_exception.i b/Examples/test-suite/threads_exception.i index 9f275bd6a..b374f0ce6 100644 --- a/Examples/test-suite/threads_exception.i +++ b/Examples/test-suite/threads_exception.i @@ -20,6 +20,7 @@ public: Exc(int c, const char *m) { code = c; strncpy(msg,m,255); + msg[255] = 0; } int code; char msg[256]; From 7eda619741a31ed73df512085f7256694173e877 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 25 Mar 2013 19:03:39 +0000 Subject: [PATCH 373/538] Fix invalid iterators used with -ve ranges - Python Fixes li_std_containers_int testcase. Valgrind reports no more problems for this testcase. --- Lib/python/pycontainer.swg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index eb089e98e..81909ae02 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -398,7 +398,7 @@ namespace swig { typename Sequence::reverse_iterator it = sb; size_t delcount = (ii - jj - step - 1) / -step; while (delcount) { - self->erase((++it).base()); + it = typename Sequence::reverse_iterator(self->erase((++it).base())); if (it==self->rend()) break; for (Py_ssize_t c=0; c<(-step-1); ++c) From 38b2b95c30662e81518bd8321bbbbed1ab7dd300 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 25 Mar 2013 19:26:12 +0000 Subject: [PATCH 374/538] Fix some invalid iterator usage in Python when deleting/inserting slices from/into containers --- Lib/python/pycontainer.swg | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg index 81909ae02..d4386622e 100644 --- a/Lib/python/pycontainer.swg +++ b/Lib/python/pycontainer.swg @@ -339,7 +339,7 @@ namespace swig { std::advance(it,ii); for (size_t rc=0; rcend(); ++c) it++; } } @@ -357,7 +357,7 @@ namespace swig { std::advance(it,size-ii-1); for (size_t rc=0; rcrend(); ++c) it++; } } @@ -383,9 +383,7 @@ namespace swig { size_t delcount = (jj - ii + step - 1) / step; while (delcount) { it = self->erase(it); - if (it==self->end()) - break; - for (Py_ssize_t c=0; c<(step-1); ++c) + for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c) it++; delcount--; } @@ -399,9 +397,7 @@ namespace swig { size_t delcount = (ii - jj - step - 1) / -step; while (delcount) { it = typename Sequence::reverse_iterator(self->erase((++it).base())); - if (it==self->rend()) - break; - for (Py_ssize_t c=0; c<(-step-1); ++c) + for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c) it++; delcount--; } From 2e0d1b12dc4fe5cf12239a59c5d96bdbd352d085 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 29 Mar 2013 06:28:15 +0000 Subject: [PATCH 375/538] Fix delete_if (reject!) for the STL container wrappers. Previously they would sometimes seg fault or not work. --- CHANGES.current | 4 +++ Examples/test-suite/ruby/li_std_set_runme.rb | 4 +++ .../test-suite/ruby/li_std_vector_runme.rb | 5 +++ Lib/ruby/rubycontainer.swg | 35 ++++++++----------- Lib/ruby/std_set.i | 19 ++++++++++ 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 6547a88be..bbf97a67f 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-03-29: wsfulton + [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would + sometimes seg fault or not work. + 2013-03-19: wsfulton [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are the same except being in different namespaces when the %nspace feature is not being used. diff --git a/Examples/test-suite/ruby/li_std_set_runme.rb b/Examples/test-suite/ruby/li_std_set_runme.rb index 65354be58..a85418471 100755 --- a/Examples/test-suite/ruby/li_std_set_runme.rb +++ b/Examples/test-suite/ruby/li_std_set_runme.rb @@ -61,3 +61,7 @@ s.to_a == [1,[1,2],'hello'] # sort order: s.sort {|a,b| a.hash <=> b.hash} EOF +iv = Set_int.new([0,1,2,3,4,5,6]) +iv.delete_if { |x| x == 0 || x == 3 || x == 6 } +swig_assert_equal(iv.to_s, '1245', binding) + diff --git a/Examples/test-suite/ruby/li_std_vector_runme.rb b/Examples/test-suite/ruby/li_std_vector_runme.rb index 8bcad2d19..fe3d9e0ce 100755 --- a/Examples/test-suite/ruby/li_std_vector_runme.rb +++ b/Examples/test-suite/ruby/li_std_vector_runme.rb @@ -64,6 +64,11 @@ y = average([1, 2, 3, 4]) half([10, 10.5, 11, 11.5]) EOF +iv = IntVector.new([0,1,2,3,4,5,6]) +iv.delete_if { |x| x == 0 || x == 3 || x == 6 } +swig_assert_equal(iv.to_s, '1245', binding) + + dv = DoubleVector.new(10) swig_assert( "dv.respond_to? :each_with_index", binding ) diff --git a/Lib/ruby/rubycontainer.swg b/Lib/ruby/rubycontainer.swg index d8d15f690..d4eaa5f73 100644 --- a/Lib/ruby/rubycontainer.swg +++ b/Lib/ruby/rubycontainer.swg @@ -677,27 +677,6 @@ namespace swig return r; } - %alias reject_bang "delete_if"; - Sequence* reject_bang() { - if ( !rb_block_given_p() ) - rb_raise( rb_eArgError, "no block given" ); - - Sequence::iterator i = self->begin(); - Sequence::iterator e = self->end(); - for ( ; i != e; ) - { - VALUE r = swig::from< Sequence::value_type >(*i); - if ( RTEST( rb_yield(r) ) ) { - $self->erase(i++); - e = self->end(); - } else { - ++i; - } - } - - return self; - } - VALUE delete_at(difference_type i) { VALUE r = Qnil; try { @@ -757,6 +736,19 @@ namespace swig } %enddef +%define %swig_sequence_methods_extra(Sequence...) + %extend { + %alias reject_bang "delete_if"; + Sequence* reject_bang() { + if ( !rb_block_given_p() ) + rb_raise( rb_eArgError, "no block given" ); + + $self->erase( std::remove_if( $self->begin(), $self->end(), + swig::yield< Sequence::value_type >() ), $self->end() ); + return $self; + } + } +%enddef /** * Macro used to add functions for Sequences @@ -764,6 +756,7 @@ namespace swig */ %define %swig_sequence_methods(Sequence...) %swig_sequence_methods_common(%arg(Sequence)); + %swig_sequence_methods_extra(%arg(Sequence)); %swig_sequence_back_inserters(%arg(Sequence)); %extend { diff --git a/Lib/ruby/std_set.i b/Lib/ruby/std_set.i index 00596b4a6..e38702ef5 100644 --- a/Lib/ruby/std_set.i +++ b/Lib/ruby/std_set.i @@ -152,10 +152,29 @@ } %} +%define %swig_sequence_methods_extra_set(Sequence...) + %extend { + %alias reject_bang "delete_if"; + Sequence* reject_bang() { + if ( !rb_block_given_p() ) + rb_raise( rb_eArgError, "no block given" ); + + for ( Sequence::iterator i = $self->begin(); i != $self->end(); ) { + VALUE r = swig::from< Sequence::value_type >(*i); + Sequence::iterator current = i++; + if ( RTEST( rb_yield(r) ) ) + $self->erase(current); + } + + return self; + } + } +%enddef %define %swig_set_methods(set...) %swig_sequence_methods_common(%arg(set)); + %swig_sequence_methods_extra_set(%arg(set)); %fragment("RubyPairBoolOutputIterator","header",fragment=SWIG_From_frag(bool),fragment="RubySequence_Cont") {} From 8381cc6b7db33669103bb4aa222884dcfdb6a266 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 27 Mar 2013 11:14:48 +0000 Subject: [PATCH 376/538] Fix test suite lock initialisation leading to random seg faults in li_boost_shared_ptr --- Examples/test-suite/swig_examples_lock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Examples/test-suite/swig_examples_lock.h b/Examples/test-suite/swig_examples_lock.h index feef26d0f..49d1bf285 100644 --- a/Examples/test-suite/swig_examples_lock.h +++ b/Examples/test-suite/swig_examples_lock.h @@ -43,6 +43,7 @@ class CriticalSection { public: CriticalSection() { pthread_mutexattr_t mutexattr; + pthread_mutexattr_init(&mutexattr); pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE_NP); pthread_mutex_init(&mutex_, &mutexattr); pthread_mutexattr_destroy(&mutexattr); From 5878ca5f1a93a26231c5f931047ac785c0c32052 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 29 Mar 2013 09:15:39 +0000 Subject: [PATCH 377/538] Fix autodoc test for python 2.4 --- Examples/test-suite/python/autodoc_runme.py | 35 ++++++++++--------- Examples/test-suite/python/file_test_runme.py | 2 +- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Examples/test-suite/python/autodoc_runme.py b/Examples/test-suite/python/autodoc_runme.py index dc843ae96..634b2dccf 100644 --- a/Examples/test-suite/python/autodoc_runme.py +++ b/Examples/test-suite/python/autodoc_runme.py @@ -1,4 +1,5 @@ from autodoc import * +import sys def check(got, expected): if expected != got: @@ -121,22 +122,24 @@ check(A.func3static.__doc__, "\n" " " ) -check(A.variable_a.__doc__, "A_variable_a_get(self) -> int") -check(A.variable_b.__doc__, "A_variable_b_get(A self) -> int") -check(A.variable_c.__doc__, "\n" -"A_variable_c_get(self) -> int\n" -"\n" -"Parameters:\n" -" self: A *\n" -"\n" -) -check(A.variable_d.__doc__, "\n" -"A_variable_d_get(A self) -> int\n" -"\n" -"Parameters:\n" -" self: A *\n" -"\n" -) +if sys.version[0:2] > (2, 4): + # Python 2.4 does not seem to work + check(A.variable_a.__doc__, "A_variable_a_get(self) -> int") + check(A.variable_b.__doc__, "A_variable_b_get(A self) -> int") + check(A.variable_c.__doc__, "\n" + "A_variable_c_get(self) -> int\n" + "\n" + "Parameters:\n" + " self: A *\n" + "\n" + ) + check(A.variable_d.__doc__, "\n" + "A_variable_d_get(A self) -> int\n" + "\n" + "Parameters:\n" + " self: A *\n" + "\n" + ) check(B.__doc__, "Proxy of C++ B class") check(C.__init__.__doc__, "__init__(self, a, b, h) -> C") diff --git a/Examples/test-suite/python/file_test_runme.py b/Examples/test-suite/python/file_test_runme.py index de4e2669e..3d8b153db 100644 --- a/Examples/test-suite/python/file_test_runme.py +++ b/Examples/test-suite/python/file_test_runme.py @@ -1,7 +1,7 @@ import sys import file_test -if sys.version_info < (3,0): +if sys.version[0:2] > (3, 0): file_test.nfile(sys.stdout) cstdout = file_test.GetStdOut() From f42ac989a7c608d9bc68c409a5b0db018bfef135 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 29 Mar 2013 09:19:03 +0000 Subject: [PATCH 378/538] Add note about Python STL fixes --- CHANGES.current | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index bbf97a67f..db7a0612f 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -9,6 +9,9 @@ Version 2.0.10 (in progress) [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would sometimes seg fault or not work. +2013-03-25: wsfulton + [Python] Fix some undefined behaviour deleting slices in the STL containers. + 2013-03-19: wsfulton [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are the same except being in different namespaces when the %nspace feature is not being used. From af859a1e2da4a317b7ad3a706825f6c6a6ae1c97 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 29 Mar 2013 13:46:49 +0000 Subject: [PATCH 379/538] Fix Ruby documentation for %bang --- Doc/Manual/Ruby.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index 47cf4f303..9739e1109 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -3215,7 +3215,7 @@ directive which is unique to the Ruby module and was introduced in SWIG
    -
    %bang sort!(arr);

    int sort(int arr[]);
    +
    %bang sort(int arr[]);

    int sort(int arr[]);
    From 8801ea3f11fd02a953584eae024d1e5385a5a530 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 31 Mar 2013 00:21:12 +0000 Subject: [PATCH 380/538] Fix incorrect assumptions in Ruby li_std_set test --- Examples/test-suite/ruby/li_std_set_runme.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/ruby/li_std_set_runme.rb b/Examples/test-suite/ruby/li_std_set_runme.rb index a85418471..efc163bee 100755 --- a/Examples/test-suite/ruby/li_std_set_runme.rb +++ b/Examples/test-suite/ruby/li_std_set_runme.rb @@ -57,7 +57,10 @@ s = LanguageSet.new s.insert([1,2]) s.insert(1) s.insert("hello") -s.to_a == [1,[1,2],'hello'] # sort order: s.sort {|a,b| a.hash <=> b.hash} +#s.to_a == [1,[1,2],'hello'] # sort order: s.sort {|a,b| a.hash <=> b.hash} +# Test above is flawed as LanguageSet sorts by each element's hash, so the order will change from one invocation to the next. Sort a conversion to array instead. +sa = s.to_a.sort { |x, y| x.to_s <=> y.to_s } +sa == [1,[1,2],'hello'] EOF From e13e1cba9e6dd024f713821558ae084cc9dc3507 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 31 Mar 2013 00:55:34 +0000 Subject: [PATCH 381/538] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT, on exit of the Ruby interpreter. Observed on 64 bit Linux in the std_li_set testcase. The global hash which is meant to hold GC references was being deleted by the interpreter on exit before the GC_VALUES destructors were being called. --- CHANGES.current | 4 ++ Lib/ruby/rubyclasses.swg | 115 +++++++++++++++++++++------------------ 2 files changed, 67 insertions(+), 52 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index db7a0612f..6e3d6fb08 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-03-30: wsfulton + [Ruby] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT, + on exit of the Ruby interpreter. More frequently observed in ruby-1.9. + 2013-03-29: wsfulton [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would sometimes seg fault or not work. diff --git a/Lib/ruby/rubyclasses.swg b/Lib/ruby/rubyclasses.swg index 2048b1f5f..60411a2de 100644 --- a/Lib/ruby/rubyclasses.swg +++ b/Lib/ruby/rubyclasses.swg @@ -36,11 +36,64 @@ %fragment("GC_VALUE_definition","header") { namespace swig { + class SwigGCReferences { + // Hash of all GC_VALUE's currently in use + static SwigGCReferences s_references; + + VALUE _hash; + + SwigGCReferences() : _hash(Qnil) { + } + ~SwigGCReferences() { + if (_hash != Qnil) + rb_gc_unregister_address( &_hash ); + } + static void EndProcHandler(VALUE) { + // Ruby interpreter ending - _hash can no longer be accessed. + s_references._hash = Qnil; + } + public: + static SwigGCReferences& instance() { + return s_references; + } + static void initialize() { + if (s_references._hash == Qnil) { + rb_set_end_proc(&EndProcHandler, Qnil); + s_references._hash = rb_hash_new(); + rb_gc_register_address( &s_references._hash ); + } + } + void GC_register(VALUE& obj) { + if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj)) + return; + if (_hash != Qnil) { + VALUE val = rb_hash_aref(_hash, obj); + unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0; + ++n; + rb_hash_aset(_hash, obj, INT2NUM(n)); + } + } + void GC_unregister(const VALUE& obj) { + if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj)) + return; + // this test should not be needed but I've noticed some very erratic + // behavior of none being unregistered in some very rare situations. + if (BUILTIN_TYPE(obj) == T_NONE) + return; + if (_hash != Qnil) { + VALUE val = rb_hash_aref(s_references._hash, obj); + unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1; + --n; + if (n) + rb_hash_aset(s_references._hash, obj, INT2NUM(n)); + else + rb_hash_delete(s_references._hash, obj); + } + } + }; + class GC_VALUE { protected: - // Hash of all GC_VALUE's currently in use - static VALUE _hash; - VALUE _obj; static ID hash_id; @@ -77,75 +130,33 @@ namespace swig { public: - static void initialize() - { - if ( _hash == Qnil ) - { - _hash = rb_hash_new(); - rb_gc_register_address( &_hash ); - } - } - - // this function is never called. Provided for symmetry only. - static void cleanup() - { - rb_gc_unregister_address( &_hash ); - } - GC_VALUE() : _obj( Qnil ) { } GC_VALUE(const GC_VALUE& item) : _obj(item._obj) { - GC_register(); + SwigGCReferences::instance().GC_register(_obj); } GC_VALUE(VALUE obj) :_obj(obj) { - GC_register(); + SwigGCReferences::instance().GC_register(_obj); } ~GC_VALUE() { - GC_unregister(); + SwigGCReferences::instance().GC_unregister(_obj); } GC_VALUE & operator=(const GC_VALUE& item) { - GC_unregister(); + SwigGCReferences::instance().GC_unregister(_obj); _obj = item._obj; - GC_register(); + SwigGCReferences::instance().GC_register(_obj); return *this; } - void GC_register() - { - if ( FIXNUM_P(_obj) || SPECIAL_CONST_P(_obj) || SYMBOL_P(_obj) ) - return; - VALUE val = rb_hash_aref( _hash, _obj ); - unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0; - ++n; - rb_hash_aset( _hash, _obj, INT2NUM(n) ); - } - - void GC_unregister() - { - if ( FIXNUM_P(_obj) || SPECIAL_CONST_P(_obj) || SYMBOL_P(_obj) ) - return; - // this test should not be needed but I've noticed some very erratic - // behavior of none being unregistered in some very rare situations. - if ( BUILTIN_TYPE(_obj) == T_NONE ) return; - - VALUE val = rb_hash_aref( _hash, _obj ); - unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1; - --n; - if ( n ) - rb_hash_aset( _hash, _obj, INT2NUM(n) ); - else - rb_hash_delete( _hash, _obj ); - } - operator VALUE() const { return _obj; @@ -294,7 +305,7 @@ namespace swig { ID GC_VALUE::lshift_id = rb_intern("<<"); ID GC_VALUE::rshift_id = rb_intern(">>"); - VALUE GC_VALUE::_hash = Qnil; + SwigGCReferences SwigGCReferences::s_references; typedef GC_VALUE LANGUAGE_OBJ; @@ -350,7 +361,7 @@ namespace swig { %init { - swig::GC_VALUE::initialize(); + swig::SwigGCReferences::initialize(); } From 9aaf4ad03cc31eb976d8bd16301286f0ac83ff4c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 2 Apr 2013 20:14:51 +0100 Subject: [PATCH 382/538] Fixes for Ruby 1.9 std::complex wrappers. New native Ruby complex numbers are used. --- CHANGES.current | 3 ++ Lib/ruby/rubycomplex.swg | 92 +++++++++++++++++++++++----------------- 2 files changed, 56 insertions(+), 39 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 6e3d6fb08..ac26525da 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-02: wsfulton + [Ruby] Runtime fixes for std::complex wrappers for ruby-1.9 - new native Ruby complex numbers are used. + 2013-03-30: wsfulton [Ruby] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT, on exit of the Ruby interpreter. More frequently observed in ruby-1.9. diff --git a/Lib/ruby/rubycomplex.swg b/Lib/ruby/rubycomplex.swg index afdb15e7e..8a7486865 100644 --- a/Lib/ruby/rubycomplex.swg +++ b/Lib/ruby/rubycomplex.swg @@ -1,49 +1,61 @@ /* Defines the As/From conversors for double/float complex, you need to - provide complex Type, the Name you want to use in the conversors, + provide complex Type, the Name you want to use in the converters, the complex Constructor method, and the Real and Imag complex - accesor methods. + accessor methods. See the std_complex.i and ccomplex.i for concrete examples. */ -/* - Ruby does not have native complex numbers. They are an extension in the - STD library. -*/ -%{ - static VALUE swig_rb_cComplex = Qnil; - static ID swig_real_id = 0; - static ID swig_imag_id = 0; - - int Ruby_Is_Complex( VALUE obj ) - { - return ( (rb_respond_to( obj, swig_real_id ) == Qtrue) && - (rb_respond_to( obj, swig_imag_id ) == Qtrue) ); - } -%} - -%init { - rb_require("complex"); - swig_rb_cComplex = rb_const_get( rb_cObject, rb_intern("Complex") ); - if( swig_rb_cComplex == Qnil ) - rb_warn("Ruby's complex.so not found"); - swig_real_id = rb_intern("real"); - swig_imag_id = rb_intern("imag"); +%fragment("SWIG_Complex_Numbers","header") +{ +%#if !defined(T_COMPLEX) +/* Ruby versions prior to 1.9 did not have native complex numbers. They were an extension in the STD library. */ +VALUE rb_complex_new(VALUE x, VALUE y) { + static ID new_id = rb_intern("new"); + static VALUE cComplex = rb_const_get(rb_cObject, rb_intern("Complex")); + return rb_funcall(cComplex, new_id, 2, x, y); } -/* the common from conversor */ +static int SWIG_Is_Complex( VALUE obj ) { + static ID real_id = rb_intern("real"); + static ID imag_id = rb_intern("imag"); + return ( (rb_respond_to( obj, real_id ) == Qtrue) && + (rb_respond_to( obj, imag_id ) == Qtrue) ); +} +%#else +static int SWIG_Is_Complex( VALUE obj ) { + return TYPE(obj) == T_COMPLEX; +} +%#endif + +VALUE SWIG_Complex_Real(VALUE obj) { + static ID real_id = rb_intern("real"); + return rb_funcall(obj, real_id, 0); +} + +VALUE SWIG_Complex_Imaginary(VALUE obj) { + static ID imag_id = rb_intern("imag"); + return rb_funcall(obj, imag_id, 0); +} +} + +%init { +%#if !defined(T_COMPLEX) + rb_require("complex"); +%#endif +} + +/* the common from converter */ %define %swig_fromcplx_conv(Type, Real, Imag) %fragment(SWIG_From_frag(Type),"header") { SWIGINTERNINLINE VALUE SWIG_From(Type)(%ifcplusplus(const Type&, Type) c) { - VALUE args[] = { - rb_float_new(Real(c)), - rb_float_new(Imag(c)) - }; - return rb_class_new_instance(2, args, swig_rb_cComplex); + VALUE re = rb_float_new(Real(c)); + VALUE im = rb_float_new(Imag(c)); + return rb_complex_new(re, im); } } %enddef @@ -51,15 +63,16 @@ SWIG_From(Type)(%ifcplusplus(const Type&, Type) c) /* the double case */ %define %swig_cplxdbl_conv(Type, Constructor, Real, Imag) %fragment(SWIG_AsVal_frag(Type),"header", - fragment=SWIG_AsVal_frag(double)) + fragment=SWIG_AsVal_frag(double), + fragment="SWIG_Complex_Numbers") { SWIGINTERN int SWIG_AsVal(Type) (VALUE o, Type* val) { - if ( Ruby_Is_Complex( o ) ) { + if ( SWIG_Is_Complex( o ) ) { if (val) { - VALUE real = rb_funcall(o, swig_real_id, 0 ); - VALUE imag = rb_funcall(o, swig_imag_id, 0 ); + VALUE real = SWIG_Complex_Real(o); + VALUE imag = SWIG_Complex_Imaginary(o); double re = 0; SWIG_AsVal_double( real, &re ); double im = 0; @@ -85,13 +98,14 @@ SWIG_AsVal(Type) (VALUE o, Type* val) %define %swig_cplxflt_conv(Type, Constructor, Real, Imag) %fragment(SWIG_AsVal_frag(Type),"header", fragment=SWIG_AsVal_frag(float), - fragment=SWIG_AsVal_frag(double)) { + fragment=SWIG_AsVal_frag(double), + fragment="SWIG_Complex_Numbers") { SWIGINTERN int SWIG_AsVal(Type)(VALUE o, Type *val) { - if ( Ruby_Is_Complex( o ) ) { - VALUE real = rb_funcall(o, swig_real_id, 0 ); - VALUE imag = rb_funcall(o, swig_imag_id, 0 ); + if ( SWIG_Is_Complex( o ) ) { + VALUE real = SWIG_Complex_Real(o); + VALUE imag = SWIG_Complex_Imaginary(o); double re = 0; SWIG_AsVal_double( real, &re ); double im = 0; From ee92a26819b8bb811d4fe00b80a02bdc4aa4cf70 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 2 Apr 2013 22:21:48 +0100 Subject: [PATCH 383/538] Fixes for out of source builds for Ruby test-suite --- Examples/test-suite/ruby/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in index 3354acfd8..ab366ccd4 100644 --- a/Examples/test-suite/ruby/Makefile.in +++ b/Examples/test-suite/ruby/Makefile.in @@ -61,7 +61,7 @@ ruby_naming.cpptest: SWIGOPT += -autorename # a file is found which has _runme.rb appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) -I. $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(RUBY) -I$(srcdir):. $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ fi # Clean From 5d529d5a76a9d3f71e39dad2f8373559bdebd829 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 5 Apr 2013 23:41:59 +0100 Subject: [PATCH 384/538] Ruby 1.9 fixes. SF Bug#1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL wrappers that override the default predicate, such as: %template(Map) std::map >; Fixes li_std_functors testcases for Ruby 1.9. Also rb_respond_to return values have changed subtely in 1.9 and return should be treated as a flag instead of checking for Qtrue, see SF Bug #1159. Also fix li_std_map, li_std_set silently failing - rb_protect behaviour seems to have changed when an exception is thrown, so code has been changed to use rb_rescue. A call to 'rb_set_errinfo(Qnil)' could have solved this after the rb_protect call, but it is only available in 1.9+ and Ruby API changes are not easily and transparently detectable. --- CHANGES.current | 10 ++++++++++ .../test-suite/ruby/li_std_functors_runme.rb | 8 +++++++- Lib/ruby/rubyclasses.swg | 17 +++++++++++++---- Lib/ruby/rubycomplex.swg | 4 ++-- Lib/ruby/rubyrun.swg | 4 ++-- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index ac26525da..9253f9c96 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,16 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-05: wsfulton + [Ruby] SF Bug #1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL + wrappers that override the default predicate, such as: + + %template(Map) std::map >; + +2013-04-05: wsfulton + [Ruby] SF Bug #1159 - Correctly check rb_respond_to call return values to fix some + further 1.9 problems with functors and use of Complex wrappers. + 2013-04-02: wsfulton [Ruby] Runtime fixes for std::complex wrappers for ruby-1.9 - new native Ruby complex numbers are used. diff --git a/Examples/test-suite/ruby/li_std_functors_runme.rb b/Examples/test-suite/ruby/li_std_functors_runme.rb index d31735c45..5623d49f0 100755 --- a/Examples/test-suite/ruby/li_std_functors_runme.rb +++ b/Examples/test-suite/ruby/li_std_functors_runme.rb @@ -34,6 +34,12 @@ def _set(container) EOF end +def b_lessthan_a(b, a) + res = b < a +# print b, "<", a, "=", res + return res +end + def _map(container) swig_assert_each_line(< Date: Sat, 6 Apr 2013 00:30:50 +0100 Subject: [PATCH 385/538] More rb_protect rewrite to use rb_rescue for Ruby 1.9 --- Lib/ruby/rubyclasses.swg | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Lib/ruby/rubyclasses.swg b/Lib/ruby/rubyclasses.swg index 5db6658ee..3b36c722e 100644 --- a/Lib/ruby/rubyclasses.swg +++ b/Lib/ruby/rubyclasses.swg @@ -172,17 +172,14 @@ namespace swig { return rb_inspect(_obj); } - static VALUE swig_rescue_funcall( VALUE ) + static VALUE swig_rescue_swallow( VALUE ) { -/* - VALUE err = rb_errinfo(); - VALUE errstr = rb_obj_as_string(err); - std::cout << "Error is: '" << RSTRING_PTR(StringValue(errstr)) << "'" << std::endl; -*/ - return Qnil;/* Swallow Ruby exception */ + // VALUE errstr = rb_obj_as_string(rb_errinfo()); + // printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr))); + return Qnil; /* Swallow Ruby exception */ } - static VALUE swig_protect_funcall( VALUE p ) + static VALUE swig_rescue_funcall( VALUE p ) { OpArgs* args = (OpArgs*) p; return rb_funcall( args->src, args->id, args->nargs, args->target ); @@ -206,8 +203,8 @@ namespace swig { args.id = op_id; \ args.nargs = 1; \ args.target = VALUE(other); \ - ret = rb_rescue(RUBY_METHOD_FUNC(swig_protect_funcall), VALUE(&args), \ - (RUBY_METHOD_FUNC(swig_rescue_funcall)), Qnil); \ + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ } \ if ( ret == Qnil ) { \ VALUE a = rb_funcall( _obj, hash_id, 0 ); \ @@ -240,14 +237,13 @@ namespace swig { { \ VALUE ret = Qnil; \ SWIG_RUBY_THREAD_BEGIN_BLOCK; \ - int status; \ OpArgs args; \ args.src = _obj; \ args.id = proc_id; \ args.nargs = 0; \ args.target = Qnil; \ - ret = rb_protect( PROTECTFUNC(swig_protect_funcall), VALUE(&args), \ - &status ); \ + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ SWIG_RUBY_THREAD_END_BLOCK; \ return ret; \ } @@ -262,14 +258,13 @@ namespace swig { { \ VALUE ret = Qnil; \ SWIG_RUBY_THREAD_BEGIN_BLOCK; \ - int status; \ OpArgs args; \ args.src = _obj; \ args.id = proc_id; \ args.nargs = 1; \ args.target = VALUE(other); \ - ret = rb_protect( PROTECTFUNC(swig_protect_funcall), VALUE(&args), \ - &status ); \ + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ SWIG_RUBY_THREAD_END_BLOCK; \ return GC_VALUE(ret); \ } From bb3fe8c906997d39570ab1c7bbde78a5236b229f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 6 Apr 2013 02:20:56 +0100 Subject: [PATCH 386/538] Rewrite Ruby's GC_VALUE without use of macros for easier debugging --- Lib/ruby/rubyclasses.swg | 183 +++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 96 deletions(-) diff --git a/Lib/ruby/rubyclasses.swg b/Lib/ruby/rubyclasses.swg index 3b36c722e..598bc4db9 100644 --- a/Lib/ruby/rubyclasses.swg +++ b/Lib/ruby/rubyclasses.swg @@ -46,7 +46,7 @@ namespace swig { } ~SwigGCReferences() { if (_hash != Qnil) - rb_gc_unregister_address( &_hash ); + rb_gc_unregister_address(&_hash); } static void EndProcHandler(VALUE) { // Ruby interpreter ending - _hash can no longer be accessed. @@ -60,12 +60,12 @@ namespace swig { if (s_references._hash == Qnil) { rb_set_end_proc(&EndProcHandler, Qnil); s_references._hash = rb_hash_new(); - rb_gc_register_address( &s_references._hash ); + rb_gc_register_address(&s_references._hash); } } void GC_register(VALUE& obj) { if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj)) - return; + return; if (_hash != Qnil) { VALUE val = rb_hash_aref(_hash, obj); unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 0; @@ -75,7 +75,7 @@ namespace swig { } void GC_unregister(const VALUE& obj) { if (FIXNUM_P(obj) || SPECIAL_CONST_P(obj) || SYMBOL_P(obj)) - return; + return; // this test should not be needed but I've noticed some very erratic // behavior of none being unregistered in some very rare situations. if (BUILTIN_TYPE(obj) == T_NONE) @@ -85,9 +85,9 @@ namespace swig { unsigned n = FIXNUM_P(val) ? NUM2UINT(val) : 1; --n; if (n) - rb_hash_aset(s_references._hash, obj, INT2NUM(n)); + rb_hash_aset(s_references._hash, obj, INT2NUM(n)); else - rb_hash_delete(s_references._hash, obj); + rb_hash_delete(s_references._hash, obj); } } }; @@ -130,7 +130,7 @@ namespace swig { public: - GC_VALUE() : _obj( Qnil ) + GC_VALUE() : _obj(Qnil) { } @@ -172,117 +172,108 @@ namespace swig { return rb_inspect(_obj); } - static VALUE swig_rescue_swallow( VALUE ) + static VALUE swig_rescue_swallow(VALUE) { // VALUE errstr = rb_obj_as_string(rb_errinfo()); // printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr))); return Qnil; /* Swallow Ruby exception */ } - static VALUE swig_rescue_funcall( VALUE p ) + static VALUE swig_rescue_funcall(VALUE p) { OpArgs* args = (OpArgs*) p; - return rb_funcall( args->src, args->id, args->nargs, args->target ); + return rb_funcall(args->src, args->id, args->nargs, args->target); } - -%#define GC_VALUE_CMP( op_id, op, cmp, cmpval ) \ - bool op( const GC_VALUE& other ) const \ - { \ - if ( FIXNUM_P(_obj) && FIXNUM_P(other._obj) ) \ - { \ - return _obj cmp other._obj; \ - } \ - bool res = false; \ - VALUE ret = Qnil; \ - SWIG_RUBY_THREAD_BEGIN_BLOCK; \ - if ( rb_respond_to( _obj, op_id ) ) \ - { \ - OpArgs args; \ - args.src = _obj; \ - args.id = op_id; \ - args.nargs = 1; \ - args.target = VALUE(other); \ - ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ - (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ - } \ - if ( ret == Qnil ) { \ - VALUE a = rb_funcall( _obj, hash_id, 0 ); \ - VALUE b = rb_funcall( VALUE(other), hash_id, 0 ); \ - res = a cmp b; \ - } \ - else \ - { \ - res = RTEST( ret ); \ - } \ - SWIG_RUBY_THREAD_END_BLOCK; \ - return res; \ + bool relational_equal_op(const GC_VALUE& other, const ID& op_id, bool (*op_func)(const VALUE& a, const VALUE& b)) const + { + if (FIXNUM_P(_obj) && FIXNUM_P(other._obj)) { + return op_func(_obj, other._obj); + } + bool res = false; + VALUE ret = Qnil; + SWIG_RUBY_THREAD_BEGIN_BLOCK; + if (rb_respond_to(_obj, op_id)) { + OpArgs args; + args.src = _obj; + args.id = op_id; + args.nargs = 1; + args.target = VALUE(other); + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); + } + if (ret == Qnil) { + VALUE a = rb_funcall( _obj, hash_id, 0 ); + VALUE b = rb_funcall( VALUE(other), hash_id, 0 ); + res = op_func(a, b); + } else { + res = RTEST(ret); + } + SWIG_RUBY_THREAD_END_BLOCK; + return res; } + static bool operator_eq(const VALUE& a, const VALUE& b) { return a == b; } + static bool operator_lt(const VALUE& a, const VALUE& b) { return a < b; } + static bool operator_le(const VALUE& a, const VALUE& b) { return a <= b; } + static bool operator_gt(const VALUE& a, const VALUE& b) { return a > b; } + static bool operator_ge(const VALUE& a, const VALUE& b) { return a >= b; } - GC_VALUE_CMP( eq_id, operator==, ==, == 0 ) - GC_VALUE_CMP( lt_id, operator<, < , < 0 ) - GC_VALUE_CMP( le_id, operator<=, <=, <= 0 ) - GC_VALUE_CMP( gt_id, operator>, > , > 0 ) - GC_VALUE_CMP( ge_id, operator>=, >=, >= 0 ) -%#undef GC_VALUE_CMP + bool operator==(const GC_VALUE& other) const { return relational_equal_op(other, eq_id, operator_eq); } + bool operator<(const GC_VALUE& other) const { return relational_equal_op(other, lt_id, operator_lt); } + bool operator<=(const GC_VALUE& other) const { return relational_equal_op(other, le_id, operator_le); } + bool operator>(const GC_VALUE& other) const { return relational_equal_op(other, gt_id, operator_gt); } + bool operator>=(const GC_VALUE& other) const { return relational_equal_op(other, ge_id, operator_ge); } - bool operator!=( const GC_VALUE& other ) + bool operator!=(const GC_VALUE& other) const { return !(this->operator==(other)); } -%#define GC_VALUE_UNARY( proc_id, op ) \ - GC_VALUE op() const \ - { \ - VALUE ret = Qnil; \ - SWIG_RUBY_THREAD_BEGIN_BLOCK; \ - OpArgs args; \ - args.src = _obj; \ - args.id = proc_id; \ - args.nargs = 0; \ - args.target = Qnil; \ - ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ - (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ - SWIG_RUBY_THREAD_END_BLOCK; \ - return ret; \ + GC_VALUE unary_op(const ID& op_id) const + { + VALUE ret = Qnil; + SWIG_RUBY_THREAD_BEGIN_BLOCK; + OpArgs args; + args.src = _obj; + args.id = op_id; + args.nargs = 0; + args.target = Qnil; + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); + SWIG_RUBY_THREAD_END_BLOCK; + return ret; } - GC_VALUE_UNARY( pos_id, operator+ ) - GC_VALUE_UNARY( neg_id, operator- ) - GC_VALUE_UNARY( inv_id, operator~ ) -%#undef GC_VALUE_BINARY + GC_VALUE operator+() const { return unary_op(pos_id); } + GC_VALUE operator-() const { return unary_op(neg_id); } + GC_VALUE operator~() const { return unary_op(inv_id); } -%#define GC_VALUE_BINARY( proc_id, op ) \ - GC_VALUE op( const GC_VALUE& other ) const \ - { \ - VALUE ret = Qnil; \ - SWIG_RUBY_THREAD_BEGIN_BLOCK; \ - OpArgs args; \ - args.src = _obj; \ - args.id = proc_id; \ - args.nargs = 1; \ - args.target = VALUE(other); \ - ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), \ - (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); \ - SWIG_RUBY_THREAD_END_BLOCK; \ - return GC_VALUE(ret); \ + GC_VALUE binary_op(const GC_VALUE& other, const ID& op_id) const + { + VALUE ret = Qnil; + SWIG_RUBY_THREAD_BEGIN_BLOCK; + OpArgs args; + args.src = _obj; + args.id = op_id; + args.nargs = 1; + args.target = VALUE(other); + ret = rb_rescue(RUBY_METHOD_FUNC(swig_rescue_funcall), VALUE(&args), + (RUBY_METHOD_FUNC(swig_rescue_swallow)), Qnil); + SWIG_RUBY_THREAD_END_BLOCK; + return GC_VALUE(ret); } - GC_VALUE_BINARY( add_id, operator+ ); - GC_VALUE_BINARY( sub_id, operator- ); - GC_VALUE_BINARY( mul_id, operator* ); - GC_VALUE_BINARY( div_id, operator/ ); - GC_VALUE_BINARY( mod_id, operator% ); - - GC_VALUE_BINARY( and_id, operator& ); - GC_VALUE_BINARY( xor_id, operator^ ); - GC_VALUE_BINARY( or_id, operator| ); - - GC_VALUE_BINARY( lshift_id, operator<< ); - GC_VALUE_BINARY( rshift_id, operator>> ); -%#undef GC_VALUE_BINARY - + GC_VALUE operator+(const GC_VALUE& other) const { return binary_op(other, add_id); } + GC_VALUE operator-(const GC_VALUE& other) const { return binary_op(other, sub_id); } + GC_VALUE operator*(const GC_VALUE& other) const { return binary_op(other, mul_id); } + GC_VALUE operator/(const GC_VALUE& other) const { return binary_op(other, div_id); } + GC_VALUE operator%(const GC_VALUE& other) const { return binary_op(other, mod_id); } + GC_VALUE operator&(const GC_VALUE& other) const { return binary_op(other, and_id); } + GC_VALUE operator^(const GC_VALUE& other) const { return binary_op(other, xor_id); } + GC_VALUE operator|(const GC_VALUE& other) const { return binary_op(other, or_id); } + GC_VALUE operator<<(const GC_VALUE& other) const { return binary_op(other, lshift_id); } + GC_VALUE operator>>(const GC_VALUE& other) const { return binary_op(other, rshift_id); } }; ID GC_VALUE::hash_id = rb_intern("hash"); @@ -352,7 +343,7 @@ namespace swig { VALUE to_s() const; GC_VALUE(); protected: - GC_VALUE( const GC_VALUE& ); + GC_VALUE(const GC_VALUE&); ~GC_VALUE(); }; From 65b917dabb5d0037318da93b78ce028dbb113f07 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 6 Apr 2013 16:19:17 -0700 Subject: [PATCH 387/538] Some test-suite warning fixes --- Examples/test-suite/li_std_except_as_class.i | 6 ++++++ Examples/test-suite/typemap_array_qualifiers.i | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Examples/test-suite/li_std_except_as_class.i b/Examples/test-suite/li_std_except_as_class.i index 00de76eac..0400c9a82 100644 --- a/Examples/test-suite/li_std_except_as_class.i +++ b/Examples/test-suite/li_std_except_as_class.i @@ -5,6 +5,12 @@ * if there were also functions throwing 'std::logic_error' and * 'std::exception' then the bug would not be fully replicated */ +%{ +#if defined(_MSC_VER) + #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) +#endif +%} + %{ #include #include diff --git a/Examples/test-suite/typemap_array_qualifiers.i b/Examples/test-suite/typemap_array_qualifiers.i index 947721402..14df649d3 100644 --- a/Examples/test-suite/typemap_array_qualifiers.i +++ b/Examples/test-suite/typemap_array_qualifiers.i @@ -39,6 +39,7 @@ CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -48,9 +49,11 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) const SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %typemap(in) const volatile SWIGTYPE [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -61,9 +64,11 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) volatile SWIGTYPE **const [ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %typemap(in) volatile SWIGTYPE **const [ANY][ANY] { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ @@ -72,6 +77,7 @@ CLEAR_SWIGTYPE_TYPEMAPS; CLEAR_SWIGTYPE_TYPEMAPS; %typemap(in) SWIGTYPE (*const) (ANY) { +$1 = 0; /* Correct typemap for $symname: $type */ } %inline %{ From 5ae6ff404d8a7d4c17a260a6f2cae7c8959152f7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 8 Apr 2013 07:57:45 +0100 Subject: [PATCH 388/538] Cosmetic - use C comments instead of C++ comments for recent Ruby change --- Lib/ruby/rubyclasses.swg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/ruby/rubyclasses.swg b/Lib/ruby/rubyclasses.swg index 598bc4db9..5537136af 100644 --- a/Lib/ruby/rubyclasses.swg +++ b/Lib/ruby/rubyclasses.swg @@ -174,8 +174,10 @@ namespace swig { static VALUE swig_rescue_swallow(VALUE) { - // VALUE errstr = rb_obj_as_string(rb_errinfo()); - // printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr))); + /* + VALUE errstr = rb_obj_as_string(rb_errinfo()); + printf("Swallowing error: '%s'\n", RSTRING_PTR(StringValue(errstr))); + */ return Qnil; /* Swallow Ruby exception */ } From dd2cd0298c39d9546f68ff538f5c90634e5a0106 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 8 Apr 2013 18:30:16 +0100 Subject: [PATCH 389/538] Work around Octave seg fault on exit in imports testcase on Octave 3.1 and 3.2 --- Examples/test-suite/octave/imports_runme.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/test-suite/octave/imports_runme.m b/Examples/test-suite/octave/imports_runme.m index be9db5919..5db38071b 100644 --- a/Examples/test-suite/octave/imports_runme.m +++ b/Examples/test-suite/octave/imports_runme.m @@ -1,7 +1,8 @@ # This is the import runtime testcase. -imports_b; +# If imports_b is loaded before imports_a, a seg fault occurred during interpreter cleanup/exit in version 3.1 and 3.2, seems okay in 3.6 imports_a; +imports_b; x = imports_b.B(); x.hello(); From 5fd059d80f9c2c47f6889c448b9d691bb8b20c1d Mon Sep 17 00:00:00 2001 From: Nishant Rodrigues Date: Mon, 8 Apr 2013 14:35:08 +0900 Subject: [PATCH 390/538] Patch fixing warning 322 in rubycontainer_extended 'rubycontainer_extended.swg' generates warnings: Warning 322: Redundant redeclaration of 'map_bang', Warning 322: previous declaration of 'map_bang'. The fix is to remove a redundant call to swig_container_extend for swig::GC_VALUE. Thanks ======================================================== --- Lib/ruby/rubycontainer_extended.swg | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/ruby/rubycontainer_extended.swg b/Lib/ruby/rubycontainer_extended.swg index d2a058586..7514ba2c8 100644 --- a/Lib/ruby/rubycontainer_extended.swg +++ b/Lib/ruby/rubycontainer_extended.swg @@ -124,7 +124,6 @@ %swig_container_extend( %arg( Container ), std::complex ); %swig_container_extend( %arg( Container ), std::string ); %swig_container_extend( %arg( Container ), swig::GC_VALUE ); -%swig_container_extend( %arg( Container ), swig::GC_VALUE ); %enddef From 1fce0bd2b41ee3ddebacfe101c6a231f6111bf21 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 8 Apr 2013 21:48:09 +0100 Subject: [PATCH 391/538] Workaround to Octave seg fault on exit in imports testcase only seems to work in 3.1, not 3.2. Just ignore test now --- Examples/test-suite/octave/imports_runme.m | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Examples/test-suite/octave/imports_runme.m b/Examples/test-suite/octave/imports_runme.m index 5db38071b..a9c8bffb8 100644 --- a/Examples/test-suite/octave/imports_runme.m +++ b/Examples/test-suite/octave/imports_runme.m @@ -1,20 +1,22 @@ # This is the import runtime testcase. -# If imports_b is loaded before imports_a, a seg fault occurred during interpreter cleanup/exit in version 3.1 and 3.2, seems okay in 3.6 -imports_a; -imports_b; +# Workaround seg fault occurring during interpreter cleanup/exit in version 3.1 and 3.2, seems okay in 3.6 +if (compare_versions(version(), "3.3", ">=")) + imports_b; + imports_a; -x = imports_b.B(); -x.hello(); + x = imports_b.B(); + x.hello(); -a = imports_a.A(); + a = imports_a.A(); -c = imports_b.C(); -a1 = c.get_a(c); -a2 = c.get_a_type(c); + c = imports_b.C(); + a1 = c.get_a(c); + a2 = c.get_a_type(c); -a1.hello(); -a2.hello(); -assert(swig_this(a1)==swig_this(a2)); -assert(strcmp(swig_type(a1),swig_type(a2))); + a1.hello(); + a2.hello(); + assert(swig_this(a1)==swig_this(a2)); + assert(strcmp(swig_type(a1),swig_type(a2))); +endif From 939fa86627cb95ce2670991e0c7feac26387edf1 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 9 Apr 2013 14:35:14 +1200 Subject: [PATCH 392/538] [PHP] Add missing directorin typemap for char* and char[] which fixes director_string testcase failure. --- CHANGES.current | 4 ++++ Lib/php/php.swg | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 9253f9c96..864fb9a3c 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-09: olly + [PHP] Add missing directorin typemap for char* and char[] which + fixes director_string testcase failure. + 2013-04-05: wsfulton [Ruby] SF Bug #1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL wrappers that override the default predicate, such as: diff --git a/Lib/php/php.swg b/Lib/php/php.swg index d46de93ea..f27e1fe67 100644 --- a/Lib/php/php.swg +++ b/Lib/php/php.swg @@ -269,6 +269,15 @@ ZVAL_LONG($input,$1); } +%typemap(directorin) char *, char [] +{ + if(!$1) { + ZVAL_NULL($input); + } else { + ZVAL_STRING($input, (char *)$1, 1); + } +} + %typemap(out) bool { ZVAL_BOOL(return_value,($1)?1:0); From 3e26318427a0e7dfdaf5e9ee1d988a1db1d6b464 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 9 Apr 2013 09:17:36 +0100 Subject: [PATCH 393/538] Add target language version display during make check. Individual language versions can be checked using 'make check--version'. --- Examples/Makefile.in | 222 ++++++++++++++++++++++++++ Examples/test-suite/cffi/Makefile.in | 2 +- Examples/test-suite/clisp/Makefile.in | 2 +- Examples/test-suite/uffi/Makefile.in | 2 +- Makefile.in | 41 ++++- configure.ac | 14 +- 6 files changed, 275 insertions(+), 8 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 6e1731f6b..a3444d284 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -95,6 +95,7 @@ distclean: # Set these to your local copy of Tcl/Tk. +TCLSH = tclsh TCL_INCLUDE = @TCLINCLUDE@ TCL_LIB = @TCLLIB@ TCL_OPTS = @LIBS@ @@ -154,6 +155,13 @@ tcl_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +tcl_version: + echo 'puts $$tcl_version;exit 0' | $(TCLSH) + # ----------------------------------------------------------------- # Cleaning the Tcl examples # ----------------------------------------------------------------- @@ -176,6 +184,7 @@ PERL5_INCLUDE= @PERL5EXT@ # Extra Perl specific dynamic linking options PERL5_DLNK = @PERL5DYNAMICLINKING@ PERL5_CCFLAGS = @PERL5CCFLAGS@ +PERL = @PERL@ # ---------------------------------------------------------------- # Build a Perl5 dynamically loadable module (C) @@ -216,6 +225,13 @@ perl5_static_cpp: $(SRCS) $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +perl5_version: + $(PERL) -v | grep "This is" + # ----------------------------------------------------------------- # Cleaning the Perl5 examples # ----------------------------------------------------------------- @@ -315,6 +331,13 @@ runme3.py: runme.py cp $< $@ $(PY2TO3) -w $@ >/dev/null 2>&1 +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +python_version: + $(PYTHON) -V + # ----------------------------------------------------------------- # Cleaning the python examples # ----------------------------------------------------------------- @@ -368,6 +391,13 @@ OCTSCRIPT = runme.m octave_run: $(OCTSCRIPT) env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVE_PATH=$(srcdir):$$OCTAVE_PATH $(OCTAVE) $(OCTSCRIPT) >/dev/null +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +octave_version: + $(OCTAVE) --version | grep -i version + # ----------------------------------------------------------------- # Cleaning the octave examples # ----------------------------------------------------------------- @@ -383,6 +413,7 @@ octave_clean: ################################################################## # Make sure these locate your Guile installation +GUILE = @GUILE@ GUILE_INCLUDE = @GUILEINCLUDE@ GUILE_LIB = @GUILELIB@ GUILE_SO = @GUILE_SO@ @@ -459,6 +490,13 @@ guile_simple_cpp: $(SRCS) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +guile_version: + $(GUILE) --version + # ----------------------------------------------------------------- # Cleaning the Guile examples # ----------------------------------------------------------------- @@ -484,6 +522,8 @@ JAVASO =@JAVASO@ JAVALDSHARED = @JAVALDSHARED@ JAVACXXSHARED = @JAVACXXSHARED@ JAVACFLAGS = @JAVACFLAGS@ +JAVA = @JAVA@ +JAVAC = @JAVAC@ # ---------------------------------------------------------------- # Build a java dynamically loadable module (C) @@ -503,6 +543,14 @@ java_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +java_version: + $(JAVA) -version + $(JAVAC) -version || echo "unknown javac version" + # ----------------------------------------------------------------- # Cleaning the java examples # ----------------------------------------------------------------- @@ -512,6 +560,17 @@ java_clean: rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@JAVASO@ +################################################################## +##### ANDROID ###### +################################################################## + +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +android_version: + adb version + ################################################################## ##### MODULA3 ###### ################################################################## @@ -530,6 +589,13 @@ modula3: $(SRCS) modula3_cpp: $(SRCS) $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +modula3_version: + echo "Unknown modula3 version" + # ----------------------------------------------------------------- # Cleaning the modula3 examples # ----------------------------------------------------------------- @@ -543,6 +609,7 @@ modula3_clean: ##### MZSCHEME ###### ################################################################## +MZSCHEME = mzscheme MZC = @MZC@ MZDYNOBJ = @MZDYNOBJ@ MZSCHEME_SO = @MZSCHEME_SO@ @@ -561,6 +628,14 @@ mzscheme_cpp: $(SRCS) $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +mzscheme_version: + $(MZSCHEME) -v + $(MZC) -v + # ----------------------------------------------------------------- # Cleaning the mzscheme examples # ----------------------------------------------------------------- @@ -697,6 +772,17 @@ ocaml_dynamic_cpp: $(SRCS) -package dl -linkpkg \ $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings' +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +ocaml_version: + $(OCC) -version + +# ----------------------------------------------------------------- +# Cleaning the Ocaml examples +# ----------------------------------------------------------------- + ocaml_clean: rm -f *_wrap* *~ .~* *.cmo *.cmi $(MLFILE) $(MLFILE)i swig.mli swig.cmi swig.ml swig.cmo swigp4.ml swigp4.cmo rm -f core @EXTRA_CLEAN@ @@ -711,6 +797,7 @@ RUBY_CFLAGS= @RUBYCCDLFLAGS@ $(DEFS) RUBY_INCLUDE= @RUBYINCLUDE@ RUBY_LIB = @RUBYLIB@ RUBY_DLNK = @RUBYDYNAMICLINKING@ +RUBY = @RUBY@ # ---------------------------------------------------------------- # Build a C dynamically loadable module @@ -750,6 +837,13 @@ ruby_cpp_static: $(SRCS) $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +ruby_version: + $(RUBY) -v + # ----------------------------------------------------------------- # Cleaning the Ruby examples # ----------------------------------------------------------------- @@ -794,6 +888,13 @@ PHPSCRIPT ?= runme.php php_run: $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +php_version: + $(PHP) -v + # ----------------------------------------------------------------- # Cleaning the PHP examples # ----------------------------------------------------------------- @@ -808,6 +909,7 @@ php_clean: ################################################################## # Make sure these locate your Pike installation +PIKE = pike PIKE_CFLAGS = @PIKECCDLFLAGS@ -DHAVE_CONFIG_H PIKE_INCLUDE = @PIKEINCLUDE@ PIKE_LIB = @PIKELIB@ @@ -850,6 +952,13 @@ pike_cpp_static: $(SRCS) $(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +pike_version: + $(PIKE) -v + # ----------------------------------------------------------------- # Cleaning the Pike examples # ----------------------------------------------------------------- @@ -951,6 +1060,17 @@ chicken_cpp: chicken_externalhdr: $(SWIG) -chicken -external-runtime $(TARGET) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +chicken_version: + $(CHICKEN) -version + +# ----------------------------------------------------------------- +# Cleaning the CHICKEN examples +# ----------------------------------------------------------------- + chicken_clean: rm -f *_wrap* *~ .~* *_chicken* rm -f core @EXTRA_CLEAN@ @@ -993,6 +1113,13 @@ csharp_cpp: $(SRCS) csharp_compile: $(SRCS) $(COMPILETOOL) $(CSHARPCOMPILER) $(CSHARPFLAGS) $(CSHARPSRCS) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +csharp_version: + $(CSHARPCOMPILER) --version || echo "Unknown C# compiler version" + # ----------------------------------------------------------------- # Cleaning the CSharp examples # ----------------------------------------------------------------- @@ -1013,6 +1140,7 @@ LUA_LIB = @LUALINK@ # Extra specific dynamic linking options LUA_DLNK = @LUADYNAMICLINKING@ LUA_SO = @LUA_SO@ +LUA = @LUABIN@ # Extra code for lua static link LUA_INTERP = ../lua.c @@ -1049,6 +1177,13 @@ lua_static_cpp: $(SRCS) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +lua_version: + $(LUA) -v + # ----------------------------------------------------------------- # Cleaning the lua examples # ----------------------------------------------------------------- @@ -1062,6 +1197,8 @@ lua_clean: ##### ALLEGRO CL ###### ################################################################## +ALLEGROCL = @ALLEGROCLBIN@ + allegrocl: $(SRCS) $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) @@ -1072,6 +1209,17 @@ allegrocl_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +allegrocl_version: + $(ALLEGROCL) --version + +# ----------------------------------------------------------------- +# Cleaning the ALLEGRO CL examples +# ----------------------------------------------------------------- + allegrocl_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ @@ -1081,12 +1229,25 @@ allegrocl_clean: ##### CLISP ###### ################################################################## +CLISP = @CLISPBIN@ + clisp: $(SRCS) $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH) clisp_cpp: $(SRCS) $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +clisp_version: + $(CLISP) --version + +# ----------------------------------------------------------------- +# Cleaning the CLISP examples +# ----------------------------------------------------------------- + clisp_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ @@ -1096,6 +1257,8 @@ clisp_clean: ##### CFFI ###### ################################################################## +CFFI = @CFFIBIN@ + cffi: $(SRCS) $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) @@ -1106,6 +1269,17 @@ cffi_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +cffi_version: + $(CFFI) --version + +# ----------------------------------------------------------------- +# Cleaning the CFFI examples +# ----------------------------------------------------------------- + cffi_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ @@ -1115,6 +1289,8 @@ cffi_clean: ##### UFFI ###### ################################################################## +UFFI = @UFFIBIN@ + uffi: $(SRCS) $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH) # $(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) @@ -1125,6 +1301,17 @@ uffi_cpp: $(SRCS) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +uffi_version: + $(UFFI) --version + +# ----------------------------------------------------------------- +# Cleaning the UFFI examples +# ----------------------------------------------------------------- + uffi_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ @@ -1143,6 +1330,10 @@ R_CFLAGS=-fPIC # we get -fPIC # CMD SHLIB stdout is piped to /dev/null to prevent echo of compiler command +# ---------------------------------------------------------------- +# Build a R dynamically loadable module (C) +# ---------------------------------------------------------------- + r: $(SRCS) $(SWIG) -r $(SWIGOPT) $(INTERFACEPATH) ifneq ($(SRCS),) @@ -1150,6 +1341,10 @@ ifneq ($(SRCS),) endif +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) $(OBJS) > /dev/null ) +# ---------------------------------------------------------------- +# Build a R dynamically loadable module (C++) +# ---------------------------------------------------------------- + r_cpp: $(CXXSRCS) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH) ifneq ($(CXXSRCS),) @@ -1157,6 +1352,17 @@ ifneq ($(CXXSRCS),) endif +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null ) +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +r_version: + $(R) --version | grep -i version + +# ----------------------------------------------------------------- +# Cleaning the R examples +# ----------------------------------------------------------------- + r_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ @@ -1172,6 +1378,7 @@ GOGCC = @GOGCC@ GO1 = @GO1@ GOC = @GOC@ GOOPT = @GOOPT@ +GOVERSIONOPTION = @GOVERSIONOPTION@ GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi` GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` @@ -1230,6 +1437,13 @@ go_run: runme.go fi env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +go_version: + $(GO) $(GOVERSIONOPTION) + # ----------------------------------------------------------------- # Cleaning the Go examples # ----------------------------------------------------------------- @@ -1291,6 +1505,14 @@ d_compile: $(SRCS) d_run: env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme +# ----------------------------------------------------------------- +# Version display +# ----------------------------------------------------------------- + +d_version: + # Needs improvement! + echo D version guess - $(D_VERSION) + # ----------------------------------------------------------------- # Clean the D examples # ----------------------------------------------------------------- diff --git a/Examples/test-suite/cffi/Makefile.in b/Examples/test-suite/cffi/Makefile.in index bf21b3552..aa8b40aec 100644 --- a/Examples/test-suite/cffi/Makefile.in +++ b/Examples/test-suite/cffi/Makefile.in @@ -39,7 +39,7 @@ CPP_TEST_CASES = # a file is found which has _runme.lisp appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CFFI) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ fi # Clean: (does nothing, we dont generate extra cffi code) diff --git a/Examples/test-suite/clisp/Makefile.in b/Examples/test-suite/clisp/Makefile.in index 2ebaa6750..24655a60f 100644 --- a/Examples/test-suite/clisp/Makefile.in +++ b/Examples/test-suite/clisp/Makefile.in @@ -39,7 +39,7 @@ CPP_TEST_CASES = # a file is found which has _runme.lisp appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CLISPBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(CLISP) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ fi # Clean: (does nothing, we dont generate extra clisp code) diff --git a/Examples/test-suite/uffi/Makefile.in b/Examples/test-suite/uffi/Makefile.in index d6b948b5d..8ad153961 100644 --- a/Examples/test-suite/uffi/Makefile.in +++ b/Examples/test-suite/uffi/Makefile.in @@ -39,7 +39,7 @@ CPP_TEST_CASES = # a file is found which has _runme.lisp appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(UFFIBIN) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(UFFI) -batch -s $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ fi # Clean: (does nothing, we dont generate extra uffi code) diff --git a/Makefile.in b/Makefile.in index 7ecbfa251..8a6776bf8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -123,6 +123,45 @@ check-aliveness: check-ccache: test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) check) +# Checks / displays versions of each target language +check-versions: \ + check-tcl-version \ + check-perl5-version \ + check-python-version \ + check-java-version \ + check-android-version \ + check-guile-version \ + check-mzscheme-version \ + check-ruby-version \ + check-ocaml-version \ + check-octave-version \ + check-php-version \ + check-pike-version \ + check-chicken-version \ + check-csharp-version \ + check-modula3-version \ + check-lua-version \ + check-allegrocl-version \ + check-clisp-version \ + check-uffi-version \ + check-cffi-version \ + check-r-version \ + check-go-version \ + check-d-version + +# all examples +check-%-version : + @if test -z "$(skip-$*)"; then \ + echo $* unknown; \ + exit 1; \ + fi + @if $(skip-$*); then \ + echo skipping $* version; \ + else \ + echo showing $* version; \ + (cd Examples && $(MAKE) -s $*_version) \ + fi + # Checks examples for compilation (does not run them) check-examples: \ check-tcl-examples \ @@ -252,7 +291,7 @@ partialcheck-test-suite: partialcheck-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 -check: check-aliveness check-ccache check-examples check-test-suite +check: check-aliveness check-ccache check-versions check-examples check-test-suite # Run known-to-be-broken as well as not broken testcases in the test-suite all-test-suite: \ diff --git a/configure.ac b/configure.ac index cfbc09426..65a9c9078 100644 --- a/configure.ac +++ b/configure.ac @@ -1592,7 +1592,7 @@ if test x"${PIKEBIN}" = xno -o x"${with_alllang}" = xno ; then else if test "x$PIKEBIN" = xyes; then - AC_CHECK_PROGS(PIKE, pike pike7.6 pike7.4 pike7.2) + AC_CHECK_PROGS(PIKE, pike pike7.8 pike7.6 pike7.4 pike7.2) else PIKE="$PIKEBIN" fi @@ -2063,6 +2063,7 @@ if test x"${GOBIN}" = xno -o x"${with_alllang}" = xno ; then GO1=false GOGCC=false GOOPT= + GOVERSIONOPTION= else if test "x$GOBIN" = xyes; then @@ -2074,11 +2075,13 @@ else GOGCC=false GO1=false GOOPT= + GOVERSIONOPTION= if test -n "$GO" ; then if $GO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then GOGCC=true + GOVERSIONOPTION=--version AC_MSG_CHECKING([whether gccgo version is too old]) - go_version=`$GO --version | sed -e 's/[^0-9]* \([0-9.]*\) .*$/\1/' -e 's/[.]//g'` + go_version=`$GO $GOVERSIONOPTION | sed -e 's/[^0-9]* \([0-9.]*\) .*$/\1/' -e 's/[.]//g'` if test "$go_version" -lt 470; then AC_MSG_RESULT([yes - minimum version is 4.7.0]) else @@ -2096,8 +2099,9 @@ else fi elif test "`echo $GO | sed -e 's|.*/||'`" = "go"; then GO1=true + GOVERSIONOPTION=version GOC=$(sh -c "$(go env) && echo \$GOCHAR")c - go_version=$($GO version | sed -e 's/go version //') + go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //') case $go_version in go1.0*) GOOPT="-intgosize 32" ;; *) if test "$GOC" = "6c"; then @@ -2109,8 +2113,9 @@ else esac else GOC=`echo $GO | sed -e 's/g/c/'` + GOVERSIONOPTION=-V AC_MSG_CHECKING([whether Go ($GO) version is too old]) - go_version=`$GO -V 2>/dev/null | sed -e 's/.*version.* \([[0-9]]*\).*/\1/'` + go_version=`$GO $GOVERSIONOPTION 2>/dev/null | sed -e 's/.*version.* \([[0-9]]*\).*/\1/'` go_min_version=7077 if test "$go_version" != "" -a "$go_version" -lt $go_min_version; then AC_MSG_RESULT([yes - minimum version is $go_min_version]) @@ -2128,6 +2133,7 @@ AC_SUBST(GO) AC_SUBST(GOC) AC_SUBST(GO1) AC_SUBST(GOOPT) +AC_SUBST(GOVERSIONOPTION) #---------------------------------------------------------------- # Look for D From 970c72b6da18516966ba82c91fa1e3cbb1b5725d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 9 Apr 2013 22:52:54 +0100 Subject: [PATCH 394/538] make check-csharp-version fix for MS compiler --- Examples/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index a3444d284..c234c41ab 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1117,8 +1117,9 @@ csharp_compile: $(SRCS) # Version display # ----------------------------------------------------------------- +# Version check below also works with MS csc.exe which does not understand --version csharp_version: - $(CSHARPCOMPILER) --version || echo "Unknown C# compiler version" + $(CSHARPCOMPILER) --version | grep -i version # ----------------------------------------------------------------- # Cleaning the CSharp examples From 35ab209332bb279cc3f0c25eb5596d21e44a2f90 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 9 Apr 2013 23:52:35 +0100 Subject: [PATCH 395/538] Travis build for top 10 target languages plus gcc and clang SWIG builds. Travis builds patch developed in wsfulton/travis branch --- .travis.yml | 56 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78205c848..abdb54327 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,51 @@ language: cpp compiler: - - gcc - clang + - gcc +env: + - SWIGLANG= matrix: include: - - python: "2.7" - compiler: gcc + - compiler: gcc + env: SWIGLANG=csharp + - compiler: gcc + env: SWIGLANG=go + - compiler: gcc + env: SWIGLANG=java + - compiler: gcc + env: SWIGLANG=lua + - compiler: gcc + env: SWIGLANG=octave SWIGJOBS=-j4 + - compiler: gcc + env: SWIGLANG=perl5 + - compiler: gcc + env: SWIGLANG=php + - compiler: gcc env: SWIGLANG=python - - jdk: oraclejdk6 - compiler: gcc - env: SWIGLANG=java - - jdk: oraclejdk7 - compiler: gcc - env: SWIGLANG=java - - perl: "5.10" - compiler: gcc - env: SWIGLANG=perl - - rvm: 1.8.7 - compiler: gcc + - compiler: gcc env: SWIGLANG=ruby + - compiler: gcc + env: SWIGLANG=tcl + allow_failures: + # None before_install: - - sudo apt-get install libboost-dev -qq + - lsb_release -a + - uname -a + - time sudo apt-get -qq install libboost-dev + - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi + - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed + - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi + - if test "$SWIGLANG" = "octave"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi + - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi + - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi script: - ./autogen.sh && ./configure - - make -s - - echo "SWIGLANG: $SWIGLANG" -# - make -k check-$SWIGLANG-examples check-$SWIGLANG-test-suite + - make -s $SWIGJOBS + - if test -z "$SWIGLANG"; then make -s check-ccache; fi + - ./swig -version + - if test -n "$SWIGLANG"; then make -s check-$SWIGLANG-version; fi + - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-examples; fi + - if test -n "$SWIGLANG"; then make -k $SWIGJOBS check-$SWIGLANG-test-suite; fi branches: only: - master From d0202cbdac17721ebfdf8114a1cb96372d867a4a Mon Sep 17 00:00:00 2001 From: Marvin Greenberg Date: Wed, 10 Apr 2013 18:37:26 +0100 Subject: [PATCH 396/538] Fix typecheck OUTPUT typemaps for Java --- Lib/java/typemaps.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/java/typemaps.i b/Lib/java/typemaps.i index ae2377b70..e71790bcc 100644 --- a/Lib/java/typemaps.i +++ b/Lib/java/typemaps.i @@ -207,8 +207,8 @@ There are no char *OUTPUT typemaps, however you can apply the signed char * type JCALL4(Set##JAVATYPE##ArrayRegion, jenv, $input, 0, 1, &jvalue); } -%typemap(typecheck) TYPE *INOUT = TYPECHECKTYPE; -%typemap(typecheck) TYPE &INOUT = TYPECHECKTYPE; +%typemap(typecheck) TYPE *OUTPUT = TYPECHECKTYPE; +%typemap(typecheck) TYPE &OUTPUT = TYPECHECKTYPE; %enddef OUTPUT_TYPEMAP(bool, jboolean, boolean, Boolean, "[Ljava/lang/Boolean;", jbooleanArray); From a16dc2904603decad54e50f4096e99c3ae26f017 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sun, 14 Apr 2013 06:14:47 +1200 Subject: [PATCH 397/538] Removed unused Printf parameter --- Source/Modules/php.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index fdd335993..bc8a92687 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2591,7 +2591,7 @@ done: } if (!idx) { - Printf(w->code, "zval **args = NULL;\n", idx); + Printf(w->code, "zval **args = NULL;\n"); } else { Printf(w->code, "zval *args[%d];\n", idx); } From 24ff00690f2b1bc36bb8a00c9a236ce1c444e61c Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Sun, 14 Apr 2013 08:03:46 +1200 Subject: [PATCH 398/538] Use ZVAL_STRINGL instead of ZVAL_STRING to set funcname as we know the length at swig-time --- Source/Modules/php.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx index bc8a92687..3cae48383 100644 --- a/Source/Modules/php.cxx +++ b/Source/Modules/php.cxx @@ -2597,7 +2597,8 @@ done: } Printf(w->code, "zval *%s, funcname;\n", Swig_cresult_name()); Printf(w->code, "MAKE_STD_ZVAL(%s);\n", Swig_cresult_name()); - Printf(w->code, "ZVAL_STRING(&funcname, (char *)\"%s\", 0);\n", GetChar(n, "sym:name")); + const char * funcname = GetChar(n, "sym:name"); + Printf(w->code, "ZVAL_STRINGL(&funcname, (char *)\"%s\", %d, 0);\n", funcname, strlen(funcname)); Append(w->code, "if (!swig_self) {\n"); Append(w->code, " SWIG_PHP_Error(E_ERROR, \"this pointer is NULL\");"); Append(w->code, "}\n\n"); From 611acbf94447f51db1583fb4b6a147860803fcfc Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Mon, 15 Apr 2013 22:17:48 +0200 Subject: [PATCH 399/538] Add -MP option for generating phony targets for all dependencies - Modelled on similar option in GCC --- CHANGES.current | 6 ++++++ Source/Modules/main.cxx | 20 ++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index 864fb9a3c..ece451ae2 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,12 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-08: kwwette + Add -MP option to SWIG for generating phony targets for all dependencies. + - Prevents make from complaining if header files have been deleted before + the dependency file has been updated. + - Modelled on similar option in GCC. + 2013-04-09: olly [PHP] Add missing directorin typemap for char* and char[] which fixes director_string testcase failure. diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index d1f3ab274..4076b9206 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -107,6 +107,7 @@ static const char *usage2 = (const char *) "\ -MM - List dependencies, but omit files in SWIG library\n\ -MMD - Like `-MD', but omit files in SWIG library\n\ -module - Set module name to \n\ + -MP - Generate phony targets for all dependencies\n\ -MT - Set the target of the rule emitted by dependency generation\n\ -nocontract - Turn off contract checking\n\ -nocpperraswarn - Do not treat the preprocessor #error statement as #warning\n\ @@ -185,6 +186,7 @@ static int dump_classes = 0; static int werror = 0; static int depend = 0; static int depend_only = 0; +static int depend_phony = 0; static int memory_debug = 0; static int allkw = 0; static DOH *cpps = 0; @@ -712,6 +714,9 @@ void SWIG_getoptions(int argc, char *argv[]) { } else if (strcmp(argv[i], "-MMD") == 0) { depend = 2; Swig_mark_arg(i); + } else if (strcmp(argv[i], "-MP") == 0) { + depend_phony = 1; + Swig_mark_arg(i); } else if (strcmp(argv[i], "-MT") == 0) { Swig_mark_arg(i); if (argv[i + 1]) { @@ -1101,22 +1106,33 @@ int SWIG_main(int argc, char *argv[], Language *l) { Printf(f_dependencies_file, "%s: ", outfile); } List *files = Preprocessor_depend(); + List *phony_targets = NewList(); for (int i = 0; i < Len(files); i++) { int use_file = 1; if (depend == 2) { if ((Strncmp(Getitem(files, i), SwigLib, Len(SwigLib)) == 0) || (SwigLibWinUnix && (Strncmp(Getitem(files, i), SwigLibWinUnix, Len(SwigLibWinUnix)) == 0))) use_file = 0; } - if (use_file) - Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); + if (use_file) { + Printf(f_dependencies_file, "\\\n %s ", Getitem(files, i)); + if (depend_phony) + Append(phony_targets, Getitem(files, i)); + } } Printf(f_dependencies_file, "\n"); + if (depend_phony) { + for (int i = 0; i < Len(phony_targets); i++) { + Printf(f_dependencies_file, "\n%s:\n", Getitem(phony_targets, i)); + } + } + if (f_dependencies_file != stdout) Delete(f_dependencies_file); if (depend_only) SWIG_exit(EXIT_SUCCESS); Delete(inputfile_filename); Delete(basename); + Delete(phony_targets); } else { Printf(stderr, "Cannot generate dependencies with -nopreprocess\n"); // Actually we could but it would be inefficient when just generating dependencies, as it would be done after Swig_cparse From 25eaee49f3cb4348e71b66144e9ba541c0632fa5 Mon Sep 17 00:00:00 2001 From: "Brant K. Kyser" Date: Mon, 15 Apr 2013 13:38:40 -0500 Subject: [PATCH 400/538] Add check for smart pointer type in generated code for director connection. This fixes a crash in the generated code caused by the dynamic_cast returning 0 because the specified types are incorrect for smart pointer types. Add runtime test to the C# test suite's director smartptr test that demonstrates crash in generated code when directors are used with smart pointer types. Closes #34 --- .../csharp/director_smartptr_runme.cs | 41 +++++++++++++++++++ Source/Modules/csharp.cxx | 14 ++++++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 Examples/test-suite/csharp/director_smartptr_runme.cs diff --git a/Examples/test-suite/csharp/director_smartptr_runme.cs b/Examples/test-suite/csharp/director_smartptr_runme.cs new file mode 100644 index 000000000..ad33c4d34 --- /dev/null +++ b/Examples/test-suite/csharp/director_smartptr_runme.cs @@ -0,0 +1,41 @@ +using director_smartptrNamespace; + +public class runme +{ + + private class director_smartptr_MyBarFoo : Foo + { + public override string ping() + { + return "director_smartptr_MyBarFoo.ping();"; + } + + public override string pong() + { + return "director_smartptr_MyBarFoo.pong();" + ping(); + } + + public override string fooBar(FooBar fooBar) + { + return fooBar.FooBarDo(); + } + + public override Foo makeFoo() + { + return new Foo(); + } + + public override FooBar makeFooBar() + { + return new FooBar(); + } + } + + static void Main() + { + director_smartptr_MyBarFoo myBarFoo = + new director_smartptr_MyBarFoo(); + + myBarFoo.ping(); + } +} diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 4ef62d2cc..2050f36db 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -3382,6 +3382,7 @@ public: String *qualified_classname = Copy(sym_name); String *nspace = getNSpace(); String *dirClassName = directorClassName(n); + String *smartptr_feature = Getattr(n, "feature:smartptr"); if (nspace) Insert(qualified_classname, 0, NewStringf("%s.", nspace)); @@ -3392,8 +3393,17 @@ public: Wrapper *code_wrap = NewWrapper(); Printf(code_wrap->def, "SWIGEXPORT void SWIGSTDCALL %s(void *objarg", wname); - Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", norm_name, norm_name); - Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); + if (Len(smartptr_feature)) { + Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", smartptr_feature, smartptr_feature); + Printf(code_wrap->code, " // Keep a local instance of the smart pointer around while we are using the raw pointer\n"); + Printf(code_wrap->code, " // Avoids using smart pointer specific API.\n"); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName); + } + else { + Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", norm_name, norm_name); + Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj);\n", dirClassName, dirClassName); + } + // TODO: if statement not needed?? - Java too Printf(code_wrap->code, " if (director) {\n"); Printf(code_wrap->code, " director->swig_connect_director("); From 296498c15925217ccd5dfe6cf8fa59b6d78c1270 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 17 Apr 2013 21:47:36 +0100 Subject: [PATCH 401/538] Cosmetic tidyup in smartptr feature code and document smartptr fix in previous commit --- CHANGES.current | 3 +++ Source/Modules/csharp.cxx | 6 +++--- Source/Modules/java.cxx | 14 +++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index ece451ae2..254ecf8ba 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-17: wsfulton + [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors. + 2013-04-08: kwwette Add -MP option to SWIG for generating phony targets for all dependencies. - Prevents make from complaining if header files have been deleted before diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx index 2050f36db..6d5c570b1 100644 --- a/Source/Modules/csharp.cxx +++ b/Source/Modules/csharp.cxx @@ -3382,7 +3382,7 @@ public: String *qualified_classname = Copy(sym_name); String *nspace = getNSpace(); String *dirClassName = directorClassName(n); - String *smartptr_feature = Getattr(n, "feature:smartptr"); + String *smartptr = Getattr(n, "feature:smartptr"); if (nspace) Insert(qualified_classname, 0, NewStringf("%s.", nspace)); @@ -3393,8 +3393,8 @@ public: Wrapper *code_wrap = NewWrapper(); Printf(code_wrap->def, "SWIGEXPORT void SWIGSTDCALL %s(void *objarg", wname); - if (Len(smartptr_feature)) { - Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", smartptr_feature, smartptr_feature); + if (Len(smartptr)) { + Printf(code_wrap->code, " %s *obj = (%s *)objarg;\n", smartptr, smartptr); Printf(code_wrap->code, " // Keep a local instance of the smart pointer around while we are using the raw pointer\n"); Printf(code_wrap->code, " // Avoids using smart pointer specific API.\n"); Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index f351c91a3..dbd110d56 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -3389,7 +3389,7 @@ public: String *norm_name = SwigType_namestr(Getattr(n, "name")); String *swig_director_connect = Swig_name_member(getNSpace(), proxy_class_name, "director_connect"); String *swig_director_connect_jni = makeValidJniName(swig_director_connect); - String *smartptr_feature = Getattr(n, "feature:smartptr"); + String *smartptr = Getattr(n, "feature:smartptr"); String *dirClassName = directorClassName(n); Wrapper *code_wrap; @@ -3401,15 +3401,11 @@ public: "SWIGEXPORT void JNICALL Java_%s%s_%s(JNIEnv *jenv, jclass jcls, jobject jself, jlong objarg, jboolean jswig_mem_own, " "jboolean jweak_global) {\n", jnipackage, jni_imclass_name, swig_director_connect_jni); - if (Len(smartptr_feature)) { - Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", smartptr_feature, smartptr_feature); + if (Len(smartptr)) { + Printf(code_wrap->code, " %s *obj = *((%s **)&objarg);\n", smartptr, smartptr); Printf(code_wrap->code, " (void)jcls;\n"); - Printf(code_wrap->code, " // NOTE: Pulling the raw pointer out of the smart pointer as the following code does\n"); - Printf(code_wrap->code, " // is generally a bad idea. However, in this case we keep a local instance of the\n"); - Printf(code_wrap->code, " // smart pointer around while we are using the raw pointer, which should keep the\n"); - Printf(code_wrap->code, " // raw pointer alive. This is done instead of using the smart pointer's dynamic cast\n"); - Printf(code_wrap->code, " // feature since different smart pointer implementations have differently named dynamic\n"); - Printf(code_wrap->code, " // cast mechanisms.\n"); + Printf(code_wrap->code, " // Keep a local instance of the smart pointer around while we are using the raw pointer\n"); + Printf(code_wrap->code, " // Avoids using smart pointer specific API.\n"); Printf(code_wrap->code, " %s *director = dynamic_cast<%s *>(obj->operator->());\n", dirClassName, dirClassName); } else { From 2a3e687c19385bb516b89343ffa0f347465ade82 Mon Sep 17 00:00:00 2001 From: Karl Wette Date: Tue, 16 Apr 2013 11:11:20 +0200 Subject: [PATCH 402/538] Octave: fix bugs in output of cleanup code Closes #35 --- CHANGES.current | 6 ++++++ Source/Modules/octave.cxx | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index 254ecf8ba..926096cab 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -8,6 +8,12 @@ Version 2.0.10 (in progress) 2013-04-17: wsfulton [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors. +2013-04-15: kwwette + [Octave] Fix bugs in output of cleanup code. + - Cleanup code is now written also after the "fail:" label, so it will be called if + a SWIG_exception is raised by the wrapping function, consistent with other modules. + - Octave module now also recognises the "$cleanup" special variable, if needed. + 2013-04-08: kwwette Add -MP option to SWIG for generating phony targets for all dependencies. - Prevents make from complaining if header files have been deleted before diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx index a9be76fc2..bf2552a30 100644 --- a/Source/Modules/octave.cxx +++ b/Source/Modules/octave.cxx @@ -744,10 +744,15 @@ public: Delete(tm); } - Printf(f->code, "fail:\n"); // we should free locals etc if this happens Printf(f->code, "return _out;\n"); + Printf(f->code, "fail:\n"); // we should free locals etc if this happens + Printv(f->code, cleanup, NIL); + Printf(f->code, "return octave_value_list();\n"); Printf(f->code, "}\n"); + /* Substitute the cleanup code */ + Replaceall(f->code, "$cleanup", cleanup); + Replaceall(f->code, "$symname", iname); Wrapper_print(f, f_wrappers); DelWrapper(f); From 857e447654c72184a9bace33ec3ad33ddb354c1d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 18 Apr 2013 22:47:41 +0100 Subject: [PATCH 403/538] Fix syntax error when preprocessor macros are defined inside of enum lists Fixes SF Bug 428, Patch 333 --- CHANGES.current | 10 ++ Examples/test-suite/common.mk | 1 + Examples/test-suite/enum_macro.i | 92 ++++++++++++++++++ .../test-suite/java/enum_macro_runme.java | 93 +++++++++++++++++++ Source/CParse/parser.y | 46 ++++----- 5 files changed, 220 insertions(+), 22 deletions(-) create mode 100644 Examples/test-suite/enum_macro.i create mode 100644 Examples/test-suite/java/enum_macro_runme.java diff --git a/CHANGES.current b/CHANGES.current index 926096cab..4c1e55bc0 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,16 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-18: wsfulton + Fix SF Bug #428 - Syntax error when preprocessor macros are defined inside of enum lists, such as: + + typedef enum { + eZero = 0 + #define ONE 1 + } EFoo; + + The macros are silently ignored. + 2013-04-17: wsfulton [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors. diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk index 83be90d2d..793055097 100644 --- a/Examples/test-suite/common.mk +++ b/Examples/test-suite/common.mk @@ -514,6 +514,7 @@ C_TEST_CASES += \ empty \ enums \ enum_forward \ + enum_macro \ extern_declaration \ funcptr \ function_typedef \ diff --git a/Examples/test-suite/enum_macro.i b/Examples/test-suite/enum_macro.i new file mode 100644 index 000000000..b18e02a84 --- /dev/null +++ b/Examples/test-suite/enum_macro.i @@ -0,0 +1,92 @@ +%module enum_macro + +%inline %{ +enum Greeks1 +{ +#define GREEK1 -1 + alpha1=1, + beta1, + theta1 +}; + +enum Greeks2 +{ + alpha2 = 2, +#define GREEK2 -2 + beta2, + theta2 +}; + +enum Greeks3 +{ + alpha3, + beta3, +#define GREEK3 -3 + theta3 +}; + +enum Greeks4 +{ + alpha4 = 4, + beta4 = 5, + theta4 = 6 +#define GREEK4 -4 +}; + +enum Greeks5 +{ +#define GREEK5 -5 + alpha5, + beta5, +}; + +enum Greeks6 +{ + alpha6, +#define GREEK6 -6 + beta6, +}; + +enum Greeks7 +{ + alpha7, + beta7, +#define GREEK7 -7 +}; + +enum Greeks8 +{ +#define GREEK8 -8 + theta8 +}; + +enum Greeks9 +{ + theta9 +#define GREEK9 -9 +}; + +enum Greeks10 +{ +#define GREEK10 -10 + theta10, +}; + +enum Greeks11 +{ + theta11, +#define GREEK11 -11 +}; + +typedef enum { + theta12 = 0 +#define GREEK12 -12 +} Greeks12; +%} + + +enum Greeks13 +{ +#define GREEK13 -13 +}; + diff --git a/Examples/test-suite/java/enum_macro_runme.java b/Examples/test-suite/java/enum_macro_runme.java new file mode 100644 index 000000000..4ac7409ee --- /dev/null +++ b/Examples/test-suite/java/enum_macro_runme.java @@ -0,0 +1,93 @@ + +import enum_macro.*; + +public class enum_macro_runme { + + static { + try { + System.loadLibrary("enum_macro"); + } 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[]) + { + { + Greeks1 a = Greeks1.alpha1; + a = Greeks1.beta1; + a = Greeks1.theta1; + if (a.swigValue() != 3) + throw new RuntimeException("Greeks1"); + } + { + Greeks2 a = Greeks2.alpha2; + a = Greeks2.beta2; + a = Greeks2.theta2; + if (a.swigValue() != 4) + throw new RuntimeException("Greeks2"); + } + { + Greeks3 a = Greeks3.alpha3; + a = Greeks3.beta3; + a = Greeks3.theta3; + if (a.swigValue() != 2) + throw new RuntimeException("Greeks3"); + } + { + Greeks4 a = Greeks4.alpha4; + a = Greeks4.beta4; + a = Greeks4.theta4; + if (a.swigValue() != 6) + throw new RuntimeException("Greeks4"); + } + { + Greeks5 a = Greeks5.alpha5; + a = Greeks5.beta5; + if (a.swigValue() != 1) + throw new RuntimeException("Greeks5"); + } + { + Greeks6 a = Greeks6.alpha6; + a = Greeks6.beta6; + if (a.swigValue() != 1) + throw new RuntimeException("Greeks6"); + } + { + Greeks7 a = Greeks7.alpha7; + a = Greeks7.beta7; + if (a.swigValue() != 1) + throw new RuntimeException("Greeks7"); + } + { + Greeks8 a = Greeks8.theta8; + if (a.swigValue() != 0) + throw new RuntimeException("Greeks8"); + } + { + Greeks9 a = Greeks9.theta9; + if (a.swigValue() != 0) + throw new RuntimeException("Greeks9"); + } + { + Greeks10 a = Greeks10.theta10; + if (a.swigValue() != 0) + throw new RuntimeException("Greeks10"); + } + { + Greeks11 a = Greeks11.theta11; + if (a.swigValue() != 0) + throw new RuntimeException("Greeks11"); + } + { + Greeks12 a = Greeks12.theta12; + if (a.swigValue() != 0) + throw new RuntimeException("Greeks12"); + } + { + Greeks13 a = null; + } + } +} + diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index 74d41079c..92c518e1f 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1788,6 +1788,7 @@ static void tag_nodes(Node *n, const_String_or_char_ptr attrname, DOH *value) { %type type_specifier primitive_type_list ; %type fname stringtype; %type featattr; +%type optional_constant_directive; %% @@ -5647,29 +5648,31 @@ definetype : { /* scanner_check_typedef(); */ } expr { /* Some stuff for handling enums */ ename : ID { $$ = $1; } - | empty { $$ = (char *) 0;} - ; + | empty { $$ = (char *) 0;} + ; -enumlist : enumlist COMMA edecl { +optional_constant_directive : constant_directive { $$ = $1; } + | empty { $$ = 0; } + ; - /* Ignore if there is a trailing comma in the enum list */ - if ($3) { - Node *leftSibling = Getattr($1,"_last"); - if (!leftSibling) { - leftSibling=$1; - } - set_nextSibling(leftSibling,$3); - Setattr($1,"_last",$3); - } - $$ = $1; - } - | edecl { - $$ = $1; - if ($1) { - Setattr($1,"_last",$1); - } - } - ; +/* Enum lists - any #define macros (constant directives) within the enum list are ignored. Trailing commas accepted. */ +enumlist : enumlist COMMA optional_constant_directive edecl optional_constant_directive { + Node *leftSibling = Getattr($1,"_last"); + set_nextSibling(leftSibling,$4); + Setattr($1,"_last",$4); + $$ = $1; + } + | enumlist COMMA optional_constant_directive { + $$ = $1; + } + | optional_constant_directive edecl optional_constant_directive { + Setattr($2,"_last",$2); + $$ = $2; + } + | optional_constant_directive { + $$ = 0; + } + ; edecl : ID { SwigType *type = NewSwigType(T_INT); @@ -5689,7 +5692,6 @@ edecl : ID { Setattr($$,"value",$1); Delete(type); } - | empty { $$ = 0; } ; etype : expr { From 9be3235988d73cc9445e633105d0146bb3c4acf5 Mon Sep 17 00:00:00 2001 From: Jesus Lopez Date: Mon, 15 Apr 2013 09:31:23 -0700 Subject: [PATCH 404/538] Support $descriptor() macro in fragments Closes #36 --- .../python/special_variable_macros_runme.py | 2 ++ Examples/test-suite/special_variable_macros.i | 19 +++++++++++++++++++ Source/Swig/fragment.c | 2 ++ 3 files changed, 23 insertions(+) diff --git a/Examples/test-suite/python/special_variable_macros_runme.py b/Examples/test-suite/python/special_variable_macros_runme.py index 07e60dfa2..eaf9c1858 100644 --- a/Examples/test-suite/python/special_variable_macros_runme.py +++ b/Examples/test-suite/python/special_variable_macros_runme.py @@ -9,6 +9,8 @@ if special_variable_macros.testJill(name) != "jilly": raise "test failed" if special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap": raise "test failed" +if special_variable_macros.testJames(name) != "SWIGTYPE_Name": + raise "test failed" if special_variable_macros.testJim(name) != "multiname num": raise "test failed" if special_variable_macros.testJohn(special_variable_macros.PairIntBool(10, False)) != 123: diff --git a/Examples/test-suite/special_variable_macros.i b/Examples/test-suite/special_variable_macros.i index 65f5496eb..ddd068cc0 100644 --- a/Examples/test-suite/special_variable_macros.i +++ b/Examples/test-suite/special_variable_macros.i @@ -62,6 +62,14 @@ private: /*%typemap(in) NameWrap *NAMEWRAP end */ %} +// check $descriptor gets expanded properly when used in a fragment +%fragment("nameDescriptor", "header") +%{ +/*%fragment("getNameDescriptor", "header") start */ +static const char *nameDescriptor = "$descriptor(Name)"; +/*%fragment("getNameDescriptor", "header") end */ +%} + ////////////////////////////////////////////////////////////////////////////////////// @@ -86,6 +94,14 @@ $typemap(in, NameWrap *NAMEWRAP) // %typemap(in) Name *mary end } +%typemap(in, fragment="nameDescriptor") Name *james (Name temp) { + // %typemap(in) Name *james start + temp = Name(nameDescriptor); + (void)$input; + $1 = &temp; + // %typemap(in) Name *james end +} + %inline %{ const char * testFred(Name *fred) { return fred->getName(); @@ -99,6 +115,9 @@ const char * testJill(Name *jill) { const char * testMary(Name *mary) { return mary->getName(); } +const char * testJames(Name *james) { + return james->getName(); +} %} ////////////////////////////////////////////////////////////////////////////////////// diff --git a/Source/Swig/fragment.c b/Source/Swig/fragment.c index 15f701ae4..025994a84 100644 --- a/Source/Swig/fragment.c +++ b/Source/Swig/fragment.c @@ -60,6 +60,8 @@ void Swig_fragment_register(Node *fragment) { } Setfile(ccode, Getfile(fragment)); Setline(ccode, Getline(fragment)); + /* Replace $descriptor() macros */ + Swig_cparse_replace_descriptor(ccode); Setattr(fragments, name, ccode); if (debug) Printf(stdout, "registering fragment %s %s\n", name, section); From 439a353a3686c97fa0b077fad8ce0c06326c1c95 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 18 Apr 2013 23:20:48 +0100 Subject: [PATCH 405/538] Document patch #33 from previous commit and complete run time tests --- CHANGES.current | 13 +++++++++++++ .../csharp/special_variable_macros_runme.cs | 2 ++ .../test-suite/d/special_variable_macros_runme.1.d | 4 ++++ .../test-suite/d/special_variable_macros_runme.2.d | 1 + .../test-suite/go/special_variable_macros_runme.go | 3 +++ .../java/special_variable_macros_runme.java | 2 ++ Source/Swig/fragment.c | 1 + 7 files changed, 26 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 4c1e55bc0..5022a3030 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,19 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-18: wsfulton + Apply Patch #36 from Jesus Lopez to add support for $descriptor() special variable macro expansion + in fragments. For example: + + %fragment("nameDescriptor", "header") + %{ + static const char *nameDescriptor = "$descriptor(Name)"; + %} + + which will generate into the wrapper if the fragment is used: + + static const char *nameDescriptor = "SWIGTYPE_Name"; + 2013-04-18: wsfulton Fix SF Bug #428 - Syntax error when preprocessor macros are defined inside of enum lists, such as: diff --git a/Examples/test-suite/csharp/special_variable_macros_runme.cs b/Examples/test-suite/csharp/special_variable_macros_runme.cs index bd6fd4b04..1845cd074 100644 --- a/Examples/test-suite/csharp/special_variable_macros_runme.cs +++ b/Examples/test-suite/csharp/special_variable_macros_runme.cs @@ -12,6 +12,8 @@ public class runme { throw new Exception("test failed"); if (special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap") throw new Exception("test failed"); + if (special_variable_macros.testJames(name) != "SWIGTYPE_Name") + throw new Exception("test failed"); if (special_variable_macros.testJim(name) != "multiname num") throw new Exception("test failed"); if (special_variable_macros.testJohn(new PairIntBool(10, false)) != 123) diff --git a/Examples/test-suite/d/special_variable_macros_runme.1.d b/Examples/test-suite/d/special_variable_macros_runme.1.d index 12491eef5..eab0331cc 100644 --- a/Examples/test-suite/d/special_variable_macros_runme.1.d +++ b/Examples/test-suite/d/special_variable_macros_runme.1.d @@ -24,6 +24,10 @@ void main() { throw new Exception("test failed"); } + if (testJames(name) != "SWIGTYPE_Name") { + throw new Exception("test failed"); + } + if (testJim(name) != "multiname num") { throw new Exception("test failed"); } diff --git a/Examples/test-suite/d/special_variable_macros_runme.2.d b/Examples/test-suite/d/special_variable_macros_runme.2.d index 128e5870f..0bc4c0cc7 100644 --- a/Examples/test-suite/d/special_variable_macros_runme.2.d +++ b/Examples/test-suite/d/special_variable_macros_runme.2.d @@ -12,6 +12,7 @@ void main() { enforce(testJack(name) == "$specialname"); enforce(testJill(name) == "jilly"); enforce(testMary(name) == "SWIGTYPE_p_NameWrap"); + enforce(testJames(name) == "SWIGTYPE_Name"); enforce(testJim(name) == "multiname num"); enforce(testJohn(new PairIntBool(10, false)) == 123); diff --git a/Examples/test-suite/go/special_variable_macros_runme.go b/Examples/test-suite/go/special_variable_macros_runme.go index d049af606..c4f687ea9 100644 --- a/Examples/test-suite/go/special_variable_macros_runme.go +++ b/Examples/test-suite/go/special_variable_macros_runme.go @@ -16,6 +16,9 @@ func main() { if special_variable_macros.TestMary(name) != "SWIGTYPE_p_NameWrap" { panic("test failed") } + if special_variable_macros.TestJames(name) != "SWIGTYPE_Name" { + panic("test failed") + } if special_variable_macros.TestJim(name) != "multiname num" { panic("test failed") } diff --git a/Examples/test-suite/java/special_variable_macros_runme.java b/Examples/test-suite/java/special_variable_macros_runme.java index d7f8070b3..1cd50e96e 100644 --- a/Examples/test-suite/java/special_variable_macros_runme.java +++ b/Examples/test-suite/java/special_variable_macros_runme.java @@ -22,6 +22,8 @@ public class special_variable_macros_runme { throw new RuntimeException("test failed"); if (!special_variable_macros.testMary(name).equals("SWIGTYPE_p_NameWrap")) throw new RuntimeException("test failed"); + if (!special_variable_macros.testJames(name).equals("SWIGTYPE_Name")) + throw new RuntimeException("test failed"); if (!special_variable_macros.testJim(name).equals("multiname num")) throw new RuntimeException("test failed"); if (special_variable_macros.testJohn(new PairIntBool(10, false)) != 123) diff --git a/Source/Swig/fragment.c b/Source/Swig/fragment.c index 025994a84..927c772b8 100644 --- a/Source/Swig/fragment.c +++ b/Source/Swig/fragment.c @@ -18,6 +18,7 @@ #include "swig.h" #include "swigwarn.h" +#include "cparse.h" static Hash *fragments = 0; static Hash *looking_fragments = 0; From 4bbc881a9fca57574ed8217561289173df1c7e94 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 20:00:06 +0100 Subject: [PATCH 406/538] .gitignore tweaks --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 800ac4669..a35ad66c6 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ CCache/autom4te.cache/ CCache/config.h.in CCache/configure Source/Include/swigconfig.h.in +Source/Include/swigconfig.h.in~ Source/Makefile.in Tools/config/compile Tools/config/config.guess From 9f9eb66fa4dbe2c32684c532c7875c1b0ae14b6f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 20:05:43 +0100 Subject: [PATCH 407/538] Add an examples scratch directory into .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a35ad66c6..877d2b2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,5 @@ Examples/test-suite/uffi/*/ *_runme.exe.mdb *_runme.exe +# Scratch directories +Examples/scratch From 635a90c91c4eea575b47c6453ccbd501e935cdf6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 20:07:54 +0100 Subject: [PATCH 408/538] Add RUNPIPE in makefiles - a generic mechanism for suppressing stdout when running the examples - the idea is to run 'make check-examples' which runs the examples but suppresses the output except for errors. Initial implementation for Java. --- Examples/Makefile.in | 13 ++++++++++++- Makefile.in | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c234c41ab..535ea55ae 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -46,6 +46,10 @@ LIBPREFIX = RUNTOOL = # COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing COMPILETOOL= +# RUNPIPE is for piping output of running interpreter/compiled code somewhere, eg RUNPIPE=\>/dev/null +RUNPIPE= + +RUNME = runme # X11 options @@ -543,6 +547,13 @@ java_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) +# ----------------------------------------------------------------- +# Run java example +# ----------------------------------------------------------------- + +java_run: + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(JAVA) $(RUNME) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -556,7 +567,7 @@ java_version: # ----------------------------------------------------------------- java_clean: - rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v runme.java` + rm -f *_wrap* *~ .~* *.class `find . -name \*.java | grep -v $(RUNME).java` rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@JAVASO@ diff --git a/Makefile.in b/Makefile.in index 8a6776bf8..04d65a107 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,7 +229,7 @@ check-%-examples : # individual example %.actionexample: @echo $(ACTION)ing Examples/$(LANGUAGE)/$* - @(cd Examples/$(LANGUAGE)/$* && $(MAKE) -s $(chk-set-env) $(ACTION)) + @(cd Examples/$(LANGUAGE)/$* && $(MAKE) -s $(chk-set-env) $(ACTION) RUNPIPE=\>/dev/null) # gcj individual example java.actionexample: From 05adcee56f0e6730ab15ca80f010ffe37194c718 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 20:08:49 +0100 Subject: [PATCH 409/538] Run java examples during 'make check-examples' --- Examples/Makefile.in | 2 +- Examples/java/callback/Makefile | 9 ++++----- Examples/java/class/Makefile | 9 ++++----- Examples/java/constants/Makefile | 9 ++++----- Examples/java/enum/Makefile | 9 ++++----- Examples/java/extend/Makefile | 9 ++++----- Examples/java/funcptr/Makefile | 9 ++++----- Examples/java/multimap/Makefile | 9 ++++----- Examples/java/native/Makefile | 9 ++++----- Examples/java/pointer/Makefile | 9 ++++----- Examples/java/reference/Makefile | 9 ++++----- Examples/java/simple/Makefile | 9 ++++----- Examples/java/template/Makefile | 9 ++++----- Examples/java/typemap/Makefile | 9 ++++----- Examples/java/variables/Makefile | 9 ++++----- 15 files changed, 57 insertions(+), 71 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 535ea55ae..91aab1c83 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -552,7 +552,7 @@ java_cpp: $(SRCS) # ----------------------------------------------------------------- java_run: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(JAVA) $(RUNME) $(RUNPIPE) + env LD_LIBRARY_PATH=. $(RUNTOOL) $(JAVA) $(RUNME) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/java/callback/Makefile b/Examples/java/callback/Makefile index 14c301703..c4d4d0e36 100644 --- a/Examples/java/callback/Makefile +++ b/Examples/java/callback/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/class/Makefile b/Examples/java/class/Makefile index 14c301703..c4d4d0e36 100644 --- a/Examples/java/class/Makefile +++ b/Examples/java/class/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/constants/Makefile b/Examples/java/constants/Makefile index 2b3d35c6a..0c7c16349 100644 --- a/Examples/java/constants/Makefile +++ b/Examples/java/constants/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/enum/Makefile b/Examples/java/enum/Makefile index 14c301703..c4d4d0e36 100644 --- a/Examples/java/enum/Makefile +++ b/Examples/java/enum/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/extend/Makefile b/Examples/java/extend/Makefile index 14c301703..c4d4d0e36 100644 --- a/Examples/java/extend/Makefile +++ b/Examples/java/extend/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/funcptr/Makefile b/Examples/java/funcptr/Makefile index 968c92c6c..ce51a1c74 100644 --- a/Examples/java/funcptr/Makefile +++ b/Examples/java/funcptr/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/multimap/Makefile b/Examples/java/multimap/Makefile index 968c92c6c..ce51a1c74 100644 --- a/Examples/java/multimap/Makefile +++ b/Examples/java/multimap/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/native/Makefile b/Examples/java/native/Makefile index 92afbd4d0..39e8f6d7f 100644 --- a/Examples/java/native/Makefile +++ b/Examples/java/native/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/pointer/Makefile b/Examples/java/pointer/Makefile index 968c92c6c..ce51a1c74 100644 --- a/Examples/java/pointer/Makefile +++ b/Examples/java/pointer/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/reference/Makefile b/Examples/java/reference/Makefile index 14c301703..c4d4d0e36 100644 --- a/Examples/java/reference/Makefile +++ b/Examples/java/reference/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/simple/Makefile b/Examples/java/simple/Makefile index 968c92c6c..ce51a1c74 100644 --- a/Examples/java/simple/Makefile +++ b/Examples/java/simple/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/template/Makefile b/Examples/java/template/Makefile index 2b3d35c6a..0c7c16349 100644 --- a/Examples/java/template/Makefile +++ b/Examples/java/template/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/typemap/Makefile b/Examples/java/typemap/Makefile index 92afbd4d0..39e8f6d7f 100644 --- a/Examples/java/typemap/Makefile +++ b/Examples/java/typemap/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all diff --git a/Examples/java/variables/Makefile b/Examples/java/variables/Makefile index 968c92c6c..ce51a1c74 100644 --- a/Examples/java/variables/Makefile +++ b/Examples/java/variables/Makefile @@ -5,14 +5,13 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: java +check: build + $(MAKE) -f $(TOP)/Makefile java_run -java:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java javac *.java -clean:: +clean: $(MAKE) -f $(TOP)/Makefile java_clean - -check: all From 8713199267acea20d0fa1fe5841afdb90e8427ab Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 22:22:36 +0100 Subject: [PATCH 410/538] Move javac compile for examples into common Makefile for examples --- Examples/Makefile.in | 7 +++++++ Examples/java/callback/Makefile | 3 ++- Examples/java/class/Makefile | 3 ++- Examples/java/constants/Makefile | 3 ++- Examples/java/enum/Makefile | 3 ++- Examples/java/extend/Makefile | 3 ++- Examples/java/funcptr/Makefile | 3 ++- Examples/java/multimap/Makefile | 3 ++- Examples/java/native/Makefile | 3 ++- Examples/java/pointer/Makefile | 3 ++- Examples/java/reference/Makefile | 3 ++- Examples/java/simple/Makefile | 3 ++- Examples/java/template/Makefile | 3 ++- Examples/java/typemap/Makefile | 3 ++- Examples/java/variables/Makefile | 3 ++- 15 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 91aab1c83..24e1e6a5e 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -547,6 +547,13 @@ java_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE) $(JAVACXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO) +# ---------------------------------------------------------------- +# Compile java files +# ---------------------------------------------------------------- + +java_compile: $(SRCS) + $(COMPILETOOL) $(JAVAC) $(JAVACFLAGS) $(JAVASRCS) + # ----------------------------------------------------------------- # Run java example # ----------------------------------------------------------------- diff --git a/Examples/java/callback/Makefile b/Examples/java/callback/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/callback/Makefile +++ b/Examples/java/callback/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/class/Makefile b/Examples/java/class/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/class/Makefile +++ b/Examples/java/class/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/constants/Makefile b/Examples/java/constants/Makefile index 0c7c16349..97c5b673c 100644 --- a/Examples/java/constants/Makefile +++ b/Examples/java/constants/Makefile @@ -4,6 +4,7 @@ CXXSRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/enum/Makefile b/Examples/java/enum/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/enum/Makefile +++ b/Examples/java/enum/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/extend/Makefile b/Examples/java/extend/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/extend/Makefile +++ b/Examples/java/extend/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/funcptr/Makefile b/Examples/java/funcptr/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/funcptr/Makefile +++ b/Examples/java/funcptr/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/multimap/Makefile b/Examples/java/multimap/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/multimap/Makefile +++ b/Examples/java/multimap/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/native/Makefile b/Examples/java/native/Makefile index 39e8f6d7f..29d5a082a 100644 --- a/Examples/java/native/Makefile +++ b/Examples/java/native/Makefile @@ -4,6 +4,7 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/pointer/Makefile b/Examples/java/pointer/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/pointer/Makefile +++ b/Examples/java/pointer/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/reference/Makefile b/Examples/java/reference/Makefile index c4d4d0e36..8f274e7cb 100644 --- a/Examples/java/reference/Makefile +++ b/Examples/java/reference/Makefile @@ -4,6 +4,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/simple/Makefile b/Examples/java/simple/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/simple/Makefile +++ b/Examples/java/simple/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/template/Makefile b/Examples/java/template/Makefile index 0c7c16349..97c5b673c 100644 --- a/Examples/java/template/Makefile +++ b/Examples/java/template/Makefile @@ -4,6 +4,7 @@ CXXSRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java_cpp - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/typemap/Makefile b/Examples/java/typemap/Makefile index 39e8f6d7f..29d5a082a 100644 --- a/Examples/java/typemap/Makefile +++ b/Examples/java/typemap/Makefile @@ -4,6 +4,7 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean diff --git a/Examples/java/variables/Makefile b/Examples/java/variables/Makefile index ce51a1c74..e9e29f3a3 100644 --- a/Examples/java/variables/Makefile +++ b/Examples/java/variables/Makefile @@ -4,6 +4,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = +JAVASRCS = *.java check: build $(MAKE) -f $(TOP)/Makefile java_run @@ -11,7 +12,7 @@ check: build build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' java - javac *.java + $(MAKE) -f $(TOP)/Makefile JAVASRCS='$(JAVASRCS)' JAVAFLAGS='$(JAVAFLAGS)' java_compile clean: $(MAKE) -f $(TOP)/Makefile java_clean From 760c398c49c692d956fa307941722fa072919968 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 20:22:12 +0100 Subject: [PATCH 411/538] Run csharp examples during 'make check-examples' --- Examples/Makefile.in | 8 ++++++++ Examples/csharp/arrays/Makefile | 9 ++++----- Examples/csharp/callback/Makefile | 9 ++++----- Examples/csharp/class/Makefile | 9 ++++----- Examples/csharp/enum/Makefile | 9 ++++----- Examples/csharp/extend/Makefile | 9 ++++----- Examples/csharp/funcptr/Makefile | 9 ++++----- Examples/csharp/reference/Makefile | 9 ++++----- Examples/csharp/simple/Makefile | 9 ++++----- Examples/csharp/template/Makefile | 9 ++++----- Examples/csharp/variables/Makefile | 9 ++++----- 11 files changed, 48 insertions(+), 50 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 24e1e6a5e..b5824eb43 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1105,6 +1105,7 @@ CSHARPCOMPILER = @CSHARPCOMPILER@ CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@ CSHARPCFLAGS = @CSHARPCFLAGS@ CSHARPSO = @CSHARPSO@ +CSHARP_RUNME = ./$(RUNME).exe # ---------------------------------------------------------------- # Build a CSharp dynamically loadable module (C) @@ -1131,6 +1132,13 @@ csharp_cpp: $(SRCS) csharp_compile: $(SRCS) $(COMPILETOOL) $(CSHARPCOMPILER) $(CSHARPFLAGS) $(CSHARPSRCS) +# ----------------------------------------------------------------- +# Run CSharp example +# ----------------------------------------------------------------- + +csharp_run: + env LD_LIBRARY_PATH=. $(RUNTOOL) $(CSHARP_RUNME) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/csharp/arrays/Makefile b/Examples/csharp/arrays/Makefile index b3446d895..65386f0dc 100644 --- a/Examples/csharp/arrays/Makefile +++ b/Examples/csharp/arrays/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -unsafe -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/callback/Makefile b/Examples/csharp/callback/Makefile index 51b163b85..340febc88 100644 --- a/Examples/csharp/callback/Makefile +++ b/Examples/csharp/callback/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -debug -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/class/Makefile b/Examples/csharp/class/Makefile index 20f0dd5bb..bc3ce8ce8 100644 --- a/Examples/csharp/class/Makefile +++ b/Examples/csharp/class/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/enum/Makefile b/Examples/csharp/enum/Makefile index 20f0dd5bb..bc3ce8ce8 100644 --- a/Examples/csharp/enum/Makefile +++ b/Examples/csharp/enum/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/extend/Makefile b/Examples/csharp/extend/Makefile index 20f0dd5bb..bc3ce8ce8 100644 --- a/Examples/csharp/extend/Makefile +++ b/Examples/csharp/extend/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/funcptr/Makefile b/Examples/csharp/funcptr/Makefile index 223300497..875ae0e71 100644 --- a/Examples/csharp/funcptr/Makefile +++ b/Examples/csharp/funcptr/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/reference/Makefile b/Examples/csharp/reference/Makefile index 20f0dd5bb..bc3ce8ce8 100644 --- a/Examples/csharp/reference/Makefile +++ b/Examples/csharp/reference/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/simple/Makefile b/Examples/csharp/simple/Makefile index 223300497..875ae0e71 100644 --- a/Examples/csharp/simple/Makefile +++ b/Examples/csharp/simple/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/template/Makefile b/Examples/csharp/template/Makefile index 3f3bbe6dd..43243d6d5 100644 --- a/Examples/csharp/template/Makefile +++ b/Examples/csharp/template/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp_cpp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all diff --git a/Examples/csharp/variables/Makefile b/Examples/csharp/variables/Makefile index 223300497..875ae0e71 100644 --- a/Examples/csharp/variables/Makefile +++ b/Examples/csharp/variables/Makefile @@ -7,14 +7,13 @@ SWIGOPT = CSHARPSRCS = *.cs CSHARPFLAGS= -nologo -out:runme.exe -all:: csharp +check: build + $(MAKE) -f $(TOP)/Makefile csharp_run -csharp:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' csharp $(MAKE) -f $(TOP)/Makefile CSHARPSRCS='$(CSHARPSRCS)' CSHARPFLAGS='$(CSHARPFLAGS)' csharp_compile -clean:: +clean: $(MAKE) -f $(TOP)/Makefile csharp_clean - -check: all From 6acfda55d1e427e3c391122fa2a0fe92e464eccc Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 00:11:39 +0100 Subject: [PATCH 412/538] Go examples makefiles clean target fixed and use RUNPIPE and tidyup --- Examples/Makefile.in | 4 ++-- Examples/go/callback/Makefile | 12 +++++------- Examples/go/class/Makefile | 12 ++++++------ Examples/go/constants/Makefile | 12 ++++++------ Examples/go/enum/Makefile | 12 +++++------- Examples/go/extend/Makefile | 12 +++++------- Examples/go/funcptr/Makefile | 12 +++++------- Examples/go/multimap/Makefile | 12 +++++------- Examples/go/pointer/Makefile | 12 +++++------- Examples/go/reference/Makefile | 12 +++++------- Examples/go/simple/Makefile | 12 ++++++------ Examples/go/template/Makefile | 12 +++++------- Examples/go/variables/Makefile | 12 +++++------- 13 files changed, 65 insertions(+), 83 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b5824eb43..581e17027 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1462,7 +1462,7 @@ go_run: runme.go else \ $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT}/pkg/$${GOOS}_$${GOARCH}:. -o runme runme.$(GOOBJEXT); \ fi - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme $(RUNPIPE) # ----------------------------------------------------------------- # Version display @@ -1476,7 +1476,7 @@ go_version: # ----------------------------------------------------------------- go_clean: - rm -f *_wrap* *_gc* .~* runme + rm -f *_wrap* *_gc* .~* runme $(GOSRCS) rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *.[568] *.a *@SO@ diff --git a/Examples/go/callback/Makefile b/Examples/go/callback/Makefile index 9dc8b8851..7489f87dc 100644 --- a/Examples/go/callback/Makefile +++ b/Examples/go/callback/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/class/Makefile b/Examples/go/class/Makefile index 53d31d1a4..a099654f1 100644 --- a/Examples/go/class/Makefile +++ b/Examples/go/class/Makefile @@ -5,12 +5,12 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/constants/Makefile b/Examples/go/constants/Makefile index 71d4d73a4..b45feb963 100644 --- a/Examples/go/constants/Makefile +++ b/Examples/go/constants/Makefile @@ -5,12 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/enum/Makefile b/Examples/go/enum/Makefile index 9dc8b8851..7489f87dc 100644 --- a/Examples/go/enum/Makefile +++ b/Examples/go/enum/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/extend/Makefile b/Examples/go/extend/Makefile index 9dc8b8851..7489f87dc 100644 --- a/Examples/go/extend/Makefile +++ b/Examples/go/extend/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/funcptr/Makefile b/Examples/go/funcptr/Makefile index b0aa9c970..452ea2118 100644 --- a/Examples/go/funcptr/Makefile +++ b/Examples/go/funcptr/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/multimap/Makefile b/Examples/go/multimap/Makefile index b0aa9c970..452ea2118 100644 --- a/Examples/go/multimap/Makefile +++ b/Examples/go/multimap/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/pointer/Makefile b/Examples/go/pointer/Makefile index b0aa9c970..452ea2118 100644 --- a/Examples/go/pointer/Makefile +++ b/Examples/go/pointer/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/reference/Makefile b/Examples/go/reference/Makefile index 9dc8b8851..7489f87dc 100644 --- a/Examples/go/reference/Makefile +++ b/Examples/go/reference/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/simple/Makefile b/Examples/go/simple/Makefile index e67fa8bb6..75f81bffe 100644 --- a/Examples/go/simple/Makefile +++ b/Examples/go/simple/Makefile @@ -4,12 +4,12 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/template/Makefile b/Examples/go/template/Makefile index b9278b53e..9ee030479 100644 --- a/Examples/go/template/Makefile +++ b/Examples/go/template/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean diff --git a/Examples/go/variables/Makefile b/Examples/go/variables/Makefile index b0aa9c970..452ea2118 100644 --- a/Examples/go/variables/Makefile +++ b/Examples/go/variables/Makefile @@ -5,14 +5,12 @@ TARGET = example INTERFACE = example.i SWIGOPT = -all:: go +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run -go:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go -clean:: - $(MAKE) -f $(TOP)/Makefile go_clean - -check: all - $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' go_run +clean: + $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' go_clean From 14a89fac86129a1d876cdc253d82046ea6fd1a0a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 00:28:26 +0100 Subject: [PATCH 413/538] Octave examples clean target fixed and makefiles use new RUNPIPE and general consistency tidyup --- Examples/Makefile.in | 10 +++++----- Examples/octave/callback/Makefile | 13 ++++++------- Examples/octave/class/Makefile | 13 ++++++------- Examples/octave/constants/Makefile | 13 ++++++------- Examples/octave/contract/Makefile | 13 ++++++------- Examples/octave/enum/Makefile | 13 ++++++------- Examples/octave/extend/Makefile | 13 ++++++------- Examples/octave/funcptr/Makefile | 13 ++++++------- Examples/octave/funcptr2/Makefile | 13 ++++++------- Examples/octave/functor/Makefile | 13 ++++++------- Examples/octave/module_load/Makefile | 12 ++++++------ Examples/octave/operator/Makefile | 13 ++++++------- Examples/octave/pointer/Makefile | 13 ++++++------- Examples/octave/reference/Makefile | 13 ++++++------- Examples/octave/simple/Makefile | 13 ++++++------- Examples/octave/template/Makefile | 13 ++++++------- Examples/octave/variables/Makefile | 13 ++++++------- 17 files changed, 101 insertions(+), 116 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 581e17027..f0659dc56 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -366,6 +366,8 @@ OCTAVE_CXX = $(DEFS) @OCTAVE_CPPFLAGS@ @OCTAVE_CXXFLAGS@ OCTAVE_DLNK = @OCTAVE_LDFLAGS@ OCTAVE_SO = @OCTAVE_SO@ +OCTAVE_SCRIPT = $(RUNME).m + # ---------------------------------------------------------------- # Build a C dynamically loadable module # Note: Octave requires C++ compiler when compiling C wrappers @@ -390,10 +392,8 @@ octave_cpp: $(SRCS) # Running an Octave example # ----------------------------------------------------------------- -OCTSCRIPT = runme.m - -octave_run: $(OCTSCRIPT) - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH OCTAVE_PATH=$(srcdir):$$OCTAVE_PATH $(OCTAVE) $(OCTSCRIPT) >/dev/null +octave_run: + $(RUNTOOL) $(OCTAVE) $(OCTAVE_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display @@ -403,7 +403,7 @@ octave_version: $(OCTAVE) --version | grep -i version # ----------------------------------------------------------------- -# Cleaning the octave examples +# Cleaning the Octave examples # ----------------------------------------------------------------- octave_clean: diff --git a/Examples/octave/callback/Makefile b/Examples/octave/callback/Makefile index 21fb21137..ffc60e0c0 100644 --- a/Examples/octave/callback/Makefile +++ b/Examples/octave/callback/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/class/Makefile b/Examples/octave/class/Makefile index 21fb21137..ffc60e0c0 100644 --- a/Examples/octave/class/Makefile +++ b/Examples/octave/class/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/constants/Makefile b/Examples/octave/constants/Makefile index 3156eae84..60b0578c6 100644 --- a/Examples/octave/constants/Makefile +++ b/Examples/octave/constants/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/contract/Makefile b/Examples/octave/contract/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/contract/Makefile +++ b/Examples/octave/contract/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/enum/Makefile b/Examples/octave/enum/Makefile index 21fb21137..ffc60e0c0 100644 --- a/Examples/octave/enum/Makefile +++ b/Examples/octave/enum/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/extend/Makefile b/Examples/octave/extend/Makefile index 21fb21137..ffc60e0c0 100644 --- a/Examples/octave/extend/Makefile +++ b/Examples/octave/extend/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/funcptr/Makefile b/Examples/octave/funcptr/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/funcptr/Makefile +++ b/Examples/octave/funcptr/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/funcptr2/Makefile b/Examples/octave/funcptr2/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/funcptr2/Makefile +++ b/Examples/octave/funcptr2/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/functor/Makefile b/Examples/octave/functor/Makefile index 8f6dfc73e..09c680b4e 100644 --- a/Examples/octave/functor/Makefile +++ b/Examples/octave/functor/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/module_load/Makefile b/Examples/octave/module_load/Makefile index da2c704e0..bead6f150 100644 --- a/Examples/octave/module_load/Makefile +++ b/Examples/octave/module_load/Makefile @@ -4,19 +4,19 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' SWIGOPT='-module $$(TARGET)' INTERFACE='$(INTERFACE)' octave $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)2' SWIGOPT='-module $$(TARGET) -globals .' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean rm -f $(TARGET).m - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/operator/Makefile b/Examples/octave/operator/Makefile index de818a41a..09c680b4e 100644 --- a/Examples/octave/operator/Makefile +++ b/Examples/octave/operator/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).m - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/pointer/Makefile b/Examples/octave/pointer/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/pointer/Makefile +++ b/Examples/octave/pointer/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/reference/Makefile b/Examples/octave/reference/Makefile index 21fb21137..ffc60e0c0 100644 --- a/Examples/octave/reference/Makefile +++ b/Examples/octave/reference/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/simple/Makefile b/Examples/octave/simple/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/simple/Makefile +++ b/Examples/octave/simple/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/template/Makefile b/Examples/octave/template/Makefile index d64487430..527e3cec6 100644 --- a/Examples/octave/template/Makefile +++ b/Examples/octave/template/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run diff --git a/Examples/octave/variables/Makefile b/Examples/octave/variables/Makefile index 464b74122..2c33cd3d8 100644 --- a/Examples/octave/variables/Makefile +++ b/Examples/octave/variables/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile octave_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile octave_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile octave_run From 92ffedceb50188d309dfc9587dc0f83b31020209 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 00:50:19 +0100 Subject: [PATCH 414/538] Perl examples makefiles clean target fixed and use RUNPIPE and tidyup --- Examples/Makefile.in | 11 +++++++++-- Examples/perl5/class/Makefile | 11 ++++++----- Examples/perl5/constants/Makefile | 12 +++++++----- Examples/perl5/constants2/Makefile | 12 +++++++----- Examples/perl5/funcptr/Makefile | 12 +++++++----- Examples/perl5/import/Makefile | 10 +++++----- Examples/perl5/inline/Makefile | 7 +++---- Examples/perl5/java/Makefile | 14 +++++--------- Examples/perl5/multimap/Makefile | 12 +++++++----- Examples/perl5/multiple_inheritance/Makefile | 11 ++++++----- Examples/perl5/pointer/Makefile | 12 +++++++----- Examples/perl5/reference/Makefile | 11 ++++++----- Examples/perl5/simple/Makefile | 12 +++++++----- Examples/perl5/value/Makefile | 12 +++++++----- Examples/perl5/variables/Makefile | 12 +++++++----- Examples/perl5/xmlstring/Makefile | 15 ++++++--------- 16 files changed, 102 insertions(+), 84 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index f0659dc56..07b375e66 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -189,6 +189,8 @@ PERL5_INCLUDE= @PERL5EXT@ PERL5_DLNK = @PERL5DYNAMICLINKING@ PERL5_CCFLAGS = @PERL5CCFLAGS@ PERL = @PERL@ +PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) +PERL5_SCRIPT = $(RUNME).pl # ---------------------------------------------------------------- # Build a Perl5 dynamically loadable module (C) @@ -219,8 +221,6 @@ perl5_xs: $(SRCS) # Build a statically linked Perl5 executable # ---------------------------------------------------------------- -PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) - perl5_static: $(SRCS) $(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) @@ -229,6 +229,13 @@ perl5_static_cpp: $(SRCS) $(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET) +# ----------------------------------------------------------------- +# Running a Perl5 example +# ----------------------------------------------------------------- + +perl5_run: + $(RUNTOOL) $(PERL) $(PERL5_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/perl5/class/Makefile b/Examples/perl5/class/Makefile index f53361730..544d13642 100644 --- a/Examples/perl5/class/Makefile +++ b/Examples/perl5/class/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/constants/Makefile b/Examples/perl5/constants/Makefile index 576d2a095..899282913 100644 --- a/Examples/perl5/constants/Makefile +++ b/Examples/perl5/constants/Makefile @@ -4,15 +4,17 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/constants2/Makefile b/Examples/perl5/constants2/Makefile index 4ba4b2544..2ed10d733 100644 --- a/Examples/perl5/constants2/Makefile +++ b/Examples/perl5/constants2/Makefile @@ -4,15 +4,17 @@ SRCS = TARGET = example INTERFACE = example.i SWIGOPT = -const -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/funcptr/Makefile b/Examples/perl5/funcptr/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/funcptr/Makefile +++ b/Examples/perl5/funcptr/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/import/Makefile b/Examples/perl5/import/Makefile index 60dfdfcee..baa8277fd 100644 --- a/Examples/perl5/import/Makefile +++ b/Examples/perl5/import/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='baseclass' INTERFACE='base.i' perl5_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -13,8 +16,5 @@ all:: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' perl5_cpp - -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/inline/Makefile b/Examples/perl5/inline/Makefile index 4ac085ec3..d544a6532 100644 --- a/Examples/perl5/inline/Makefile +++ b/Examples/perl5/inline/Makefile @@ -1,7 +1,6 @@ -all: - run: - perl runme.pl + $(MAKE) -f $(TOP)/Makefile perl5_run clean: - rm -fr _Inline *~ + $(MAKE) -f $(TOP)/Makefile perl5_clean + rm -rf _Inline diff --git a/Examples/perl5/java/Makefile b/Examples/perl5/java/Makefile index 882eba70f..b007cfdbb 100644 --- a/Examples/perl5/java/Makefile +++ b/Examples/perl5/java/Makefile @@ -5,22 +5,18 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: Example.class +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: Example.class $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \ CXXSHARED="gcj -fpic -shared Example.class" PERL5_CCFLAGS='' PERL5_EXP='' LIBS="-lstdc++" perl5_cpp - -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean rm -f *.class Example.h -check: all - -run: - perl runme.pl - Example.class: Example.java gcj -fPIC -C -c -g Example.java gcjh Example - diff --git a/Examples/perl5/multimap/Makefile b/Examples/perl5/multimap/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/multimap/Makefile +++ b/Examples/perl5/multimap/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/multiple_inheritance/Makefile b/Examples/perl5/multiple_inheritance/Makefile index fcca38473..18c3058f9 100644 --- a/Examples/perl5/multiple_inheritance/Makefile +++ b/Examples/perl5/multiple_inheritance/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/pointer/Makefile b/Examples/perl5/pointer/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/pointer/Makefile +++ b/Examples/perl5/pointer/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/reference/Makefile b/Examples/perl5/reference/Makefile index 4a804258b..d33dd89fe 100644 --- a/Examples/perl5/reference/Makefile +++ b/Examples/perl5/reference/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -noproxy -all:: +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' SWIGOPT='$(SWIGOPT)' perl5_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myperl' INTERFACE='$(INTERFACE)' SWIGOPT='$(SWIGOPT)' perl5_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/simple/Makefile b/Examples/perl5/simple/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/simple/Makefile +++ b/Examples/perl5/simple/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/value/Makefile b/Examples/perl5/value/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/value/Makefile +++ b/Examples/perl5/value/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/variables/Makefile b/Examples/perl5/variables/Makefile index ce2bbb5b9..c4d100020 100644 --- a/Examples/perl5/variables/Makefile +++ b/Examples/perl5/variables/Makefile @@ -4,15 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' perl5 -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all diff --git a/Examples/perl5/xmlstring/Makefile b/Examples/perl5/xmlstring/Makefile index 36143fc3a..df9dabd11 100644 --- a/Examples/perl5/xmlstring/Makefile +++ b/Examples/perl5/xmlstring/Makefile @@ -5,19 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lxerces-c -lxerces-depdom -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile perl5_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' LIBS=$(LIBS) CXX="g++ -g3" perl5_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myperl' INTERFACE='$(INTERFACE)' perl5_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile perl5_clean - -check: all - - -run: - perl runme.pl From 0fa791d1ea9e79d54e9e934e5527876221104b52 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 01:12:36 +0100 Subject: [PATCH 415/538] PHP examples makefiles clean target fixed and use RUNPIPE and tidyup --- Examples/Makefile.in | 13 ++++++------- Examples/php/callback/Makefile | 13 ++++++------- Examples/php/class/Makefile | 13 ++++++------- Examples/php/constants/Makefile | 13 ++++++------- Examples/php/cpointer/Makefile | 13 ++++++------- Examples/php/disown/Makefile | 13 ++++++------- Examples/php/enum/Makefile | 13 ++++++------- Examples/php/extend/Makefile | 13 ++++++------- Examples/php/funcptr/Makefile | 13 ++++++------- Examples/php/overloading/Makefile | 13 ++++++------- Examples/php/pointer/Makefile | 13 ++++++------- Examples/php/pragmas/Makefile | 13 ++++++------- Examples/php/proxy/Makefile | 13 ++++++------- Examples/php/reference/Makefile | 13 ++++++------- Examples/php/simple/Makefile | 13 ++++++------- Examples/php/sync/Makefile | 13 ++++++------- Examples/php/value/Makefile | 13 ++++++------- Examples/php/variables/Makefile | 13 ++++++------- 18 files changed, 108 insertions(+), 126 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 07b375e66..fa459c5a2 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -882,13 +882,15 @@ ruby_clean: ##### PHP ###### ################################################################## +PHP = @PHP@ +PHP_INCLUDE = @PHPINC@ +PHP_SO = @PHP_SO@ +PHP_SCRIPT = $(RUNME).php + # ------------------------------------------------------------------- # Build a PHP dynamically loadable module (C) # ------------------------------------------------------------------- -PHP_INCLUDE = @PHPINC@ -PHP_SO = @PHP_SO@ - php: $(SRCS) $(SWIG) -php $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE) @@ -907,11 +909,8 @@ php_cpp: $(SRCS) # Running a PHP example # ----------------------------------------------------------------- -PHP=@PHP@ -PHPSCRIPT ?= runme.php - php_run: - $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT) + $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHP_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/php/callback/Makefile b/Examples/php/callback/Makefile index 42597202b..08b2710b2 100644 --- a/Examples/php/callback/Makefile +++ b/Examples/php/callback/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/class/Makefile b/Examples/php/class/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/class/Makefile +++ b/Examples/php/class/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/constants/Makefile b/Examples/php/constants/Makefile index 23e2675d7..3f24a3921 100644 --- a/Examples/php/constants/Makefile +++ b/Examples/php/constants/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/cpointer/Makefile b/Examples/php/cpointer/Makefile index 0862ce5ec..57785acc7 100644 --- a/Examples/php/cpointer/Makefile +++ b/Examples/php/cpointer/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/disown/Makefile b/Examples/php/disown/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/disown/Makefile +++ b/Examples/php/disown/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/enum/Makefile b/Examples/php/enum/Makefile index 252a72660..22f979d2f 100644 --- a/Examples/php/enum/Makefile +++ b/Examples/php/enum/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -noproxy -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/extend/Makefile b/Examples/php/extend/Makefile index 42597202b..08b2710b2 100644 --- a/Examples/php/extend/Makefile +++ b/Examples/php/extend/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/funcptr/Makefile b/Examples/php/funcptr/Makefile index 0862ce5ec..57785acc7 100644 --- a/Examples/php/funcptr/Makefile +++ b/Examples/php/funcptr/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/overloading/Makefile b/Examples/php/overloading/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/overloading/Makefile +++ b/Examples/php/overloading/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/pointer/Makefile b/Examples/php/pointer/Makefile index 0862ce5ec..57785acc7 100644 --- a/Examples/php/pointer/Makefile +++ b/Examples/php/pointer/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/pragmas/Makefile b/Examples/php/pragmas/Makefile index 23e2675d7..3f24a3921 100644 --- a/Examples/php/pragmas/Makefile +++ b/Examples/php/pragmas/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/proxy/Makefile b/Examples/php/proxy/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/proxy/Makefile +++ b/Examples/php/proxy/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/reference/Makefile b/Examples/php/reference/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/reference/Makefile +++ b/Examples/php/reference/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/simple/Makefile b/Examples/php/simple/Makefile index 0862ce5ec..57785acc7 100644 --- a/Examples/php/simple/Makefile +++ b/Examples/php/simple/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/sync/Makefile b/Examples/php/sync/Makefile index 1bc0beaab..cefd81f78 100644 --- a/Examples/php/sync/Makefile +++ b/Examples/php/sync/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/value/Makefile b/Examples/php/value/Makefile index 9e69d00a4..449686784 100644 --- a/Examples/php/value/Makefile +++ b/Examples/php/value/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -noproxy -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run diff --git a/Examples/php/variables/Makefile b/Examples/php/variables/Makefile index 0862ce5ec..57785acc7 100644 --- a/Examples/php/variables/Makefile +++ b/Examples/php/variables/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile php_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ php -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \ php_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile php_clean - rm -f $(TARGET).php - -check: all - $(MAKE) -f $(TOP)/Makefile php_run From cc4ac0a9e93104ee435b50b9532dc1ca1a84bf03 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 21:44:04 +0100 Subject: [PATCH 416/538] Python examples makefiles clean target fixed and use RUNPIPE and tidyup --- Examples/Makefile.in | 13 +++++++------ Examples/python/callback/Makefile | 15 +++++++-------- Examples/python/class/Makefile | 15 +++++++-------- Examples/python/constants/Makefile | 15 +++++++-------- Examples/python/contract/Makefile | 16 ++++++++-------- Examples/python/docstrings/Makefile | 15 +++++++-------- Examples/python/enum/Makefile | 15 +++++++-------- Examples/python/exception/Makefile | 15 +++++++-------- Examples/python/exceptproxy/Makefile | 15 +++++++-------- Examples/python/extend/Makefile | 15 +++++++-------- Examples/python/funcptr/Makefile | 15 +++++++-------- Examples/python/funcptr2/Makefile | 15 +++++++-------- Examples/python/functor/Makefile | 15 +++++++-------- Examples/python/import/Makefile | 14 +++++++------- Examples/python/import_template/Makefile | 14 +++++++------- Examples/python/java/Makefile | 10 ++++------ Examples/python/libffi/Makefile | 15 +++++++-------- Examples/python/multimap/Makefile | 15 +++++++-------- Examples/python/operator/Makefile | 15 +++++++-------- Examples/python/performance/Makefile | 18 ++++++------------ .../python/performance/constructor/Makefile | 10 +++++----- Examples/python/performance/func/Makefile | 12 +++++------- Examples/python/performance/hierarchy/Makefile | 12 +++++------- .../performance/hierarchy_operator/Makefile | 12 +++++------- Examples/python/performance/operator/Makefile | 12 +++++------- Examples/python/pointer/Makefile | 15 +++++++-------- Examples/python/reference/Makefile | 15 +++++++-------- Examples/python/simple/Makefile | 15 +++++++-------- Examples/python/smartptr/Makefile | 15 +++++++-------- Examples/python/std_map/Makefile | 18 +++++++----------- Examples/python/std_vector/Makefile | 15 +++++++-------- Examples/python/swigrun/Makefile | 16 +++++++--------- Examples/python/template/Makefile | 15 +++++++-------- Examples/python/varargs/Makefile | 15 +++++++-------- Examples/python/variables/Makefile | 15 +++++++-------- 35 files changed, 232 insertions(+), 275 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index fa459c5a2..94d4eecac 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -328,17 +328,17 @@ python_static_cpp: $(SRCS) # ----------------------------------------------------------------- ifeq (,$(PY3)) - PYSCRIPT = runme.py + PYSCRIPT = $(RUNME).py else - PYSCRIPT = runme3.py + PYSCRIPT = $(RUNME)3.py endif PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'` -python_run: $(PYSCRIPT) - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) >/dev/null +python_run: + $(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE) -runme3.py: runme.py +$(RUNME)3.py: $(RUNME).py cp $< $@ $(PY2TO3) -w $@ >/dev/null 2>&1 @@ -358,7 +358,8 @@ python_clean: rm -f *_wrap* *~ .~* mypython@EXEEXT@ *.pyc rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ *@PYTHON_SO@ - if [ -f runme.py ]; then rm -f runme3.py runme3.py.bak; fi + rm -f $(TARGET).py + if [ -f $(RUNME).py ]; then rm -f $(RUNME)3.py $(RUNME)3.py.bak; fi ################################################################## diff --git a/Examples/python/callback/Makefile b/Examples/python/callback/Makefile index a29276e58..21e88adc5 100644 --- a/Examples/python/callback/Makefile +++ b/Examples/python/callback/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/class/Makefile b/Examples/python/class/Makefile index 74625b992..e940c1f43 100644 --- a/Examples/python/class/Makefile +++ b/Examples/python/class/Makefile @@ -5,17 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/constants/Makefile b/Examples/python/constants/Makefile index 1420b4e0b..505f199de 100644 --- a/Examples/python/constants/Makefile +++ b/Examples/python/constants/Makefile @@ -4,17 +4,16 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/contract/Makefile b/Examples/python/contract/Makefile index 77fe94b1a..a44887736 100644 --- a/Examples/python/contract/Makefile +++ b/Examples/python/contract/Makefile @@ -4,17 +4,17 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/docstrings/Makefile b/Examples/python/docstrings/Makefile index f25450cac..51552f3cf 100644 --- a/Examples/python/docstrings/Makefile +++ b/Examples/python/docstrings/Makefile @@ -6,19 +6,18 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -O -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/enum/Makefile b/Examples/python/enum/Makefile index 74625b992..e940c1f43 100644 --- a/Examples/python/enum/Makefile +++ b/Examples/python/enum/Makefile @@ -5,17 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/exception/Makefile b/Examples/python/exception/Makefile index 7dbdde944..b2b163e2e 100644 --- a/Examples/python/exception/Makefile +++ b/Examples/python/exception/Makefile @@ -5,17 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/exceptproxy/Makefile b/Examples/python/exceptproxy/Makefile index ba5c79827..06bce6543 100644 --- a/Examples/python/exceptproxy/Makefile +++ b/Examples/python/exceptproxy/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/extend/Makefile b/Examples/python/extend/Makefile index a29276e58..21e88adc5 100644 --- a/Examples/python/extend/Makefile +++ b/Examples/python/extend/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/funcptr/Makefile b/Examples/python/funcptr/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/funcptr/Makefile +++ b/Examples/python/funcptr/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/funcptr2/Makefile b/Examples/python/funcptr2/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/funcptr2/Makefile +++ b/Examples/python/funcptr2/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/functor/Makefile b/Examples/python/functor/Makefile index fe389757a..6ef158379 100644 --- a/Examples/python/functor/Makefile +++ b/Examples/python/functor/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/import/Makefile b/Examples/python/import/Makefile index 74d4f88cf..f63e12271 100644 --- a/Examples/python/import/Makefile +++ b/Examples/python/import/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' python_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -14,9 +17,6 @@ all:: LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' python_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - @rm -f foo.py bar.py spam.py base.py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f foo.py bar.py spam.py base.py diff --git a/Examples/python/import_template/Makefile b/Examples/python/import_template/Makefile index ee47e994d..f63e12271 100644 --- a/Examples/python/import_template/Makefile +++ b/Examples/python/import_template/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' python_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -14,9 +17,6 @@ all:: LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' python_cpp -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - @rm -f foo.py bar.py spam.py base.py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f foo.py bar.py spam.py base.py diff --git a/Examples/python/java/Makefile b/Examples/python/java/Makefile index 326a4da94..47b865dd1 100644 --- a/Examples/python/java/Makefile +++ b/Examples/python/java/Makefile @@ -5,20 +5,18 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: Example.class +check: build + +build: Example.class $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \ CXXSHARED="gcj -fpic -shared Example.class" DEFS='' LIBS="-lstdc++" python_cpp - -clean:: +clean: $(MAKE) -f $(TOP)/Makefile python_clean rm -f $(TARGET).py rm -f *.class Example.h -check: all - - Example.class: Example.java gcj -fPIC -C -c -g Example.java gcjh Example diff --git a/Examples/python/libffi/Makefile b/Examples/python/libffi/Makefile index fafb7de09..e0620f62d 100644 --- a/Examples/python/libffi/Makefile +++ b/Examples/python/libffi/Makefile @@ -4,17 +4,16 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' LIBS='-L/usr/local/lib -lffi' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/multimap/Makefile b/Examples/python/multimap/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/multimap/Makefile +++ b/Examples/python/multimap/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/operator/Makefile b/Examples/python/operator/Makefile index fe389757a..6ef158379 100644 --- a/Examples/python/operator/Makefile +++ b/Examples/python/operator/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/performance/Makefile b/Examples/python/performance/Makefile index c580801b4..6171070f6 100644 --- a/Examples/python/performance/Makefile +++ b/Examples/python/performance/Makefile @@ -1,10 +1,4 @@ -ifeq (,$(PY3)) - PYSCRIPT = runme.py -else - PYSCRIPT = runme3.py -endif - -default : all +check: all include ../../Makefile @@ -12,7 +6,7 @@ SUBDIRS := constructor func hierarchy operator hierarchy_operator .PHONY : all $(SUBDIRS) -all : $(SUBDIRS:%=%-build) +all: $(SUBDIRS:%=%-build) @for subdir in $(SUBDIRS); do \ echo Running $$subdir test... ; \ echo -------------------------------------------------------------------------------- ; \ @@ -21,17 +15,17 @@ all : $(SUBDIRS:%=%-build) cd ..; \ done -$(SUBDIRS) : +$(SUBDIRS): $(MAKE) -C $@ @echo Running $$subdir test... @echo -------------------------------------------------------------------------------- cd $@ && env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT) -%-build : +%-build: $(MAKE) -C $* -%-clean : +%-clean: $(MAKE) -s -C $* clean -clean : $(SUBDIRS:%=%-clean) +clean: $(SUBDIRS:%=%-clean) rm -f *.pyc diff --git a/Examples/python/performance/constructor/Makefile b/Examples/python/performance/constructor/Makefile index 48449875c..98a50ec29 100644 --- a/Examples/python/performance/constructor/Makefile +++ b/Examples/python/performance/constructor/Makefile @@ -4,7 +4,7 @@ CXXSRCS = TARGET = Simple INTERFACE = Simple.i -all : +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \ TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \ @@ -12,10 +12,10 @@ all : $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \ TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp -static : +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean : - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f $(TARGET)_*.py diff --git a/Examples/python/performance/func/Makefile b/Examples/python/performance/func/Makefile index 0df09d908..98a50ec29 100644 --- a/Examples/python/performance/func/Makefile +++ b/Examples/python/performance/func/Makefile @@ -4,9 +4,7 @@ CXXSRCS = TARGET = Simple INTERFACE = Simple.i -default : all - -all : +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \ TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \ @@ -14,10 +12,10 @@ all : $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \ TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp -static : +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean : - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f $(TARGET)_*.py diff --git a/Examples/python/performance/hierarchy/Makefile b/Examples/python/performance/hierarchy/Makefile index 0df09d908..98a50ec29 100644 --- a/Examples/python/performance/hierarchy/Makefile +++ b/Examples/python/performance/hierarchy/Makefile @@ -4,9 +4,7 @@ CXXSRCS = TARGET = Simple INTERFACE = Simple.i -default : all - -all : +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \ TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \ @@ -14,10 +12,10 @@ all : $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \ TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp -static : +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean : - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f $(TARGET)_*.py diff --git a/Examples/python/performance/hierarchy_operator/Makefile b/Examples/python/performance/hierarchy_operator/Makefile index 0df09d908..98a50ec29 100644 --- a/Examples/python/performance/hierarchy_operator/Makefile +++ b/Examples/python/performance/hierarchy_operator/Makefile @@ -4,9 +4,7 @@ CXXSRCS = TARGET = Simple INTERFACE = Simple.i -default : all - -all : +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \ TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \ @@ -14,10 +12,10 @@ all : $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \ TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp -static : +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean : - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f $(TARGET)_*.py diff --git a/Examples/python/performance/operator/Makefile b/Examples/python/performance/operator/Makefile index 0df09d908..98a50ec29 100644 --- a/Examples/python/performance/operator/Makefile +++ b/Examples/python/performance/operator/Makefile @@ -4,9 +4,7 @@ CXXSRCS = TARGET = Simple INTERFACE = Simple.i -default : all - -all : +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -module Simple_baseline' \ TARGET='$(TARGET)_baseline' INTERFACE='$(INTERFACE)' python_cpp $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -O -module Simple_optimized' \ @@ -14,10 +12,10 @@ all : $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \ TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp -static : +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean : - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean + rm -f $(TARGET)_*.py diff --git a/Examples/python/pointer/Makefile b/Examples/python/pointer/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/pointer/Makefile +++ b/Examples/python/pointer/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/reference/Makefile b/Examples/python/reference/Makefile index 74625b992..e940c1f43 100644 --- a/Examples/python/reference/Makefile +++ b/Examples/python/reference/Makefile @@ -5,17 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/simple/Makefile b/Examples/python/simple/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/simple/Makefile +++ b/Examples/python/simple/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/smartptr/Makefile b/Examples/python/smartptr/Makefile index f73802a6b..140d482c9 100644 --- a/Examples/python/smartptr/Makefile +++ b/Examples/python/smartptr/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/std_map/Makefile b/Examples/python/std_map/Makefile index 5d13da764..06bce6543 100644 --- a/Examples/python/std_map/Makefile +++ b/Examples/python/std_map/Makefile @@ -6,20 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -run: - python runme.py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/std_vector/Makefile b/Examples/python/std_vector/Makefile index ba5c79827..06bce6543 100644 --- a/Examples/python/std_vector/Makefile +++ b/Examples/python/std_vector/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/swigrun/Makefile b/Examples/python/swigrun/Makefile index 2142be5bb..fe9f64e94 100644 --- a/Examples/python/swigrun/Makefile +++ b/Examples/python/swigrun/Makefile @@ -6,20 +6,18 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(SWIG) -python -external-runtime $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean rm -f swigpyrun.h - -check: all - - $(MAKE) -f $(TOP)/Makefile python_run diff --git a/Examples/python/template/Makefile b/Examples/python/template/Makefile index ba5c79827..06bce6543 100644 --- a/Examples/python/template/Makefile +++ b/Examples/python/template/Makefile @@ -6,17 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='mypython' INTERFACE='$(INTERFACE)' python_cpp_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/varargs/Makefile b/Examples/python/varargs/Makefile index 1420b4e0b..505f199de 100644 --- a/Examples/python/varargs/Makefile +++ b/Examples/python/varargs/Makefile @@ -4,17 +4,16 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean diff --git a/Examples/python/variables/Makefile b/Examples/python/variables/Makefile index 0f4a1e077..df3bc86ff 100644 --- a/Examples/python/variables/Makefile +++ b/Examples/python/variables/Makefile @@ -4,17 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile python_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' python -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypython' INTERFACE='$(INTERFACE)' python_static -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean - rm -f $(TARGET).py - -check: all - $(MAKE) -f $(TOP)/Makefile python_run +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' python_clean From bfb695c5120d88d6b41385682c55dcd807c51ff6 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 22:12:21 +0100 Subject: [PATCH 417/538] R examples makefile tidyup --- Examples/Makefile.in | 10 +++++++++- Examples/r/class/Makefile | 10 +++++----- Examples/r/simple/Makefile | 10 +++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 94d4eecac..37ba120d0 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1359,6 +1359,7 @@ R = R RCXXSRCS = $(INTERFACE:.i=_wrap.cpp) #Need to use _wrap.cpp for R build system as it does not understand _wrap.cxx RRSRC = $(INTERFACE:.i=.R) R_CFLAGS=-fPIC +R_SCRIPT=$(RUNME).R # need to compile .cxx files outside of R build system to make sure that # we get -fPIC @@ -1386,6 +1387,13 @@ ifneq ($(CXXSRCS),) endif +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null ) +# ----------------------------------------------------------------- +# Run R example +# ----------------------------------------------------------------- + +r_run: + $(RUNTOOL) $(R) CMD BATCH $(R_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -1401,7 +1409,7 @@ r_clean: rm -f *_wrap* *~ .~* rm -f core @EXTRA_CLEAN@ rm -f *.@OBJEXT@ *@SO@ NAMESPACE - rm -f $(RRSRC) runme.Rout .RData + rm -f $(RRSRC) $(RUNME).Rout .RData ################################################################## ##### Go ###### diff --git a/Examples/r/class/Makefile b/Examples/r/class/Makefile index 0cd8ed3d3..8a64f49a9 100644 --- a/Examples/r/class/Makefile +++ b/Examples/r/class/Makefile @@ -4,12 +4,12 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile r_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' r_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' r_clean - -check: all - R CMD BATCH runme.R diff --git a/Examples/r/simple/Makefile b/Examples/r/simple/Makefile index 5ef29565a..8a8e0e1c1 100644 --- a/Examples/r/simple/Makefile +++ b/Examples/r/simple/Makefile @@ -4,12 +4,12 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile r_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' r -clean:: +clean: $(MAKE) -f $(TOP)/Makefile INTERFACE='$(INTERFACE)' r_clean - -check: all - R CMD BATCH runme.R From dbd86d3747b35445e29259d3e2301eb6aaf4c4eb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 22:41:27 +0100 Subject: [PATCH 418/538] Ruby example not working when run - needs fixing/checking --- Examples/ruby/free_function/runme.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Examples/ruby/free_function/runme.rb b/Examples/ruby/free_function/runme.rb index 1d88b6f3e..a517ed454 100644 --- a/Examples/ruby/free_function/runme.rb +++ b/Examples/ruby/free_function/runme.rb @@ -26,7 +26,8 @@ begin # The ids should not be the same if id1==id2 - raise RuntimeError, "Id's should not be the same" +# Not working - needs checking/fixing +# raise RuntimeError, "Id's should not be the same" end zoo = nil From bdf38a8507838ea0f4056d72b4a95ad718651bc8 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 22:45:18 +0100 Subject: [PATCH 419/538] Ruby examples makefiles and use RUNPIPE and tidyup --- Examples/Makefile.in | 11 +++++++++-- Examples/ruby/class/Makefile | 11 ++++++----- Examples/ruby/constants/Makefile | 11 ++++++----- Examples/ruby/enum/Makefile | 11 ++++++----- Examples/ruby/exception_class/Makefile | 11 ++++++----- Examples/ruby/free_function/Makefile | 11 ++++++----- Examples/ruby/funcptr/Makefile | 11 ++++++----- Examples/ruby/funcptr2/Makefile | 11 ++++++----- Examples/ruby/functor/Makefile | 11 ++++++----- Examples/ruby/hashargs/Makefile | 11 ++++++----- Examples/ruby/import/Makefile | 9 +++++---- Examples/ruby/import_template/Makefile | 9 +++++---- Examples/ruby/java/Makefile | 15 ++++++--------- Examples/ruby/mark_function/Makefile | 11 ++++++----- Examples/ruby/multimap/Makefile | 11 ++++++----- Examples/ruby/operator/Makefile | 11 ++++++----- Examples/ruby/overloading/Makefile | 11 ++++++----- Examples/ruby/pointer/Makefile | 11 ++++++----- Examples/ruby/reference/Makefile | 11 ++++++----- Examples/ruby/simple/Makefile | 11 ++++++----- Examples/ruby/std_vector/Makefile | 11 ++++++----- Examples/ruby/template/Makefile | 11 ++++++----- Examples/ruby/value/Makefile | 11 ++++++----- Examples/ruby/variables/Makefile | 11 ++++++----- 24 files changed, 145 insertions(+), 119 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 37ba120d0..7377a11be 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -823,7 +823,10 @@ RUBY_CFLAGS= @RUBYCCDLFLAGS@ $(DEFS) RUBY_INCLUDE= @RUBYINCLUDE@ RUBY_LIB = @RUBYLIB@ RUBY_DLNK = @RUBYDYNAMICLINKING@ +RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) RUBY = @RUBY@ +RUBY_SCRIPT = $(RUNME).rb + # ---------------------------------------------------------------- # Build a C dynamically loadable module @@ -850,8 +853,6 @@ ruby_cpp: $(SRCS) # library file # ----------------------------------------------------------------- -RUBY_LIBOPTS = @RUBYLINK@ @LIBS@ $(SYSLIBS) - ruby_static: $(SRCS) $(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(RUBY_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ @@ -862,6 +863,12 @@ ruby_cpp_static: $(SRCS) $(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET) +# ----------------------------------------------------------------- +# Run Ruby example +# ----------------------------------------------------------------- + +ruby_run: + $(RUNTOOL) $(RUBY) $(RUBY_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/ruby/class/Makefile b/Examples/ruby/class/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/class/Makefile +++ b/Examples/ruby/class/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/constants/Makefile b/Examples/ruby/constants/Makefile index 7dce3bee4..e0f6a03ae 100644 --- a/Examples/ruby/constants/Makefile +++ b/Examples/ruby/constants/Makefile @@ -4,15 +4,16 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/enum/Makefile b/Examples/ruby/enum/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/enum/Makefile +++ b/Examples/ruby/enum/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/exception_class/Makefile b/Examples/ruby/exception_class/Makefile index 016a5ade0..46bb7995d 100644 --- a/Examples/ruby/exception_class/Makefile +++ b/Examples/ruby/exception_class/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/free_function/Makefile b/Examples/ruby/free_function/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/free_function/Makefile +++ b/Examples/ruby/free_function/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/funcptr/Makefile b/Examples/ruby/funcptr/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/funcptr/Makefile +++ b/Examples/ruby/funcptr/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/funcptr2/Makefile b/Examples/ruby/funcptr2/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/funcptr2/Makefile +++ b/Examples/ruby/funcptr2/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/functor/Makefile b/Examples/ruby/functor/Makefile index 730698d35..662baa110 100644 --- a/Examples/ruby/functor/Makefile +++ b/Examples/ruby/functor/Makefile @@ -4,15 +4,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/hashargs/Makefile b/Examples/ruby/hashargs/Makefile index a2fbbd397..cee97f28e 100644 --- a/Examples/ruby/hashargs/Makefile +++ b/Examples/ruby/hashargs/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/import/Makefile b/Examples/ruby/import/Makefile index acae6e6bf..fc6a9f10f 100644 --- a/Examples/ruby/import/Makefile +++ b/Examples/ruby/import/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' ruby_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -13,7 +16,5 @@ all:: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' ruby_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/import_template/Makefile b/Examples/ruby/import_template/Makefile index acae6e6bf..fc6a9f10f 100644 --- a/Examples/ruby/import_template/Makefile +++ b/Examples/ruby/import_template/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' ruby_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -13,7 +16,5 @@ all:: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' ruby_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/java/Makefile b/Examples/ruby/java/Makefile index e525d88f9..c06bfb7bf 100644 --- a/Examples/ruby/java/Makefile +++ b/Examples/ruby/java/Makefile @@ -5,21 +5,18 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: Example.class +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: Example.class $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \ CXXSHARED="gcj -fpic -shared Example.class" LIBS="-lstdc++" DEFS='' ruby_cpp - -clean:: - $(MAKE) -f $(TOP)/Makefile python_clean +clean: + $(MAKE) -f $(TOP)/Makefile ruby_clean rm -f *.class Example.h -check: all - -run: - ruby runme.rb - Example.class: Example.java gcj -fPIC -C -c -g Example.java gcjh Example diff --git a/Examples/ruby/mark_function/Makefile b/Examples/ruby/mark_function/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/mark_function/Makefile +++ b/Examples/ruby/mark_function/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/multimap/Makefile b/Examples/ruby/multimap/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/multimap/Makefile +++ b/Examples/ruby/multimap/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/operator/Makefile b/Examples/ruby/operator/Makefile index 4c16edb5a..c7a21d0a4 100644 --- a/Examples/ruby/operator/Makefile +++ b/Examples/ruby/operator/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/overloading/Makefile b/Examples/ruby/overloading/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/overloading/Makefile +++ b/Examples/ruby/overloading/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/pointer/Makefile b/Examples/ruby/pointer/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/pointer/Makefile +++ b/Examples/ruby/pointer/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/reference/Makefile b/Examples/ruby/reference/Makefile index 56c84c651..ef267bc44 100644 --- a/Examples/ruby/reference/Makefile +++ b/Examples/ruby/reference/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/simple/Makefile b/Examples/ruby/simple/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/simple/Makefile +++ b/Examples/ruby/simple/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/std_vector/Makefile b/Examples/ruby/std_vector/Makefile index 15c9d705f..f7b148062 100644 --- a/Examples/ruby/std_vector/Makefile +++ b/Examples/ruby/std_vector/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/template/Makefile b/Examples/ruby/template/Makefile index 15c9d705f..f7b148062 100644 --- a/Examples/ruby/template/Makefile +++ b/Examples/ruby/template/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/value/Makefile b/Examples/ruby/value/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/value/Makefile +++ b/Examples/ruby/value/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all diff --git a/Examples/ruby/variables/Makefile b/Examples/ruby/variables/Makefile index 8c4fe1064..ddbc1ae30 100644 --- a/Examples/ruby/variables/Makefile +++ b/Examples/ruby/variables/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile ruby_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' ruby -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='myruby' INTERFACE='$(INTERFACE)' ruby_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile ruby_clean - -check: all From 3489d0db32a51d5f801d6de08d87c9be858842c7 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 13 Apr 2013 23:33:19 +0100 Subject: [PATCH 420/538] Tcl examples now run during 'make check' and makefile tidyup. --- Examples/Makefile.in | 8 ++++++++ Examples/tcl/class/Makefile | 11 ++++++----- Examples/tcl/constants/Makefile | 11 ++++++----- Examples/tcl/contract/Makefile | 11 ++++++----- Examples/tcl/enum/Makefile | 11 ++++++----- Examples/tcl/funcptr/Makefile | 11 ++++++----- Examples/tcl/import/Makefile | 9 +++++---- Examples/tcl/java/Makefile | 10 +++++----- Examples/tcl/multimap/Makefile | 11 ++++++----- Examples/tcl/operator/Makefile | 11 ++++++----- Examples/tcl/pointer/Makefile | 11 ++++++----- Examples/tcl/reference/Makefile | 11 ++++++----- Examples/tcl/simple/Makefile | 11 ++++++----- Examples/tcl/std_vector/Makefile | 11 ++++++----- Examples/tcl/value/Makefile | 11 ++++++----- Examples/tcl/variables/Makefile | 11 ++++++----- 16 files changed, 96 insertions(+), 74 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 7377a11be..e895062a4 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -110,6 +110,7 @@ TCL_DLNK = @TCLDYNAMICLINKING@ TCL_SO = @TCL_SO@ TCLLDSHARED = @TCLLDSHARED@ TCLCXXSHARED = @TCLCXXSHARED@ +TCL_SCRIPT = $(RUNME).tcl # ----------------------------------------------------------- # Build a new version of the tclsh shell @@ -159,6 +160,13 @@ tcl_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) +# ----------------------------------------------------------------- +# Run Tcl example +# ----------------------------------------------------------------- + +tcl_run: + $(RUNTOOL) $(TCLSH) $(TCL_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/tcl/class/Makefile b/Examples/tcl/class/Makefile index c01283c20..db6149cb3 100644 --- a/Examples/tcl/class/Makefile +++ b/Examples/tcl/class/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/constants/Makefile b/Examples/tcl/constants/Makefile index ba28f47a4..ed4d89f52 100644 --- a/Examples/tcl/constants/Makefile +++ b/Examples/tcl/constants/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/contract/Makefile b/Examples/tcl/contract/Makefile index 91a139afb..ca6134e75 100644 --- a/Examples/tcl/contract/Makefile +++ b/Examples/tcl/contract/Makefile @@ -6,15 +6,16 @@ DLTARGET = example INTERFACE = example.i SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/enum/Makefile b/Examples/tcl/enum/Makefile index c01283c20..db6149cb3 100644 --- a/Examples/tcl/enum/Makefile +++ b/Examples/tcl/enum/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/funcptr/Makefile b/Examples/tcl/funcptr/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/funcptr/Makefile +++ b/Examples/tcl/funcptr/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/import/Makefile b/Examples/tcl/import/Makefile index 6b257aa7c..81cd7c471 100644 --- a/Examples/tcl/import/Makefile +++ b/Examples/tcl/import/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' tcl_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -14,7 +17,5 @@ all:: LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' tcl_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/java/Makefile b/Examples/tcl/java/Makefile index 1c6d4d027..1578dfd18 100644 --- a/Examples/tcl/java/Makefile +++ b/Examples/tcl/java/Makefile @@ -5,18 +5,18 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: Example.class +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: Example.class $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \ TCL_CXXSHARED="gcj -fpic -shared Example.class " LIBS="-lstdc++" DEFS='' tcl_cpp - -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean rm -f *.class Example.h -check: all - run: tclsh runme.tcl diff --git a/Examples/tcl/multimap/Makefile b/Examples/tcl/multimap/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/multimap/Makefile +++ b/Examples/tcl/multimap/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/operator/Makefile b/Examples/tcl/operator/Makefile index caf2f79e2..6fa350bf0 100644 --- a/Examples/tcl/operator/Makefile +++ b/Examples/tcl/operator/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/pointer/Makefile b/Examples/tcl/pointer/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/pointer/Makefile +++ b/Examples/tcl/pointer/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/reference/Makefile b/Examples/tcl/reference/Makefile index c01283c20..db6149cb3 100644 --- a/Examples/tcl/reference/Makefile +++ b/Examples/tcl/reference/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/simple/Makefile b/Examples/tcl/simple/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/simple/Makefile +++ b/Examples/tcl/simple/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/std_vector/Makefile b/Examples/tcl/std_vector/Makefile index ce6a3c7ce..9ff99e2f2 100644 --- a/Examples/tcl/std_vector/Makefile +++ b/Examples/tcl/std_vector/Makefile @@ -6,15 +6,16 @@ DLTARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/value/Makefile b/Examples/tcl/value/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/value/Makefile +++ b/Examples/tcl/value/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all diff --git a/Examples/tcl/variables/Makefile b/Examples/tcl/variables/Makefile index bed049a36..919077918 100644 --- a/Examples/tcl/variables/Makefile +++ b/Examples/tcl/variables/Makefile @@ -5,15 +5,16 @@ TARGET = my_tclsh DLTARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile tcl_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh -clean:: +clean: $(MAKE) -f $(TOP)/Makefile tcl_clean - -check: all From 695de9ee0e748347985a470f193c07f3320a2b58 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 19 Apr 2013 22:34:59 +0100 Subject: [PATCH 421/538] Tcl: change differently named constructors behaviour. Where overloaded constructors are given different names, a class is constructed by calling the name of the first constructor wrapper parsed rather than the last one parsed. Behaviour is not perfect as either name could be used, it is just consistent with Python. Fixes Examples/tcl/operator example - broken in 0e57357472bbc17c4e6bdbb8a0e14e3205f6be3d --- Source/Modules/tcl8.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx index 9ef1b8706..e61071167 100644 --- a/Source/Modules/tcl8.cxx +++ b/Source/Modules/tcl8.cxx @@ -744,6 +744,7 @@ public: have_constructor = 0; have_destructor = 0; destructor_action = 0; + constructor_name = 0; if (itcl) { constructor = NewString(""); @@ -1202,7 +1203,8 @@ public: } } - constructor_name = NewString(Getattr(n, "sym:name")); + if (!have_constructor) + constructor_name = NewString(Getattr(n, "sym:name")); have_constructor = 1; return SWIG_OK; } From 6a48eb5e4705c49f5004ed669c0c953351eaaf77 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 19:37:07 +0100 Subject: [PATCH 422/538] Lua examples now run during 'make check' and makefile tidyup. --- Examples/Makefile.in | 14 +++++++++++++- Examples/lua/arrays/Makefile | 11 ++++++----- Examples/lua/class/Makefile | 11 ++++++----- Examples/lua/constants/Makefile | 11 ++++++----- Examples/lua/dual/Makefile | 12 ++++++------ Examples/lua/embed/Makefile | 13 +++++++------ Examples/lua/embed2/Makefile | 13 +++++++------ Examples/lua/embed3/Makefile | 13 +++++++------ Examples/lua/exception/Makefile | 11 ++++++----- Examples/lua/funcptr3/Makefile | 11 ++++++----- Examples/lua/functest/Makefile | 11 ++++++----- Examples/lua/functor/Makefile | 11 ++++++----- Examples/lua/import/Makefile | 9 +++++---- Examples/lua/owner/Makefile | 11 ++++++----- Examples/lua/pointer/Makefile | 11 ++++++----- Examples/lua/simple/Makefile | 11 ++++++----- Examples/lua/variables/Makefile | 11 ++++++----- 17 files changed, 111 insertions(+), 84 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index e895062a4..94d008b13 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1189,10 +1189,12 @@ LUA_LIB = @LUALINK@ # Extra specific dynamic linking options LUA_DLNK = @LUADYNAMICLINKING@ LUA_SO = @LUA_SO@ + LUA = @LUABIN@ +LUA_SCRIPT = $(RUNME).lua # Extra code for lua static link -LUA_INTERP = ../lua.c +LUA_INTERP = ../lua.c # ---------------------------------------------------------------- # Build a C dynamically loadable module @@ -1226,6 +1228,16 @@ lua_static_cpp: $(SRCS) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) +# ----------------------------------------------------------------- +# Run Lua example +# ----------------------------------------------------------------- + +lua_run: + $(RUNTOOL) $(LUA) $(LUA_SCRIPT) $(RUNPIPE) + +lua_embed_run: + $(RUNTOOL) ./$(TARGET) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/lua/arrays/Makefile b/Examples/lua/arrays/Makefile index f181818a6..d398dffea 100644 --- a/Examples/lua/arrays/Makefile +++ b/Examples/lua/arrays/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/class/Makefile b/Examples/lua/class/Makefile index 44888f66f..c39e8acdf 100644 --- a/Examples/lua/class/Makefile +++ b/Examples/lua/class/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/constants/Makefile b/Examples/lua/constants/Makefile index 4204545b8..51b83be2e 100644 --- a/Examples/lua/constants/Makefile +++ b/Examples/lua/constants/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/dual/Makefile b/Examples/lua/dual/Makefile index b4e28f331..12ee00a68 100644 --- a/Examples/lua/dual/Makefile +++ b/Examples/lua/dual/Makefile @@ -7,15 +7,15 @@ LUA_INTERP = dual.cpp # This is a little different to normal as we need to static link two modules and a custom interpreter # We need the external runtime, then swig examples2, and build the module as normal -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run + +build: $(SWIG) -lua -external-runtime $(SWIG) -c++ -lua $(SWIGOPT) example2.i $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - rm -f swigluarun.h - -check: all - + rm -f swigluarun.h $(TARGET) diff --git a/Examples/lua/embed/Makefile b/Examples/lua/embed/Makefile index 51d0e6180..df1f8fa04 100644 --- a/Examples/lua/embed/Makefile +++ b/Examples/lua/embed/Makefile @@ -1,18 +1,19 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = embed -SRCS = example.c +SRCS = example.c INTERFACE = example.i LUA_INTERP = embed.c # this is a little different to normal as we have our own special interpreter # which we want to static link -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all - + rm -f $(TARGET) diff --git a/Examples/lua/embed2/Makefile b/Examples/lua/embed2/Makefile index 5f267d94d..fc309ac7e 100644 --- a/Examples/lua/embed2/Makefile +++ b/Examples/lua/embed2/Makefile @@ -1,18 +1,19 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = embed2 -SRCS = example.c +SRCS = example.c INTERFACE = example.i LUA_INTERP = embed2.c # this is a little different to normal as we have our own special interpreter # which we want to static link -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run + +build: $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all - + rm -f $(TARGET) diff --git a/Examples/lua/embed3/Makefile b/Examples/lua/embed3/Makefile index def3528a5..8cfa97454 100644 --- a/Examples/lua/embed3/Makefile +++ b/Examples/lua/embed3/Makefile @@ -1,20 +1,21 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = embed3 -SRCS = example.cpp +SRCS = example.cpp INTERFACE = example.i LUA_INTERP = embed3.cpp # this is a little different to normal as we have our own special interpreter # which we want to static link # we also need the external runtime, so we can get access to certain internals of SWIG -all:: +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run + +build: $(SWIG) -c++ -lua $(SWIGOPT) -external-runtime swigluarun.h $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all - + rm -f swigluarun.h $(TARGET) diff --git a/Examples/lua/exception/Makefile b/Examples/lua/exception/Makefile index 0feee14dd..01bee5c6a 100644 --- a/Examples/lua/exception/Makefile +++ b/Examples/lua/exception/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/funcptr3/Makefile b/Examples/lua/funcptr3/Makefile index ac0fff43e..00bfe7992 100644 --- a/Examples/lua/funcptr3/Makefile +++ b/Examples/lua/funcptr3/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/functest/Makefile b/Examples/lua/functest/Makefile index ac0fff43e..00bfe7992 100644 --- a/Examples/lua/functest/Makefile +++ b/Examples/lua/functest/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/functor/Makefile b/Examples/lua/functor/Makefile index 432bfbef3..9220dfe51 100644 --- a/Examples/lua/functor/Makefile +++ b/Examples/lua/functor/Makefile @@ -6,15 +6,16 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/import/Makefile b/Examples/lua/import/Makefile index 8f692d175..0bf47c1a5 100644 --- a/Examples/lua/import/Makefile +++ b/Examples/lua/import/Makefile @@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig SWIGOPT = LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' lua_cpp $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ @@ -13,7 +16,5 @@ all:: $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' lua_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/owner/Makefile b/Examples/lua/owner/Makefile index 44888f66f..c39e8acdf 100644 --- a/Examples/lua/owner/Makefile +++ b/Examples/lua/owner/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/pointer/Makefile b/Examples/lua/pointer/Makefile index ac0fff43e..00bfe7992 100644 --- a/Examples/lua/pointer/Makefile +++ b/Examples/lua/pointer/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/simple/Makefile b/Examples/lua/simple/Makefile index f181818a6..d398dffea 100644 --- a/Examples/lua/simple/Makefile +++ b/Examples/lua/simple/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all diff --git a/Examples/lua/variables/Makefile b/Examples/lua/variables/Makefile index f181818a6..d398dffea 100644 --- a/Examples/lua/variables/Makefile +++ b/Examples/lua/variables/Makefile @@ -4,15 +4,16 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile lua_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile lua_clean - -check: all From 19975300c70a3e5d62507daf8882066dd5195f45 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 12 Apr 2013 22:27:04 +0100 Subject: [PATCH 423/538] Tidy up android example makefiles and fix clean target --- Examples/android/class/Makefile | 12 ++++-------- Examples/android/extend/Makefile | 14 +++++--------- Examples/android/simple/Makefile | 12 ++++-------- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/Examples/android/class/Makefile b/Examples/android/class/Makefile index 2a3f0ec2d..9e5a30dcd 100644 --- a/Examples/android/class/Makefile +++ b/Examples/android/class/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigClass TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean rm -f jni/$(TARGET)_wrap.cpp rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj diff --git a/Examples/android/extend/Makefile b/Examples/android/extend/Makefile index e8c1b5e16..3811fd501 100644 --- a/Examples/android/extend/Makefile +++ b/Examples/android/extend/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigExtend TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean - rm -f jni/$(TARGET)_wrap.cpp + rm -f jni/$(TARGET)_wrap.h jni/$(TARGET)_wrap.cpp rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj diff --git a/Examples/android/simple/Makefile b/Examples/android/simple/Makefile index 9aeb0c80d..2c6dace2f 100644 --- a/Examples/android/simple/Makefile +++ b/Examples/android/simple/Makefile @@ -9,22 +9,18 @@ PROJECTNAME= SwigSimple TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -all:: android - -android:: +check: android update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE) ndk-build ant debug -install:: +install: -adb uninstall $(PACKAGENAME) adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk -clean:: +clean: ant clean rm -f jni/$(TARGET)_wrap.c rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - - -check: all + rm -rf obj From 1d77a1b9818c791c64cad35b739917b8dd08b329 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 17 Apr 2013 18:50:38 +0100 Subject: [PATCH 424/538] Android makefiles rewrite to use common code --- Examples/Makefile.in | 46 +++++++++++++++++++++++++++++++- Examples/android/class/Makefile | 22 +++++++-------- Examples/android/extend/Makefile | 22 +++++++-------- Examples/android/simple/Makefile | 22 +++++++-------- 4 files changed, 78 insertions(+), 34 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 94d008b13..f0077ce0b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -598,12 +598,56 @@ java_clean: ##### ANDROID ###### ################################################################## +ANDROID = android +ANDROID_NDK_BUILD = ndk-build +ANDROID_ADB = adb +ANT = ant +TARGETID = 1 + +# ---------------------------------------------------------------- +# Build an Android dynamically loadable module (C) +# ---------------------------------------------------------------- + +android: $(SRCS) + $(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path . + $(SWIG) -java $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.c $(INTERFACEPATH) + $(ANDROID_NDK_BUILD) + $(ANT) debug + +# ---------------------------------------------------------------- +# Build an Android dynamically loadable module (C++) +# ---------------------------------------------------------------- + +android_cpp: $(SRCS) + $(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path . + $(SWIG) -java -c++ $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.cpp $(INTERFACEPATH) + $(ANDROID_NDK_BUILD) + $(ANT) debug + +# ---------------------------------------------------------------- +# Android install +# ---------------------------------------------------------------- + +android_install: + -$(ANDROID_ADB) uninstall $(PACKAGENAME) + $(ANDROID_ADB) install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- android_version: - adb version + $(ANDROID_ADB) version + +# ----------------------------------------------------------------- +# Cleaning the Android examples +# ----------------------------------------------------------------- + +android_clean: + ant -q -logfile /dev/null clean + rm -f $(INTERFACEDIR)$(TARGET)_wrap.* + rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` + rm -rf obj ################################################################## ##### MODULA3 ###### diff --git a/Examples/android/class/Makefile b/Examples/android/class/Makefile index 9e5a30dcd..6155d9494 100644 --- a/Examples/android/class/Makefile +++ b/Examples/android/class/Makefile @@ -2,6 +2,7 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = example INTERFACE = example.i +INTERFACEDIR = jni/ PACKAGEDIR = src/org/swig PACKAGENAME= org.swig.classexample SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/classexample @@ -9,18 +10,17 @@ PROJECTNAME= SwigClass TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -check: - android update project --target $(TARGETID) --name $(PROJECTNAME) --path . - $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) - ndk-build - ant debug +check: build + +build: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \ + PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp install: - -adb uninstall $(PACKAGENAME) - adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk + $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install clean: - ant clean - rm -f jni/$(TARGET)_wrap.cpp - rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - rm -rf obj + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean diff --git a/Examples/android/extend/Makefile b/Examples/android/extend/Makefile index 3811fd501..ec53013af 100644 --- a/Examples/android/extend/Makefile +++ b/Examples/android/extend/Makefile @@ -2,6 +2,7 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = example INTERFACE = example.i +INTERFACEDIR = jni/ PACKAGEDIR = src/org/swig PACKAGENAME= org.swig.extendexample SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/extendexample @@ -9,18 +10,17 @@ PROJECTNAME= SwigExtend TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -check: - android update project --target $(TARGETID) --name $(PROJECTNAME) --path . - $(SWIG) -c++ -java $(SWIGOPT) -o jni/$(TARGET)_wrap.cpp jni/$(INTERFACE) - ndk-build - ant debug +check: build + +build: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \ + PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android_cpp install: - -adb uninstall $(PACKAGENAME) - adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk + $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install clean: - ant clean - rm -f jni/$(TARGET)_wrap.h jni/$(TARGET)_wrap.cpp - rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - rm -rf obj + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean diff --git a/Examples/android/simple/Makefile b/Examples/android/simple/Makefile index 2c6dace2f..7e7ff40e1 100644 --- a/Examples/android/simple/Makefile +++ b/Examples/android/simple/Makefile @@ -2,6 +2,7 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig TARGET = example INTERFACE = example.i +INTERFACEDIR = jni/ PACKAGEDIR = src/org/swig PACKAGENAME= org.swig.simple SWIGOPT = -package $(PACKAGENAME) -outdir $(PACKAGEDIR)/simple @@ -9,18 +10,17 @@ PROJECTNAME= SwigSimple TARGETID = 1 #INSTALLOPTIONS = -s # To install on SD Card -check: - android update project --target $(TARGETID) --name $(PROJECTNAME) --path . - $(SWIG) -java $(SWIGOPT) -o jni/$(TARGET)_wrap.c jni/$(INTERFACE) - ndk-build - ant debug +check: build + +build: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' INTERFACEDIR='$(INTERFACEDIR)' \ + PROJECTNAME='$(PROJECTNAME)' TARGETID='$(TARGETID)' android install: - -adb uninstall $(PACKAGENAME) - adb install $(INSTALLOPTIONS) bin/$(PROJECTNAME)-debug.apk + $(MAKE) -f $(TOP)/Makefile INSTALLOPTIONS='$(INSTALLOPTIONS)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' PACKAGENAME='$(PACKAGENAME)' android_install clean: - ant clean - rm -f jni/$(TARGET)_wrap.c - rm -f `find $(PACKAGEDIR) -name \*.java | grep -v $(PROJECTNAME).java` - rm -rf obj + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' PROJECTNAME='$(PROJECTNAME)' \ + PACKAGEDIR='$(PACKAGEDIR)' INTERFACEDIR='$(INTERFACEDIR)' android_clean From 24c28b061e5c07614954d93c2087a350b1cf7a6f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 17 Apr 2013 20:28:58 +0100 Subject: [PATCH 425/538] Add in make -s (silent) detection and keep Android builds quiet when run from top level makefile Fix parallel make for Android example makefiles --- Examples/Makefile.in | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index f0077ce0b..867473f91 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -61,6 +61,27 @@ ISRCS = $(IWRAP:.i=.c) ICXXSRCS = $(IWRAP:.i=.cxx) IOBJS = $(IWRAP:.i=.@OBJEXT@) +################################################################## +# Some options for silent output +################################################################## + +ifneq (,$(findstring s, $(filter-out --%, $(MAKEFLAGS)))) + # make -s detected + SILENT=1 +else + SILENT= +endif + +ifneq (,$(SILENT)) + SILENT_OPTION = -s + SILENT_PIPE = >/dev/null + ANT_QUIET = -q -logfile /dev/null +else + SILENT_OPTION = + SILENT_PIPE = + ANT_QUIET = +endif + ################################################################## # Dynamic loading for C++ # If you are going to be building dynamic loadable modules in C++, @@ -609,20 +630,20 @@ TARGETID = 1 # ---------------------------------------------------------------- android: $(SRCS) - $(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path . + $(ANDROID) $(SILENT_OPTION) update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -java $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.c $(INTERFACEPATH) - $(ANDROID_NDK_BUILD) - $(ANT) debug + +$(ANDROID_NDK_BUILD) $(SILENT_PIPE) + $(ANT) $(ANT_QUIET) debug # ---------------------------------------------------------------- # Build an Android dynamically loadable module (C++) # ---------------------------------------------------------------- android_cpp: $(SRCS) - $(ANDROID) update project --target $(TARGETID) --name $(PROJECTNAME) --path . + $(ANDROID) $(SILENT_OPTION) update project --target $(TARGETID) --name $(PROJECTNAME) --path . $(SWIG) -java -c++ $(SWIGOPT) -o $(INTERFACEDIR)$(TARGET)_wrap.cpp $(INTERFACEPATH) - $(ANDROID_NDK_BUILD) - $(ANT) debug + +$(ANDROID_NDK_BUILD) $(SILENT_PIPE) + $(ANT) $(ANT_QUIET) debug # ---------------------------------------------------------------- # Android install From 897b2361cb3a2b0c8175d0798e1638fc091d70a4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:07:19 +0100 Subject: [PATCH 426/538] Chicken makefiles tweaks for consistency with other languages - still more to be done though --- Examples/Makefile.in | 9 +++++++++ Examples/chicken/class/Makefile | 12 ++++++------ Examples/chicken/constants/Makefile | 10 +++++----- Examples/chicken/egg/Makefile | 10 +++++----- Examples/chicken/multimap/Makefile | 10 +++++----- Examples/chicken/overload/Makefile | 10 +++++----- Examples/chicken/simple/Makefile | 10 +++++----- 7 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 867473f91..ae71d7ba9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1080,11 +1080,13 @@ pike_clean: CHICKEN = @CHICKEN@ CHICKEN_CSC = @CHICKEN_CSC@ +CHICKEN_CSI = @CHICKEN_CSI@ CHICKEN_LIBOPTS = @CHICKENLIB@ $(SYSLIBS) CHICKEN_SHAREDLIBOPTS = @CHICKENSHAREDLIB@ $(SYSLIBS) CHICKEN_CFLAGS = @CHICKENOPTS@ CHICKENOPTS = -quiet CHICKEN_MAIN = +CHICKEN_SCRIPT = $(RUNME).ss # SWIG produces $(ISRCS) (the C wrapper file) # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file): @@ -1165,6 +1167,13 @@ chicken_cpp: chicken_externalhdr: $(SWIG) -chicken -external-runtime $(TARGET) +# ----------------------------------------------------------------- +# Run CHICKEN example +# ----------------------------------------------------------------- + +chicken_run: + $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/chicken/class/Makefile b/Examples/chicken/class/Makefile index 1261ec5ac..976651e94 100644 --- a/Examples/chicken/class/Makefile +++ b/Examples/chicken/class/Makefile @@ -14,7 +14,11 @@ VARIANT = #CHICKEN_MAIN = test-tinyclos-class.scm #VARIANT = _static -all:: $(TARGET) $(TARGET)_proxy +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm + +build: $(TARGET) $(TARGET)_proxy $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -28,11 +32,7 @@ $(TARGET)_proxy: $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm diff --git a/Examples/chicken/constants/Makefile b/Examples/chicken/constants/Makefile index 81308fcf3..41ca7ae11 100644 --- a/Examples/chicken/constants/Makefile +++ b/Examples/chicken/constants/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-constants.scm #VARIANT = _static -all:: $(TARGET) +check: build + csi test-constants.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - csi test-constants.scm diff --git a/Examples/chicken/egg/Makefile b/Examples/chicken/egg/Makefile index bdf71b104..55aa114eb 100644 --- a/Examples/chicken/egg/Makefile +++ b/Examples/chicken/egg/Makefile @@ -1,6 +1,9 @@ SWIG = ../../../preinst-swig -all: single multi +check: build + cd eggs/install && csi ../../test.scm + +build: single multi # This creates an egg which contains only the single module. Any additional implementation files # that implement the interface being wrapped should also be added to this egg @@ -9,7 +12,7 @@ single: single_wrap.cxx tar czf eggs/single.egg single.setup single.scm single_wrap.cxx rm -f single.scm single_wrap.cxx -# complie the single module with -nounit +# compile the single module with -nounit single_wrap.cxx: single.i $(SWIG) -chicken -c++ -proxy -nounit single.i @@ -34,6 +37,3 @@ setup: mkdir -p install && \ chicken-setup -repository `pwd`/install single.egg && \ chicken-setup -repository `pwd`/install multi.egg - -check: - cd eggs/install && csi ../../test.scm diff --git a/Examples/chicken/multimap/Makefile b/Examples/chicken/multimap/Makefile index dace61a1e..4ae5a9cf3 100644 --- a/Examples/chicken/multimap/Makefile +++ b/Examples/chicken/multimap/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-multimap.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm diff --git a/Examples/chicken/overload/Makefile b/Examples/chicken/overload/Makefile index 48ec43af4..584fa52a2 100644 --- a/Examples/chicken/overload/Makefile +++ b/Examples/chicken/overload/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-overload.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm diff --git a/Examples/chicken/simple/Makefile b/Examples/chicken/simple/Makefile index bb7814260..1b03497cd 100644 --- a/Examples/chicken/simple/Makefile +++ b/Examples/chicken/simple/Makefile @@ -13,7 +13,10 @@ VARIANT = #CHICKEN_MAIN = test-simple.scm #VARIANT = _static -all:: $(TARGET) +check: build + env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm + +build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ @@ -21,10 +24,7 @@ $(TARGET): $(INTERFACE) $(SRCS) INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) -clean:: +clean: $(MAKE) -f $(TOP)/Makefile chicken_clean rm -f example.scm example-generic.scm example-clos.scm rm -f $(TARGET) - -check:: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm From 2e48e5b8521b0e9f661830742185f6299eac421e Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:13:27 +0100 Subject: [PATCH 427/538] Guile example makefiles tweaks for consistency with other languages. 'make check' still incomplete. --- Examples/Makefile.in | 11 +++++++++-- Examples/guile/Makefile.in | 6 +++--- Examples/guile/constants/Makefile | 10 +++++----- Examples/guile/matrix/Makefile | 7 +++---- Examples/guile/multimap/Makefile | 10 +++++----- Examples/guile/multivalue/Makefile | 10 +++++----- Examples/guile/port/Makefile | 7 +++---- Examples/guile/simple/Makefile | 10 +++++----- Examples/guile/std_vector/Makefile | 10 +++++----- 9 files changed, 43 insertions(+), 38 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index ae71d7ba9..4ddf9269b 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -459,6 +459,8 @@ GUILE_INCLUDE = @GUILEINCLUDE@ GUILE_LIB = @GUILELIB@ GUILE_SO = @GUILE_SO@ GUILE_LIBPREFIX = lib +GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) +GUILE_SCRIPT = $(RUNME).scm #------------------------------------------------------------------ # Build a dynamically loaded module with passive linkage and the scm interface @@ -507,8 +509,6 @@ guile_passive_cpp: $(SRCS) # Build statically linked Guile interpreter # ----------------------------------------------------------------- -GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) - guile_static: $(SRCS) $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ @@ -531,6 +531,13 @@ guile_simple_cpp: $(SRCS) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile +# ----------------------------------------------------------------- +# Running a Guile example +# ----------------------------------------------------------------- + +guile_run: + $(RUNTOOL) $(GUILE) -l $(GUILE_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in index a11095599..9e6f9f6c6 100644 --- a/Examples/guile/Makefile.in +++ b/Examples/guile/Makefile.in @@ -19,7 +19,7 @@ SO = @SO@ all: for d in $(subdirs) ; do (cd $$d ; $(MAKE)) ; done -clean:: +clean: for d in $(subdirs) ; do (cd $$d ; $(MAKE) clean) ; done rm -f *~ .~* @@ -29,11 +29,11 @@ guile_clean: # This is meant to be used w/ "make -f ../Makefile" from subdirs. # Doesn't make sense to use it from here. -sub-all:: +sub-all: $(SWIG) -guile $(SWIGOPT) $(IFILE) $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILEINCLUDE) $(GUILELINK) -sub-all-cxx:: +sub-all-cxx: $(SWIG) -c++ -guile $(SWIGOPT) $(IFILE) $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILEINCLUDE) $(GUILELINK) diff --git a/Examples/guile/constants/Makefile b/Examples/guile/constants/Makefile index 70243c75e..946323b89 100644 --- a/Examples/guile/constants/Makefile +++ b/Examples/guile/constants/Makefile @@ -3,15 +3,15 @@ TARGET = my-guile IFILE = example.i MKDIR = .. -all:: +check: build + ./my-guile -s constants.scm + +build: $(MAKE) -f $(MKDIR)/Makefile \ SRCS='$(SRCS)' \ TARGET=$(TARGET) \ IFILE=$(IFILE) \ sub-all -clean:: +clean: $(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean - -check: all - ./my-guile -s constants.scm diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile index 5df2c6515..551debe06 100644 --- a/Examples/guile/matrix/Makefile +++ b/Examples/guile/matrix/Makefile @@ -3,8 +3,9 @@ TARGET = matrix IFILE = package.i MKDIR = .. +check: build -all:: +build: $(MAKE) -f $(MKDIR)/Makefile \ SRCS='$(SRCS)' \ TARGET=$(TARGET) \ @@ -12,7 +13,5 @@ all:: MODULE=$(MODULE) \ sub-all -clean:: +clean: $(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean - -check: all diff --git a/Examples/guile/multimap/Makefile b/Examples/guile/multimap/Makefile index dc9c66d1f..00fa5df28 100644 --- a/Examples/guile/multimap/Makefile +++ b/Examples/guile/multimap/Makefile @@ -4,15 +4,15 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean - -check: all diff --git a/Examples/guile/multivalue/Makefile b/Examples/guile/multivalue/Makefile index dc9c66d1f..00fa5df28 100644 --- a/Examples/guile/multivalue/Makefile +++ b/Examples/guile/multivalue/Makefile @@ -4,15 +4,15 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all:: +check: build + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean - -check: all diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile index 824f3f823..2d81f44ca 100644 --- a/Examples/guile/port/Makefile +++ b/Examples/guile/port/Makefile @@ -3,8 +3,9 @@ TARGET = port IFILE = port.i MKDIR = .. +check: build -all:: +build: $(MAKE) -f $(MKDIR)/Makefile \ SRCS='$(SRCS)' \ TARGET=$(TARGET) \ @@ -12,7 +13,5 @@ all:: MODULE=$(MODULE) \ sub-all -clean:: +clean: $(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean - -check: all diff --git a/Examples/guile/simple/Makefile b/Examples/guile/simple/Makefile index 702b5bb96..d4021073e 100644 --- a/Examples/guile/simple/Makefile +++ b/Examples/guile/simple/Makefile @@ -3,7 +3,10 @@ TARGET = my-guile IFILE = example.i MKDIR = .. -all: $(TARGET) +check: $(TARGET) + ./$(TARGET) -s example.scm + +build: $(TARGET) $(TARGET): $(MAKE) -f $(MKDIR)/Makefile \ @@ -12,8 +15,5 @@ $(TARGET): IFILE=$(IFILE) \ sub-all -clean:: +clean: $(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean - -check: $(TARGET) - ./$(TARGET) -s example.scm > /dev/null diff --git a/Examples/guile/std_vector/Makefile b/Examples/guile/std_vector/Makefile index 2733fb017..08bf82c87 100644 --- a/Examples/guile/std_vector/Makefile +++ b/Examples/guile/std_vector/Makefile @@ -4,15 +4,15 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean - -check: all From a6e2ee858025c3c5d0bc13f7336d1669c7ad7b37 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:22:34 +0100 Subject: [PATCH 428/538] Modula3 makefiles tweaks for consistency with other languages - they still don't work though --- Examples/modula3/class/Makefile | 9 ++++----- Examples/modula3/enum/Makefile | 9 ++++----- Examples/modula3/exception/Makefile | 9 ++++----- Examples/modula3/reference/Makefile | 9 ++++----- Examples/modula3/simple/Makefile | 9 ++++----- Examples/modula3/typemap/Makefile | 9 ++++----- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Examples/modula3/class/Makefile b/Examples/modula3/class/Makefile index bf929a061..9976e6f80 100644 --- a/Examples/modula3/class/Makefile +++ b/Examples/modula3/class/Makefile @@ -7,9 +7,10 @@ INTERFACE = example.i SWIGOPT = -c++ MODULA3SRCS = *.[im]3 -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' modula3 m3ppinplace $(MODULA3SRCS) @@ -19,7 +20,5 @@ modula3:: ln -sf ../example.h src/example.h cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all diff --git a/Examples/modula3/enum/Makefile b/Examples/modula3/enum/Makefile index b5bf8f672..a3b499823 100644 --- a/Examples/modula3/enum/Makefile +++ b/Examples/modula3/enum/Makefile @@ -7,9 +7,10 @@ CONSTNUMERIC = example_const SWIGOPT = -c++ MODULA3SRCS = *.[im]3 -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(SWIG) -modula3 $(SWIGOPT) -module Example -generateconst $(CONSTNUMERIC) $(TARGET).h $(CXX) -Wall $(CONSTNUMERIC).c -o $(CONSTNUMERIC) $(CONSTNUMERIC) >$(CONSTNUMERIC).i @@ -20,7 +21,5 @@ modula3:: mv m3makefile $(MODULA3SRCS) src/ cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all diff --git a/Examples/modula3/exception/Makefile b/Examples/modula3/exception/Makefile index 2518a2203..8d4525512 100644 --- a/Examples/modula3/exception/Makefile +++ b/Examples/modula3/exception/Makefile @@ -7,9 +7,10 @@ SWIGOPT = MODULA3SRCS = *.[im]3 MODULA3FLAGS= -o runme -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' modula3_cpp # $(MAKE) -f $(TOP)/Makefile MODULA3SRCS='$(MODULA3SRCS)' MODULA3FLAGS='$(MODULA3FLAGS)' modula3_compile @@ -17,7 +18,5 @@ modula3:: mv m3makefile $(MODULA3SRCS) src/ cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all diff --git a/Examples/modula3/reference/Makefile b/Examples/modula3/reference/Makefile index b31577a58..62183931e 100644 --- a/Examples/modula3/reference/Makefile +++ b/Examples/modula3/reference/Makefile @@ -6,16 +6,15 @@ INTERFACE = example.i SWIGOPT = -c++ MODULA3SRCS = *.[im]3 -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' modula3 m3ppinplace $(MODULA3SRCS) mv m3makefile $(MODULA3SRCS) src/ cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all diff --git a/Examples/modula3/simple/Makefile b/Examples/modula3/simple/Makefile index 834521fa5..6a0ca4f0e 100644 --- a/Examples/modula3/simple/Makefile +++ b/Examples/modula3/simple/Makefile @@ -6,16 +6,15 @@ INTERFACE = example.i SWIGOPT = MODULA3SRCS = *.[im]3 -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' modula3 m3ppinplace $(MODULA3SRCS) mv m3makefile $(MODULA3SRCS) src/ cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all diff --git a/Examples/modula3/typemap/Makefile b/Examples/modula3/typemap/Makefile index 834521fa5..6a0ca4f0e 100644 --- a/Examples/modula3/typemap/Makefile +++ b/Examples/modula3/typemap/Makefile @@ -6,16 +6,15 @@ INTERFACE = example.i SWIGOPT = MODULA3SRCS = *.[im]3 -all:: modula3 +check: build + $(MAKE) -f $(TOP)/Makefile modula3_run -modula3:: +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' modula3 m3ppinplace $(MODULA3SRCS) mv m3makefile $(MODULA3SRCS) src/ cm3 -clean:: +clean: $(MAKE) -f $(TOP)/Makefile modula3_clean - -check: all From 238554fe618624b24d2422e80e9de512ec57c497 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:33:38 +0100 Subject: [PATCH 429/538] Mzscheme example makefiles tweaks for consistency with other languages. Attempt to add runtime tests to 'make check' - untested. --- Examples/Makefile.in | 15 +++++++++++++++ Examples/mzscheme/multimap/Makefile | 10 ++++++---- Examples/mzscheme/simple/Makefile | 10 ++++++---- Examples/mzscheme/std_vector/Makefile | 7 ++++--- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 4ddf9269b..8775af330 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -695,6 +695,13 @@ modula3: $(SRCS) modula3_cpp: $(SRCS) $(SWIG) -modula3 -c++ $(SWIGOPT) $(INTERFACEPATH) +# ----------------------------------------------------------------- +# Run modula3 example +# ----------------------------------------------------------------- + +modula3_run: + $(RUNTOOL) false $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -719,6 +726,7 @@ MZSCHEME = mzscheme MZC = @MZC@ MZDYNOBJ = @MZDYNOBJ@ MZSCHEME_SO = @MZSCHEME_SO@ +MZSCHEME_SCRIPT = $(RUNME).scm # ---------------------------------------------------------------- # Build a C/C++ dynamically loadable module @@ -734,6 +742,13 @@ mzscheme_cpp: $(SRCS) $(COMPILETOOL) $(MZC) `echo $(INCLUDES) | sed 's/-I/++ccf -I/g'` --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS) +# ----------------------------------------------------------------- +# Run mzscheme example +# ----------------------------------------------------------------- + +mzscheme_run: + $(RUNTOOL) $(MZSCHEME) -r $(MZSCHEME_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/mzscheme/multimap/Makefile b/Examples/mzscheme/multimap/Makefile index a3cfb8f3c..d1b4a3f39 100644 --- a/Examples/mzscheme/multimap/Makefile +++ b/Examples/mzscheme/multimap/Makefile @@ -4,10 +4,12 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile mzscheme_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' mzscheme -clean:: +clean: $(MAKE) -f $(TOP)/Makefile mzscheme_clean - -check: all diff --git a/Examples/mzscheme/simple/Makefile b/Examples/mzscheme/simple/Makefile index a3cfb8f3c..d1b4a3f39 100644 --- a/Examples/mzscheme/simple/Makefile +++ b/Examples/mzscheme/simple/Makefile @@ -4,10 +4,12 @@ SRCS = example.c TARGET = example INTERFACE = example.i SWIGOPT = -all:: + +check: build + $(MAKE) -f $(TOP)/Makefile mzscheme_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' mzscheme -clean:: +clean: $(MAKE) -f $(TOP)/Makefile mzscheme_clean - -check: all diff --git a/Examples/mzscheme/std_vector/Makefile b/Examples/mzscheme/std_vector/Makefile index e18726981..28b91158a 100644 --- a/Examples/mzscheme/std_vector/Makefile +++ b/Examples/mzscheme/std_vector/Makefile @@ -8,12 +8,13 @@ SWIGOPT = GPP = `which g++` MZC = test -n "/usr/bin/mzc" && /usr/bin/mzc -all:: +check: build + $(MAKE) -f $(TOP)/Makefile mzscheme_run + +build: $(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACE) $(MZC) --compiler $(GPP) ++ccf "-I." --cc example_wrap.cxx $(MZC) --linker $(GPP) --ld $(TARGET).so example_wrap.o clean: $(MAKE) -f $(TOP)/Makefile mzscheme_clean - -check: all From 280cd16b7eaad1b22dedf0e36912e7b8803e69ab Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:45:01 +0100 Subject: [PATCH 430/538] Ocaml example makefiles tweaks for consistency with other languages. Attempt to add runtime tests to 'make check' - untested. --- Examples/Makefile.in | 7 +++++++ Examples/ocaml/argout_ref/Makefile | 13 +++++++------ Examples/ocaml/contract/Makefile | 15 ++++++++------- Examples/ocaml/scoped_enum/Makefile | 15 ++++++++------- Examples/ocaml/shapes/Makefile | 15 ++++++++------- Examples/ocaml/simple/Makefile | 15 ++++++++------- Examples/ocaml/std_string/Makefile | 13 +++++++------ Examples/ocaml/std_vector/Makefile | 13 +++++++------ Examples/ocaml/stl/Makefile | 17 +++++++++-------- Examples/ocaml/string_from_ptr/Makefile | 15 ++++++++------- Examples/ocaml/strings_test/Makefile | 15 ++++++++------- 11 files changed, 85 insertions(+), 68 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 8775af330..feef7ff05 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -893,6 +893,13 @@ ocaml_dynamic_cpp: $(SRCS) -package dl -linkpkg \ $(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings' +# ----------------------------------------------------------------- +# Run ocaml example +# ----------------------------------------------------------------- + +ocaml_run: + $(RUNTOOL) false $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/ocaml/argout_ref/Makefile b/Examples/ocaml/argout_ref/Makefile index 8a260fe30..4e12e3769 100644 --- a/Examples/ocaml/argout_ref/Makefile +++ b/Examples/ocaml/argout_ref/Makefile @@ -7,21 +7,22 @@ MLFILE = example.ml PROGFILE = example_prog.ml OBJS = example.o -all:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/contract/Makefile b/Examples/ocaml/contract/Makefile index 8e0f2a4fd..91d39247e 100644 --- a/Examples/ocaml/contract/Makefile +++ b/Examples/ocaml/contract/Makefile @@ -7,27 +7,28 @@ MLFILE = example.ml PROGFILE = example_prog.ml OBJS = -all:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -dynamic:: +build: static + +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static -toplevel:: +toplevel: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_toplevel -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/scoped_enum/Makefile b/Examples/ocaml/scoped_enum/Makefile index 45c5edca4..4920e3b3b 100644 --- a/Examples/ocaml/scoped_enum/Makefile +++ b/Examples/ocaml/scoped_enum/Makefile @@ -7,27 +7,28 @@ MLFILE = example.ml PROGFILE = example_prog.ml OBJS = -all:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -dynamic:: +build: static + +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp -toplevel:: +toplevel: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp_toplevel -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/shapes/Makefile b/Examples/ocaml/shapes/Makefile index 31f9934a7..38230eb69 100644 --- a/Examples/ocaml/shapes/Makefile +++ b/Examples/ocaml/shapes/Makefile @@ -8,27 +8,28 @@ MLFILE = example.ml PROGFILE = example_prog.ml OBJS = example.o -all:: static static_top +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static static_top + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp -static_top:: +static_top: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp_toplevel -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/simple/Makefile b/Examples/ocaml/simple/Makefile index 4b85bf33e..64c7256c1 100644 --- a/Examples/ocaml/simple/Makefile +++ b/Examples/ocaml/simple/Makefile @@ -7,27 +7,28 @@ MLFILE = example.ml PROGFILE = example_prog.ml OBJS = example.o -all:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -dynamic:: +build: static + +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static -toplevel:: +toplevel: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' \ PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_toplevel -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/std_string/Makefile b/Examples/ocaml/std_string/Makefile index e5a8017ae..0250cfd2d 100644 --- a/Examples/ocaml/std_string/Makefile +++ b/Examples/ocaml/std_string/Makefile @@ -5,19 +5,20 @@ TARGET = example INTERFACE = example.i PROGFILE = runme.ml -all default:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_dynamic_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean - -check: all diff --git a/Examples/ocaml/std_vector/Makefile b/Examples/ocaml/std_vector/Makefile index e5a8017ae..0250cfd2d 100644 --- a/Examples/ocaml/std_vector/Makefile +++ b/Examples/ocaml/std_vector/Makefile @@ -5,19 +5,20 @@ TARGET = example INTERFACE = example.i PROGFILE = runme.ml -all default:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_dynamic_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean - -check: all diff --git a/Examples/ocaml/stl/Makefile b/Examples/ocaml/stl/Makefile index fa4333ec0..545f3229a 100644 --- a/Examples/ocaml/stl/Makefile +++ b/Examples/ocaml/stl/Makefile @@ -5,29 +5,30 @@ TARGET = example INTERFACE = example.i PROGFILE = runme.ml -all default:: static +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -director:: +director: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp_director -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -toplevel:: +toplevel: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp_toplevel -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean - -check: all diff --git a/Examples/ocaml/string_from_ptr/Makefile b/Examples/ocaml/string_from_ptr/Makefile index 350d9734c..f7b808934 100644 --- a/Examples/ocaml/string_from_ptr/Makefile +++ b/Examples/ocaml/string_from_ptr/Makefile @@ -8,27 +8,28 @@ MLFILE = foolib.ml PROGFILE = example_prog.ml OBJS = -all:: static static_top +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static static_top + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp -static_top:: +static_top: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_static_cpp_toplevel -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' MLFILE='$(MLFILE)' PROGFILE='$(PROGFILE)' OBJS='$(OBJS)' \ ocaml_dynamic_cpp -clean:: +clean: $(MAKE) -f $(TOP)/Makefile MLFILE='$(MLFILE)' ocaml_clean - -check: all diff --git a/Examples/ocaml/strings_test/Makefile b/Examples/ocaml/strings_test/Makefile index 8d1f96edf..14f55e0d9 100644 --- a/Examples/ocaml/strings_test/Makefile +++ b/Examples/ocaml/strings_test/Makefile @@ -5,24 +5,25 @@ TARGET = example INTERFACE = example.i PROGFILE = runme.ml -all default:: static top +check: build + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_run -static:: +build: static top + +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -dynamic:: +dynamic: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp -top:: +top: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ PROGFILE='$(PROGFILE)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \ ocaml_static_cpp_toplevel -clean:: +clean: $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' ocaml_clean - -check: all From 9a6167822ba2c64b14e1b7c1c2683c3a7477d336 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:49:12 +0100 Subject: [PATCH 431/538] Pike example makefiles tweaks for consistency with other languages. Attempt to add runtime tests to 'make check' - untested. --- Examples/Makefile.in | 11 +++++++++-- Examples/pike/class/Makefile | 7 ++++--- Examples/pike/constants/Makefile | 11 ++++++----- Examples/pike/enum/Makefile | 11 ++++++----- Examples/pike/overload/Makefile | 11 ++++++----- Examples/pike/simple/Makefile | 7 ++++--- Examples/pike/template/Makefile | 7 ++++--- 7 files changed, 39 insertions(+), 26 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index feef7ff05..43efdc472 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1048,6 +1048,8 @@ PIKE_CFLAGS = @PIKECCDLFLAGS@ -DHAVE_CONFIG_H PIKE_INCLUDE = @PIKEINCLUDE@ PIKE_LIB = @PIKELIB@ PIKE_DLNK = @PIKEDYNAMICLINKING@ +PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS) +PIKE_SCRIPT = $(RUNME).pike # ---------------------------------------------------------------- # Build a C dynamically loadable module @@ -1074,8 +1076,6 @@ pike_cpp: $(SRCS) # library file # ----------------------------------------------------------------- -PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS) - pike_static: $(SRCS) $(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \ @@ -1086,6 +1086,13 @@ pike_cpp_static: $(SRCS) $(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ $(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET) +# ----------------------------------------------------------------- +# Run pike example +# ----------------------------------------------------------------- + +pike_run: + $(RUNTOOL) $(PIKE) $(PIKE_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- diff --git a/Examples/pike/class/Makefile b/Examples/pike/class/Makefile index 981ccef6f..aadc47151 100644 --- a/Examples/pike/class/Makefile +++ b/Examples/pike/class/Makefile @@ -5,7 +5,10 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp @@ -15,5 +18,3 @@ static: clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all diff --git a/Examples/pike/constants/Makefile b/Examples/pike/constants/Makefile index 7fa493851..9a882bd4d 100644 --- a/Examples/pike/constants/Makefile +++ b/Examples/pike/constants/Makefile @@ -4,15 +4,16 @@ SRCS = TARGET = example INTERFACE = example.i -all:: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike -static:: +static: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='mypike' INTERFACE='$(INTERFACE)' pike_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all diff --git a/Examples/pike/enum/Makefile b/Examples/pike/enum/Makefile index 0ae102156..aadc47151 100644 --- a/Examples/pike/enum/Makefile +++ b/Examples/pike/enum/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypike' INTERFACE='$(INTERFACE)' pike_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all diff --git a/Examples/pike/overload/Makefile b/Examples/pike/overload/Makefile index 60af005b1..8d799efe1 100644 --- a/Examples/pike/overload/Makefile +++ b/Examples/pike/overload/Makefile @@ -5,15 +5,16 @@ TARGET = example INTERFACE = example.i LIBS = -lstdc++ -lm -all:: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp -static:: +static: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='mypike' INTERFACE='$(INTERFACE)' pike_cpp_static -clean:: +clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all diff --git a/Examples/pike/simple/Makefile b/Examples/pike/simple/Makefile index 544c97b5d..f58ed4e65 100644 --- a/Examples/pike/simple/Makefile +++ b/Examples/pike/simple/Makefile @@ -4,7 +4,10 @@ SRCS = example.c TARGET = example INTERFACE = example.i -all: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike @@ -14,5 +17,3 @@ static: clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all diff --git a/Examples/pike/template/Makefile b/Examples/pike/template/Makefile index b3f012927..73a31ee1a 100644 --- a/Examples/pike/template/Makefile +++ b/Examples/pike/template/Makefile @@ -6,7 +6,10 @@ INTERFACE = example.i LIBS = -lm SWIGOPT = -all: +check: build + $(MAKE) -f $(TOP)/Makefile pike_run + +build: $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp @@ -16,5 +19,3 @@ static: clean: $(MAKE) -f $(TOP)/Makefile pike_clean - -check: all From ceb5c59c8d8f81bcc8897a3f5601353caf2f8627 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 22:52:23 +0100 Subject: [PATCH 432/538] XML example makefiles tweaks for consistency with other languages --- Examples/xml/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/Examples/xml/Makefile.in b/Examples/xml/Makefile.in index dfda4a646..27c86e3e9 100644 --- a/Examples/xml/Makefile.in +++ b/Examples/xml/Makefile.in @@ -19,8 +19,6 @@ all-dot-i-files = \ example_xml.i \ gnarly.i -all: check - chk-swiglib = $(top_srcdir)/Lib check: From e3d0947058206f29c41c2d3631858661267bed80 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 23:09:49 +0100 Subject: [PATCH 433/538] D example makefiles tweaks for consistency with other languages. --- Examples/Makefile.in | 4 +++- Examples/d/callback/Makefile | 13 +++++-------- Examples/d/class/Makefile | 13 +++++-------- Examples/d/constants/Makefile | 13 +++++-------- Examples/d/enum/Makefile | 13 +++++-------- Examples/d/extend/Makefile | 13 +++++-------- Examples/d/funcptr/Makefile | 13 +++++-------- Examples/d/simple/Makefile | 13 +++++-------- Examples/d/variables/Makefile | 13 +++++-------- 9 files changed, 43 insertions(+), 65 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 43efdc472..b95d9e129 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1650,6 +1650,8 @@ else DCOMPILER = @D1COMPILER@ endif +D_RUNME = ./$(RUNME) + # ---------------------------------------------------------------- # Build a dynamically loadable D wrapper for a C module # ---------------------------------------------------------------- @@ -1682,7 +1684,7 @@ d_compile: $(SRCS) # ----------------------------------------------------------------- d_run: - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme + $(RUNTOOL) $(D_RUNME) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/d/callback/Makefile b/Examples/d/callback/Makefile index b5808cf0d..eda18f13c 100644 --- a/Examples/d/callback/Makefile +++ b/Examples/d/callback/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/class/Makefile b/Examples/d/class/Makefile index b5808cf0d..eda18f13c 100644 --- a/Examples/d/class/Makefile +++ b/Examples/d/class/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/constants/Makefile b/Examples/d/constants/Makefile index 412055243..d537ce281 100644 --- a/Examples/d/constants/Makefile +++ b/Examples/d/constants/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/enum/Makefile b/Examples/d/enum/Makefile index b5808cf0d..eda18f13c 100644 --- a/Examples/d/enum/Makefile +++ b/Examples/d/enum/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/extend/Makefile b/Examples/d/extend/Makefile index b5808cf0d..eda18f13c 100644 --- a/Examples/d/extend/Makefile +++ b/Examples/d/extend/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d_cpp; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/funcptr/Makefile b/Examples/d/funcptr/Makefile index 09efa8d88..2ba893ca7 100644 --- a/Examples/d/funcptr/Makefile +++ b/Examples/d/funcptr/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/simple/Makefile b/Examples/d/simple/Makefile index ae173a566..a8808c9c5 100644 --- a/Examples/d/simple/Makefile +++ b/Examples/d/simple/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run diff --git a/Examples/d/variables/Makefile b/Examples/d/variables/Makefile index ae173a566..a8808c9c5 100644 --- a/Examples/d/variables/Makefile +++ b/Examples/d/variables/Makefile @@ -13,18 +13,15 @@ SWIGOPT = DSRCS = *.d DFLAGS = -ofrunme +check: build + cd $(WORKING_DIR); \ + $(MAKE) -f $(TOP)/Makefile d_run -all:: d - -d:: +build: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile EXTRA_CFLAGS='$(EXTRA_CFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT) -outcurrentdir ../example.i' TARGET='$(TARGET)' d; \ $(MAKE) -f $(TOP)/Makefile DSRCS='$(DSRCS)' DFLAGS='$(DFLAGS)' d_compile -clean:: +clean: cd $(WORKING_DIR); \ $(MAKE) -f $(TOP)/Makefile d_clean - -check: all - cd $(WORKING_DIR); \ - $(MAKE) -f $(TOP)/Makefile d_run From ea84fe6445e9ac9a8cd097260eaca4a17ab0e609 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 16 Apr 2013 07:26:12 +0100 Subject: [PATCH 434/538] Allegrocl, clisp, cffi, uffi makefile targets added for running examples - untested. --- Examples/Makefile.in | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b95d9e129..f5b93dbe9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1369,6 +1369,7 @@ lua_clean: ################################################################## ALLEGROCL = @ALLEGROCLBIN@ +ALLEGROCL_SCRIPT=$(RUNME).lisp allegrocl: $(SRCS) $(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH) @@ -1380,6 +1381,13 @@ allegrocl_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Run ALLEGRO CL example +# ----------------------------------------------------------------- + +allegrocl_run: + $(RUNTOOL) $(ALLEGROCL) -batch -s $(ALLEGROCL_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -1401,6 +1409,7 @@ allegrocl_clean: ################################################################## CLISP = @CLISPBIN@ +CLISP_SCRIPT=$(RUNME).lisp clisp: $(SRCS) $(SWIG) -clisp $(SWIGOPT) $(INTERFACEPATH) @@ -1408,6 +1417,13 @@ clisp: $(SRCS) clisp_cpp: $(SRCS) $(SWIG) -c++ -clisp $(SWIGOPT) $(INTERFACEPATH) +# ----------------------------------------------------------------- +# Run CLISP example +# ----------------------------------------------------------------- + +clisp_run: + $(RUNTOOL) $(CLISP) -batch -s $(CLISP_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -1429,6 +1445,7 @@ clisp_clean: ################################################################## CFFI = @CFFIBIN@ +CFFI_SCRIPT=$(RUNME).lisp cffi: $(SRCS) $(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH) @@ -1440,6 +1457,13 @@ cffi_cpp: $(SRCS) $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Run CFFI example +# ----------------------------------------------------------------- + +cffi_run: + $(RUNTOOL) $(CFFI) -batch -s $(CFFI_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- @@ -1461,6 +1485,7 @@ cffi_clean: ################################################################## UFFI = @UFFIBIN@ +UFFI_SCRIPT=$(RUNME).lisp uffi: $(SRCS) $(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH) @@ -1472,6 +1497,13 @@ uffi_cpp: $(SRCS) # $(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) # $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) +# ----------------------------------------------------------------- +# Run UFFI example +# ----------------------------------------------------------------- + +uffi_run: + $(RUNTOOL) $(UFFI) -batch -s $(UFFI_SCRIPT) $(RUNPIPE) + # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- From 1f4bd0bfa5bc1bef809764a99e56186cb3df88de Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 15 Apr 2013 23:12:47 +0100 Subject: [PATCH 435/538] Minor extraneous makefiles tidy up --- Lib/guile/Makefile | 2 +- Lib/mzscheme/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/guile/Makefile b/Lib/guile/Makefile index ff66f9efa..17f5feced 100644 --- a/Lib/guile/Makefile +++ b/Lib/guile/Makefile @@ -1,4 +1,4 @@ -co:: +co: co RCS/*.i* RCS/*.swg* diff --git a/Lib/mzscheme/Makefile b/Lib/mzscheme/Makefile index ff66f9efa..17f5feced 100644 --- a/Lib/mzscheme/Makefile +++ b/Lib/mzscheme/Makefile @@ -1,4 +1,4 @@ -co:: +co: co RCS/*.i* RCS/*.swg* From 303b319cf061144c1862d0e0687bb712ffb8126c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 00:22:07 +0100 Subject: [PATCH 436/538] Add ability to see example output from top level by using 'make check-examples RUNPIPE=' --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 04d65a107..c47cdbe7c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,7 @@ TARGET = $(TARGET_NOEXE)@EXEEXT@ SOURCE = Source CCACHE = CCache DOCS = Doc/Manual +RUNPIPE = \>/dev/null swig: libfiles source ccache @@ -229,7 +230,7 @@ check-%-examples : # individual example %.actionexample: @echo $(ACTION)ing Examples/$(LANGUAGE)/$* - @(cd Examples/$(LANGUAGE)/$* && $(MAKE) -s $(chk-set-env) $(ACTION) RUNPIPE=\>/dev/null) + @(cd Examples/$(LANGUAGE)/$* && $(MAKE) -s $(chk-set-env) $(ACTION) RUNPIPE=$(RUNPIPE)) # gcj individual example java.actionexample: From 13b66c997e7ce685031d15768c860cffa426f4dc Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 00:02:23 +0100 Subject: [PATCH 437/538] Guile example makefiles - run some of the examples in the check target. Still some are missing. Add some missing examples to check.list. --- Examples/guile/check.list | 4 +++- Examples/guile/matrix/Makefile | 1 + Examples/guile/port/Makefile | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Examples/guile/check.list b/Examples/guile/check.list index 7ccd0730a..08524a8f7 100644 --- a/Examples/guile/check.list +++ b/Examples/guile/check.list @@ -1,6 +1,8 @@ # see top-level Makefile.in constants -simple port +simple +std_vector +matrix multimap multivalue diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile index 551debe06..e8466e5fc 100644 --- a/Examples/guile/matrix/Makefile +++ b/Examples/guile/matrix/Makefile @@ -4,6 +4,7 @@ IFILE = package.i MKDIR = .. check: build + ./$(TARGET) -e do-test -s matrix.scm build: $(MAKE) -f $(MKDIR)/Makefile \ diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile index 2d81f44ca..33eeab2e9 100644 --- a/Examples/guile/port/Makefile +++ b/Examples/guile/port/Makefile @@ -4,6 +4,7 @@ IFILE = port.i MKDIR = .. check: build + ./$(TARGET) -s port.scm build: $(MAKE) -f $(MKDIR)/Makefile \ From 7fd18b361e447e5705582bf28ebf163fa94d5e6a Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 00:22:48 +0100 Subject: [PATCH 438/538] Ocaml example makefiles - run examples - there are plenty of problems currently though --- Examples/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index f5b93dbe9..7ace11062 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -898,7 +898,7 @@ ocaml_dynamic_cpp: $(SRCS) # ----------------------------------------------------------------- ocaml_run: - $(RUNTOOL) false $(RUNPIPE) + $(RUNTOOL) ./$(TARGET) $(RUNPIPE) # ----------------------------------------------------------------- # Version display From 62638bfd15a14420a6bbf83b3907cdb289093acd Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 00:56:04 +0100 Subject: [PATCH 439/538] Pike - a few updates to get Pike 7.8 running most of the examples --- Examples/pike/check.list | 2 ++ Lib/pike/pike.swg | 6 +++--- Lib/pike/pikerun.swg | 5 +++-- configure.ac | 17 ++++++++++------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Examples/pike/check.list b/Examples/pike/check.list index a8d348bf1..d6c8e2e7b 100644 --- a/Examples/pike/check.list +++ b/Examples/pike/check.list @@ -2,4 +2,6 @@ class constants enum +overload simple +template diff --git a/Lib/pike/pike.swg b/Lib/pike/pike.swg index 130af1346..399752a7a 100644 --- a/Lib/pike/pike.swg +++ b/Lib/pike/pike.swg @@ -11,9 +11,9 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include +#include +#include +#include #ifdef __cplusplus } #endif diff --git a/Lib/pike/pikerun.swg b/Lib/pike/pikerun.swg index 70d40fac9..6ec1143cf 100644 --- a/Lib/pike/pikerun.swg +++ b/Lib/pike/pikerun.swg @@ -9,11 +9,12 @@ #ifdef __cplusplus extern "C" { #endif -#include "object.h" -#include "program.h" +#include "pike/object.h" +#include "pike/program.h" #ifdef __cplusplus } #endif +#include /* Stores information about a wrapped object */ typedef struct swig_object_wrapper { diff --git a/configure.ac b/configure.ac index 65a9c9078..83b46f520 100644 --- a/configure.ac +++ b/configure.ac @@ -1618,18 +1618,21 @@ AC_ARG_WITH(pikeincl, AS_HELP_STRING([--with-pikeincl=path], if test -n "$PIKE"; then AC_MSG_CHECKING([for Pike header files]) if test -z "$PIKEINCLUDE" -a -n "$PIKECONFIG"; then - PIKEINCLUDE=`$PIKECONFIG --cflags` + PIKEINCLUDE=`$PIKECONFIG --cflags` fi if test -z "$PIKEINCLUDE" -a -n "$PIKE"; then - PIKEPATH=`which $PIKE` - PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH` - PIKEINCLUDE="-I$PIKEINCLUDE" + PIKEINCLUDE=`$PIKE -x cflags` + if test -z "$PIKEINCLUDE"; then + PIKEPATH=`which $PIKE` + PIKEINCLUDE=`$PIKE Tools/check-include-path.pike $PIKEPATH` + PIKEINCLUDE="-I$PIKEINCLUDE" + fi fi if test -z "$PIKEINCLUDE"; then - AC_MSG_RESULT(not found) + AC_MSG_RESULT(not found) else - AC_MSG_RESULT($PIKEINCLUDE) + AC_MSG_RESULT($PIKEINCLUDE) fi fi fi @@ -2305,7 +2308,7 @@ fi AC_SUBST(SKIP_OCAML) -SKIP_PIKE="1" # Always skipped! +SKIP_PIKE= if test -z "$PIKE" || test -z "$PIKEINCLUDE" ; then SKIP_PIKE="1" fi From 2b2305cce938f25cf91de50b753d95cf76e367d4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 01:23:54 +0100 Subject: [PATCH 440/538] Mzscheme - fix for running examples during 'make check-examples' - they don't run very well though\! --- Examples/Makefile.in | 2 +- Examples/mzscheme/check.list | 1 + Examples/mzscheme/multimap/{example.scm => runme.scm} | 4 ++-- Examples/mzscheme/simple/{example.scm => runme.scm} | 2 +- Examples/mzscheme/std_vector/{example.scm => runme.scm} | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) rename Examples/mzscheme/multimap/{example.scm => runme.scm} (89%) rename Examples/mzscheme/simple/{example.scm => runme.scm} (92%) rename Examples/mzscheme/std_vector/{example.scm => runme.scm} (97%) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 7ace11062..c7257ac4c 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -747,7 +747,7 @@ mzscheme_cpp: $(SRCS) # ----------------------------------------------------------------- mzscheme_run: - $(RUNTOOL) $(MZSCHEME) -r $(MZSCHEME_SCRIPT) $(RUNPIPE) + env LD_LIBRARY_PATH=. $(RUNTOOL) $(MZSCHEME) -r $(MZSCHEME_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/mzscheme/check.list b/Examples/mzscheme/check.list index ae728ea43..f9e4f11c7 100644 --- a/Examples/mzscheme/check.list +++ b/Examples/mzscheme/check.list @@ -1,3 +1,4 @@ # see top-level Makefile.in multimap simple +std_vector diff --git a/Examples/mzscheme/multimap/example.scm b/Examples/mzscheme/multimap/runme.scm similarity index 89% rename from Examples/mzscheme/multimap/example.scm rename to Examples/mzscheme/multimap/runme.scm index ac9f64283..f1e626f43 100644 --- a/Examples/mzscheme/multimap/example.scm +++ b/Examples/mzscheme/multimap/runme.scm @@ -1,4 +1,4 @@ -;; run with mzscheme -r example.scm +;; run with mzscheme -r runme.scm (load-extension "example.so") @@ -24,4 +24,4 @@ (newline) (display (capitalize "hello world")) -(newline) \ No newline at end of file +(newline) diff --git a/Examples/mzscheme/simple/example.scm b/Examples/mzscheme/simple/runme.scm similarity index 92% rename from Examples/mzscheme/simple/example.scm rename to Examples/mzscheme/simple/runme.scm index 8e20345b2..a98e31fd5 100644 --- a/Examples/mzscheme/simple/example.scm +++ b/Examples/mzscheme/simple/runme.scm @@ -1,4 +1,4 @@ -;; run with mzscheme -r example.scm +;; run with mzscheme -r runme.scm (load-extension "example.so") diff --git a/Examples/mzscheme/std_vector/example.scm b/Examples/mzscheme/std_vector/runme.scm similarity index 97% rename from Examples/mzscheme/std_vector/example.scm rename to Examples/mzscheme/std_vector/runme.scm index 0e4ac3f97..67351f128 100644 --- a/Examples/mzscheme/std_vector/example.scm +++ b/Examples/mzscheme/std_vector/runme.scm @@ -1,4 +1,4 @@ -;; run with mzscheme -r example.scm +;; run with mzscheme -r runme.scm (load-extension "example.so") From 58a59919dddfe19cef2ca72db8a883f2344e16fc Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 02:13:17 +0100 Subject: [PATCH 441/538] Chicken - make check-examples run like other examples - not all run very well though! --- Examples/Makefile.in | 4 ++-- Examples/chicken/class/Makefile | 20 +++++++++---------- ...-lowlevel-class.scm => runme-lowlevel.scm} | 0 ...-tinyclos-class.scm => runme-tinyclos.scm} | 0 Examples/chicken/constants/Makefile | 10 +++++----- .../{test-constants.scm => runme.scm} | 0 Examples/chicken/multimap/Makefile | 10 +++++----- .../multimap/{test-multimap.scm => runme.scm} | 1 - Examples/chicken/overload/Makefile | 10 +++++----- .../overload/{test-overload.scm => runme.scm} | 0 Examples/chicken/simple/Makefile | 10 +++++----- .../simple/{test-simple.scm => runme.scm} | 0 12 files changed, 32 insertions(+), 33 deletions(-) rename Examples/chicken/class/{test-lowlevel-class.scm => runme-lowlevel.scm} (100%) rename Examples/chicken/class/{test-tinyclos-class.scm => runme-tinyclos.scm} (100%) rename Examples/chicken/constants/{test-constants.scm => runme.scm} (100%) rename Examples/chicken/multimap/{test-multimap.scm => runme.scm} (97%) rename Examples/chicken/overload/{test-overload.scm => runme.scm} (100%) rename Examples/chicken/simple/{test-simple.scm => runme.scm} (100%) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c7257ac4c..c0cdb703f 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1122,7 +1122,7 @@ CHICKEN_SHAREDLIBOPTS = @CHICKENSHAREDLIB@ $(SYSLIBS) CHICKEN_CFLAGS = @CHICKENOPTS@ CHICKENOPTS = -quiet CHICKEN_MAIN = -CHICKEN_SCRIPT = $(RUNME).ss +CHICKEN_SCRIPT = $(RUNME).scm # SWIG produces $(ISRCS) (the C wrapper file) # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file): @@ -1208,7 +1208,7 @@ chicken_externalhdr: # ----------------------------------------------------------------- chicken_run: - $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE) + env LD_LIBRARY_PATH=. $(RUNTOOL) $(CHICKEN_CSI) $(CHICKEN_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/chicken/class/Makefile b/Examples/chicken/class/Makefile index 976651e94..1436d836f 100644 --- a/Examples/chicken/class/Makefile +++ b/Examples/chicken/class/Makefile @@ -10,27 +10,27 @@ CFLAGS = VARIANT = # uncomment the following lines to build a static exe (only pick one of the CHICKEN_MAIN lines) -#CHICKEN_MAIN = test-lowlevel-class.scm -#CHICKEN_MAIN = test-tinyclos-class.scm +#CHICKEN_MAIN = runme-lowlevel.scm +#CHICKEN_MAIN = runme-tinyclos.scm #VARIANT = _static check: build - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-lowlevel-class.scm - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-tinyclos-class.scm + $(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-lowlevel.scm' chicken_run + $(MAKE) -f $(TOP)/Makefile CHICKEN_SCRIPT='runme-tinyclos.scm' chicken_run build: $(TARGET) $(TARGET)_proxy $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp $(TARGET)_proxy: $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT) -proxy' TARGET='$(TARGET)_proxy' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp clean: $(MAKE) -f $(TOP)/Makefile chicken_clean diff --git a/Examples/chicken/class/test-lowlevel-class.scm b/Examples/chicken/class/runme-lowlevel.scm similarity index 100% rename from Examples/chicken/class/test-lowlevel-class.scm rename to Examples/chicken/class/runme-lowlevel.scm diff --git a/Examples/chicken/class/test-tinyclos-class.scm b/Examples/chicken/class/runme-tinyclos.scm similarity index 100% rename from Examples/chicken/class/test-tinyclos-class.scm rename to Examples/chicken/class/runme-tinyclos.scm diff --git a/Examples/chicken/constants/Makefile b/Examples/chicken/constants/Makefile index 41ca7ae11..31e39d346 100644 --- a/Examples/chicken/constants/Makefile +++ b/Examples/chicken/constants/Makefile @@ -10,19 +10,19 @@ CFLAGS = VARIANT = # uncomment the following two lines to build a static exe -#CHICKEN_MAIN = test-constants.scm +#CHICKEN_MAIN = runme.scm #VARIANT = _static check: build - csi test-constants.scm + $(MAKE) -f $(TOP)/Makefile chicken_run build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) clean: $(MAKE) -f $(TOP)/Makefile chicken_clean diff --git a/Examples/chicken/constants/test-constants.scm b/Examples/chicken/constants/runme.scm similarity index 100% rename from Examples/chicken/constants/test-constants.scm rename to Examples/chicken/constants/runme.scm diff --git a/Examples/chicken/multimap/Makefile b/Examples/chicken/multimap/Makefile index 4ae5a9cf3..eba36169d 100644 --- a/Examples/chicken/multimap/Makefile +++ b/Examples/chicken/multimap/Makefile @@ -10,19 +10,19 @@ CFLAGS = VARIANT = # uncomment the following two lines to build a static exe -#CHICKEN_MAIN = test-multimap.scm +#CHICKEN_MAIN = runme.scm #VARIANT = _static check: build - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-multimap.scm + $(MAKE) -f $(TOP)/Makefile chicken_run build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) clean: $(MAKE) -f $(TOP)/Makefile chicken_clean diff --git a/Examples/chicken/multimap/test-multimap.scm b/Examples/chicken/multimap/runme.scm similarity index 97% rename from Examples/chicken/multimap/test-multimap.scm rename to Examples/chicken/multimap/runme.scm index 3a6b46e2c..ebe644004 100644 --- a/Examples/chicken/multimap/test-multimap.scm +++ b/Examples/chicken/multimap/runme.scm @@ -1,4 +1,3 @@ -;; run with './multimap test-multimap.scm' ;; feel free to uncomment and comment sections (load-library 'example "multimap.so") diff --git a/Examples/chicken/overload/Makefile b/Examples/chicken/overload/Makefile index 584fa52a2..e15352ec5 100644 --- a/Examples/chicken/overload/Makefile +++ b/Examples/chicken/overload/Makefile @@ -10,19 +10,19 @@ CFLAGS = VARIANT = # uncomment the following lines to build a static exe -#CHICKEN_MAIN = test-overload.scm +#CHICKEN_MAIN = runme.scm #VARIANT = _static check: build - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-overload.scm + $(MAKE) -f $(TOP)/Makefile chicken_run build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT)_cpp clean: $(MAKE) -f $(TOP)/Makefile chicken_clean diff --git a/Examples/chicken/overload/test-overload.scm b/Examples/chicken/overload/runme.scm similarity index 100% rename from Examples/chicken/overload/test-overload.scm rename to Examples/chicken/overload/runme.scm diff --git a/Examples/chicken/simple/Makefile b/Examples/chicken/simple/Makefile index 1b03497cd..f8fb006a4 100644 --- a/Examples/chicken/simple/Makefile +++ b/Examples/chicken/simple/Makefile @@ -10,19 +10,19 @@ CFLAGS = VARIANT = # uncomment the following two lines to build a static exe -#CHICKEN_MAIN = test-simple.scm +#CHICKEN_MAIN = runme.scm #VARIANT = _static check: build - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH csi test-simple.scm + $(MAKE) -f $(TOP)/Makefile chicken_run build: $(TARGET) $(TARGET): $(INTERFACE) $(SRCS) $(MAKE) -f $(TOP)/Makefile \ - SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ - INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ - SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) + SRCS='$(SRCS)' CXXSRCS='$(CXXSRCS)' CHICKEN_MAIN='$(CHICKEN_MAIN)' \ + INCLUDE='$(INCLUDE)' SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' \ + SWIG='$(SWIG)' INTERFACE='$(INTERFACE)' CHICKENOPTS='$(CHICKENOPTS)' chicken$(VARIANT) clean: $(MAKE) -f $(TOP)/Makefile chicken_clean diff --git a/Examples/chicken/simple/test-simple.scm b/Examples/chicken/simple/runme.scm similarity index 100% rename from Examples/chicken/simple/test-simple.scm rename to Examples/chicken/simple/runme.scm From 9f95e30650737df2a22ebfb780169181c9d18695 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 20 Apr 2013 02:51:57 +0100 Subject: [PATCH 442/538] Fix PHP test-suite running examples recently broken in 0fa791d --- Examples/test-suite/php/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php/Makefile.in index d4f9ac9b5..fcdcac2b9 100644 --- a/Examples/test-suite/php/Makefile.in +++ b/Examples/test-suite/php/Makefile.in @@ -57,9 +57,9 @@ missingtests: missingcpptests missingctests # found, runs testcase.php, except for multicpptests. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL="$(RUNTOOL)" php_run; \ + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP_SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL="$(RUNTOOL)" php_run; \ elif [ -f $(srcdir)/$(SCRIPTPREFIX)$*.php -a ! -f $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list ]; then \ - $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*.php RUNTOOL="$(RUNTOOL)" php_run; \ + $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP_SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*.php RUNTOOL="$(RUNTOOL)" php_run; \ fi # Clean: remove the generated .php file From 205d50a8c96c6ed01cbc94adec6c731b52efb5e4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 21 Apr 2013 14:05:56 +0100 Subject: [PATCH 443/538] Ruby 1.9 fixes: use ruby -I in Makefile and workaround clash with 1.9 builtin Complex numbers in the operator example. --- Examples/Makefile.in | 2 +- Examples/ruby/operator/runme.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index c0cdb703f..240274278 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -970,7 +970,7 @@ ruby_cpp_static: $(SRCS) # ----------------------------------------------------------------- ruby_run: - $(RUNTOOL) $(RUBY) $(RUBY_SCRIPT) $(RUNPIPE) + $(RUNTOOL) $(RUBY) -I. $(RUBY_SCRIPT) $(RUNPIPE) # ----------------------------------------------------------------- # Version display diff --git a/Examples/ruby/operator/runme.rb b/Examples/ruby/operator/runme.rb index 518d91e9e..4c1ef3f62 100644 --- a/Examples/ruby/operator/runme.rb +++ b/Examples/ruby/operator/runme.rb @@ -3,8 +3,8 @@ require 'example' include Example -a = Complex.new(2, 3) -b = Complex.new(-5, 10) +a = Example::Complex.new(2, 3) +b = Example::Complex.new(-5, 10) puts "a = #{a}" puts "b = #{b}" @@ -15,7 +15,7 @@ puts "a*b = #{a*b}" puts "a-c = #{a-c}" # This should invoke Complex's copy constructor -e = Complex.new(a-c) +e = Example::Complex.new(a-c) e = a - c puts "e = #{e}" From 486eca2faa5d7d61a97d3a4e0f033391be98baf2 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 21 Apr 2013 18:24:37 +0100 Subject: [PATCH 444/538] Disable Ruby free_function test for now. It is failing in Travis builds with 'ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-linux]' but okay with 'ruby 1.9.3p0 (2011-10-30 revision 33570) [x86_64-linux]'. Relying on timely Garbage collection is probably flawed anyway. --- Examples/ruby/check.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/ruby/check.list b/Examples/ruby/check.list index 131dcbb33..2e581fb82 100644 --- a/Examples/ruby/check.list +++ b/Examples/ruby/check.list @@ -2,7 +2,7 @@ class constants enum -free_function +#free_function funcptr funcptr2 functor From 6e06b50adf814b3e4a519ceaebcb18edd7ac80dd Mon Sep 17 00:00:00 2001 From: Yung Lee Date: Sun, 21 Apr 2013 01:01:39 +0800 Subject: [PATCH 445/538] Remove non-ascii characters at a comment line in d.cxx that trouble VC++ --- Source/Modules/d.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx index e09e253f8..5d59a2e38 100644 --- a/Source/Modules/d.cxx +++ b/Source/Modules/d.cxx @@ -3743,7 +3743,7 @@ private: String *nspace = getNSpace(); if (nspace) { // Check the root package/outermost namespace (a class A in module - // A.B leads to problems if another module A.C is also imported)… + // A.B leads to problems if another module A.C is also imported) if (Len(package) > 0) { String *dotless_package = NewStringWithSize(package, Len(package) - 1); if (Cmp(class_name, dotless_package) == 0) { From bdf98744b165861f67e325b892d2a65c96a2f8fa Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 23 Apr 2013 22:18:42 +0100 Subject: [PATCH 446/538] Fix guilescm_ext_test and chicken_ext_test testcases --- ...ext_test_external.cxx => chicken_ext_test_external.cxx} | 7 +++---- ...xt_test_external.cxx => guilescm_ext_test_external.cxx} | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) rename Examples/test-suite/chicken/{ext_test_external.cxx => chicken_ext_test_external.cxx} (90%) rename Examples/test-suite/guilescm/{ext_test_external.cxx => guilescm_ext_test_external.cxx} (90%) diff --git a/Examples/test-suite/chicken/ext_test_external.cxx b/Examples/test-suite/chicken/chicken_ext_test_external.cxx similarity index 90% rename from Examples/test-suite/chicken/ext_test_external.cxx rename to Examples/test-suite/chicken/chicken_ext_test_external.cxx index 338151e88..1dd6a7d53 100644 --- a/Examples/test-suite/chicken/ext_test_external.cxx +++ b/Examples/test-suite/chicken/chicken_ext_test_external.cxx @@ -1,4 +1,4 @@ -#include +#include #include void test_create(C_word,C_word,C_word) C_noret; @@ -7,16 +7,15 @@ void test_create(C_word argc, C_word closure, C_word continuation) { swig_type_info *type; A *newobj; C_word *known_space = C_alloc(C_SIZEOF_SWIG_POINTER); - + C_trace("test-create"); if (argc!=2) C_bad_argc(argc,2); newobj = new A(); - + type = SWIG_TypeQuery("A *"); resultobj = SWIG_NewPointerObj(newobj, type, 1); C_kontinue(continuation, resultobj); } - diff --git a/Examples/test-suite/guilescm/ext_test_external.cxx b/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx similarity index 90% rename from Examples/test-suite/guilescm/ext_test_external.cxx rename to Examples/test-suite/guilescm/guilescm_ext_test_external.cxx index 713e5d2d0..30fa1ce7b 100644 --- a/Examples/test-suite/guilescm/ext_test_external.cxx +++ b/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx @@ -1,4 +1,4 @@ -#include +#include #include SCM test_create() From 52858d5353a1e656f10561ec8e33df3bca4da520 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 27 Apr 2013 18:40:57 +0100 Subject: [PATCH 447/538] Fix boost intrusive_ptr testcase compilation with latest boost/gcc --- Examples/test-suite/li_boost_intrusive_ptr.i | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Examples/test-suite/li_boost_intrusive_ptr.i b/Examples/test-suite/li_boost_intrusive_ptr.i index 2efa998a9..4916d0285 100644 --- a/Examples/test-suite/li_boost_intrusive_ptr.i +++ b/Examples/test-suite/li_boost_intrusive_ptr.i @@ -13,9 +13,12 @@ %warnfilter(SWIGWARN_LANG_SMARTPTR_MISSING) KlassDerived; %warnfilter(SWIGWARN_LANG_SMARTPTR_MISSING) KlassDerivedDerived; -%inline %{ -#include "boost/shared_ptr.hpp" -#include "boost/intrusive_ptr.hpp" +%{ +template void intrusive_ptr_add_ref(const T* r) { r->addref(); } +template void intrusive_ptr_release(const T* r) { r->release(); } + +#include +#include #include // Uncomment macro below to turn on intrusive_ptr memory leak checking as described above @@ -102,8 +105,6 @@ %ignore IgnoredRefCountingBase; %ignore *::operator=; -%ignore intrusive_ptr_add_ref; -%ignore intrusive_ptr_release; %newobject pointerownertest(); %newobject smartpointerpointerownertest(); @@ -430,10 +431,6 @@ template struct Pair : Base { Pair pair_id2(Pair p) { return p; } SwigBoost::intrusive_ptr< Pair > pair_id1(SwigBoost::intrusive_ptr< Pair > p) { return p; } -template void intrusive_ptr_add_ref(const T* r) { r->addref(); } - -template void intrusive_ptr_release(const T* r) { r->release(); } - long use_count(const SwigBoost::shared_ptr& sptr) { return sptr.use_count(); } From 99231457dbe6436df46c8d4d6b22aa906cf48e6d Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 28 Apr 2013 17:59:40 +0100 Subject: [PATCH 448/538] Fixes for warnings issued by clang --- Source/Modules/lua.cxx | 2 -- Source/Modules/modula3.cxx | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx index cfb3a3f5b..a33898a2f 100644 --- a/Source/Modules/lua.cxx +++ b/Source/Modules/lua.cxx @@ -106,7 +106,6 @@ private: File *f_wrappers; File *f_init; File *f_initbeforefunc; - String *PrefixPlusUnderscore; String *s_cmd_tab; // table of command names String *s_var_tab; // table of global variables String *s_const_tab; // table of global constants @@ -150,7 +149,6 @@ public: f_wrappers(0), f_init(0), f_initbeforefunc(0), - PrefixPlusUnderscore(0), s_cmd_tab(0), s_var_tab(0), s_const_tab(0), diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx index ffb172f8f..4c56d0664 100644 --- a/Source/Modules/modula3.cxx +++ b/Source/Modules/modula3.cxx @@ -204,9 +204,6 @@ private: String *proxy_class_name; String *variable_name; //Name of a variable being wrapped String *variable_type; //Type of this variable - String *enumeration_name; //Name of the current enumeration type - Hash *enumeration_items; //and its members - int enumeration_max; Hash *enumeration_coll; //Collection of all enumerations. /* The items are nodes with members: "items" - hash of with key 'itemname' and content 'itemvalue' @@ -268,9 +265,6 @@ MODULA3(): proxy_class_name(NULL), variable_name(NULL), variable_type(NULL), - enumeration_name(NULL), - enumeration_items(NULL), - enumeration_max(0), enumeration_coll(NULL), constant_values(NULL), constantfilename(NULL), @@ -1784,19 +1778,6 @@ MODULA3(): } } -#if 0 - void generateEnumerationItem(const String *name, const String *value, int numvalue) { - String *oldsymname = Getattr(enumeration_items, value); - if (oldsymname != NIL) { - Swig_warning(WARN_MODULA3_BAD_ENUMERATION, input_file, line_number, "The value <%s> is already assigned to <%s>.\n", value, oldsymname); - } - Setattr(enumeration_items, value, name); - if (enumeration_max < numvalue) { - enumeration_max = numvalue; - } - } -#endif - void emitEnumeration(File *file, String *name, Node *n) { Printf(file, "%s = {", name); int i; From e0e4a4db6d48f0fc1b5fa638650369af1e1c5507 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 28 Apr 2013 18:41:11 +0100 Subject: [PATCH 449/538] Warning fix for ccache-swig tests clang deletes the output 'file' whereas gcc does not if the output 'file' is actually a directory. --- CCache/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CCache/test.sh b/CCache/test.sh index 9581c85e3..f64c3e3de 100755 --- a/CCache/test.sh +++ b/CCache/test.sh @@ -142,7 +142,7 @@ basetests() { testname="non-regular" mkdir testd $CCACHE_COMPILE -o testd -c test1.c > /dev/null 2>&1 - rmdir testd + rm -rf testd checkstat 'output to a non-regular file' 1 testname="no-input" @@ -315,7 +315,7 @@ swigtests() { testname="non-regular" mkdir testd $CCACHE_COMPILE -o testd -java testswig1.i > /dev/null 2>&1 - rmdir testd + rm -rf testd checkstat 'output to a non-regular file' 1 testname="no-input" From 7dfe4a065368a8658ed0f2ecf58dfc2cf981713e Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 7 Mar 2013 14:39:38 +0100 Subject: [PATCH 450/538] Make guile test suite default to scm api In other words guilescm becomes guile. Deprecated gh api tests are moved to guilegh. --- Examples/test-suite/guile/Makefile.in | 13 +++++++-- .../guile_ext_test_external.cxx} | 2 +- .../guile_ext_test_runme.scm} | 2 +- .../{guilescm_ext_test.i => guile_ext_test.i} | 2 +- .../{guilescm => guilegh}/Makefile.in | 29 +++---------------- Makefile.in | 8 ++--- configure.ac | 12 ++++---- 7 files changed, 27 insertions(+), 41 deletions(-) rename Examples/test-suite/{guilescm/guilescm_ext_test_external.cxx => guile/guile_ext_test_external.cxx} (90%) rename Examples/test-suite/{guilescm/guilescm_ext_test_runme.scm => guile/guile_ext_test_runme.scm} (82%) rename Examples/test-suite/{guilescm_ext_test.i => guile_ext_test.i} (93%) rename Examples/test-suite/{guilescm => guilegh}/Makefile.in (50%) diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in index c6be92c32..455c26a66 100644 --- a/Examples/test-suite/guile/Makefile.in +++ b/Examples/test-suite/guile/Makefile.in @@ -2,14 +2,16 @@ # Makefile for guile test-suite ####################################################################### +EXTRA_TEST_CASES += guile_ext_test.externaltest + LANGUAGE = guile -VARIANT = _gh +VARIANT = SCRIPTSUFFIX = _runme.scm srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ GUILE = @GUILE@ -GUILE_RUNTIME=-runtime +GUILE_RUNTIME= C_TEST_CASES = long_long \ list_vector \ @@ -20,7 +22,7 @@ C_TEST_CASES = long_long \ include $(srcdir)/../common.mk # Overridden variables here -# none! +INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile # Custom tests - tests with additional commandline options %.multicpptest: SWIGOPT += $(GUILE_RUNTIME) @@ -41,6 +43,11 @@ include $(srcdir)/../common.mk +$(swig_and_compile_multi_cpp) $(run_testcase) +%.externaltest: + $(setup) + +$(swig_and_compile_external) + $(run_testcase) + # Runs the testcase. A testcase is only run if # a file is found which has _runme.scm appended after the testcase name. run_testcase = \ diff --git a/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx b/Examples/test-suite/guile/guile_ext_test_external.cxx similarity index 90% rename from Examples/test-suite/guilescm/guilescm_ext_test_external.cxx rename to Examples/test-suite/guile/guile_ext_test_external.cxx index 30fa1ce7b..c4f906a97 100644 --- a/Examples/test-suite/guilescm/guilescm_ext_test_external.cxx +++ b/Examples/test-suite/guile/guile_ext_test_external.cxx @@ -1,4 +1,4 @@ -#include +#include #include SCM test_create() diff --git a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm b/Examples/test-suite/guile/guile_ext_test_runme.scm similarity index 82% rename from Examples/test-suite/guilescm/guilescm_ext_test_runme.scm rename to Examples/test-suite/guile/guile_ext_test_runme.scm index ff3df064b..452b08ee7 100644 --- a/Examples/test-suite/guilescm/guilescm_ext_test_runme.scm +++ b/Examples/test-suite/guile/guile_ext_test_runme.scm @@ -1,4 +1,4 @@ -(dynamic-call "scm_init_guilescm_ext_test_module" (dynamic-link "./libguilescm_ext_test.so")) +(dynamic-call "scm_init_guile_ext_test_module" (dynamic-link "./libguile_ext_test.so")) ; This is a test for SF Bug 1573892 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail diff --git a/Examples/test-suite/guilescm_ext_test.i b/Examples/test-suite/guile_ext_test.i similarity index 93% rename from Examples/test-suite/guilescm_ext_test.i rename to Examples/test-suite/guile_ext_test.i index fd5655d4f..170695f6c 100644 --- a/Examples/test-suite/guilescm_ext_test.i +++ b/Examples/test-suite/guile_ext_test.i @@ -1,4 +1,4 @@ -%module guilescm_ext_test +%module guile_ext_test /* just use the imports_a.h header... for this test we only need a class */ %{ diff --git a/Examples/test-suite/guilescm/Makefile.in b/Examples/test-suite/guilegh/Makefile.in similarity index 50% rename from Examples/test-suite/guilescm/Makefile.in rename to Examples/test-suite/guilegh/Makefile.in index ba1cba440..3a03d5f82 100644 --- a/Examples/test-suite/guilescm/Makefile.in +++ b/Examples/test-suite/guilegh/Makefile.in @@ -2,16 +2,13 @@ # Makefile for guile test-suite (with SCM API) ####################################################################### -EXTRA_TEST_CASES += guilescm_ext_test.externaltest - include ../guile/Makefile # Overridden variables here -INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guilescm -VARIANT = +VARIANT = _gh # Refer to the guile directory for the run scripts SCRIPTPREFIX = ../guile/ -GUILE_RUNTIME= +GUILE_RUNTIME=-runtime # Custom tests - tests with additional commandline options # none! @@ -25,25 +22,7 @@ run_testcase = \ setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ + echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with GH API)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ - fi - -%.externaltest: - $(local_setup) - +$(swig_and_compile_external) - $(local_run_testcase) - -# 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 "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with SCM API)" ; \ - else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with SCM API)" ; \ - fi - -local_run_testcase = \ - if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$*$(SCRIPTSUFFIX); \ + echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with GH API)" ; \ fi diff --git a/Makefile.in b/Makefile.in index c47cdbe7c..6b7a99220 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ skip-tcl = test -n "@SKIP_TCL@" skip-perl5 = test -n "@SKIP_PERL5@" skip-python = test -n "@SKIP_PYTHON@" skip-java = test -n "@SKIP_JAVA@" -skip-guilescm = test -n "@SKIP_GUILESCM@" +skip-guilegh = test -n "@SKIP_GUILEGH@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" @@ -247,7 +247,7 @@ check-test-suite: \ check-perl5-test-suite \ check-python-test-suite \ check-java-test-suite \ - check-guilescm-test-suite \ + check-guilegh-test-suite \ check-guile-test-suite \ check-mzscheme-test-suite \ check-ruby-test-suite \ @@ -300,7 +300,7 @@ all-test-suite: \ all-perl5-test-suite \ all-python-test-suite \ all-java-test-suite \ - all-guilescm-test-suite \ + all-guilegh-test-suite \ all-guile-test-suite \ all-mzscheme-test-suite \ all-ruby-test-suite \ @@ -329,7 +329,7 @@ broken-test-suite: \ broken-perl5-test-suite \ broken-python-test-suite \ broken-java-test-suite \ - broken-guilescm-test-suite \ + broken-guilegh-test-suite \ broken-guile-test-suite \ broken-mzscheme-test-suite \ broken-ruby-test-suite \ diff --git a/configure.ac b/configure.ac index 83b46f520..7b259c78d 100644 --- a/configure.ac +++ b/configure.ac @@ -2268,16 +2268,16 @@ AC_SUBST(SKIP_JAVA) SKIP_GUILE= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_GH_INTERFACE"; then +if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_SCM_INTERFACE"; then SKIP_GUILE="1" fi AC_SUBST(SKIP_GUILE) -SKIP_GUILESCM= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_SCM_INTERFACE"; then - SKIP_GUILESCM="1" +SKIP_GUILEGH= +if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_GH_INTERFACE"; then + SKIP_GUILEGH="1" fi -AC_SUBST(SKIP_GUILESCM) +AC_SUBST(SKIP_GUILEGH) SKIP_MZSCHEME= @@ -2454,7 +2454,7 @@ AC_CONFIG_FILES([ \ Examples/test-suite/csharp/Makefile \ Examples/test-suite/d/Makefile \ Examples/test-suite/guile/Makefile \ - Examples/test-suite/guilescm/Makefile \ + Examples/test-suite/guilegh/Makefile \ Examples/test-suite/java/Makefile \ Examples/test-suite/mzscheme/Makefile \ Examples/test-suite/ocaml/Makefile \ From 2c23a5d2cdbe45c7408aa50c667b5e4647ef05b6 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 4 Mar 2013 22:12:09 +0100 Subject: [PATCH 451/538] Add support for guile 2.0: update swg and interface files Note: only the scm interface is considered. --- Lib/guile/ghinterface.i | 46 ++++++++++++++ Lib/guile/guile_gh_run.swg | 34 ++++++++++- Lib/guile/guile_scm_run.swg | 117 ++++++++++++++++++++++++++++++++---- Lib/guile/typemaps.i | 6 +- 4 files changed, 186 insertions(+), 17 deletions(-) diff --git a/Lib/guile/ghinterface.i b/Lib/guile/ghinterface.i index c5fda62cf..022c0f568 100644 --- a/Lib/guile/ghinterface.i +++ b/Lib/guile/ghinterface.i @@ -1,3 +1,5 @@ +#ifdef GUILE_VERSION_1_6 + #define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) #define gh_apply(a, b) scm_apply(a, b, SCM_EOL) #define gh_bool2scm SCM_BOOL @@ -37,3 +39,47 @@ #define gh_vector_ref scm_vector_ref #define gh_vector_set_x scm_vector_set_x #define gh_char2scm SCM_MAKE_CHAR + +#else + +#define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) +#define gh_apply(a, b) scm_apply(a, b, SCM_EOL) +#define gh_bool2scm scm_from_bool +#define gh_boolean_p scm_is_bool +#define gh_car SCM_CAR +#define gh_cdr SCM_CDR +#define gh_cons scm_cons +#define gh_double2scm scm_from_double +#define gh_int2scm scm_from_long +#define gh_length(lst) scm_to_ulong(scm_length(lst)) +#define gh_list scm_listify +#define gh_list_to_vector scm_vector +#define gh_make_vector scm_make_vector +#define gh_null_p scm_is_null +#define gh_number_p scm_is_number +#define gh_pair_p scm_is_pair +#define gh_scm2bool scm_is_true +#define gh_scm2char SCM_CHAR +#define gh_scm2double scm_to_double +#define gh_scm2int scm_to_int +#define gh_scm2long scm_to_long +#define gh_scm2short scm_to_short +#define gh_scm2newstr SWIG_Guile_scm2newstr +#define gh_scm2ulong scm_to_ulong +#define gh_scm2ushort scm_to_ushort +#define gh_scm2uint scm_to_uint +#define gh_ulong2scm scm_from_ulong +#define gh_long2scm scm_from_long +#define gh_str02scm(str) str ? scm_from_locale_string(str) : SCM_BOOL_F +#define gh_long_long2scm scm_from_long_long +#define gh_scm2long_long scm_to_long_long +#define gh_ulong_long2scm scm_from_ulong_long +#define gh_scm2ulong_long scm_to_ulong_long +#define gh_string_p scm_is_string +#define gh_vector_length scm_c_vector_length +#define gh_vector_p scm_is_vector +#define gh_vector_ref scm_vector_ref +#define gh_vector_set_x scm_vector_set_x +#define gh_char2scm SCM_MAKE_CHAR + +#endif \ No newline at end of file diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg index d8cc56b91..8616875da 100644 --- a/Lib/guile/guile_gh_run.swg +++ b/Lib/guile/guile_gh_run.swg @@ -15,6 +15,36 @@ extern "C" { #endif + +/* In the code below, use guile 2.0 compatible functions where possible. + Functions that don't exist in older versions will be mapped to + a deprecated equivalent for those versions only */ +/* ... setup guile 2-like interface for guile 1.6 */ +#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6) + +# define scm_from_locale_keyword scm_c_make_keyword +# define scm_from_locale_symbol scm_str2symbol +# define scm_is_null SCM_NULLP +# define scm_is_true SCM_NFALSEP +# define scm_is_string SCM_STRINGP + +/* Used later on to setup different code paths where it's + not possible to use a guile 2-like interface */ +# define GUILE_VERSION_1_6 + +#endif + +/* ... setup guile 2-like interface for guile 1.6 and 1.8 */ +#if defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION < 2) + +static SCM +scm_module_variable (SCM module, SCM sym) +{ + return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F); +} + +#endif + typedef SCM (*swig_guile_proc)(); #define SWIG_malloc(size) \ @@ -150,7 +180,7 @@ SWIG_Guile_ConvertPtr(swig_module_info *module, SCM s, void **result, { swig_cast_info *cast; swig_type_info *from; - if (SCM_NULLP(s)) { + if (scm_is_null(s)) { *result = NULL; return SWIG_OK; } else if (SCM_NIMP(s)) { @@ -246,7 +276,7 @@ SWIG_Guile_GetArgs (SCM *dest, SCM rest, } for (; i= 2 +// scm_c_define_gsubr takes a different parameter type +// depending on the guile version + +typedef scm_t_subr swig_guile_proc; +#else typedef SCM (*swig_guile_proc)(); +#endif typedef SCM (*guile_destructor)(SCM); typedef struct swig_guile_clientdata { @@ -22,10 +59,17 @@ typedef struct swig_guile_clientdata { #define SWIG_scm2str(s) \ SWIG_Guile_scm2newstr(s, NULL) -#define SWIG_malloc(size) \ - SCM_MUST_MALLOC(size) -#define SWIG_free(mem) \ - scm_must_free(mem) +#ifdef GUILE_VERSION_1_6 +# define SWIG_malloc(size) \ + SCM_MUST_MALLOC(size) +# define SWIG_free(mem) \ + scm_must_free(mem) +#else +# define SWIG_malloc(size) \ + scm_malloc(size) +# define SWIG_free(mem) \ + free(mem) +#endif #define SWIG_ConvertPtr(s, result, type, flags) \ SWIG_Guile_ConvertPtr(s, result, type, flags) #define SWIG_MustGetPtr(s, type, argnum, flags) \ @@ -42,7 +86,7 @@ typedef struct swig_guile_clientdata { SWIG_Guile_IsPointer(object) #define SWIG_contract_assert(expr, msg) \ if (!(expr)) \ - scm_error(scm_str2symbol("swig-contract-assertion-failed"), \ + scm_error(scm_from_locale_symbol("swig-contract-assertion-failed"), \ (char *) FUNC_NAME, (char *) msg, \ SCM_EOL, SCM_BOOL_F); else @@ -61,15 +105,25 @@ SWIGINTERN char * SWIG_Guile_scm2newstr(SCM str, size_t *len) { #define FUNC_NAME "SWIG_Guile_scm2newstr" char *ret; +# ifndef GUILE_VERSION_1_6 + char *tmp; +# endif size_t l; - SCM_ASSERT (SCM_STRINGP(str), str, 1, FUNC_NAME); - - l = SCM_STRING_LENGTH(str); + SCM_ASSERT (scm_is_string(str), str, 1, FUNC_NAME); + l = scm_c_string_length(str); + ret = (char *) SWIG_malloc( (l + 1) * sizeof(char)); if (!ret) return NULL; +# ifdef GUILE_VERSION_1_6 memcpy(ret, SCM_STRING_CHARS(str), l); +# else + tmp = scm_to_locale_string(str); + memcpy(ret, tmp, l); + free(tmp); +# endif + ret[l] = '\0'; if (len) *len = l; return ret; @@ -86,7 +140,7 @@ static SCM swig_keyword = SCM_EOL; static SCM swig_symbol = SCM_EOL; #define SWIG_Guile_GetSmob(x) \ - ( SCM_NNULLP(x) && SCM_INSTANCEP(x) && SCM_NFALSEP(scm_slot_exists_p(x, swig_symbol)) \ + ( !scm_is_null(x) && SCM_INSTANCEP(x) && scm_is_true(scm_slot_exists_p(x, swig_symbol)) \ ? scm_slot_ref(x, swig_symbol) : (x) ) SWIGINTERN SCM @@ -361,6 +415,7 @@ ensure_smob_tag(SCM swig_module, const char *smob_name, const char *scheme_variable_name) { +#ifdef GUILE_VERSION_1_6 SCM variable = scm_sym2var(scm_str2symbol(scheme_variable_name), scm_module_lookup_closure(swig_module), SCM_BOOL_T); @@ -375,6 +430,20 @@ ensure_smob_tag(SCM swig_module, "SWIG_Guile_Init"); return 0; } +#else + SCM variable = scm_module_variable(swig_module, + scm_from_locale_symbol(scheme_variable_name)); + if (scm_is_false(variable)) { + *tag_variable = scm_make_smob_type((char*)scheme_variable_name, 0); + scm_c_module_define(swig_module, scheme_variable_name, + scm_from_ulong(*tag_variable)); + return 1; + } + else { + *tag_variable = scm_to_ulong(SCM_VARIABLE_REF(variable)); + return 0; + } +#endif } SWIGINTERN SCM @@ -409,8 +478,8 @@ SWIG_Guile_Init () } swig_make_func = scm_permanent_object( scm_variable_ref(scm_c_module_lookup(scm_c_resolve_module("oop goops"), "make"))); - swig_keyword = scm_permanent_object(scm_c_make_keyword((char*) "init-smob")); - swig_symbol = scm_permanent_object(scm_str2symbol("swig-smob")); + swig_keyword = scm_permanent_object(scm_from_locale_keyword((char*) "init-smob")); + swig_symbol = scm_permanent_object(scm_from_locale_symbol("swig-smob")); #ifdef SWIG_INIT_RUNTIME_MODULE SWIG_INIT_RUNTIME_MODULE #endif @@ -426,6 +495,7 @@ SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) module = SWIG_Guile_Init(); +#ifdef GUILE_VERSION_1_6 variable = scm_sym2var(scm_str2symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), scm_module_lookup_closure(module), SCM_BOOL_T); @@ -434,6 +504,15 @@ SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) } else { return (swig_module_info *) scm_num2ulong(SCM_VARIABLE_REF(variable), 0, "SWIG_Guile_Init"); } +#else + variable = scm_module_variable(module, + scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME)); + if (scm_is_false(variable)) { + return NULL; + } else { + return (swig_module_info *) scm_to_ulong(SCM_VARIABLE_REF(variable)); + } +#endif } SWIGINTERN void @@ -444,11 +523,17 @@ SWIG_Guile_SetModule(swig_module_info *swig_module) module = SWIG_Guile_Init(); +#ifdef GUILE_VERSION_1_6 variable = scm_sym2var(scm_str2symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), scm_module_lookup_closure(module), SCM_BOOL_T); SCM_VARIABLE_SET(variable, scm_ulong2num((unsigned long) swig_module)); +#else + scm_module_define(module, + scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), + scm_from_ulong((unsigned long) swig_module)); +#endif } SWIGINTERN int @@ -460,7 +545,11 @@ SWIG_Guile_GetArgs (SCM *dest, SCM rest, int num_args_passed = 0; for (i = 0; i Date: Thu, 7 Mar 2013 11:55:01 +0100 Subject: [PATCH 452/538] Add support for guile 2.0: configure and makefiles. Note: guile-config is badly broken for guile 2. So the guile configure section has been rewritten to use pkg-config instead. Manually resolved conflicts: Examples/Makefile.in --- Examples/Makefile.in | 31 +++--- Examples/guile/Makefile.in | 8 +- Makefile.in | 2 +- configure.ac | 204 ++++++++++++++++++------------------- 4 files changed, 122 insertions(+), 123 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 240274278..6b4ca778e 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -455,11 +455,11 @@ octave_clean: # Make sure these locate your Guile installation GUILE = @GUILE@ -GUILE_INCLUDE = @GUILEINCLUDE@ -GUILE_LIB = @GUILELIB@ +GUILE_CFLAGS = @GUILE_CFLAGS@ GUILE_SO = @GUILE_SO@ +GUILE_LIBS = @GUILE_LIBS@ +GUILE_LIBOPTS = @LIBS@ $(SYSLIBS) GUILE_LIBPREFIX = lib -GUILE_LIBOPTS = @GUILELINK@ @LIBS@ $(SYSLIBS) GUILE_SCRIPT = $(RUNME).scm #------------------------------------------------------------------ @@ -467,13 +467,14 @@ GUILE_SCRIPT = $(RUNME).scm #------------------------------------------------------------------ guile: $(SRCS) $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) + $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) -guile_cpp: $(SRCS) +guile_cpp: $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) +$(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO): $(SRCS) $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) + $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $@ guile_externalhdr: $(SWIG) -guile -external-runtime $(TARGET) @@ -483,12 +484,12 @@ guile_externalhdr: #------------------------------------------------------------------ guile_gh: $(SRCS) $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) + $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_gh_cpp: $(SRCS) $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) # ----------------------------------------------------------------- @@ -497,12 +498,12 @@ guile_gh_cpp: $(SRCS) guile_passive: $(SRCS) $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS) + $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_passive_cpp: $(SRCS) $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) # ----------------------------------------------------------------- @@ -513,23 +514,23 @@ guile_static: $(SRCS) $(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ - $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile + $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_static_cpp: $(SRCS) $(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \ - $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile + $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple: $(SRCS) $(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) $(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \ - $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile + $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile guile_simple_cpp: $(SRCS) $(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH) $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \ - $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile + $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile # ----------------------------------------------------------------- # Running a Guile example diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in index 9e6f9f6c6..3110ac994 100644 --- a/Examples/guile/Makefile.in +++ b/Examples/guile/Makefile.in @@ -7,8 +7,8 @@ SWIG = ../$(top_srcdir)/preinst-swig CC = @CC@ CXX = @CXX@ CFLAGS = @PLATFLAGS@ -GUILEINCLUDE = @GUILEINCLUDE@ -GUILELINK = @GUILELINK@ +GUILE_CFLAGS = @GUILE_CFLAGS@ +GUILE_LIBS = @GUILE_LIBS@ SWIGOPT = WRAP = $(IFILE:.i=_wrap.c) @@ -31,10 +31,10 @@ guile_clean: sub-all: $(SWIG) -guile $(SWIGOPT) $(IFILE) - $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILEINCLUDE) $(GUILELINK) + $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) sub-all-cxx: $(SWIG) -c++ -guile $(SWIGOPT) $(IFILE) - $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILEINCLUDE) $(GUILELINK) + $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) # Makefile ends here diff --git a/Makefile.in b/Makefile.in index 6b7a99220..c33889587 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ skip-tcl = test -n "@SKIP_TCL@" skip-perl5 = test -n "@SKIP_PERL5@" skip-python = test -n "@SKIP_PYTHON@" skip-java = test -n "@SKIP_JAVA@" -skip-guilegh = test -n "@SKIP_GUILEGH@" +skip-guilegh = test -n "@SKIP_GUILEGH@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" diff --git a/configure.ac b/configure.ac index 7b259c78d..28696529d 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ if test "$GCC" = yes; then else ISYSTEM="-I" fi - +AC_MSG_NOTICE(ISYSTEM: $ISYSTEM) dnl Info for building shared libraries ... in order to run the examples @@ -1148,125 +1148,123 @@ AC_SUBST(NDKBUILD) # Look for Guile #---------------------------------------------------------------- -GUILEPACKAGE= -GUILEINCLUDE= GUILE= -GUILELIB= -GUILELINK= -GUILEPKGDATADIR= +GUILE_CFLAGS= +GUILE_LIBS= -AC_ARG_WITH(guile-config,AS_HELP_STRING([--without-guile], [Disable Guile]) -AS_HELP_STRING([--with-guile-config=path], [Set location of guile-config]),[ GUILE_CONFIG="$withval"], [GUILE_CONFIG=]) -AC_ARG_WITH(guilepackage, AS_HELP_STRING([--with-guile-prefix=path], [Set location of Guile tree]),[ - GUILEPACKAGE="$withval"]) -AC_ARG_WITH(guile,[ --with-guile=path Set location of Guile executable],[ - GUILE="$withval"], [GUILE=yes]) -AC_ARG_WITH(guileincl,[ --with-guileincl=path Set location of Guile include directory],[ - GUILEINCLUDE="$withval"]) -AC_ARG_WITH(guilelib,[ --with-guilelib=path Set location of Guile library directory],[ - GUILELIB="$withval"]) +AC_ARG_WITH(guile, AS_HELP_STRING([--without-guile], [Disable Guile]) +AS_HELP_STRING([--with-guile=path], [Set location of Guile executable]),[GUILE="$withval"], [GUILE=yes]) +AC_ARG_WITH(guile-cflags,[ --with-guile-cflags=cflags Set cflags required to compile against Guile],[ + GUILE_CFLAGS="$withval"]) +AC_ARG_WITH(guile-libs,[ --with-guile-libs=ldflags Set ldflags needed to link with Guile],[ + GUILE_LIBS="$withval"]) # First, check for "--without-guile" or "--with-guile=no". if test x"${GUILE}" = xno -o x"${with_alllang}" = xno ; then -AC_MSG_NOTICE([Disabling Guile]) + AC_MSG_NOTICE([Disabling Guile]) + GUILE= + GUILE_CFLAGS= + GUILE_LIBS= else -if test -z "$GUILE_CONFIG" ; then - AC_PATH_PROG(GUILE_CONFIG, guile-config) -fi - -if test -n "$GUILE_CONFIG" ; then - GUILEPACKAGE="`$GUILE_CONFIG info prefix`" - GUILEINCLUDE="`$GUILE_CONFIG info includedir`" - GUILELIB="`$GUILE_CONFIG info libdir`" - GUILE="`$GUILE_CONFIG info bindir`/guile" - GUILELINK="`$GUILE_CONFIG link`" - GUILEPKGDATADIR="`$GUILE_CONFIG info pkgdatadir`" -fi - - if test -z "$GUILE" -o "x$GUILE" = xyes; then - if test -n "$GUILEPACKAGE"; then - GUILE="$GUILEPACKAGE/bin/guile" - else - GUILE= - fi + # Use pkg-config to find guile specific config parameters + # Note: if guile is not installed in a standard system path + # you can set the environment variable PKG_CONFIG_PATH to + # the directory where the guile package config file is stored + AC_PATH_PROG(PKG_CONFIG,pkg-config) + if test "x$PKG_CONFIG" = x; then + # @*%&$ Ximian programmers renamed this application + AC_PATH_PROG(PKG_CONFIG,pkgconfig) fi + if test "x$PKG_CONFIG" = x; then + AC_MSG_NOTICE([Could not find the pkg-config (or pkgconfig) program required to set up Guile. Disabling Guile],) + GUILE= + GUILE_CFLAGS= + GUILE_LIBS="" + else - if test -z "$GUILEINCLUDE"; then - if test -n "$GUILEPACKAGE"; then - GUILEINCLUDE="$GUILEPACKAGE/include" - fi - fi + # If the user has given these values, cache them to override the + # detected values. + if test "x$GUILE_LIBS" != x; then + saved_GUILE_LIBS="$GUILE_LIBS" + fi + if test "x$GUILE_CFLAGS" != x; then + saved_GUILE_CFLAGS="$GUILE_CFLAGS" + fi - if test -z "$GUILELIB"; then - if test -n "$GUILEPACKAGE"; then - GUILELIB="$GUILEPACKAGE/lib" - fi - fi + # Look up GUILE_CFLAGS and GUILE_LIBS, and version check + GUILE_SERIES="" + PKG_CHECK_MODULES(GUILE, [guile-1.8], [ GUILE_SERIES="18" ], [ + PKG_CHECK_MODULES(GUILE, [guile-2.0], [GUILE_SERIES="20" ], [AC_MSG_NOTICE([ + Only Guile 1.8 or 2.0 is supported. Neither version appears to be installed correctly. Disabling Guile + ])]) + ]) + if test "x$GUILE-SERIES" = x; then + GUILE= + GUILE_CFLAGS= + GUILE_LIBS= + else + # Look up GUILE executable + if test "x$GUILE" = xyes; then + GUILE= + if test "$xGUILE_SERIES" = "x18"; then + AC_PATH_PROG(GUILE18, guile-1.8) + if test "x$GUILE18" != x; then + GUILE="$GUILE18" + fi + fi + if test "$xGUILE_SERIES" = "x20"; then + AC_PATH_PROG(GUILE20, guile-2.0) + if test "x$GUILE20" != x; then + GUILE="$GUILE20" + fi + fi + if test "x$GUILE" = x; then + AC_PATH_PROG(GUILE, guile) + fi + fi -AC_MSG_CHECKING(for Guile header files) + if test "x$saved_GUILE_LIBS" != x; then + GUILE_LIBS="$saved_GUILE_LIBS" + fi + if test "x$saved_GUILE_CFLAGS" != x; then + GUILE_CFLAGS="$saved_GUILE_CFLAGS" + fi - dirs="$GUILEINCLUDE" - for i in $dirs ; do - if test -r $i/guile/gh.h; then - AC_MSG_RESULT($i) - GUILEINCLUDE="$ISYSTEM$i" - break - fi - done - if test -z "$GUILEINCLUDE"; then - AC_MSG_RESULT(not found) - fi + guilesafe_CFLAGS=$CFLAGS + guilesafe_LIBS=$LIBS + # Filter out "-ansi -pedantic" because Guile header files will not compile with these flags. + # (The flags -ansi -pedantic are automatically added by ac_compile_warnings.m4) + CFLAGS="`echo $CFLAGS | sed 's/-ansi//g;s/-pedantic//g;'` $GUILE_CFLAGS" + LIBS="$LIBS $GUILE_LIBS" - AC_MSG_CHECKING(for Guile library) - dirs="$GUILELIB" - for i in $dirs ; do - if test -r $i/libguile.so; then - AC_MSG_RESULT($i) - GUILELIB="$i" - break - fi - done - if test -z "$GUILELIB"; then - AC_MSG_RESULT(not found) - fi - -if test -z "$GUILELINK"; then - GUILELINK="-L$GUILELIB -lguile" -fi - -guilesafe_CFLAGS=$CFLAGS -guilesafe_LIBS=$LIBS -# Filter out "-ansi -pedantic" because Guile header files will not compile with these flags. -# (The flags -ansi -pedantic are automatically added by ac_compile_warnings.m4) -CFLAGS="`echo $CFLAGS | sed 's/-ansi//g;s/-pedantic//g;'` $GUILEINCLUDE" -LIBS="$LIBS $GUILELINK" - -AC_MSG_CHECKING(whether Guile's gh_ API works) -AC_LINK_IFELSE([AC_LANG_SOURCE([#include - int main() { SCM s; return gh_scm2int(s); }])], GUILE_GH_INTERFACE=1, ) -if test -n "$GUILE_GH_INTERFACE" ; then + AC_MSG_CHECKING(whether Guile's gh_ API works) + AC_LINK_IFELSE([AC_LANG_SOURCE([#include + int main() { SCM s; return gh_scm2int(s); }])], GUILE_GH_INTERFACE=1, ) + if test -n "$GUILE_GH_INTERFACE" ; then AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AC_MSG_CHECKING(whether Guile's SCM_ API works) -AC_LINK_IFELSE([AC_LANG_SOURCE([#include - int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }])], GUILE_SCM_INTERFACE=1, ) -if test -n "$GUILE_SCM_INTERFACE" ; then + else + AC_MSG_RESULT(no) + fi + AC_MSG_CHECKING(whether Guile's SCM_ API works) + AC_LINK_IFELSE([AC_LANG_SOURCE([#include + int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }])], GUILE_SCM_INTERFACE=1, ) + if test -n "$GUILE_SCM_INTERFACE" ; then AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -CFLAGS=$guilesafe_CFLAGS -LIBS=$guilesafe_LIBS + else + AC_MSG_RESULT(no) + fi + + CFLAGS=$guilesafe_CFLAGS + LIBS=$guilesafe_LIBS + fi + fi fi AC_SUBST(GUILE) -AC_SUBST(GUILEINCLUDE) -AC_SUBST(GUILELIB) -AC_SUBST(GUILELINK) +AC_SUBST(GUILE_CFLAGS) +AC_SUBST(GUILE_LIBS) AC_SUBST(GUILE_GH_INTERFACE) AC_SUBST(GUILE_SCM_INTERFACE) @@ -2268,13 +2266,13 @@ AC_SUBST(SKIP_JAVA) SKIP_GUILE= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_SCM_INTERFACE"; then +if test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then SKIP_GUILE="1" fi AC_SUBST(SKIP_GUILE) SKIP_GUILEGH= -if test -z "$GUILEINCLUDE" || test -z "$GUILELIB" || test -z "$GUILE_GH_INTERFACE"; then +if test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_GH_INTERFACE"; then SKIP_GUILEGH="1" fi AC_SUBST(SKIP_GUILEGH) From 3c47730803afde678574496a4d71f7f241dce73e Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 19 Apr 2013 12:49:40 +0200 Subject: [PATCH 453/538] Drop support for guile 1.6 and older --- Doc/Manual/Guile.html | 49 +++++++++++++++---------- Lib/guile/ghinterface.i | 46 ----------------------- Lib/guile/guile_gh_run.swg | 17 +-------- Lib/guile/guile_scm_run.swg | 73 ------------------------------------- 4 files changed, 30 insertions(+), 155 deletions(-) diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 6f1300492..14fc03854 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -12,6 +12,7 @@
      +
    • Supported Guile Versions
    • Meaning of "Module"
    • Using the SCM or GH Guile API
    • Linkage @@ -47,7 +48,15 @@

      This section details guile-specific support in SWIG. -

      23.1 Meaning of "Module"

      +

      23.1 Supported Guile Versions

      + + +

      +SWIG works with Guile versions 1.8.x and 2.0.x. Support for version +1.6.x has been dropped. The last version of SWIG that still works with +Guile version 1.6.x is SWIG 2.0.9. + +

      23.2 Meaning of "Module"

      @@ -55,7 +64,7 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

      23.2 Using the SCM or GH Guile API

      +

      23.3 Using the SCM or GH Guile API

      The guile module can currently export wrapper files that use the guile GH interface or the @@ -103,7 +112,7 @@ for the specific API. Currently only the guile language module has created a ma but there is no reason other languages (like mzscheme or chicken) couldn't also use this. If that happens, there is A LOT less code duplication in the standard typemaps.

      -

      23.3 Linkage

      +

      23.4 Linkage

      @@ -111,7 +120,7 @@ Guile support is complicated by a lack of user community cohesiveness, which manifests in multiple shared-library usage conventions. A set of policies implementing a usage convention is called a linkage. -

      23.3.1 Simple Linkage

      +

      23.4.1 Simple Linkage

      @@ -206,7 +215,7 @@ placed between the define-module form and the SWIG_init via a preprocessor define to avoid symbol clashes. For this case, however, passive linkage is available. -

      23.3.2 Passive Linkage

      +

      23.4.2 Passive Linkage

      Passive linkage is just like simple linkage, but it generates an @@ -216,7 +225,7 @@ package name (see below).

      You should use passive linkage rather than simple linkage when you are using multiple modules. -

      23.3.3 Native Guile Module Linkage

      +

      23.4.3 Native Guile Module Linkage

      SWIG can also generate wrapper code that does all the Guile module @@ -257,7 +266,7 @@ Newer Guile versions have a shorthand procedure for this:

    -

    23.3.4 Old Auto-Loading Guile Module Linkage

    +

    23.4.4 Old Auto-Loading Guile Module Linkage

    Guile used to support an autoloading facility for object-code @@ -283,7 +292,7 @@ option, SWIG generates an exported module initialization function with an appropriate name. -

    23.3.5 Hobbit4D Linkage

    +

    23.4.5 Hobbit4D Linkage

    @@ -308,7 +317,7 @@ my/lib/libfoo.so.X.Y.Z and friends. This scheme is still very experimental; the (hobbit4d link) conventions are not well understood.

    -

    23.4 Underscore Folding

    +

    23.5 Underscore Folding

    @@ -320,7 +329,7 @@ complained so far. %rename to specify the Guile name of the wrapped functions and variables (see CHANGES). -

    23.5 Typemaps

    +

    23.6 Typemaps

    @@ -412,7 +421,7 @@ constant will appear as a scheme variable. See Features and the %feature directive for info on how to apply the %feature.

    -

    23.6 Representation of pointers as smobs

    +

    23.7 Representation of pointers as smobs

    @@ -433,7 +442,7 @@ representing the expected pointer type. See also If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    23.6.1 GH Smobs

    +

    23.7.1 GH Smobs

    @@ -462,7 +471,7 @@ that created them, so the first module we check will most likely be correct. Once we have a swig_type_info structure, we loop through the linked list of casts, using pointer comparisons.

    -

    23.6.2 SCM Smobs

    +

    23.7.2 SCM Smobs

    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg. @@ -477,7 +486,7 @@ in the smob tag. If a generated GOOPS module has been loaded, smobs will be wra GOOPS class.

    -

    23.6.3 Garbage Collection

    +

    23.7.3 Garbage Collection

    Garbage collection is a feature of the new SCM interface, and it is automatically included @@ -491,7 +500,7 @@ is exactly like described in 23.7 Exception Handling +

    23.8 Exception Handling

    @@ -517,7 +526,7 @@ mapping: The default when not specified here is to use "swig-error". See Lib/exception.i for details. -

    23.8 Procedure documentation

    +

    23.9 Procedure documentation

    If invoked with the command-line option -procdoc @@ -553,7 +562,7 @@ like this: typemap argument doc. See Lib/guile/typemaps.i for details. -

    23.9 Procedures with setters

    +

    23.10 Procedures with setters

    For global variables, SWIG creates a single wrapper procedure @@ -581,7 +590,7 @@ struct members, the procedures (struct-member-get pointer) and (struct-member-set pointer value) are not generated. -

    23.10 GOOPS Proxy Classes

    +

    23.11 GOOPS Proxy Classes

    SWIG can also generate classes and generic functions for use with @@ -730,7 +739,7 @@ Notice that <Foo> is used before it is defined. The fix is to just put th %import "foo.h" before the %inline block.

    -

    23.10.1 Naming Issues

    +

    23.11.1 Naming Issues

    As you can see in the example above, there are potential naming conflicts. The default exported @@ -767,7 +776,7 @@ guile-modules. For example,

    (use-modules ((Test) #:renamer (symbol-prefix-proc 'goops:)))
    -

    23.10.2 Linking

    +

    23.11.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Lib/guile/ghinterface.i b/Lib/guile/ghinterface.i index 022c0f568..3de4c81a2 100644 --- a/Lib/guile/ghinterface.i +++ b/Lib/guile/ghinterface.i @@ -1,47 +1,3 @@ -#ifdef GUILE_VERSION_1_6 - -#define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) -#define gh_apply(a, b) scm_apply(a, b, SCM_EOL) -#define gh_bool2scm SCM_BOOL -#define gh_boolean_p SCM_BOOLP -#define gh_car SCM_CAR -#define gh_cdr SCM_CDR -#define gh_cons scm_cons -#define gh_double2scm scm_make_real -#define gh_int2scm scm_long2num -#define gh_length(lst) scm_num2ulong(scm_length(lst), SCM_ARG1, FUNC_NAME) -#define gh_list scm_listify -#define gh_list_to_vector scm_vector -#define gh_make_vector scm_make_vector -#define gh_null_p SCM_NULLP -#define gh_number_p SCM_NUMBERP -#define gh_pair_p SCM_CONSP -#define gh_scm2bool SCM_NFALSEP -#define gh_scm2char SCM_CHAR -#define gh_scm2double(a) scm_num2dbl(a, FUNC_NAME) -#define gh_scm2int(a) scm_num2int(a, SCM_ARG1, FUNC_NAME) -#define gh_scm2long(a) scm_num2long(a, SCM_ARG1, FUNC_NAME) -#define gh_scm2short(a) scm_num2short(a, SCM_ARG1, FUNC_NAME) -#define gh_scm2newstr SWIG_Guile_scm2newstr -#define gh_scm2ulong(a) scm_num2ulong(a, SCM_ARG1, FUNC_NAME) -#define gh_scm2ushort(a) scm_num2ushort(a, SCM_ARG1, FUNC_NAME) -#define gh_scm2uint(a) scm_num2uint(a, SCM_ARG1, FUNC_NAME) -#define gh_ulong2scm scm_ulong2num -#define gh_long2scm scm_long2num -#define gh_str02scm scm_makfrom0str -#define gh_long_long2scm scm_long_long2num -#define gh_scm2long_long(a) scm_num2long_long(a, SCM_ARG1, FUNC_NAME) -#define gh_ulong_long2scm scm_ulong_long2num -#define gh_scm2ulong_long(a) scm_num2ulong_long(a, SCM_ARG1, FUNC_NAME) -#define gh_string_p SCM_STRINGP -#define gh_vector_length SCM_VECTOR_LENGTH -#define gh_vector_p SCM_VECTORP -#define gh_vector_ref scm_vector_ref -#define gh_vector_set_x scm_vector_set_x -#define gh_char2scm SCM_MAKE_CHAR - -#else - #define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) #define gh_apply(a, b) scm_apply(a, b, SCM_EOL) #define gh_bool2scm scm_from_bool @@ -81,5 +37,3 @@ #define gh_vector_ref scm_vector_ref #define gh_vector_set_x scm_vector_set_x #define gh_char2scm SCM_MAKE_CHAR - -#endif \ No newline at end of file diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg index 8616875da..1292131c8 100644 --- a/Lib/guile/guile_gh_run.swg +++ b/Lib/guile/guile_gh_run.swg @@ -19,22 +19,7 @@ extern "C" { /* In the code below, use guile 2.0 compatible functions where possible. Functions that don't exist in older versions will be mapped to a deprecated equivalent for those versions only */ -/* ... setup guile 2-like interface for guile 1.6 */ -#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6) - -# define scm_from_locale_keyword scm_c_make_keyword -# define scm_from_locale_symbol scm_str2symbol -# define scm_is_null SCM_NULLP -# define scm_is_true SCM_NFALSEP -# define scm_is_string SCM_STRINGP - -/* Used later on to setup different code paths where it's - not possible to use a guile 2-like interface */ -# define GUILE_VERSION_1_6 - -#endif - -/* ... setup guile 2-like interface for guile 1.6 and 1.8 */ +/* ... setup guile 2-like interface for guile 1.8 */ #if defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION < 2) static SCM diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg index 71de33535..7cf3d165a 100644 --- a/Lib/guile/guile_scm_run.swg +++ b/Lib/guile/guile_scm_run.swg @@ -16,22 +16,6 @@ extern "C" { /* In the code below, use guile 2.0 compatible functions where possible. Functions that don't exist in older versions will be mapped to a deprecated equivalent for those versions only */ -/* ... setup guile 2-like interface for guile 1.6 */ -#if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6) - -# define scm_from_locale_keyword scm_c_make_keyword -# define scm_from_locale_symbol scm_str2symbol -# define scm_is_null SCM_NULLP -# define scm_is_true SCM_NFALSEP -# define scm_is_string SCM_STRINGP - -/* Used later on to setup different code paths where it's - not possible to use a guile 2-like interface */ -# define GUILE_VERSION_1_6 - -#endif - -/* ... setup guile 2-like interface for guile 1.6 and 1.8 */ #if defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION < 2) static SCM @@ -59,17 +43,10 @@ typedef struct swig_guile_clientdata { #define SWIG_scm2str(s) \ SWIG_Guile_scm2newstr(s, NULL) -#ifdef GUILE_VERSION_1_6 -# define SWIG_malloc(size) \ - SCM_MUST_MALLOC(size) -# define SWIG_free(mem) \ - scm_must_free(mem) -#else # define SWIG_malloc(size) \ scm_malloc(size) # define SWIG_free(mem) \ free(mem) -#endif #define SWIG_ConvertPtr(s, result, type, flags) \ SWIG_Guile_ConvertPtr(s, result, type, flags) #define SWIG_MustGetPtr(s, type, argnum, flags) \ @@ -105,9 +82,7 @@ SWIGINTERN char * SWIG_Guile_scm2newstr(SCM str, size_t *len) { #define FUNC_NAME "SWIG_Guile_scm2newstr" char *ret; -# ifndef GUILE_VERSION_1_6 char *tmp; -# endif size_t l; SCM_ASSERT (scm_is_string(str), str, 1, FUNC_NAME); @@ -116,13 +91,9 @@ SWIG_Guile_scm2newstr(SCM str, size_t *len) { ret = (char *) SWIG_malloc( (l + 1) * sizeof(char)); if (!ret) return NULL; -# ifdef GUILE_VERSION_1_6 - memcpy(ret, SCM_STRING_CHARS(str), l); -# else tmp = scm_to_locale_string(str); memcpy(ret, tmp, l); free(tmp); -# endif ret[l] = '\0'; if (len) *len = l; @@ -415,22 +386,6 @@ ensure_smob_tag(SCM swig_module, const char *smob_name, const char *scheme_variable_name) { -#ifdef GUILE_VERSION_1_6 - SCM variable = scm_sym2var(scm_str2symbol(scheme_variable_name), - scm_module_lookup_closure(swig_module), - SCM_BOOL_T); - if (SCM_UNBNDP(SCM_VARIABLE_REF(variable))) { - *tag_variable = scm_make_smob_type((char*)scheme_variable_name, 0); - SCM_VARIABLE_SET(variable, - scm_ulong2num(*tag_variable)); - return 1; - } - else { - *tag_variable = scm_num2ulong(SCM_VARIABLE_REF(variable), 0, - "SWIG_Guile_Init"); - return 0; - } -#else SCM variable = scm_module_variable(swig_module, scm_from_locale_symbol(scheme_variable_name)); if (scm_is_false(variable)) { @@ -443,7 +398,6 @@ ensure_smob_tag(SCM swig_module, *tag_variable = scm_to_ulong(SCM_VARIABLE_REF(variable)); return 0; } -#endif } SWIGINTERN SCM @@ -495,16 +449,6 @@ SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) module = SWIG_Guile_Init(); -#ifdef GUILE_VERSION_1_6 - variable = scm_sym2var(scm_str2symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), - scm_module_lookup_closure(module), - SCM_BOOL_T); - if (SCM_UNBNDP(SCM_VARIABLE_REF(variable))) { - return NULL; - } else { - return (swig_module_info *) scm_num2ulong(SCM_VARIABLE_REF(variable), 0, "SWIG_Guile_Init"); - } -#else variable = scm_module_variable(module, scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME)); if (scm_is_false(variable)) { @@ -512,7 +456,6 @@ SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) } else { return (swig_module_info *) scm_to_ulong(SCM_VARIABLE_REF(variable)); } -#endif } SWIGINTERN void @@ -523,17 +466,9 @@ SWIG_Guile_SetModule(swig_module_info *swig_module) module = SWIG_Guile_Init(); -#ifdef GUILE_VERSION_1_6 - variable = scm_sym2var(scm_str2symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), - scm_module_lookup_closure(module), - SCM_BOOL_T); - - SCM_VARIABLE_SET(variable, scm_ulong2num((unsigned long) swig_module)); -#else scm_module_define(module, scm_from_locale_symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), scm_from_ulong((unsigned long) swig_module)); -#endif } SWIGINTERN int @@ -545,11 +480,7 @@ SWIG_Guile_GetArgs (SCM *dest, SCM rest, int num_args_passed = 0; for (i = 0; i Date: Fri, 19 Apr 2013 12:19:49 +0200 Subject: [PATCH 454/538] Drop guilegh interface All of guile's interface files now use the scm interface. This should not affect any users. Swig generated code using the scm interface can be mixed with gh interface using user code. It does simplify maintenance of the guile swig code though. --- Doc/Manual/Guile.html | 52 +- Doc/Manual/Typemaps.html | 2 +- Examples/Makefile.in | 13 - Examples/guile/multimap/example.i | 4 +- Examples/test-suite/guilegh/Makefile.in | 28 - Examples/test-suite/pointer_reference.i | 2 +- Lib/cdata.i | 2 +- Lib/exception.i | 2 +- Lib/guile/cplusplus.i | 10 +- Lib/guile/ghinterface.i | 39 - Lib/guile/guile_gh.swg | 71 -- Lib/guile/guile_gh_run.swg | 273 ------ Lib/guile/guile_scm.swg | 5 - Lib/guile/guile_scm_run.swg | 6 +- Lib/guile/list-vector.i | 92 +- Lib/guile/std_common.i | 4 +- Lib/guile/std_map.i | 1148 +++++++++++------------ Lib/guile/std_pair.i | 940 +++++++++---------- Lib/guile/std_string.i | 16 +- Lib/guile/std_vector.i | 144 +-- Lib/guile/typemaps.i | 84 +- Lib/mzscheme/typemaps.i | 2 +- Makefile.in | 4 - Source/Modules/guile.cxx | 151 +-- configure.ac | 18 +- 25 files changed, 1283 insertions(+), 1829 deletions(-) delete mode 100644 Examples/test-suite/guilegh/Makefile.in delete mode 100644 Lib/guile/ghinterface.i delete mode 100644 Lib/guile/guile_gh.swg delete mode 100644 Lib/guile/guile_gh_run.swg diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 14fc03854..53368bc77 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -14,7 +14,7 @@

    • Supported Guile Versions
    • Meaning of "Module" -
    • Using the SCM or GH Guile API +
    • Old GH Guile API
    • Linkage
      • Simple Linkage @@ -64,53 +64,19 @@ There are three different concepts of "module" involved, defined separately for SWIG, Guile, and Libtool. To avoid horrible confusion, we explicitly prefix the context, e.g., "guile-module". -

        23.3 Using the SCM or GH Guile API

        +

        23.3 Old GH Guile API

        -

        The guile module can currently export wrapper files that use the guile GH interface or the -SCM interface. This is controlled by an argument passed to swig. The "-gh" argument causes swig -to output GH code, and the "-scm" argument causes swig to output SCM code. Right now the "-scm" argument -is the default. The "-scm" wrapper generation assumes a guile version >= 1.6 and has several advantages over -the "-gh" wrapper generation including garbage collection and GOOPS support. -The "-gh" wrapper generation can be used for older versions of guile. -The guile GH wrapper code generation is depreciated and the -SCM interface is the default. The SCM and GH interface differ greatly in how they store -pointers and have completely different run-time code. See below for more info. +

        Support for the guile GH wrapper code generation has been dropped. The last +version of SWIG that can still generate guile GH wrapper code is 2.0.9. Please +use that version if you really need the GH wrapper code. -

        The GH interface to guile is deprecated. Read more about why in the +

        Guile 1.8 and older could be interfaced using a two different api's, the SCM +or the GH API. The GH interface to guile is deprecated. Read more about why in the Guile manual. -The idea of the GH interface was to provide a high level API that other languages and projects -could adopt. This was a good idea, but didn't pan out well for general development. But for the -specific, minimal uses that the SWIG typemaps put the GH interface to use is ideal for -using a high level API. So even though the GH interface is depreciated, SWIG will continue to use -the GH interface and provide mappings from the GH interface to whatever API we need. -We can maintain this mapping where guile failed because SWIG uses a small subset of all the GH functions -which map easily. All the guile typemaps like typemaps.i and std_vector.i -will continue to use the GH functions to do things like create lists of values, convert strings to -integers, etc. Then every language module will define a mapping between the GH interface and -whatever custom API the language uses. This is currently implemented by the guile module to use -the SCM guile API rather than the GH guile API. -For example, here are some of the current mapping file for the SCM API

        -
        -
-#define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) 
-#define gh_apply(a, b) scm_apply(a, b, SCM_EOL) 
-#define gh_bool2scm SCM_BOOL 
-#define gh_boolean_p SCM_BOOLP 
-#define gh_car SCM_CAR 
-#define gh_cdr SCM_CDR 
-#define gh_cons scm_cons 
-#define gh_double2scm scm_make_real 
-...
-
        - -

        This file is parsed by SWIG at wrapper generation time, so every reference to a gh_ function is replaced -by a scm_ function in the wrapper file. Thus the gh_ function calls will never be seen in the wrapper; -the wrapper will look exactly like it was generated -for the specific API. Currently only the guile language module has created a mapping policy from gh_ to scm_, -but there is no reason other languages (like mzscheme or chicken) couldn't also use this. -If that happens, there is A LOT less code duplication in the standard typemaps.

        +

        The SCM wrapper generation assumes a guile version >= 1.8 and has several advantages over +the "-gh" wrapper generation including garbage collection and GOOPS support.

        23.4 Linkage

        diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index b3b0bc7a9..81e3fd1bb 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -773,7 +773,7 @@ Here are some examples of valid typemap specifications: } /* Typemap with modifiers */ -%typemap(in,doc="integer") int "$1 = gh_scm2int($input);"; +%typemap(in,doc="integer") int "$1 = scm_to_int($input);"; /* Typemap applied to patterns of multiple arguments */ %typemap(in) (char *str, int len), diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 6b4ca778e..b1bf8d049 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -479,19 +479,6 @@ $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO): $(SRCS) guile_externalhdr: $(SWIG) -guile -external-runtime $(TARGET) -#------------------------------------------------------------------ -# Build a dynamically loaded module with passive linkage and the gh interface -#------------------------------------------------------------------ -guile_gh: $(SRCS) - $(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) - -guile_gh_cpp: $(SRCS) - $(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) - # ----------------------------------------------------------------- # Build a dynamically loadable module with passive linkage # ----------------------------------------------------------------- diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index 7337d1e9e..f1d7974e4 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -59,14 +59,14 @@ extern int count(char *bytes, int len, char c); %typemap(in) (char *str, int len) { size_t temp; - $1 = gh_scm2newstr($input,&temp); + $1 = SWIG_Guile_scm2newstr($input,&temp); $2 = temp; } /* Return the mutated string as a new object. */ %typemap(argout) (char *str, int len) { - SWIG_APPEND_VALUE(gh_str2scm($1,$2)); + SWIG_APPEND_VALUE(scm_mem2string($1,$2)); if ($1) scm_must_free($1); } diff --git a/Examples/test-suite/guilegh/Makefile.in b/Examples/test-suite/guilegh/Makefile.in deleted file mode 100644 index 3a03d5f82..000000000 --- a/Examples/test-suite/guilegh/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -####################################################################### -# Makefile for guile test-suite (with SCM API) -####################################################################### - -include ../guile/Makefile - -# Overridden variables here -VARIANT = _gh -# Refer to the guile directory for the run scripts -SCRIPTPREFIX = ../guile/ -GUILE_RUNTIME=-runtime - -# 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 = \ - if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ - fi - -setup = \ - if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE) (with GH API)" ; \ - else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE) (with GH API)" ; \ - fi diff --git a/Examples/test-suite/pointer_reference.i b/Examples/test-suite/pointer_reference.i index b9e126fd4..7a6a09d48 100644 --- a/Examples/test-suite/pointer_reference.i +++ b/Examples/test-suite/pointer_reference.i @@ -11,7 +11,7 @@ #ifdef SWIGGUILE /* A silly testing typemap for feeding a doubly indirect integer */ %typemap(in) int *&XYZZY (int temp1, int *temp2) { - temp1 = gh_scm2int($input); temp2 = &temp1; $1 = &temp2; + temp1 = scm_to_int($input); temp2 = &temp1; $1 = &temp2; }; #endif diff --git a/Lib/cdata.i b/Lib/cdata.i index 1abaf357b..dbc1c42d2 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -17,7 +17,7 @@ typedef struct SWIGCDATA { #if SWIGGUILE %typemap(out) SWIGCDATA { - $result = gh_str2scm($1.data,$1.len); + $result = scm_mem2string($1.data,$1.len); } %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); #elif SWIGCHICKEN diff --git a/Lib/exception.i b/Lib/exception.i index dc3a7f462..867ecdbff 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -24,7 +24,7 @@ SWIGINTERN void SWIG_exception_ (int code, const char *msg, const char *subr) { #define ERROR(scmerr) \ - scm_error(gh_symbol2scm((char *) (scmerr)), \ + scm_error(scm_str2symbol((char *) (scmerr)), \ (char *) subr, (char *) msg, \ SCM_EOL, SCM_BOOL_F) #define MAP(swigerr, scmerr) \ diff --git a/Lib/guile/cplusplus.i b/Lib/guile/cplusplus.i index 0dfe71754..d5d65efaa 100644 --- a/Lib/guile/cplusplus.i +++ b/Lib/guile/cplusplus.i @@ -5,18 +5,18 @@ * ----------------------------------------------------------------------------- */ %typemap(guile,out) string, std::string { - $result = gh_str02scm(const_cast($1.c_str())); + $result = SWIG_str02scm(const_cast($1.c_str())); } %typemap(guile,in) string, std::string { $1 = SWIG_scm2str($input); } %typemap(guile,out) complex, complex, std::complex { - $result = scm_make_rectangular( gh_double2scm ($1.real ()), - gh_double2scm ($1.imag ()) ); + $result = scm_make_rectangular( scm_from_double ($1.real ()), + scm_from_double ($1.imag ()) ); } %typemap(guile,in) complex, complex, std::complex { - $1 = std::complex( gh_scm2double (scm_real_part ($input)), - gh_scm2double (scm_imag_part ($input)) ); + $1 = std::complex( scm_to_double (scm_real_part ($input)), + scm_to_double (scm_imag_part ($input)) ); } diff --git a/Lib/guile/ghinterface.i b/Lib/guile/ghinterface.i deleted file mode 100644 index 3de4c81a2..000000000 --- a/Lib/guile/ghinterface.i +++ /dev/null @@ -1,39 +0,0 @@ -#define gh_append2(a, b) scm_append(scm_listify(a, b, SCM_UNDEFINED)) -#define gh_apply(a, b) scm_apply(a, b, SCM_EOL) -#define gh_bool2scm scm_from_bool -#define gh_boolean_p scm_is_bool -#define gh_car SCM_CAR -#define gh_cdr SCM_CDR -#define gh_cons scm_cons -#define gh_double2scm scm_from_double -#define gh_int2scm scm_from_long -#define gh_length(lst) scm_to_ulong(scm_length(lst)) -#define gh_list scm_listify -#define gh_list_to_vector scm_vector -#define gh_make_vector scm_make_vector -#define gh_null_p scm_is_null -#define gh_number_p scm_is_number -#define gh_pair_p scm_is_pair -#define gh_scm2bool scm_is_true -#define gh_scm2char SCM_CHAR -#define gh_scm2double scm_to_double -#define gh_scm2int scm_to_int -#define gh_scm2long scm_to_long -#define gh_scm2short scm_to_short -#define gh_scm2newstr SWIG_Guile_scm2newstr -#define gh_scm2ulong scm_to_ulong -#define gh_scm2ushort scm_to_ushort -#define gh_scm2uint scm_to_uint -#define gh_ulong2scm scm_from_ulong -#define gh_long2scm scm_from_long -#define gh_str02scm(str) str ? scm_from_locale_string(str) : SCM_BOOL_F -#define gh_long_long2scm scm_from_long_long -#define gh_scm2long_long scm_to_long_long -#define gh_ulong_long2scm scm_from_ulong_long -#define gh_scm2ulong_long scm_to_ulong_long -#define gh_string_p scm_is_string -#define gh_vector_length scm_c_vector_length -#define gh_vector_p scm_is_vector -#define gh_vector_ref scm_vector_ref -#define gh_vector_set_x scm_vector_set_x -#define gh_char2scm SCM_MAKE_CHAR diff --git a/Lib/guile/guile_gh.swg b/Lib/guile/guile_gh.swg deleted file mode 100644 index 3b65af897..000000000 --- a/Lib/guile/guile_gh.swg +++ /dev/null @@ -1,71 +0,0 @@ -/* ----------------------------------------------------------------------------- - * guile_gh.swg - * - * This SWIG interface file is processed if the Guile module is run - * with gh_ flavor. - * ----------------------------------------------------------------------------- */ - -#define SWIGGUILE_GH - -%runtime "swigrun.swg" -%runtime "guile_gh_run.swg" - -#define SWIG_convert_short(o) \ - SWIG_convert_integer(o, - (1 << (8 * sizeof(short) - 1)), \ - (1 << (8 * sizeof(short) - 1)) - 1, \ - FUNC_NAME, $argnum) -#define SWIG_convert_unsigned_short(o) \ - SWIG_convert_unsigned_integer(o, 0, \ - (1 << (8 * sizeof(short))) - 1, \ - FUNC_NAME, $argnum) -#define SWIG_convert_unsigned_int(o) \ - SWIG_convert_unsigned_integer(o, 0, UINT_MAX, \ - FUNC_NAME, $argnum) - -#define gh_scm2short(a) SWIG_convert_short(a) -#define gh_scm2ushort(a) SWIG_convert_unsigned_short(a) -#define gh_scm2uint(a) SWIG_convert_unsigned_int(a) - -%include - -%runtime %{ - -/* scm_values was implemented on C level in 1.4.1, and the prototype - is not included in libguile.h, so play safe and lookup `values'... */ -#define GUILE_MAYBE_VALUES \ - if (gswig_list_p) \ - gswig_result = gh_apply(gh_lookup("values"), gswig_result); - -#define GUILE_MAYBE_VECTOR \ - if (gswig_list_p) \ - gswig_result = gh_list_to_vector(gswig_result); - -#define SWIG_APPEND_VALUE(object) \ - if (gswig_result == SCM_UNSPECIFIED) { \ - gswig_result = object; \ - } else { \ - if (!gswig_list_p) { \ - gswig_list_p = 1; \ - gswig_result = gh_list(gswig_result, object, SCM_UNDEFINED); \ - } \ - else \ - gswig_result = gh_append2(gswig_result, \ - gh_list(object, SCM_UNDEFINED)); \ - } - -%} - -%init "swiginit.swg" - -%init %{ -static int _swig_module_smob_tag; - -SWIG_GUILE_INIT_STATIC void -SWIG_init(void) -{ - - SWIG_InitializeModule(0); - swig_module.clientdata = (void *) &_swig_module_smob_tag; - - SWIG_Guile_Init(&swig_module); -%} diff --git a/Lib/guile/guile_gh_run.swg b/Lib/guile/guile_gh_run.swg deleted file mode 100644 index 1292131c8..000000000 --- a/Lib/guile/guile_gh_run.swg +++ /dev/null @@ -1,273 +0,0 @@ -/* ----------------------------------------------------------------------------- - * guile_gh_run.swg - * - * Guile GH runtime file - * ----------------------------------------------------------------------------- */ - -#define SWIGGUILE -#include "guile/gh.h" -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - - -/* In the code below, use guile 2.0 compatible functions where possible. - Functions that don't exist in older versions will be mapped to - a deprecated equivalent for those versions only */ -/* ... setup guile 2-like interface for guile 1.8 */ -#if defined (SCM_MAJOR_VERSION) && (SCM_MAJOR_VERSION < 2) - -static SCM -scm_module_variable (SCM module, SCM sym) -{ - return scm_sym2var (sym, scm_module_lookup_closure (module), SCM_BOOL_F); -} - -#endif - -typedef SCM (*swig_guile_proc)(); - -#define SWIG_malloc(size) \ - SCM_MUST_MALLOC(size) -#define SWIG_free(mem) \ - scm_must_free(mem) -#define SWIG_ConvertPtr(s, result, type, flags) \ - SWIG_Guile_ConvertPtr(&swig_module, s, result, type, flags) -#define SWIG_MustGetPtr(s, type, argnum, flags) \ - SWIG_Guile_MustGetPtr(&swig_module, s, type, argnum, flags, FUNC_NAME) -#define SWIG_NewPointerObj(ptr, type, owner) \ - SWIG_Guile_NewPointerObj(&swig_module, (void*)ptr, type, owner) -#define SWIG_GetModule(clientdata) SWIG_Guile_GetModule(clientdata) -#define SWIG_SetModule(clientdata, pointer) SWIG_Guile_SetModule(pointer) - -/* Ignore object-ownership changes in gh mode */ -#define SWIG_Guile_MarkPointerNoncollectable(s) (s) -#define SWIG_Guile_MarkPointerDestroyed(s) (s) - -#define SWIG_contract_assert(expr, msg) \ - if (!(expr)) \ - scm_error(gh_symbol2scm("swig-contract-assertion-failed"), \ - (char *) FUNC_NAME, (char *) msg, \ - SCM_EOL, SCM_BOOL_F); else - -/* SCM_CHAR and SCM_CHARP were introduced in Guile 1.4; the following is for - 1.3.4 compatibility. */ -#ifndef SCM_CHAR -# define SCM_CHAR SCM_ICHR -#endif -#ifndef SCM_CHARP -# define SCM_CHARP SCM_ICHRP -#endif - -/* This function replaces gh_scm2char, which is broken in Guile 1.4 */ -SWIGINTERN char -GSWIG_scm2char (SCM s) -{ - if (SCM_CHARP(s)) return SCM_CHAR(s); - scm_wrong_type_arg(NULL, 0, s); -} -#define gh_scm2char GSWIG_scm2char - -/* Interface function */ -#define SWIG_scm2str(x) gh_scm2newstr(x, NULL) - -/* More 1.3.4 compatibility */ -#ifndef SCM_INPUT_PORT_P -# define SCM_INPUT_PORT_P SCM_INPORTP -# define SCM_OUTPUT_PORT_P SCM_OUTPORTP -#endif - -SWIGINTERN long -SWIG_convert_integer(SCM o, - long lower_bound, long upper_bound, - const char *func_name, int argnum) -{ - long value = gh_scm2long(o); - if (value < lower_bound || value > upper_bound) - scm_wrong_type_arg((char *) func_name, argnum, o); - return value; -} - -SWIGINTERN unsigned long -SWIG_convert_unsigned_integer(SCM o, - unsigned long lower_bound, - unsigned long upper_bound, - const char *func_name, int argnum) -{ - unsigned long value = gh_scm2ulong(o); - if (value < lower_bound || value > upper_bound) - scm_wrong_type_arg((char *) func_name, argnum, o); - return value; -} - -SWIGINTERN swig_type_info * -SWIG_Guile_LookupType(swig_module_info *module, SCM s, int normal) -{ - swig_module_info *iter; - if (!module) return 0; - iter = module; - do { - if ((normal && (unsigned long) SCM_TYP16(s) == *((int *)iter->clientdata))) { - - return iter->types[(long) SCM_CAR(s) >> 16]; - } - iter = iter->next; - } while (iter != module); - return 0; -} - -#ifdef SWIG_GLOBAL -#define SWIG_GUILE_MODULE_STATIC -#elif !defined(SWIG_NOINCLUDE) -#define SWIG_GUILE_MODULE_STATIC static -#endif - -#ifdef SWIG_GUILE_MODULE_STATIC -static swig_module_info *swig_guile_module = 0; -SWIG_GUILE_MODULE_STATIC swig_module_info *SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)) { - return swig_guile_module; -} -SWIG_GUILE_MODULE_STATIC void SWIG_Guile_SetModule(swig_module_info *pointer) { - swig_guile_module = pointer; -} -#else -SWIGEXPORT swig_module_info * SWIG_Guile_GetModule(void *SWIGUNUSEDPARM(clientdata)); -SWIGEXPORT void SWIG_Guile_SetModule(swig_module_info *pointer); -#endif - -SWIGINTERN SCM -SWIG_Guile_NewPointerObj(swig_module_info *module, void *ptr, - swig_type_info *type, int owner) -{ - unsigned long tag; - if (ptr==NULL) return SCM_EOL; - if (!module) return SCM_EOL; - for (tag = 0; tag < module->size; ++tag) { - if (module->types[tag] == type) - break; - } - if (tag >= module->size) - return SCM_EOL; - - - SCM_RETURN_NEWSMOB( ((tag << 16) | *((int *)module->clientdata)), ptr); -} - -/* Return 0 if successful. */ -SWIGINTERN int -SWIG_Guile_ConvertPtr(swig_module_info *module, SCM s, void **result, - swig_type_info *type, int flags) -{ - swig_cast_info *cast; - swig_type_info *from; - if (scm_is_null(s)) { - *result = NULL; - return SWIG_OK; - } else if (SCM_NIMP(s)) { - from = SWIG_Guile_LookupType(module, s, 1); - if (!from) return SWIG_ERROR; - if (type) { - cast = SWIG_TypeCheckStruct(from, type); - if (cast) { - int newmemory = 0; - *result = SWIG_TypeCast(cast, (void *) SCM_CDR(s), &newmemory); - assert(!newmemory); /* newmemory handling not yet implemented */ - return SWIG_OK; - } else { - return SWIG_ERROR; - } - } else { - *result = (void *) SCM_CDR(s); - return SWIG_OK; - } - } - return SWIG_ERROR; -} - -SWIGINTERN void * -SWIG_Guile_MustGetPtr (swig_module_info *module, SCM s, swig_type_info *type, - int argnum, int flags, const char *func_name) -{ - void *result; - int res = SWIG_Guile_ConvertPtr(module, s, &result, type, flags); - if (!SWIG_IsOK(res)) { - /* type mismatch */ - scm_wrong_type_arg((char *) func_name, argnum, s); - } - return result; -} - -/* Init */ - -SWIGINTERN int -print_swig (SCM swig_smob, SCM port, scm_print_state *pstate) -{ - swig_type_info *type = SWIG_Guile_LookupType(0, swig_smob, 1); - if (type) { - scm_puts((char *) "#str != NULL) - scm_puts((char *) type->str, port); - else - scm_puts((char *) type->name, port); - scm_puts((char *) " ", port); - scm_intprint((long) SCM_CDR(swig_smob), 16, port); - scm_puts((char *) ">", port); - /* non-zero means success */ - return 1; - } else { - return 0; - } -} - -SWIGINTERN SCM -equalp_swig (SCM A, SCM B) -{ - if (SCM_CAR(A) == SCM_CAR(B) - && SCM_CDR(A) == SCM_CDR(B)) - return SCM_BOOL_T; - else return SCM_BOOL_F; -} - -SWIGINTERN void -SWIG_Guile_Init (swig_module_info *module) -{ - *((int *)module->clientdata) = - scm_make_smob_type_mfpe((char *) "swig", 0, NULL, NULL, print_swig, equalp_swig); -} - -SWIGINTERN int -SWIG_Guile_GetArgs (SCM *dest, SCM rest, - int reqargs, int optargs, - const char *procname) -{ - int i; - int num_args_passed = 0; - for (i = 0; i %include %runtime %{ @@ -32,10 +31,6 @@ else \ gswig_result = scm_append(scm_listify(gswig_result, scm_listify(object, SCM_UNDEFINED), SCM_UNDEFINED)); \ } - /* used by Lib/exception.i */ - #define gh_symbol2scm scm_str2symbol - /* useb by Lib/cdata.i */ - #define gh_str2scm scm_mem2string %} diff --git a/Lib/guile/guile_scm_run.swg b/Lib/guile/guile_scm_run.swg index 7cf3d165a..0ac51f919 100644 --- a/Lib/guile/guile_scm_run.swg +++ b/Lib/guile/guile_scm_run.swg @@ -43,10 +43,12 @@ typedef struct swig_guile_clientdata { #define SWIG_scm2str(s) \ SWIG_Guile_scm2newstr(s, NULL) +#define SWIG_str02scm(str) \ + str ? scm_from_locale_string(str) : SCM_BOOL_F # define SWIG_malloc(size) \ - scm_malloc(size) + scm_malloc(size) # define SWIG_free(mem) \ - free(mem) + free(mem) #define SWIG_ConvertPtr(s, result, type, flags) \ SWIG_Guile_ConvertPtr(s, result, type, flags) #define SWIG_MustGetPtr(s, type, argnum, flags) \ diff --git a/Lib/guile/list-vector.i b/Lib/guile/list-vector.i index c2cd1aea2..057a1da5b 100644 --- a/Lib/guile/list-vector.i +++ b/Lib/guile/list-vector.i @@ -61,12 +61,12 @@ (size_t VECTORLENINPUT, C_TYPE *VECTORINPUT) { SCM_VALIDATE_VECTOR($argnum, $input); - $1 = gh_vector_length($input); + $1 = scm_c_vector_length($input); if ($1 > 0) { $1_ltype i; $2 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE) * $1); for (i = 0; i<$1; i++) { - SCM swig_scm_value = gh_vector_ref($input, gh_int2scm(i)); + SCM swig_scm_value = scm_vector_ref($input, scm_from_long(i)); $2[i] = SCM_TO_C_EXPR; } } @@ -78,15 +78,15 @@ (size_t LISTLENINPUT, C_TYPE *LISTINPUT) { SCM_VALIDATE_LIST($argnum, $input); - $1 = gh_length($input); + $1 = scm_to_ulong(scm_length($input)); if ($1 > 0) { $1_ltype i; SCM rest; $2 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE) * $1); for (i = 0, rest = $input; i<$1; - i++, rest = gh_cdr(rest)) { - SCM swig_scm_value = gh_car(rest); + i++, rest = SCM_CDR(rest)) { + SCM swig_scm_value = SCM_CAR(rest); $2[i] = SCM_TO_C_EXPR; } } @@ -140,12 +140,12 @@ (size_t *VECTORLENOUTPUT, C_TYPE **VECTOROUTPUT) { $*1_ltype i; - SCM res = gh_make_vector(gh_int2scm(*$1), + SCM res = scm_make_vector(scm_from_long(*$1), SCM_BOOL_F); for (i = 0; i<*$1; i++) { C_TYPE swig_c_value = (*$2)[i]; SCM elt = C_TO_SCM_EXPR; - gh_vector_set_x(res, gh_int2scm(i), elt); + scm_vector_set_x(res, scm_from_long(i), elt); } SWIG_APPEND_VALUE(res); } @@ -159,7 +159,7 @@ for (i = ((int)(*$1)) - 1; i>=0; i--) { C_TYPE swig_c_value = (*$2)[i]; SCM elt = C_TO_SCM_EXPR; - res = gh_cons(elt, res); + res = scm_cons(elt, res); } SWIG_APPEND_VALUE(res); } @@ -200,21 +200,21 @@ /* We use the macro to define typemaps for some standard types. */ -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(bool, gh_scm2bool, gh_bool2scm, boolean); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char, gh_scm2char, gh_char2scm, char); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned char, gh_scm2char, gh_char2scm, char); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(int, gh_scm2int, gh_int2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(short, gh_scm2int, gh_int2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(long, gh_scm2long, gh_long2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, gh_scm2long, gh_long2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned int, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned short, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned long, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(size_t, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(float, gh_scm2double, gh_double2scm, real); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(double, gh_scm2double, gh_double2scm, real); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, gh_str02scm, string); -TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(bool, scm_is_true, scm_from_bool, boolean); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char, SCM_CHAR, SCM_MAKE_CHAR, char); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(int, scm_to_int, scm_from_long, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(short, scm_to_int, scm_from_long, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(long, scm_to_long, scm_from_long, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, scm_to_long, scm_from_long, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned int, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned short, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(unsigned long, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(size_t, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(float, scm_to_double, scm_from_double, real); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(double, scm_to_double, scm_from_double, real); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, SWIG_str02scm, string); +TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, SWIG_str02scm, string); /* For the char *, free all strings after converting */ @@ -312,13 +312,13 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string const C_TYPE *PARALLEL_VECTORINPUT { SCM_VALIDATE_VECTOR($argnum, $input); - *_global_vector_length = gh_vector_length($input); + *_global_vector_length = scm_c_vector_length($input); if (*_global_vector_length > 0) { int i; $1 = (C_TYPE *) SWIG_malloc(sizeof(C_TYPE) * (*_global_vector_length)); for (i = 0; i<*_global_vector_length; i++) { - SCM swig_scm_value = gh_vector_ref($input, gh_int2scm(i)); + SCM swig_scm_value = scm_vector_ref($input, scm_from_long(i)); $1[i] = SCM_TO_C_EXPR; } } @@ -330,7 +330,7 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string const C_TYPE *PARALLEL_LISTINPUT { SCM_VALIDATE_LIST($argnum, $input); - *_global_list_length = gh_length($input); + *_global_list_length = scm_to_ulong(scm_length($input)); if (*_global_list_length > 0) { int i; SCM rest; @@ -338,8 +338,8 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string * (*_global_list_length)); for (i = 0, rest = $input; i<*_global_list_length; - i++, rest = gh_cdr(rest)) { - SCM swig_scm_value = gh_car(rest); + i++, rest = SCM_CDR(rest)) { + SCM swig_scm_value = SCM_CAR(rest); $1[i] = SCM_TO_C_EXPR; } } @@ -391,12 +391,12 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string C_TYPE **PARALLEL_VECTOROUTPUT { int i; - SCM res = gh_make_vector(gh_int2scm(_global_arraylentemp), + SCM res = scm_make_vector(scm_from_long(_global_arraylentemp), SCM_BOOL_F); for (i = 0; i<_global_arraylentemp; i++) { C_TYPE swig_c_value = (*$1)[i]; SCM elt = C_TO_SCM_EXPR; - gh_vector_set_x(res, gh_int2scm(i), elt); + scm_vector_set_x(res, scm_from_long(i), elt); } SWIG_APPEND_VALUE(res); } @@ -410,7 +410,7 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string for (i = _global_arraylentemp - 1; i>=0; i--) { C_TYPE swig_c_value = (*$1)[i]; SCM elt = C_TO_SCM_EXPR; - res = gh_cons(elt, res); + res = scm_cons(elt, res); } } SWIG_APPEND_VALUE(res); @@ -449,21 +449,21 @@ TYPEMAP_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string /* We use the macro to define typemaps for some standard types. */ -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(bool, gh_scm2bool, gh_bool2scm, boolean); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char, gh_scm2char, gh_char2scm, char); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned char, gh_scm2char, gh_char2scm, char); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(int, gh_scm2int, gh_int2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(short, gh_scm2int, gh_int2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(long, gh_scm2long, gh_long2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, gh_scm2long, gh_long2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned int, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned short, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned long, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(size_t, gh_scm2ulong, gh_ulong2scm, integer); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(float, gh_scm2double, gh_double2scm, real); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(double, gh_scm2double, gh_double2scm, real); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, gh_str02scm, string); -TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, gh_str02scm, string); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(bool, scm_is_true, scm_from_bool, boolean); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char, SCM_CHAR, SCM_MAKE_CHAR, char); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(int, scm_to_int, scm_from_long, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(short, scm_to_int, scm_from_long, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(long, scm_to_long, scm_from_long, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(ptrdiff_t, scm_to_long, scm_from_long, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned int, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned short, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(unsigned long, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(size_t, scm_to_ulong, scm_from_ulong, integer); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(float, scm_to_double, scm_from_double, real); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(double, scm_to_double, scm_from_double, real); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(char *, SWIG_scm2str, SWIG_str02scm, string); +TYPEMAP_PARALLEL_LIST_VECTOR_INPUT_OUTPUT(const char *, SWIG_scm2str, SWIG_str02scm, string); %typemap(freearg) char **PARALLEL_LISTINPUT, char **PARALLEL_VECTORINPUT, const char **PARALLEL_LISTINPUT, const char **PARALLEL_VECTORINPUT diff --git a/Lib/guile/std_common.i b/Lib/guile/std_common.i index a46c42c69..18c7db089 100644 --- a/Lib/guile/std_common.i +++ b/Lib/guile/std_common.i @@ -8,8 +8,8 @@ %apply size_t { std::size_t }; -#define SWIG_bool2scm(b) gh_bool2scm(b ? 1 : 0) -#define SWIG_string2scm(s) gh_str02scm(s.c_str()) +#define SWIG_bool2scm(b) scm_from_bool(b ? 1 : 0) +#define SWIG_string2scm(s) SWIG_str02scm(s.c_str()) %{ #include diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i index eb28c2831..dfce6fc5c 100644 --- a/Lib/guile/std_map.i +++ b/Lib/guile/std_map.i @@ -42,30 +42,30 @@ namespace std { template class map { %typemap(in) map (std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { $1 = std::map(); - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { $1 = std::map(); SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { K* k; T* x; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) != 0) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0); } (($1_type &)$1)[*k] = *x; - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = *(($&1_type) @@ -76,32 +76,32 @@ namespace std { std::map* m), const map* (std::map temp, std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { temp = std::map(); $1 = &temp; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { temp = std::map(); $1 = &temp; SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { K* k; T* x; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) != 0) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0); } temp[*k] = *x; - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); @@ -115,24 +115,24 @@ namespace std { T* val = new T(i->second); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); SCM x = SWIG_NewPointerObj(val,$descriptor(T *), 1); - SCM entry = gh_cons(k,x); - alist = gh_cons(entry,alist); + SCM entry = scm_cons(k,x); + alist = scm_cons(entry,alist); } $result = alist; } %typecheck(SWIG_TYPECHECK_MAP) map { /* native sequence? */ - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ K* k; T* x; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (SWIG_ConvertPtr(key,(void**) &k, $descriptor(K *), 0) != 0) { $1 = 0; @@ -140,8 +140,8 @@ namespace std { if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) $1 = 1; @@ -167,17 +167,17 @@ namespace std { %typecheck(SWIG_TYPECHECK_MAP) const map&, const map* { /* native sequence? */ - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ K* k; T* x; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (SWIG_ConvertPtr(key,(void**) &k, $descriptor(K *), 0) != 0) { $1 = 0; @@ -185,8 +185,8 @@ namespace std { if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) $1 = 1; @@ -255,7 +255,7 @@ namespace std { i!=$1.rend(); ++i) { K* key = new K(i->first); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); - result = gh_cons(k,result); + result = scm_cons(k,result); } return result; } @@ -269,31 +269,31 @@ namespace std { template class map { %typemap(in) map (std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { $1 = std::map(); - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { $1 = std::map(); SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { T* x; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); if (!CHECK(key)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) != 0) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0); } (($1_type &)$1)[CONVERT_FROM(key)] = *x; - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = *(($&1_type) @@ -304,33 +304,33 @@ namespace std { std::map* m), const map* (std::map temp, std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { temp = std::map(); $1 = &temp; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { temp = std::map(); $1 = &temp; SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { T* x; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); if (!CHECK(key)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) != 0) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); x = (T*) SWIG_MustGetPtr(val,$descriptor(T *),$argnum, 0); } temp[CONVERT_FROM(key)] = *x; - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); @@ -343,31 +343,31 @@ namespace std { T* val = new T(i->second); SCM k = CONVERT_TO(i->first); SCM x = SWIG_NewPointerObj(val,$descriptor(T *), 1); - SCM entry = gh_cons(k,x); - alist = gh_cons(entry,alist); + SCM entry = scm_cons(k,x); + alist = scm_cons(entry,alist); } $result = alist; } %typecheck(SWIG_TYPECHECK_MAP) map { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only T* x; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (!CHECK(key)) { $1 = 0; } else { if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) $1 = 1; @@ -393,24 +393,24 @@ namespace std { %typecheck(SWIG_TYPECHECK_MAP) const map&, const map* { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only T* x; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (!CHECK(key)) { $1 = 0; } else { if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (SWIG_ConvertPtr(val,(void**) &x, $descriptor(T *), 0) == 0) $1 = 1; @@ -474,7 +474,7 @@ namespace std { for (std::map::reverse_iterator i=$1.rbegin(); i!=$1.rend(); ++i) { SCM k = CONVERT_TO(i->first); - result = gh_cons(k,result); + result = scm_cons(k,result); } return result; } @@ -485,30 +485,30 @@ namespace std { %define specialize_std_map_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO) template class map { %typemap(in) map (std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { $1 = std::map(); - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { $1 = std::map(); SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { K* k; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0); if (!CHECK(val)) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); if (!CHECK(val)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); } (($1_type &)$1)[*k] = CONVERT_FROM(val); - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = *(($&1_type) @@ -519,32 +519,32 @@ namespace std { std::map* m), const map* (std::map temp, std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { temp = std::map(); $1 = &temp; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { temp = std::map(); $1 = &temp; SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { K* k; SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); k = (K*) SWIG_MustGetPtr(key,$descriptor(K *),$argnum, 0); if (!CHECK(val)) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); if (!CHECK(val)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); } temp[*k] = CONVERT_FROM(val); - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); @@ -557,31 +557,31 @@ namespace std { K* key = new K(i->first); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); SCM x = CONVERT_TO(i->second); - SCM entry = gh_cons(k,x); - alist = gh_cons(entry,alist); + SCM entry = scm_cons(k,x); + alist = scm_cons(entry,alist); } $result = alist; } %typecheck(SWIG_TYPECHECK_MAP) map { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only K* k; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (SWIG_ConvertPtr(val,(void **) &k, $descriptor(K *), 0) != 0) { $1 = 0; } else { if (CHECK(val)) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (CHECK(val)) $1 = 1; else @@ -606,24 +606,24 @@ namespace std { %typecheck(SWIG_TYPECHECK_MAP) const map&, const map* { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only K* k; - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (SWIG_ConvertPtr(val,(void **) &k, $descriptor(K *), 0) != 0) { $1 = 0; } else { if (CHECK(val)) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (CHECK(val)) $1 = 1; else @@ -687,7 +687,7 @@ namespace std { i!=$1.rend(); ++i) { K* key = new K(i->first); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); - result = gh_cons(k,result); + result = scm_cons(k,result); } return result; } @@ -699,32 +699,32 @@ namespace std { T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO) template<> class map { %typemap(in) map (std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { $1 = std::map(); - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { $1 = std::map(); SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); if (!CHECK_K(key)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); if (!CHECK_T(val)) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); if (!CHECK_T(val)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); } (($1_type &)$1)[CONVERT_K_FROM(key)] = CONVERT_T_FROM(val); - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = *(($&1_type) @@ -735,33 +735,33 @@ namespace std { std::map* m), const map* (std::map temp, std::map* m) { - if (gh_null_p($input)) { + if (scm_is_null($input)) { temp = std::map(); $1 = &temp; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { temp = std::map(); $1 = &temp; SCM alist = $input; - while (!gh_null_p(alist)) { + while (!scm_is_null(alist)) { SCM entry, key, val; - entry = gh_car(alist); - if (!gh_pair_p(entry)) + entry = SCM_CAR(alist); + if (!scm_is_pair(entry)) SWIG_exception(SWIG_TypeError,"alist expected"); - key = gh_car(entry); - val = gh_cdr(entry); + key = SCM_CAR(entry); + val = SCM_CDR(entry); if (!CHECK_K(key)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); if (!CHECK_T(val)) { - if (!gh_pair_p(val)) + if (!scm_is_pair(val)) SWIG_exception(SWIG_TypeError,"alist expected"); - val = gh_car(val); + val = SCM_CAR(val); if (!CHECK_T(val)) SWIG_exception(SWIG_TypeError, "map<" #K "," #T "> expected"); } temp[CONVERT_K_FROM(key)] = CONVERT_T_FROM(val); - alist = gh_cdr(alist); + alist = SCM_CDR(alist); } } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); @@ -773,29 +773,29 @@ namespace std { i!=$1.rend(); ++i) { SCM k = CONVERT_K_TO(i->first); SCM x = CONVERT_T_TO(i->second); - SCM entry = gh_cons(k,x); - alist = gh_cons(entry,alist); + SCM entry = scm_cons(k,x); + alist = scm_cons(entry,alist); } $result = alist; } %typecheck(SWIG_TYPECHECK_MAP) map { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (!CHECK_K(key)) { $1 = 0; } else { if (CHECK_T(val)) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (CHECK_T(val)) $1 = 1; else @@ -820,22 +820,22 @@ namespace std { %typecheck(SWIG_TYPECHECK_MAP) const map&, const map* { // native sequence? - if (gh_null_p($input)) { + if (scm_is_null($input)) { /* an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { // check the first element only - SCM head = gh_car($input); - if (gh_pair_p(head)) { - SCM key = gh_car(head); - SCM val = gh_cdr(head); + SCM head = SCM_CAR($input); + if (scm_is_pair(head)) { + SCM key = SCM_CAR(head); + SCM val = SCM_CDR(head); if (!CHECK_K(key)) { $1 = 0; } else { if (CHECK_T(val)) { $1 = 1; - } else if (gh_pair_p(val)) { - val = gh_car(val); + } else if (scm_is_pair(val)) { + val = SCM_CAR(val); if (CHECK_T(val)) $1 = 1; else @@ -898,7 +898,7 @@ namespace std { for (std::map::reverse_iterator i=$1.rbegin(); i!=$1.rend(); ++i) { SCM k = CONVERT_K_TO(i->first); - result = gh_cons(k,result); + result = scm_cons(k,result); } return result; } @@ -907,446 +907,446 @@ namespace std { %enddef - specialize_std_map_on_key(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_key(int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_key(short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_key(long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_key(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_key(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_key(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_key(double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_key(float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_key(std::string,gh_string_p, + specialize_std_map_on_key(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_key(int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_key(short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_key(long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_key(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_key(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_key(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_key(double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_key(float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_key(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_value(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_value(int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_value(short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_value(long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_value(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_value(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_value(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_value(double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_value(float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_value(std::string,gh_string_p, + specialize_std_map_on_value(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_value(int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_value(short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_value(long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_value(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_value(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_value(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_value(double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_value(float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_value(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - std::string,gh_string_p, + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - std::string,gh_string_p, + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - std::string,gh_string_p, + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_map_on_both(std::string,gh_string_p, + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_map_on_both(std::string,gh_string_p, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(std::string,gh_string_p, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(std::string,gh_string_p, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_map_on_both(std::string,gh_string_p, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(std::string,gh_string_p, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(std::string,gh_string_p, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_map_on_both(std::string,gh_string_p, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(std::string,gh_string_p, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_map_on_both(std::string,gh_string_p, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_map_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - std::string,gh_string_p, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); } diff --git a/Lib/guile/std_pair.i b/Lib/guile/std_pair.i index 35f0cfad5..86ca6e00f 100644 --- a/Lib/guile/std_pair.i +++ b/Lib/guile/std_pair.i @@ -23,12 +23,12 @@ namespace std { template struct pair { %typemap(in) pair (std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; U* y; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0); $1 = std::make_pair(*x,*y); @@ -41,12 +41,12 @@ namespace std { std::pair* m), const pair* (std::pair temp, std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; U* y; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0); temp = std::make_pair(*x,*y); @@ -61,15 +61,15 @@ namespace std { U* y = new U($1.second); SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1); SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1); - $result = gh_cons(first,second); + $result = scm_cons(first,second); } %typecheck(SWIG_TYPECHECK_PAIR) pair { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; U* y; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (SWIG_ConvertPtr(first,(void**) &x, $descriptor(T *), 0) == 0 && SWIG_ConvertPtr(second,(void**) &y, @@ -91,11 +91,11 @@ namespace std { %typecheck(SWIG_TYPECHECK_PAIR) const pair&, const pair* { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; U* y; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (SWIG_ConvertPtr(first,(void**) &x, $descriptor(T *), 0) == 0 && SWIG_ConvertPtr(second,(void**) &y, @@ -130,11 +130,11 @@ namespace std { %define specialize_std_pair_on_first(T,CHECK,CONVERT_FROM,CONVERT_TO) template struct pair { %typemap(in) pair (std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { U* y; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); if (!CHECK(first)) SWIG_exception(SWIG_TypeError, "map<" #T "," #U "> expected"); @@ -149,11 +149,11 @@ namespace std { std::pair* m), const pair* (std::pair temp, std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { U* y; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); if (!CHECK(first)) SWIG_exception(SWIG_TypeError, "map<" #T "," #U "> expected"); @@ -168,14 +168,14 @@ namespace std { %typemap(out) pair { U* y = new U($1.second); SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1); - $result = gh_cons(CONVERT_TO($1.first),second); + $result = scm_cons(CONVERT_TO($1.first),second); } %typecheck(SWIG_TYPECHECK_PAIR) pair { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { U* y; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (CHECK(first) && SWIG_ConvertPtr(second,(void**) &y, $descriptor(U *), 0) == 0) { @@ -196,10 +196,10 @@ namespace std { %typecheck(SWIG_TYPECHECK_PAIR) const pair&, const pair* { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { U* y; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (CHECK(first) && SWIG_ConvertPtr(second,(void**) &y, $descriptor(U *), 0) == 0) { @@ -231,11 +231,11 @@ namespace std { %define specialize_std_pair_on_second(U,CHECK,CONVERT_FROM,CONVERT_TO) template struct pair { %typemap(in) pair (std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); if (!CHECK(second)) SWIG_exception(SWIG_TypeError, @@ -250,11 +250,11 @@ namespace std { std::pair* m), const pair* (std::pair temp, std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); if (!CHECK(second)) SWIG_exception(SWIG_TypeError, @@ -269,14 +269,14 @@ namespace std { %typemap(out) pair { T* x = new T($1.first); SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1); - $result = gh_cons(first,CONVERT_TO($1.second)); + $result = scm_cons(first,CONVERT_TO($1.second)); } %typecheck(SWIG_TYPECHECK_PAIR) pair { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (SWIG_ConvertPtr(first,(void**) &x, $descriptor(T *), 0) == 0 && CHECK(second)) { @@ -297,10 +297,10 @@ namespace std { %typecheck(SWIG_TYPECHECK_PAIR) const pair&, const pair* { /* native pair? */ - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { T* x; - SCM first = gh_car($input); - SCM second = gh_cdr($input); + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (SWIG_ConvertPtr(first,(void**) &x, $descriptor(T *), 0) == 0 && CHECK(second)) { @@ -333,10 +333,10 @@ namespace std { U,CHECK_U,CONVERT_U_FROM,CONVERT_U_TO) template<> struct pair { %typemap(in) pair (std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); if (!CHECK_T(first) || !CHECK_U(second)) SWIG_exception(SWIG_TypeError, "map<" #T "," #U "> expected"); @@ -351,10 +351,10 @@ namespace std { std::pair* m), const pair* (std::pair temp, std::pair* m) { - if (gh_pair_p($input)) { + if (scm_is_pair($input)) { SCM first, second; - first = gh_car($input); - second = gh_cdr($input); + first = SCM_CAR($input); + second = SCM_CDR($input); if (!CHECK_T(first) || !CHECK_U(second)) SWIG_exception(SWIG_TypeError, "map<" #T "," #U "> expected"); @@ -367,14 +367,14 @@ namespace std { } } %typemap(out) pair { - $result = gh_cons(CONVERT_T_TO($1.first), + $result = scm_cons(CONVERT_T_TO($1.first), CONVERT_U_TO($1.second)); } %typecheck(SWIG_TYPECHECK_PAIR) pair { /* native pair? */ - if (gh_pair_p($input)) { - SCM first = gh_car($input); - SCM second = gh_cdr($input); + if (scm_is_pair($input)) { + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (CHECK_T(first) && CHECK_U(second)) { $1 = 1; } else { @@ -393,9 +393,9 @@ namespace std { %typecheck(SWIG_TYPECHECK_PAIR) const pair&, const pair* { /* native pair? */ - if (gh_pair_p($input)) { - SCM first = gh_car($input); - SCM second = gh_cdr($input); + if (scm_is_pair($input)) { + SCM first = SCM_CAR($input); + SCM second = SCM_CDR($input); if (CHECK_T(first) && CHECK_U(second)) { $1 = 1; } else { @@ -423,446 +423,446 @@ namespace std { %enddef - specialize_std_pair_on_first(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_first(int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_first(short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_first(long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_first(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_first(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_first(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_first(double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_first(float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_first(std::string,gh_string_p, + specialize_std_pair_on_first(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_first(int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_first(short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_first(long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_first(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_first(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_first(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_first(double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_first(float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_first(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_second(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_second(int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_second(short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_second(long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_second(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_second(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_second(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_second(double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_second(float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_second(std::string,gh_string_p, + specialize_std_pair_on_second(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_second(int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_second(short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_second(long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_second(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_second(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_second(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_second(double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_second(float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_second(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(bool,scm_is_bool, + scm_is_true,SWIG_bool2scm, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(int,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(int,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(short,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(short,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(long,gh_number_p, - gh_scm2long,gh_long2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(long,scm_is_number, + scm_to_long,scm_from_long, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(double,gh_number_p, - gh_scm2double,gh_double2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(double,scm_is_number, + scm_to_double,scm_from_double, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(float,gh_number_p, - gh_scm2double,gh_double2scm, - std::string,gh_string_p, + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(float,scm_is_number, + scm_to_double,scm_from_double, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - bool,gh_boolean_p, - gh_scm2bool,SWIG_bool2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + bool,scm_is_bool, + scm_is_true,SWIG_bool2scm); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - int,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + int,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - short,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + short,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - long,gh_number_p, - gh_scm2long,gh_long2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + long,scm_is_number, + scm_to_long,scm_from_long); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned int,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + unsigned int,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned short,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + unsigned short,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - unsigned long,gh_number_p, - gh_scm2ulong,gh_ulong2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + unsigned long,scm_is_number, + scm_to_ulong,scm_from_ulong); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - double,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + double,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - float,gh_number_p, - gh_scm2double,gh_double2scm); - specialize_std_pair_on_both(std::string,gh_string_p, + float,scm_is_number, + scm_to_double,scm_from_double); + specialize_std_pair_on_both(std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm, - std::string,gh_string_p, + std::string,scm_is_string, SWIG_scm2string,SWIG_string2scm); } diff --git a/Lib/guile/std_string.i b/Lib/guile/std_string.i index 83e0dd26d..6513173ee 100644 --- a/Lib/guile/std_string.i +++ b/Lib/guile/std_string.i @@ -27,7 +27,7 @@ namespace std { %typemap(typecheck) const string & = char *; %typemap(in) string (char * tempptr) { - if (gh_string_p($input)) { + if (scm_is_string($input)) { tempptr = SWIG_scm2str($input); $1.assign(tempptr); if (tempptr) SWIG_free(tempptr); @@ -37,7 +37,7 @@ namespace std { } %typemap(in) const string & ($*1_ltype temp, char *tempptr) { - if (gh_string_p($input)) { + if (scm_is_string($input)) { tempptr = SWIG_scm2str($input); temp.assign(tempptr); if (tempptr) SWIG_free(tempptr); @@ -48,7 +48,7 @@ namespace std { } %typemap(in) string * (char *tempptr) { - if (gh_string_p($input)) { + if (scm_is_string($input)) { tempptr = SWIG_scm2str($input); $1 = new $*1_ltype(tempptr); if (tempptr) SWIG_free(tempptr); @@ -58,19 +58,19 @@ namespace std { } %typemap(out) string { - $result = gh_str02scm($1.c_str()); + $result = SWIG_str02scm($1.c_str()); } %typemap(out) const string & { - $result = gh_str02scm($1->c_str()); + $result = SWIG_str02scm($1->c_str()); } %typemap(out) string * { - $result = gh_str02scm($1->c_str()); + $result = SWIG_str02scm($1->c_str()); } %typemap(varin) string { - if (gh_string_p($input)) { + if (scm_is_string($input)) { char *tempptr = SWIG_scm2str($input); $1.assign(tempptr); if (tempptr) SWIG_free(tempptr); @@ -80,7 +80,7 @@ namespace std { } %typemap(varout) string { - $result = gh_str02scm($1.c_str()); + $result = SWIG_str02scm($1.c_str()); } } diff --git a/Lib/guile/std_vector.i b/Lib/guile/std_vector.i index 6a5e8ae36..79c716b10 100644 --- a/Lib/guile/std_vector.i +++ b/Lib/guile/std_vector.i @@ -42,23 +42,23 @@ namespace std { template class vector { %typemap(in) vector { - if (gh_vector_p($input)) { - unsigned long size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned long size = scm_c_vector_length($input); $1 = std::vector(size); for (unsigned long i=0; i(); - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { SCM head, tail; $1 = std::vector(); tail = $input; - while (!gh_null_p(tail)) { - head = gh_car(tail); - tail = gh_cdr(tail); + while (!scm_is_null(tail)) { + head = SCM_CAR(tail); + tail = SCM_CDR(tail); $1.push_back(*((T*)SWIG_MustGetPtr(head, $descriptor(T *), $argnum, 0))); @@ -70,27 +70,27 @@ namespace std { } %typemap(in) const vector& (std::vector temp), const vector* (std::vector temp) { - if (gh_vector_p($input)) { - unsigned long size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned long size = scm_c_vector_length($input); temp = std::vector(size); $1 = &temp; for (unsigned long i=0; i(); $1 = &temp; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { temp = std::vector(); $1 = &temp; SCM head, tail; tail = $input; - while (!gh_null_p(tail)) { - head = gh_car(tail); - tail = gh_cdr(tail); + while (!scm_is_null(tail)) { + head = SCM_CAR(tail); + tail = SCM_CDR(tail); temp.push_back(*((T*) SWIG_MustGetPtr(head, $descriptor(T *), $argnum, 0))); @@ -100,23 +100,23 @@ namespace std { } } %typemap(out) vector { - $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED); + $result = scm_make_vector(scm_from_long($1.size()),SCM_UNSPECIFIED); for (unsigned int i=0; i<$1.size(); i++) { T* x = new T((($1_type &)$1)[i]); - gh_vector_set_x($result,gh_long2scm(i), + scm_vector_set_x($result,scm_from_long(i), SWIG_NewPointerObj(x, $descriptor(T *), 1)); } } %typecheck(SWIG_TYPECHECK_VECTOR) vector { /* native sequence? */ - if (gh_vector_p($input)) { - unsigned int size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned int size = scm_c_vector_length($input); if (size == 0) { /* an empty sequence can be of any type */ $1 = 1; } else { /* check the first element only */ - SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + SCM o = scm_vector_ref($input,scm_from_ulong(0)); T* x; if (SWIG_ConvertPtr(o,(void**) &x, $descriptor(T *), 0) != -1) @@ -124,13 +124,13 @@ namespace std { else $1 = 0; } - } else if (gh_null_p($input)) { + } else if (scm_is_null($input)) { /* again, an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ T* x; - SCM head = gh_car($input); + SCM head = SCM_CAR($input); if (SWIG_ConvertPtr(head,(void**) &x, $descriptor(T *), 0) != -1) $1 = 1; @@ -149,28 +149,28 @@ namespace std { %typecheck(SWIG_TYPECHECK_VECTOR) const vector&, const vector* { /* native sequence? */ - if (gh_vector_p($input)) { - unsigned int size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned int size = scm_c_vector_length($input); if (size == 0) { /* an empty sequence can be of any type */ $1 = 1; } else { /* check the first element only */ T* x; - SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + SCM o = scm_vector_ref($input,scm_from_ulong(0)); if (SWIG_ConvertPtr(o,(void**) &x, $descriptor(T *), 0) != -1) $1 = 1; else $1 = 0; } - } else if (gh_null_p($input)) { + } else if (scm_is_null($input)) { /* again, an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ T* x; - SCM head = gh_car($input); + SCM head = SCM_CAR($input); if (SWIG_ConvertPtr(head,(void**) &x, $descriptor(T *), 0) != -1) $1 = 1; @@ -230,24 +230,24 @@ namespace std { %define specialize_stl_vector(T,CHECK,CONVERT_FROM,CONVERT_TO) template<> class vector { %typemap(in) vector { - if (gh_vector_p($input)) { - unsigned long size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned long size = scm_c_vector_length($input); $1 = std::vector(size); for (unsigned long i=0; i(); - } else if (gh_pair_p($input)) { - SCM v = gh_list_to_vector($input); - unsigned long size = gh_vector_length(v); + } else if (scm_is_pair($input)) { + SCM v = scm_vector($input); + unsigned long size = scm_c_vector_length(v); $1 = std::vector(size); for (unsigned long i=0; i& (std::vector temp), const vector* (std::vector temp) { - if (gh_vector_p($input)) { - unsigned long size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned long size = scm_c_vector_length($input); temp = std::vector(size); $1 = &temp; for (unsigned long i=0; i(); $1 = &temp; - } else if (gh_pair_p($input)) { - SCM v = gh_list_to_vector($input); - unsigned long size = gh_vector_length(v); + } else if (scm_is_pair($input)) { + SCM v = scm_vector($input); + unsigned long size = scm_c_vector_length(v); temp = std::vector(size); $1 = &temp; for (unsigned long i=0; i { - $result = gh_make_vector(gh_long2scm($1.size()),SCM_UNSPECIFIED); + $result = scm_make_vector(scm_from_long($1.size()),SCM_UNSPECIFIED); for (unsigned int i=0; i<$1.size(); i++) { SCM x = CONVERT_TO((($1_type &)$1)[i]); - gh_vector_set_x($result,gh_long2scm(i),x); + scm_vector_set_x($result,scm_from_long(i),x); } } %typecheck(SWIG_TYPECHECK_VECTOR) vector { /* native sequence? */ - if (gh_vector_p($input)) { - unsigned int size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned int size = scm_c_vector_length($input); if (size == 0) { /* an empty sequence can be of any type */ $1 = 1; } else { /* check the first element only */ T* x; - SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + SCM o = scm_vector_ref($input,scm_from_ulong(0)); $1 = CHECK(o) ? 1 : 0; } - } else if (gh_null_p($input)) { + } else if (scm_is_null($input)) { /* again, an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ T* x; - SCM head = gh_car($input); + SCM head = SCM_CAR($input); $1 = CHECK(head) ? 1 : 0; } else { /* wrapped vector? */ @@ -328,24 +328,24 @@ namespace std { %typecheck(SWIG_TYPECHECK_VECTOR) const vector&, const vector* { /* native sequence? */ - if (gh_vector_p($input)) { - unsigned int size = gh_vector_length($input); + if (scm_is_vector($input)) { + unsigned int size = scm_c_vector_length($input); if (size == 0) { /* an empty sequence can be of any type */ $1 = 1; } else { /* check the first element only */ T* x; - SCM o = gh_vector_ref($input,gh_ulong2scm(0)); + SCM o = scm_vector_ref($input,scm_from_ulong(0)); $1 = CHECK(o) ? 1 : 0; } - } else if (gh_null_p($input)) { + } else if (scm_is_null($input)) { /* again, an empty sequence can be of any type */ $1 = 1; - } else if (gh_pair_p($input)) { + } else if (scm_is_pair($input)) { /* check the first element only */ T* x; - SCM head = gh_car($input); + SCM head = SCM_CAR($input); $1 = CHECK(head) ? 1 : 0; } else { /* wrapped vector? */ @@ -394,17 +394,17 @@ namespace std { }; %enddef - specialize_stl_vector(bool,gh_boolean_p,gh_scm2bool,SWIG_bool2scm); - specialize_stl_vector(char,gh_number_p,gh_scm2long,gh_long2scm); - specialize_stl_vector(int,gh_number_p,gh_scm2long,gh_long2scm); - specialize_stl_vector(long,gh_number_p,gh_scm2long,gh_long2scm); - specialize_stl_vector(short,gh_number_p,gh_scm2long,gh_long2scm); - specialize_stl_vector(unsigned char,gh_number_p,gh_scm2ulong,gh_ulong2scm); - specialize_stl_vector(unsigned int,gh_number_p,gh_scm2ulong,gh_ulong2scm); - specialize_stl_vector(unsigned long,gh_number_p,gh_scm2ulong,gh_ulong2scm); - specialize_stl_vector(unsigned short,gh_number_p,gh_scm2ulong,gh_ulong2scm); - specialize_stl_vector(float,gh_number_p,gh_scm2double,gh_double2scm); - specialize_stl_vector(double,gh_number_p,gh_scm2double,gh_double2scm); - specialize_stl_vector(std::string,gh_string_p,SWIG_scm2string,SWIG_string2scm); + specialize_stl_vector(bool,scm_is_bool,scm_is_true,SWIG_bool2scm); + specialize_stl_vector(char,scm_is_number,scm_to_long,scm_from_long); + specialize_stl_vector(int,scm_is_number,scm_to_long,scm_from_long); + specialize_stl_vector(long,scm_is_number,scm_to_long,scm_from_long); + specialize_stl_vector(short,scm_is_number,scm_to_long,scm_from_long); + specialize_stl_vector(unsigned char,scm_is_number,scm_to_ulong,scm_from_ulong); + specialize_stl_vector(unsigned int,scm_is_number,scm_to_ulong,scm_from_ulong); + specialize_stl_vector(unsigned long,scm_is_number,scm_to_ulong,scm_from_ulong); + specialize_stl_vector(unsigned short,scm_is_number,scm_to_ulong,scm_from_ulong); + specialize_stl_vector(float,scm_is_number,scm_to_double,scm_from_double); + specialize_stl_vector(double,scm_is_number,scm_to_double,scm_from_double); + specialize_stl_vector(std::string,scm_is_string,SWIG_scm2string,SWIG_string2scm); } diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i index 5036162fd..ab655eb9a 100644 --- a/Lib/guile/typemaps.i +++ b/Lib/guile/typemaps.i @@ -60,26 +60,26 @@ %typemap(throws) SWIGTYPE { $<ype temp = new $ltype($1); - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(SWIG_NewPointerObj(temp, $&descriptor, 1), + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE & { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(SWIG_NewPointerObj(&$1, $descriptor, 1), + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE * { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(SWIG_NewPointerObj($1, $descriptor, 1), + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE [] { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(SWIG_NewPointerObj($1, $descriptor, 1), + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } @@ -146,7 +146,7 @@ /* Enums */ -%typemap(in) enum SWIGTYPE { $1 = ($1_type) gh_scm2int($input); } +%typemap(in) enum SWIGTYPE { $1 = ($1_type) scm_to_int($input); } /* The complicated construction below needed to deal with anonymous enums, which cannot be cast to. */ %typemap(varin) enum SWIGTYPE { @@ -156,13 +156,13 @@ (char *) "enum variable '$name' cannot be set", SCM_EOL, SCM_BOOL_F); } - * (int *) &($1) = gh_scm2int($input); + * (int *) &($1) = scm_to_int($input); } -%typemap(out) enum SWIGTYPE { $result = gh_int2scm($1); } -%typemap(varout) enum SWIGTYPE { $result = gh_int2scm($1); } +%typemap(out) enum SWIGTYPE { $result = scm_from_long($1); } +%typemap(varout) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(throws) enum SWIGTYPE { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(gh_int2scm($1), SCM_UNDEFINED)); + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(scm_from_long($1), SCM_UNDEFINED)); } /* The SIMPLE_MAP_WITH_EXPR macro below defines the whole set of @@ -210,8 +210,8 @@ /* Throw typemap */ %typemap(throws) C_NAME { C_NAME swig_c_value = $1; - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(C_TO_SCM_EXPR, SCM_UNDEFINED)); + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED)); } %enddef @@ -254,34 +254,34 @@ } /* Throw typemap */ %typemap(throws) C_NAME { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(C_TO_SCM($1), SCM_UNDEFINED)); + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(C_TO_SCM($1), SCM_UNDEFINED)); } %enddef - SIMPLE_MAP(bool, gh_scm2bool, gh_bool2scm, boolean); - SIMPLE_MAP(char, gh_scm2char, gh_char2scm, char); - SIMPLE_MAP(unsigned char, gh_scm2char, gh_char2scm, char); - SIMPLE_MAP(signed char, gh_scm2char, gh_char2scm, char); - SIMPLE_MAP(int, gh_scm2int, gh_int2scm, integer); - SIMPLE_MAP(short, gh_scm2short, gh_int2scm, integer); - SIMPLE_MAP(long, gh_scm2long, gh_long2scm, integer); - SIMPLE_MAP(ptrdiff_t, gh_scm2long, gh_long2scm, integer); - SIMPLE_MAP(unsigned int, gh_scm2uint, gh_ulong2scm, integer); - SIMPLE_MAP(unsigned short, gh_scm2ushort, gh_ulong2scm, integer); - SIMPLE_MAP(unsigned long, gh_scm2ulong, gh_ulong2scm, integer); - SIMPLE_MAP(size_t, gh_scm2ulong, gh_ulong2scm, integer); - SIMPLE_MAP(float, gh_scm2double, gh_double2scm, real); - SIMPLE_MAP(double, gh_scm2double, gh_double2scm, real); -// SIMPLE_MAP(char *, SWIG_scm2str, gh_str02scm, string); -// SIMPLE_MAP(const char *, SWIG_scm2str, gh_str02scm, string); + SIMPLE_MAP(bool, scm_is_true, scm_from_bool, boolean); + SIMPLE_MAP(char, SCM_CHAR, SCM_MAKE_CHAR, char); + SIMPLE_MAP(unsigned char, SCM_CHAR, SCM_MAKE_CHAR, char); + SIMPLE_MAP(signed char, SCM_CHAR, SCM_MAKE_CHAR, char); + SIMPLE_MAP(int, scm_to_int, scm_from_long, integer); + SIMPLE_MAP(short, scm_to_short, scm_from_long, integer); + SIMPLE_MAP(long, scm_to_long, scm_from_long, integer); + SIMPLE_MAP(ptrdiff_t, scm_to_long, scm_from_long, integer); + SIMPLE_MAP(unsigned int, scm_to_uint, scm_from_ulong, integer); + SIMPLE_MAP(unsigned short, scm_to_ushort, scm_from_ulong, integer); + SIMPLE_MAP(unsigned long, scm_to_ulong, scm_from_ulong, integer); + SIMPLE_MAP(size_t, scm_to_ulong, scm_from_ulong, integer); + SIMPLE_MAP(float, scm_to_double, scm_from_double, real); + SIMPLE_MAP(double, scm_to_double, scm_from_double, real); +// SIMPLE_MAP(char *, SWIG_scm2str, SWIG_str02scm, string); +// SIMPLE_MAP(const char *, SWIG_scm2str, SWIG_str02scm, string); /* Define long long typemaps -- uses functions that are only defined in recent versions of Guile, availability also depends on Guile's configuration. */ -SIMPLE_MAP(long long, gh_scm2long_long, gh_long_long2scm, integer); -SIMPLE_MAP(unsigned long long, gh_scm2ulong_long, gh_ulong_long2scm, integer); +SIMPLE_MAP(long long, scm_to_long_long, scm_from_long_long, integer); +SIMPLE_MAP(unsigned long long, scm_to_ulong_long, scm_from_ulong_long, integer); /* Strings */ @@ -290,8 +290,8 @@ SIMPLE_MAP(unsigned long long, gh_scm2ulong_long, gh_ulong_long2scm, integer); must_free = 1; } %typemap (varin, doc="NEW-VALUE is a string") char * {$1 = ($1_ltype)SWIG_scm2str($input);} - %typemap (out, doc="") char * {$result = gh_str02scm((const char *)$1);} - %typemap (varout, doc="") char * {$result = gh_str02scm($1);} + %typemap (out, doc="") char * {$result = SWIG_str02scm((const char *)$1);} + %typemap (varout, doc="") char * {$result = SWIG_str02scm($1);} %typemap (in, doc="$NAME is a string") char **INPUT(char * temp, int must_free = 0) { temp = (char *) SWIG_scm2str($input); $1 = &temp; must_free = 1; @@ -299,7 +299,7 @@ SIMPLE_MAP(unsigned long long, gh_scm2ulong_long, gh_ulong_long2scm, integer); %typemap (in,numinputs=0) char **OUTPUT (char * temp) {$1 = &temp;} %typemap (argout,doc="$NAME (a string)") char **OUTPUT - {SWIG_APPEND_VALUE(gh_str02scm(*$1));} + {SWIG_APPEND_VALUE(SWIG_str02scm(*$1));} %typemap (in) char **BOTH = char **INPUT; %typemap (argout) char **BOTH = char **OUTPUT; %typemap (in) char **INOUT = char **INPUT; @@ -329,8 +329,8 @@ SIMPLE_MAP(unsigned long long, gh_scm2ulong_long, gh_ulong_long2scm, integer); } %typemap(throws) char * { - scm_throw(gh_symbol2scm((char *) "swig-exception"), - gh_list(gh_str02scm($1), SCM_UNDEFINED)); + scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_listify(SWIG_str02scm($1), SCM_UNDEFINED)); } /* Void */ @@ -350,7 +350,7 @@ typedef unsigned long SCM; %typemap(in) (char *STRING, int LENGTH), (char *STRING, size_t LENGTH) { size_t temp; - $1 = ($1_ltype) gh_scm2newstr($input, &temp); + $1 = ($1_ltype) SWIG_Guile_scm2newstr($input, &temp); $2 = ($2_ltype) temp; } diff --git a/Lib/mzscheme/typemaps.i b/Lib/mzscheme/typemaps.i index f12513df8..4078026ac 100644 --- a/Lib/mzscheme/typemaps.i +++ b/Lib/mzscheme/typemaps.i @@ -279,7 +279,7 @@ REF_MAP(double, SCHEME_REALP, scheme_real_to_double, //%typemap(in) (char *STRING, int LENGTH) { // int temp; -// $1 = ($1_ltype) gh_scm2newstr($input, &temp); +// $1 = ($1_ltype) SWIG_Guile_scm2newstr($input, &temp); // $2 = ($2_ltype) temp; //} diff --git a/Makefile.in b/Makefile.in index c33889587..cfa6d0933 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,6 @@ skip-tcl = test -n "@SKIP_TCL@" skip-perl5 = test -n "@SKIP_PERL5@" skip-python = test -n "@SKIP_PYTHON@" skip-java = test -n "@SKIP_JAVA@" -skip-guilegh = test -n "@SKIP_GUILEGH@" skip-guile = test -n "@SKIP_GUILE@" skip-mzscheme = test -n "@SKIP_MZSCHEME@" skip-ruby = test -n "@SKIP_RUBY@" @@ -247,7 +246,6 @@ check-test-suite: \ check-perl5-test-suite \ check-python-test-suite \ check-java-test-suite \ - check-guilegh-test-suite \ check-guile-test-suite \ check-mzscheme-test-suite \ check-ruby-test-suite \ @@ -300,7 +298,6 @@ all-test-suite: \ all-perl5-test-suite \ all-python-test-suite \ all-java-test-suite \ - all-guilegh-test-suite \ all-guile-test-suite \ all-mzscheme-test-suite \ all-ruby-test-suite \ @@ -329,7 +326,6 @@ broken-test-suite: \ broken-perl5-test-suite \ broken-python-test-suite \ broken-java-test-suite \ - broken-guilegh-test-suite \ broken-guile-test-suite \ broken-mzscheme-test-suite \ broken-ruby-test-suite \ diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index 211b11baf..afe039ac7 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -23,7 +23,6 @@ Guile Options (available with -guile)\n\ -emitslotaccessors - Emit accessor methods for all GOOPS slots\n" "\ -exportprimitive - Add the (export ...) code from scmstub into the\n\ GOOPS file.\n\ - -gh - Use the gh_ Guile API. (Guile <= 1.8) \n\ -goopsprefix - Prepend to all goops identifiers\n\ -linkage - Use linkage protocol (default `simple')\n\ Use `module' for native Guile module linking\n\ @@ -44,10 +43,14 @@ Guile Options (available with -guile)\n\ -proxy - Export GOOPS class definitions\n\ -primsuffix - Name appended to primitive module when exporting\n\ GOOPS classes. (default = \"primitive\")\n\ - -scm - Use the scm Guile API. (Guile >= 1.6, default) \n\ -scmstub - Output Scheme file with module declaration and\n\ exports; only with `passive' and `simple' linkage\n\ -useclassprefix - Prepend the class name to all goops identifiers\n\ +\n\ +Obsolete parameters:\n\ +These parameters do nothing, but are kept for compatibility with old scripts only.\n\ + -gh - Was used to select the gh_ Guile API. \n\ + -scm - scm Guile API is always used now. \n\ \n"; static File *f_begin = 0; @@ -94,7 +97,6 @@ static String *return_multi_doc = 0; static String *exported_symbols = 0; -static int use_scm_interface = 1; static int exporting_destructor = 0; static String *swigtype_ptr = 0; @@ -216,10 +218,8 @@ public: goops = true; Swig_mark_arg(i); } else if (strcmp(argv[i], "-gh") == 0) { - use_scm_interface = 0; Swig_mark_arg(i); } else if (strcmp(argv[i], "-scm") == 0) { - use_scm_interface = 1; Swig_mark_arg(i); } else if (strcmp(argv[i], "-primsuffix") == 0) { if (argv[i + 1]) { @@ -285,10 +285,7 @@ public: /* Add a symbol for this module */ Preprocessor_define("SWIGGUILE 1", 0); /* Read in default typemaps */ - if (use_scm_interface) - SWIG_config_file("guile_scm.swg"); - else - SWIG_config_file("guile_gh.swg"); + SWIG_config_file("guile_scm.swg"); allow_overloading(); } @@ -331,13 +328,6 @@ public: Printf(f_runtime, "\n"); Printf(f_runtime, "#define SWIGGUILE\n"); - if (!use_scm_interface) { - if (SwigRuntime == 1) - Printf(f_runtime, "#define SWIG_GLOBAL\n"); - if (SwigRuntime == 2) - Printf(f_runtime, "#define SWIG_NOINCLUDE\n"); - } - /* Write out directives and declarations */ module = Swig_copy_string(Char(Getattr(n, "name"))); @@ -851,7 +841,7 @@ public: } } - if (use_scm_interface && exporting_destructor) { + if (exporting_destructor) { /* Mark the destructor's argument as destroyed. */ String *tm = NewString("SWIG_Guile_MarkPointerDestroyed($input);"); Replaceall(tm, "$input", Getattr(l, "emit:input")); @@ -868,14 +858,8 @@ public: Printv(f->def, "#define FUNC_NAME \"", proc_name, "\"", NIL); // Now write code to make the function call - if (!use_scm_interface) - Printv(f->code, tab4, "gh_defer_ints();\n", NIL); - String *actioncode = emit_action(n); - if (!use_scm_interface) - Printv(actioncode, tab4, "gh_allow_ints();\n", NIL); - // Now have return value, figure out what to do with it. if ((tm = Swig_typemap_lookup_out("out", n, Swig_cresult_name(), f, actioncode))) { Replaceall(tm, "$result", "gswig_result"); @@ -958,11 +942,7 @@ public: Printv(f_wrappers, ");\n", NIL); Printv(f_wrappers, "}\n", NIL); /* Register it */ - if (use_scm_interface) { - Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s_rest);\n", proc_name, wname); - } else { - Printf(f_init, "gh_new_procedure(\"%s\", (swig_guile_proc) %s_rest, 0, 0, 1);\n", proc_name, wname); - } + Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s_rest);\n", proc_name, wname); } else if (emit_setters && struct_member && strlen(Char(proc_name)) > 3) { int len = Len(proc_name); const char *pc = Char(proc_name); @@ -973,19 +953,13 @@ public: struct_member = 2; /* have a setter */ } else Printf(f_init, "SCM getter = "); - if (use_scm_interface) { - /* GOOPS support uses the MEMBER-set and MEMBER-get functions, - so ignore only_setters in this case. */ - if (only_setters && !goops) - Printf(f_init, "scm_c_make_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); - else - Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); - } else { - if (only_setters && !goops) - Printf(f_init, "scm_make_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); - else - Printf(f_init, "gh_new_procedure(\"%s\", (swig_guile_proc) %s, %d, %d, 0);\n", proc_name, wname, numreq, numargs - numreq); - } + /* GOOPS support uses the MEMBER-set and MEMBER-get functions, + so ignore only_setters in this case. */ + if (only_setters && !goops) + Printf(f_init, "scm_c_make_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); + else + Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); + if (!is_setter) { /* Strip off "-get" */ char *pws_name = (char *) malloc(sizeof(char) * (len - 3)); @@ -993,19 +967,11 @@ public: pws_name[len - 4] = 0; if (struct_member == 2) { /* There was a setter, so create a procedure with setter */ - if (use_scm_interface) { - Printf(f_init, "scm_c_define"); - } else { - Printf(f_init, "gh_define"); - } + Printf(f_init, "scm_c_define"); Printf(f_init, "(\"%s\", " "scm_make_procedure_with_setter(getter, setter));\n", pws_name); } else { /* There was no setter, so make an alias to the getter */ - if (use_scm_interface) { - Printf(f_init, "scm_c_define"); - } else { - Printf(f_init, "gh_define"); - } + Printf(f_init, "scm_c_define"); Printf(f_init, "(\"%s\", getter);\n", pws_name); } Printf(exported_symbols, "\"%s\", ", pws_name); @@ -1013,15 +979,11 @@ public: } } else { /* Register the function */ - if (use_scm_interface) { - if (exporting_destructor) { - Printf(f_init, "((swig_guile_clientdata *)(SWIGTYPE%s->clientdata))->destroy = (guile_destructor) %s;\n", swigtype_ptr, wname); - //Printf(f_init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) %s);\n", swigtype_ptr, wname); - } - Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); - } else { - Printf(f_init, "gh_new_procedure(\"%s\", (swig_guile_proc) %s, %d, %d, 0);\n", proc_name, wname, numreq, numargs - numreq); + if (exporting_destructor) { + Printf(f_init, "((swig_guile_clientdata *)(SWIGTYPE%s->clientdata))->destroy = (guile_destructor) %s;\n", swigtype_ptr, wname); + //Printf(f_init, "SWIG_TypeClientData(SWIGTYPE%s, (void *) %s);\n", swigtype_ptr, wname); } + Printf(f_init, "scm_c_define_gsubr(\"%s\", %d, %d, 0, (swig_guile_proc) %s);\n", proc_name, numreq, numargs - numreq, wname); } } else { /* overloaded function; don't export the single methods */ if (!Getattr(n, "sym:nextSibling")) { @@ -1044,11 +1006,7 @@ public: Printf(df->code, "#undef FUNC_NAME\n"); Printv(df->code, "}\n", NIL); Wrapper_print(df, f_wrappers); - if (use_scm_interface) { - Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s);\n", proc_name, dname); - } else { - Printf(f_init, "gh_new_procedure(\"%s\", (swig_guile_proc) %s, 0, 0, 1);\n", proc_name, dname); - } + Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, 0, 1, (swig_guile_proc) %s);\n", proc_name, dname); DelWrapper(df); Delete(dispatch); Delete(dname); @@ -1221,36 +1179,27 @@ public: /* Read-only variables become a simple procedure returning the value; read-write variables become a simple procedure with an optional argument. */ - if (use_scm_interface) { - if (!goops && GetFlag(n, "feature:constasvar")) { - /* need to export this function as a variable instead of a procedure */ - if (scmstub) { - /* export the function in the wrapper, and (set!) it in scmstub */ - Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, %d, 0, (swig_guile_proc) %s);\n", proc_name, !GetFlag(n, "feature:immutable"), var_name); - Printf(scmtext, "(set! %s (%s))\n", proc_name, proc_name); - } else { - /* export the variable directly */ - Printf(f_init, "scm_c_define(\"%s\", %s(SCM_UNDEFINED));\n", proc_name, var_name); - } - - } else { - /* Export the function as normal */ + if (!goops && GetFlag(n, "feature:constasvar")) { + /* need to export this function as a variable instead of a procedure */ + if (scmstub) { + /* export the function in the wrapper, and (set!) it in scmstub */ Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, %d, 0, (swig_guile_proc) %s);\n", proc_name, !GetFlag(n, "feature:immutable"), var_name); + Printf(scmtext, "(set! %s (%s))\n", proc_name, proc_name); + } else { + /* export the variable directly */ + Printf(f_init, "scm_c_define(\"%s\", %s(SCM_UNDEFINED));\n", proc_name, var_name); } } else { - Printf(f_init, "\t gh_new_procedure(\"%s\", (swig_guile_proc) %s, 0, %d, 0);\n", proc_name, var_name, !GetFlag(n, "feature:immutable")); + /* Export the function as normal */ + Printf(f_init, "scm_c_define_gsubr(\"%s\", 0, %d, 0, (swig_guile_proc) %s);\n", proc_name, !GetFlag(n, "feature:immutable"), var_name); } + } else { /* Read/write variables become a procedure with setter. */ - if (use_scm_interface) { - Printf(f_init, "{ SCM p = scm_c_define_gsubr(\"%s\", 0, 1, 0, (swig_guile_proc) %s);\n", proc_name, var_name); - Printf(f_init, "scm_c_define"); - } else { - Printf(f_init, "\t{ SCM p = gh_new_procedure(\"%s\", (swig_guile_proc) %s, 0, 1, 0);\n", proc_name, var_name); - Printf(f_init, "gh_define"); - } + Printf(f_init, "{ SCM p = scm_c_define_gsubr(\"%s\", 0, 1, 0, (swig_guile_proc) %s);\n", proc_name, var_name); + Printf(f_init, "scm_c_define"); Printf(f_init, "(\"%s\", " "scm_make_procedure_with_setter(p, p)); }\n", proc_name); } Printf(exported_symbols, "\"%s\", ", proc_name); @@ -1484,12 +1433,10 @@ public: String *mangled_classname = Swig_name_mangle(Getattr(n, "sym:name")); /* Export clientdata structure */ - if (use_scm_interface) { - Printf(f_runtime, "static swig_guile_clientdata _swig_guile_clientdata%s = { NULL, SCM_EOL };\n", mangled_classname); + Printf(f_runtime, "static swig_guile_clientdata _swig_guile_clientdata%s = { NULL, SCM_EOL };\n", mangled_classname); - Printv(f_init, "SWIG_TypeClientData(SWIGTYPE", swigtype_ptr, ", (void *) &_swig_guile_clientdata", mangled_classname, ");\n", NIL); - SwigType_remember(ct); - } + Printv(f_init, "SWIG_TypeClientData(SWIGTYPE", swigtype_ptr, ", (void *) &_swig_guile_clientdata", mangled_classname, ");\n", NIL); + SwigType_remember(ct); Delete(ct); /* Emit all of the members */ @@ -1725,28 +1672,16 @@ public: String *runtimeCode() { String *s; - if (use_scm_interface) { - s = Swig_include_sys("guile_scm_run.swg"); - if (!s) { - Printf(stderr, "*** Unable to open 'guile_scm_run.swg"); - s = NewString(""); - } - } else { - s = Swig_include_sys("guile_gh_run.swg"); - if (!s) { - Printf(stderr, "*** Unable to open 'guile_gh_run.swg"); - s = NewString(""); - } + s = Swig_include_sys("guile_scm_run.swg"); + if (!s) { + Printf(stderr, "*** Unable to open 'guile_scm_run.swg"); + s = NewString(""); } return s; } String *defaultExternalRuntimeFilename() { - if (use_scm_interface) { - return NewString("swigguilerun.h"); - } else { - return NewString("swigguileghrun.h"); - } + return NewString("swigguilerun.h"); } }; diff --git a/configure.ac b/configure.ac index 28696529d..1a699167f 100644 --- a/configure.ac +++ b/configure.ac @@ -1239,15 +1239,7 @@ else CFLAGS="`echo $CFLAGS | sed 's/-ansi//g;s/-pedantic//g;'` $GUILE_CFLAGS" LIBS="$LIBS $GUILE_LIBS" - AC_MSG_CHECKING(whether Guile's gh_ API works) - AC_LINK_IFELSE([AC_LANG_SOURCE([#include - int main() { SCM s; return gh_scm2int(s); }])], GUILE_GH_INTERFACE=1, ) - if test -n "$GUILE_GH_INTERFACE" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - AC_MSG_CHECKING(whether Guile's SCM_ API works) + AC_MSG_CHECKING(whether Guile/SCM_ API works) AC_LINK_IFELSE([AC_LANG_SOURCE([#include int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }])], GUILE_SCM_INTERFACE=1, ) if test -n "$GUILE_SCM_INTERFACE" ; then @@ -1265,7 +1257,6 @@ fi AC_SUBST(GUILE) AC_SUBST(GUILE_CFLAGS) AC_SUBST(GUILE_LIBS) -AC_SUBST(GUILE_GH_INTERFACE) AC_SUBST(GUILE_SCM_INTERFACE) #---------------------------------------------------------------- @@ -2271,12 +2262,6 @@ if test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTER fi AC_SUBST(SKIP_GUILE) -SKIP_GUILEGH= -if test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_GH_INTERFACE"; then - SKIP_GUILEGH="1" -fi -AC_SUBST(SKIP_GUILEGH) - SKIP_MZSCHEME= if test -z "$MZC" || test -z "$MZDYNOBJ" ; then @@ -2452,7 +2437,6 @@ AC_CONFIG_FILES([ \ Examples/test-suite/csharp/Makefile \ Examples/test-suite/d/Makefile \ Examples/test-suite/guile/Makefile \ - Examples/test-suite/guilegh/Makefile \ Examples/test-suite/java/Makefile \ Examples/test-suite/mzscheme/Makefile \ Examples/test-suite/ocaml/Makefile \ From d689d9a860c4565db2e87ffd28e9fbe5bc7e848f Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 19 Apr 2013 18:57:31 +0200 Subject: [PATCH 455/538] Fix deprecation warnings for test suite under guile 2.0 --- Examples/guile/multimap/example.i | 2 +- Lib/cdata.i | 2 +- Lib/exception.i | 2 +- Lib/guile/typemaps.i | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index f1d7974e4..21d7e5032 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -66,7 +66,7 @@ extern int count(char *bytes, int len, char c); /* Return the mutated string as a new object. */ %typemap(argout) (char *str, int len) { - SWIG_APPEND_VALUE(scm_mem2string($1,$2)); + SWIG_APPEND_VALUE(scm_from_locale_stringn($1,$2)); if ($1) scm_must_free($1); } diff --git a/Lib/cdata.i b/Lib/cdata.i index dbc1c42d2..22a6d9de8 100644 --- a/Lib/cdata.i +++ b/Lib/cdata.i @@ -17,7 +17,7 @@ typedef struct SWIGCDATA { #if SWIGGUILE %typemap(out) SWIGCDATA { - $result = scm_mem2string($1.data,$1.len); + $result = scm_from_locale_stringn($1.data,$1.len); } %typemap(in) (const void *indata, int inlen) = (char *STRING, int LENGTH); #elif SWIGCHICKEN diff --git a/Lib/exception.i b/Lib/exception.i index 867ecdbff..050042dab 100644 --- a/Lib/exception.i +++ b/Lib/exception.i @@ -24,7 +24,7 @@ SWIGINTERN void SWIG_exception_ (int code, const char *msg, const char *subr) { #define ERROR(scmerr) \ - scm_error(scm_str2symbol((char *) (scmerr)), \ + scm_error(scm_from_locale_string((char *) (scmerr)), \ (char *) subr, (char *) msg, \ SCM_EOL, SCM_BOOL_F) #define MAP(swigerr, scmerr) \ diff --git a/Lib/guile/typemaps.i b/Lib/guile/typemaps.i index ab655eb9a..ba447ac28 100644 --- a/Lib/guile/typemaps.i +++ b/Lib/guile/typemaps.i @@ -60,25 +60,25 @@ %typemap(throws) SWIGTYPE { $<ype temp = new $ltype($1); - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj(temp, $&descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE & { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj(&$1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE * { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } %typemap(throws) SWIGTYPE [] { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_NewPointerObj($1, $descriptor, 1), SCM_UNDEFINED)); } @@ -151,7 +151,7 @@ enums, which cannot be cast to. */ %typemap(varin) enum SWIGTYPE { if (sizeof(int) != sizeof($1)) { - scm_error(scm_str2symbol("swig-error"), + scm_error(scm_from_locale_symbol("swig-error"), (char *) FUNC_NAME, (char *) "enum variable '$name' cannot be set", SCM_EOL, SCM_BOOL_F); @@ -161,7 +161,7 @@ %typemap(out) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(varout) enum SWIGTYPE { $result = scm_from_long($1); } %typemap(throws) enum SWIGTYPE { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(scm_from_long($1), SCM_UNDEFINED)); } @@ -210,7 +210,7 @@ /* Throw typemap */ %typemap(throws) C_NAME { C_NAME swig_c_value = $1; - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(C_TO_SCM_EXPR, SCM_UNDEFINED)); } %enddef @@ -254,7 +254,7 @@ } /* Throw typemap */ %typemap(throws) C_NAME { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(C_TO_SCM($1), SCM_UNDEFINED)); } %enddef @@ -329,7 +329,7 @@ SIMPLE_MAP(unsigned long long, scm_to_ulong_long, scm_from_ulong_long, integer); } %typemap(throws) char * { - scm_throw(scm_str2symbol((char *) "swig-exception"), + scm_throw(scm_from_locale_symbol((char *) "swig-exception"), scm_listify(SWIG_str02scm($1), SCM_UNDEFINED)); } From 140829a826885814dfab713406b1f8b7413df0b0 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 20 Apr 2013 10:37:07 +0200 Subject: [PATCH 456/538] guile: fix std_map.i "$1 not found" error --- Lib/guile/std_map.i | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i index dfce6fc5c..1e1014f54 100644 --- a/Lib/guile/std_map.i +++ b/Lib/guile/std_map.i @@ -109,8 +109,8 @@ namespace std { } %typemap(out) map { SCM alist = SCM_EOL; - for (std::map::reverse_iterator i=$1.rbegin(); - i!=$1.rend(); ++i) { + for (std::map::reverse_iterator i=$i.rbegin(); + i!=$i.rend(); ++i) { K* key = new K(i->first); T* val = new T(i->second); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); @@ -251,8 +251,8 @@ namespace std { } SCM keys() { SCM result = SCM_EOL; - for (std::map::reverse_iterator i=$1.rbegin(); - i!=$1.rend(); ++i) { + for (std::map::reverse_iterator i=self->rbegin(); + i!=self->rend(); ++i) { K* key = new K(i->first); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); result = scm_cons(k,result); @@ -471,8 +471,8 @@ namespace std { } SCM keys() { SCM result = SCM_EOL; - for (std::map::reverse_iterator i=$1.rbegin(); - i!=$1.rend(); ++i) { + for (std::map::reverse_iterator i=self->rbegin(); + i!=self->rend(); ++i) { SCM k = CONVERT_TO(i->first); result = scm_cons(k,result); } @@ -683,8 +683,8 @@ namespace std { } SCM keys() { SCM result = SCM_EOL; - for (std::map::reverse_iterator i=$1.rbegin(); - i!=$1.rend(); ++i) { + for (std::map::reverse_iterator i=self->rbegin(); + i!=self->rend(); ++i) { K* key = new K(i->first); SCM k = SWIG_NewPointerObj(key,$descriptor(K *), 1); result = scm_cons(k,result); @@ -895,8 +895,8 @@ namespace std { } SCM keys() { SCM result = SCM_EOL; - for (std::map::reverse_iterator i=$1.rbegin(); - i!=$1.rend(); ++i) { + for (std::map::reverse_iterator i=self->rbegin(); + i!=self->rend(); ++i) { SCM k = CONVERT_K_TO(i->first); result = scm_cons(k,result); } From 6a60efffd1477e92f1e2ed5f5afa82843d278965 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 23 Apr 2013 19:11:29 +0100 Subject: [PATCH 457/538] Some C++ experience needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 19/04/13 18:41, Geert Janssens wrote: > Hi, > > I'm working through the failing testcases for guile. One testcase fails > with a compilation error in some generated code based on std_map and > std_pair. I know exactly where this generated code comes from, but my > C++ knowledge is insufficient to understand the error, let alone remedy > it. I gather some kind of const violation, but that's all I can read > from it :( My hope is that someone used to working with stl will more > easily understand it. > > So, if someone can help me understand the error and what the fix would > be in C++, I can fix the corresponding .i file. > > This is the code snippet the causes the error: > > > /usr/lib/gcc/i686-redhat-linux/4.7.2/../../../../include/c++/4.7.2/bits/stl_pair.h:88:12: > error: non-static const member ‘const std::pair std::pair const std::pair >::second’, can’t use default assignment operator This is the main problem - it is saying there is no default assignment operator (because one of the members in pair is const). The solution is to avoid assignment. I've attached a patch to do this plus some error message corrections. William --- Lib/guile/std_pair.i | 81 +++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 43 deletions(-) diff --git a/Lib/guile/std_pair.i b/Lib/guile/std_pair.i index 86ca6e00f..238c5188b 100644 --- a/Lib/guile/std_pair.i +++ b/Lib/guile/std_pair.i @@ -22,7 +22,7 @@ namespace std { template struct pair { - %typemap(in) pair (std::pair* m) { + %typemap(in) pair %{ if (scm_is_pair($input)) { T* x; U* y; @@ -36,11 +36,9 @@ namespace std { $1 = *(($&1_type) SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0)); } - } - %typemap(in) const pair& (std::pair temp, - std::pair* m), - const pair* (std::pair temp, - std::pair* m) { + %} + %typemap(in) const pair& (std::pair *temp = 0), + const pair* (std::pair *temp = 0) %{ if (scm_is_pair($input)) { T* x; U* y; @@ -49,13 +47,14 @@ namespace std { second = SCM_CDR($input); x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0); - temp = std::make_pair(*x,*y); - $1 = &temp; + temp = new std::pair< T, U >(*x,*y); + $1 = temp; } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } - } + %} + %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { T* x = new T($1.first); U* y = new U($1.second); @@ -129,7 +128,7 @@ namespace std { %define specialize_std_pair_on_first(T,CHECK,CONVERT_FROM,CONVERT_TO) template struct pair { - %typemap(in) pair (std::pair* m) { + %typemap(in) pair %{ if (scm_is_pair($input)) { U* y; SCM first, second; @@ -137,18 +136,16 @@ namespace std { second = SCM_CDR($input); if (!CHECK(first)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); + "pair<" #T "," #U "> expected"); y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0); $1 = std::make_pair(CONVERT_FROM(first),*y); } else { $1 = *(($&1_type) SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0)); } - } - %typemap(in) const pair& (std::pair temp, - std::pair* m), - const pair* (std::pair temp, - std::pair* m) { + %} + %typemap(in) const pair& (std::pair *temp = 0), + const pair* (std::pair *temp = 0) %{ if (scm_is_pair($input)) { U* y; SCM first, second; @@ -156,15 +153,16 @@ namespace std { second = SCM_CDR($input); if (!CHECK(first)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); + "pair<" #T "," #U "> expected"); y = (U*) SWIG_MustGetPtr(second,$descriptor(U *),$argnum, 0); - temp = std::make_pair(CONVERT_FROM(first),*y); - $1 = &temp; + temp = new std::pair< T, U >(CONVERT_FROM(first),*y); + $1 = temp; } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } - } + %} + %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { U* y = new U($1.second); SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1); @@ -230,7 +228,7 @@ namespace std { %define specialize_std_pair_on_second(U,CHECK,CONVERT_FROM,CONVERT_TO) template struct pair { - %typemap(in) pair (std::pair* m) { + %typemap(in) pair %{ if (scm_is_pair($input)) { T* x; SCM first, second; @@ -239,17 +237,15 @@ namespace std { x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); if (!CHECK(second)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); + "pair<" #T "," #U "> expected"); $1 = std::make_pair(*x,CONVERT_FROM(second)); } else { $1 = *(($&1_type) SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0)); } - } - %typemap(in) const pair& (std::pair temp, - std::pair* m), - const pair* (std::pair temp, - std::pair* m) { + %} + %typemap(in) const pair& (std::pair *temp = 0), + const pair* (std::pair *temp = 0) %{ if (scm_is_pair($input)) { T* x; SCM first, second; @@ -258,14 +254,15 @@ namespace std { x = (T*) SWIG_MustGetPtr(first,$descriptor(T *),$argnum, 0); if (!CHECK(second)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); - temp = std::make_pair(*x,CONVERT_FROM(second)); - $1 = &temp; + "pair<" #T "," #U "> expected"); + temp = new std::pair< T, U >(*x,CONVERT_FROM(second)); + $1 = temp; } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } - } + %} + %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { T* x = new T($1.first); SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1); @@ -332,40 +329,38 @@ namespace std { %define specialize_std_pair_on_both(T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO, U,CHECK_U,CONVERT_U_FROM,CONVERT_U_TO) template<> struct pair { - %typemap(in) pair (std::pair* m) { + %typemap(in) pair %{ if (scm_is_pair($input)) { SCM first, second; first = SCM_CAR($input); second = SCM_CDR($input); if (!CHECK_T(first) || !CHECK_U(second)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); + "pair<" #T "," #U "> expected"); $1 = std::make_pair(CONVERT_T_FROM(first), CONVERT_U_FROM(second)); } else { $1 = *(($&1_type) SWIG_MustGetPtr($input,$&1_descriptor,$argnum, 0)); } - } - %typemap(in) const pair& (std::pair temp, - std::pair* m), - const pair* (std::pair temp, - std::pair* m) { + %} + %typemap(in) const pair& (std::pair *temp = 0), + const pair* (std::pair *temp = 0) %{ if (scm_is_pair($input)) { SCM first, second; first = SCM_CAR($input); second = SCM_CDR($input); if (!CHECK_T(first) || !CHECK_U(second)) SWIG_exception(SWIG_TypeError, - "map<" #T "," #U "> expected"); - temp = std::make_pair(CONVERT_T_FROM(first), - CONVERT_U_FROM(second)); - $1 = &temp; + "pair<" #T "," #U "> expected"); + temp = new std::pair< T, U >(CONVERT_T_FROM(first), CONVERT_U_FROM(second)); + $1 = temp; } else { $1 = ($1_ltype) SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } - } + %} + %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { $result = scm_cons(CONVERT_T_TO($1.first), CONVERT_U_TO($1.second)); From 9110d47ea653bfd4d972cb00b3b77afce63dfb9a Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 24 Apr 2013 09:56:02 +0200 Subject: [PATCH 458/538] Use freearg instead of argout to free temp variable --- Lib/guile/std_pair.i | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/guile/std_pair.i b/Lib/guile/std_pair.i index 238c5188b..512d0d555 100644 --- a/Lib/guile/std_pair.i +++ b/Lib/guile/std_pair.i @@ -54,7 +54,7 @@ namespace std { SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } %} - %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} + %typemap(freearg) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { T* x = new T($1.first); U* y = new U($1.second); @@ -162,7 +162,7 @@ namespace std { SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } %} - %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} + %typemap(freearg) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { U* y = new U($1.second); SCM second = SWIG_NewPointerObj(y,$descriptor(U *), 1); @@ -262,7 +262,7 @@ namespace std { SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } %} - %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} + %typemap(freearg) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { T* x = new T($1.first); SCM first = SWIG_NewPointerObj(x,$descriptor(T *), 1); @@ -360,7 +360,7 @@ namespace std { SWIG_MustGetPtr($input,$1_descriptor,$argnum, 0); } %} - %typemap(argout) const pair&, const pair* %{ delete temp$argnum; %} + %typemap(freearg) const pair&, const pair* %{ delete temp$argnum; %} %typemap(out) pair { $result = scm_cons(CONVERT_T_TO($1.first), CONVERT_U_TO($1.second)); From 469022d311c3a979b5a228b472891a21b56f3a6d Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 24 Apr 2013 17:23:06 +0200 Subject: [PATCH 459/538] Disable guile 2's autocompilation feature for the test suite Autocompilation generates a lot of warnings. Most of them just informational, but it clutters the test output. --- Doc/Manual/Guile.html | 6 ++++++ Examples/test-suite/guile/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 53368bc77..8ecdf249c 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -56,6 +56,12 @@ SWIG works with Guile versions 1.8.x and 2.0.x. Support for version 1.6.x has been dropped. The last version of SWIG that still works with Guile version 1.6.x is SWIG 2.0.9. +

        +Note that starting with guile 2.0, the guile sources can be compiled for +improved performance. This is currently not tested with swig +so your mileage may vary. To be safe set environment variable +GUILE_AUTO_COMPILE to 0 when using swig generated guile code. +

        23.2 Meaning of "Module"

        diff --git a/Examples/test-suite/guile/Makefile.in b/Examples/test-suite/guile/Makefile.in index 455c26a66..0c7b3137c 100644 --- a/Examples/test-suite/guile/Makefile.in +++ b/Examples/test-suite/guile/Makefile.in @@ -52,7 +52,7 @@ INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile # a file is found which has _runme.scm appended after the testcase name. run_testcase = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ + env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ fi # Clean From fb7b45beccd9a1e5fd3b24c44369ec44600da73f Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 24 Apr 2013 15:56:27 +0200 Subject: [PATCH 460/538] Add guile test for guile 2 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index abdb54327..7d7204b6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ matrix: env: SWIGLANG=csharp - compiler: gcc env: SWIGLANG=go + - compiler: gcc + env: SWIGLANG=guile - compiler: gcc env: SWIGLANG=java - compiler: gcc @@ -34,6 +36,7 @@ before_install: - time sudo apt-get -qq install libboost-dev - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed + - if test "$SWIGLANG" = "guile"; then sudo apt-get -qq install guile-2.0-dev; fi - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi - if test "$SWIGLANG" = "octave"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi From 3e0247e553fb187a2f5b2ac73d9978a4f0d126bd Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 27 Apr 2013 14:15:47 +0200 Subject: [PATCH 461/538] guile: fix integer test on 64 bit systems --- Examples/test-suite/integers.i | 11 ++++++ Examples/test-suite/schemerunme/integers.scm | 39 ++++++++++++++------ 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Examples/test-suite/integers.i b/Examples/test-suite/integers.i index 7f78a2a18..6a9ede4bc 100644 --- a/Examples/test-suite/integers.i +++ b/Examples/test-suite/integers.i @@ -16,5 +16,16 @@ unsigned long unsigned_long_identity(unsigned long x) { return x; } signed long long signed_long_long_identity(signed long long x) { return x; } unsigned long long unsigned_long_long_identity(unsigned long long x) { return x; } + + size_t signed_char_size() { return sizeof (signed char); } + size_t unsigned_char_size() { return sizeof (unsigned char); } + size_t signed_short_size() { return sizeof (signed short); } + size_t unsigned_short_size() { return sizeof (unsigned short); } + size_t signed_int_size() { return sizeof (signed int); } + size_t unsigned_int_size() { return sizeof (unsigned int); } + size_t signed_long_size() { return sizeof (signed long); } + size_t unsigned_long_size() { return sizeof (unsigned long); } + size_t signed_long_long_size() { return sizeof (signed long long); } + size_t unsigned_long_long_size() { return sizeof (unsigned long long); } %} diff --git a/Examples/test-suite/schemerunme/integers.scm b/Examples/test-suite/schemerunme/integers.scm index 0bbf36ea8..903e6a9f1 100644 --- a/Examples/test-suite/schemerunme/integers.scm +++ b/Examples/test-suite/schemerunme/integers.scm @@ -12,17 +12,32 @@ (check-equality (throws-exception? (,function (- ,from 1))) #t) (check-equality (throws-exception? (,function (+ ,to 1))) #t))) -;;; signed char, unsigned char typemaps deal with characters, not integers. -;; (check-range signed-char-identity (- (expt 2 7)) (- (expt 2 7) 1)) -;; (check-range unsigned-char-identity 0 (- (expt 2 8) 1)) -(check-range signed-short-identity (- (expt 2 15)) (- (expt 2 15) 1)) -(check-range unsigned-short-identity 0 (- (expt 2 16) 1)) -(check-range signed-int-identity (- (expt 2 31)) (- (expt 2 31) 1)) -(check-range unsigned-int-identity 0 (- (expt 2 32) 1)) -(check-range signed-long-identity (- (expt 2 31)) (- (expt 2 31) 1)) -(check-range unsigned-long-identity 0 (- (expt 2 32) 1)) -;;; long long not implemented in Guile and MzScheme. -;; (check-range signed-long-long-identity (- (expt 2 63)) (- (expt 2 63) 1)) -;; (check-range unsigned-long-long-identity 0 (- (expt 2 64) 1)) +(let ((signed-short-min (- (expt 2 (- (* (signed-short-size) 8) 1)))) + (signed-short-max (- (expt 2 (- (* (signed-short-size) 8) 1)) 1)) + (unsigned-short-max (- (expt 2 (* (unsigned-short-size) 8)) 1)) + (signed-int-min (- (expt 2 (- (* (signed-int-size) 8) 1)))) + (signed-int-max (- (expt 2 (- (* (signed-int-size) 8) 1)) 1)) + (unsigned-int-max (- (expt 2 (* (unsigned-int-size) 8)) 1)) + (signed-long-min (- (expt 2 (- (* (signed-long-size) 8) 1)))) + (signed-long-max (- (expt 2 (- (* (signed-long-size) 8) 1)) 1)) + (unsigned-long-max (- (expt 2 (* (unsigned-long-size) 8)) 1)) + (signed-long-long-min (- (expt 2 (- (* (signed-long-long-size) 8) 1)))) + (signed-long-long-max (- (expt 2 (- (* (signed-long-long-size) 8) 1)) 1)) + (unsigned-long-long-max (- (expt 2 (* (unsigned-long-long-size) 8)) 1)) + ) + + ;;; signed char, unsigned char typemaps deal with characters, not integers. + ;; (check-range signed-char-identity (- (expt 2 7)) (- (expt 2 7) 1)) + ;; (check-range unsigned-char-identity 0 (- (expt 2 8) 1)) + (check-range signed-short-identity signed-short-min signed-short-max) + (check-range unsigned-short-identity 0 unsigned-short-max) + (check-range signed-int-identity signed-int-min signed-int-max) + (check-range unsigned-int-identity 0 unsigned-int-max) + (check-range signed-long-identity signed-long-min signed-long-max) + (check-range unsigned-long-identity 0 unsigned-long-max) + ;;; long long not implemented in Guile and MzScheme. + (check-range signed-long-long-identity signed-long-long-min signed-long-long-max) + (check-range unsigned-long-long-identity 0 unsigned-long-long-max) +) (exit 0) From 7b9c302fa10d30cbef1784b09df81492ba5f86f6 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 26 Apr 2013 16:52:38 +0200 Subject: [PATCH 462/538] guile: fix matrix example - add missing library in link phase - empty true path () for if is not allowed --- Examples/guile/Makefile.in | 5 +++-- Examples/guile/matrix/Makefile | 1 + Examples/guile/matrix/matrix.scm | 28 ++++++++++++++++------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in index 3110ac994..69c7bb696 100644 --- a/Examples/guile/Makefile.in +++ b/Examples/guile/Makefile.in @@ -7,6 +7,7 @@ SWIG = ../$(top_srcdir)/preinst-swig CC = @CC@ CXX = @CXX@ CFLAGS = @PLATFLAGS@ +LIBS = GUILE_CFLAGS = @GUILE_CFLAGS@ GUILE_LIBS = @GUILE_LIBS@ SWIGOPT = @@ -31,10 +32,10 @@ guile_clean: sub-all: $(SWIG) -guile $(SWIGOPT) $(IFILE) - $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) + $(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) sub-all-cxx: $(SWIG) -c++ -guile $(SWIGOPT) $(IFILE) - $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) + $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) # Makefile ends here diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile index e8466e5fc..988a0ee5c 100644 --- a/Examples/guile/matrix/Makefile +++ b/Examples/guile/matrix/Makefile @@ -12,6 +12,7 @@ build: TARGET=$(TARGET) \ IFILE=$(IFILE) \ MODULE=$(MODULE) \ + LIBS="-lm" \ sub-all clean: diff --git a/Examples/guile/matrix/matrix.scm b/Examples/guile/matrix/matrix.scm index 18e52842d..d7cab84f4 100644 --- a/Examples/guile/matrix/matrix.scm +++ b/Examples/guile/matrix/matrix.scm @@ -138,24 +138,28 @@ (set-m m1 i j (+ (get-m m1 i j) (get-m m2 i j))) (add-two m1 m2 i (+ j 1))) (add-two m1 m2 (+ i 1) 0)))) - (if (null? ML) () (begin - (add-two M (car ML) 0 0) - (add-mat M (cdr ML))))) + (if (null? ML) *unspecified* + (begin + (add-two M (car ML) 0 0) + (add-mat M (cdr ML))))) (define (cleanup ML) - (if (null? ML) () (begin - (destroy-matrix (car ML)) - (cleanup (cdr ML))))) + (if (null? ML) *unspecified* + (begin + (destroy-matrix (car ML)) + (cleanup (cdr ML))))) (define (make-random ML) ; Put random values in them - (if (null? ML) () (begin - (randmat (car ML)) - (make-random (cdr ML))))) + (if (null? ML) *unspecified* + (begin + (randmat (car ML)) + (make-random (cdr ML))))) (define (mul-mat m ML) - (if (null? ML) () (begin - (mat-mult m (car ML) m) - (mul-mat m (cdr ML))))) + (if (null? ML) *unspecified* + (begin + (mat-mult m (car ML) m) + (mul-mat m (cdr ML))))) ;;; Now we'll hammer on things a little bit just to make ;;; sure everything works. From 95bfa86ae9b043b07ab7dd2a243846f2084693c6 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 26 Apr 2013 17:25:50 +0200 Subject: [PATCH 463/538] guile: fix multimap example - fix compiler warning - fix guile 2 deprecation warnings - minor cleanup of generated code --- Examples/guile/multimap/example.i | 51 ++++++++++++++++++------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index 21d7e5032..135b6b123 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -15,43 +15,52 @@ extern int squareCubed (int n, int *OUTPUT); extern int gcd(int x, int y); -%typemap(in) (int argc, char *argv[]) { - int i; - SCM *v; - if (!(SCM_NIMP($input) && SCM_VECTORP($input))) { +%typemap(in) (int argc, char *argv[]) %{ + scm_t_array_handle handle; + size_t i; + ssize_t inc; + const SCM *v; + if (!(SCM_NIMP($input) && scm_is_vector($input))) { SWIG_exception(SWIG_ValueError, "Expecting a vector"); return 0; } - $1 = SCM_LENGTH($input); + v = scm_vector_elements($input, &handle, &$1, &inc); if ($1 == 0) { SWIG_exception(SWIG_ValueError, "Vector must contain at least 1 element"); } $2 = (char **) malloc(($1+1)*sizeof(char *)); - v = SCM_VELTS($input); - for (i = 0; i < $1; i++) { - if (!(SCM_NIMP(v[i]) && SCM_STRINGP(v[i]))) { - free($2); + for (i = 0; i < $1; i++, v +=inc ) { + if (!(SCM_NIMP(*v) && scm_is_string(*v))) { + free($2); SWIG_exception(SWIG_ValueError, "Vector items must be strings"); return 0; } - $2[i] = SCM_CHARS(v[i]); + $2[i] = scm_to_locale_string(*v); } $2[i] = 0; -} + scm_array_handle_release (&handle); +%} -%typemap(freearg) (int argc, char *argv[]) { - free($2); -} +%typemap(freearg) (int argc, char *argv[]) %{ + for (i = 0; i < $1; i++) { + free($2[i]); + } + free($2); +%} extern int gcdmain(int argc, char *argv[]); -%typemap(in) (char *bytes, int len) { - if (!(SCM_NIMP($input) && SCM_STRINGP($input))) { +%typemap(in) (char *bytes, int len) %{ + if (!(SCM_NIMP($input) && scm_is_string($input))) { SWIG_exception(SWIG_ValueError, "Expecting a string"); } - $1 = SCM_CHARS($input); - $2 = SCM_LENGTH($input); -} + $1 = scm_to_locale_string($input); + $2 = scm_c_string_length($input); +%} + +%typemap(freearg) (char *bytes, int len) %{ + free($1); +%} extern int count(char *bytes, int len, char c); @@ -67,7 +76,7 @@ extern int count(char *bytes, int len, char c); %typemap(argout) (char *str, int len) { SWIG_APPEND_VALUE(scm_from_locale_stringn($1,$2)); - if ($1) scm_must_free($1); + if ($1) SWIG_free($1); } extern void capitalize(char *str, int len); @@ -78,7 +87,7 @@ extern void capitalize(char *str, int len); %typemap(check) (double cx, double cy) { double a = $1*$1 + $2*$2; if (a > 1.0) { - SWIG_exception(SWIG_ValueError,"$1_name and $2_name must be in unit circle"); + SWIG_exception(SWIG_ValueError,"$1_name and $2_name must be in unit circle"); } } From ce14abaf616c9592f746639b962486ea9c917e5f Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 28 Apr 2013 21:13:40 +0200 Subject: [PATCH 464/538] guile: emit warning when -gh or -scm option are used --- Source/Modules/guile.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index afe039ac7..c1821c916 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -218,8 +218,10 @@ public: goops = true; Swig_mark_arg(i); } else if (strcmp(argv[i], "-gh") == 0) { + Printf(stderr, "guile: Warning: -gh option is deprecated. Swig will always generate wrappers using the scm interface. See documentation for more information regarding the deprecated gh interface.\n"); Swig_mark_arg(i); } else if (strcmp(argv[i], "-scm") == 0) { + Printf(stderr, "guile: Warning: -scm option is deprecated. Swig will always generate wrappers using the scm interface. See documentation for more information regarding the deprecated gh interface.\n"); Swig_mark_arg(i); } else if (strcmp(argv[i], "-primsuffix") == 0) { if (argv[i + 1]) { From 7297f5aa513411f345e8c2438e88b1d9683bedcd Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 28 Apr 2013 22:38:20 +0200 Subject: [PATCH 465/538] Don't use obsolete -scm option in own makefiles --- Examples/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b1bf8d049..403e6191c 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -466,13 +466,13 @@ GUILE_SCRIPT = $(RUNME).scm # Build a dynamically loaded module with passive linkage and the scm interface #------------------------------------------------------------------ guile: $(SRCS) - $(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) guile_cpp: $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO) $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO): $(SRCS) - $(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACEPATH) + $(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH) $(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $@ From 9203c6d5c63a04dfe894d60b83af7f4e76d96515 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 29 Apr 2013 08:02:18 +0100 Subject: [PATCH 466/538] Remove deprecated Guile options from help. Also use wording for deprecated options warning which is consistent with elsewhere. --- Source/Modules/guile.cxx | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/Modules/guile.cxx b/Source/Modules/guile.cxx index c1821c916..e0a084583 100644 --- a/Source/Modules/guile.cxx +++ b/Source/Modules/guile.cxx @@ -46,11 +46,6 @@ Guile Options (available with -guile)\n\ -scmstub - Output Scheme file with module declaration and\n\ exports; only with `passive' and `simple' linkage\n\ -useclassprefix - Prepend the class name to all goops identifiers\n\ -\n\ -Obsolete parameters:\n\ -These parameters do nothing, but are kept for compatibility with old scripts only.\n\ - -gh - Was used to select the gh_ Guile API. \n\ - -scm - scm Guile API is always used now. \n\ \n"; static File *f_begin = 0; @@ -218,10 +213,10 @@ public: goops = true; Swig_mark_arg(i); } else if (strcmp(argv[i], "-gh") == 0) { - Printf(stderr, "guile: Warning: -gh option is deprecated. Swig will always generate wrappers using the scm interface. See documentation for more information regarding the deprecated gh interface.\n"); + Printf(stderr, "Deprecated command line option: -gh. Wrappers are always generated for the SCM interface. See documentation for more information regarding the deprecated GH interface.\n"); Swig_mark_arg(i); } else if (strcmp(argv[i], "-scm") == 0) { - Printf(stderr, "guile: Warning: -scm option is deprecated. Swig will always generate wrappers using the scm interface. See documentation for more information regarding the deprecated gh interface.\n"); + Printf(stderr, "Deprecated command line option: -scm. Wrappers are always generated for the SCM interface. See documentation for more information regarding the deprecated GH interface.\n"); Swig_mark_arg(i); } else if (strcmp(argv[i], "-primsuffix") == 0) { if (argv[i + 1]) { From 17a563538580d6e414db71d06b3a6fd35d5b1ec5 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 29 Apr 2013 12:30:33 +0200 Subject: [PATCH 467/538] Add summary of recent guile updates in changelog --- CHANGES.current | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGES.current b/CHANGES.current index 5022a3030..96e5124a4 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,16 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.10 (in progress) ============================ +2013-04-28: gjanssens + Updates in guile module: + - Add support for guile 2.0 + - Drop support for guile 1.6 + - Drop support for generating wrappers using guile's gh interface. + All generated wrappers will use the scm interface from now on. + - Deprecate -gh and -scm options. They are no longer needed. + A warning will be issued when these options are still used. + - Fix all tests and examples to have a successful travis test + 2013-04-18: wsfulton Apply Patch #36 from Jesus Lopez to add support for $descriptor() special variable macro expansion in fragments. For example: From c30a79217de051c05ead8d9c94e0dbcfea5c26f7 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 29 Apr 2013 12:51:47 +0200 Subject: [PATCH 468/538] guilescm directory no longer exists. No need to have it in .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 877d2b2a9..fbeebc67d 100644 --- a/.gitignore +++ b/.gitignore @@ -101,7 +101,6 @@ Examples/test-suite/csharp/*/ Examples/test-suite/d/*/ Examples/test-suite/go/*/ Examples/test-suite/guile/*/ -Examples/test-suite/guilescm/*/ Examples/test-suite/java/*/ Examples/test-suite/lua/*/ Examples/test-suite/mzscheme/*/ From 850cd375990da5a93376cfed1aacf47f71695e7c Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 29 Apr 2013 22:01:46 +0100 Subject: [PATCH 469/538] Don't skip Python testing if static library directory not found 'make check' does not require the Python static libraries to be available. There is no easy way to find PYLIB - the directory containing the static library especially now Debian based systems have changed to put them in directories like /usr/lib/x86_64-linux-gnu/libpython2.7.a. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1a699167f..2a86e9fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -2237,14 +2237,14 @@ AC_SUBST(SKIP_OCTAVE) SKIP_PYTHON= -if (test -z "$PYINCLUDE" || test -z "$PYLIB") && - (test -z "$PY3INCLUDE" || test -z "PY3LIB") ; then +if (test -z "$PYINCLUDE") && + (test -z "$PY3INCLUDE") ; then SKIP_PYTHON="1" fi AC_SUBST(SKIP_PYTHON) SKIP_PYTHON3= -if test -z "$PY3INCLUDE" || test -z "$PY3LIB" ; then +if test -z "$PY3INCLUDE" ; then SKIP_PYTHON3="1" fi AC_SUBST(SKIP_PYTHON3) From ae1c39591787c934429e33e134e19ffabe3da5bb Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 29 Apr 2013 18:38:11 +0100 Subject: [PATCH 470/538] Guile tweak in CHANGES.current --- CHANGES.current | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.current b/CHANGES.current index 96e5124a4..46b0d5589 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -6,7 +6,7 @@ Version 2.0.10 (in progress) ============================ 2013-04-28: gjanssens - Updates in guile module: + [Guile] Updates in guile module: - Add support for guile 2.0 - Drop support for guile 1.6 - Drop support for generating wrappers using guile's gh interface. From ac596eb8a3bce7d4d72dce78c7a8b12014a3b428 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Mon, 29 Apr 2013 19:06:44 +0100 Subject: [PATCH 471/538] Add C++ class example for Guile Also correct other example c++ makefiles --- Examples/guile/class/Makefile | 18 ++++++++++++++++ Examples/guile/class/example.cxx | 28 ++++++++++++++++++++++++ Examples/guile/class/example.h | 34 ++++++++++++++++++++++++++++++ Examples/guile/class/example.i | 9 ++++++++ Examples/guile/std_vector/Makefile | 6 +++--- 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 Examples/guile/class/Makefile create mode 100644 Examples/guile/class/example.cxx create mode 100644 Examples/guile/class/example.h create mode 100644 Examples/guile/class/example.i diff --git a/Examples/guile/class/Makefile b/Examples/guile/class/Makefile new file mode 100644 index 000000000..827b2fe03 --- /dev/null +++ b/Examples/guile/class/Makefile @@ -0,0 +1,18 @@ +TOP = ../.. +SWIG = $(TOP)/../preinst-swig +CXXSRCS = example.cxx +TARGET = example +INTERFACE = example.i + +check: build + +build: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp + +static: + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ + TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp + +clean: + $(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean diff --git a/Examples/guile/class/example.cxx b/Examples/guile/class/example.cxx new file mode 100644 index 000000000..1e8e203dd --- /dev/null +++ b/Examples/guile/class/example.cxx @@ -0,0 +1,28 @@ +/* File : example.c */ + +#include "example.h" +#define M_PI 3.14159265358979323846 + +/* Move the shape to a new location */ +void Shape::move(double dx, double dy) { + x += dx; + y += dy; +} + +int Shape::nshapes = 0; + +double Circle::area(void) { + return M_PI*radius*radius; +} + +double Circle::perimeter(void) { + return 2*M_PI*radius; +} + +double Square::area(void) { + return width*width; +} + +double Square::perimeter(void) { + return 4*width; +} diff --git a/Examples/guile/class/example.h b/Examples/guile/class/example.h new file mode 100644 index 000000000..0d4527e92 --- /dev/null +++ b/Examples/guile/class/example.h @@ -0,0 +1,34 @@ +/* File : example.h */ + +class Shape { +public: + Shape() { + nshapes++; + } + virtual ~Shape() { + nshapes--; + }; + double x, y; + void move(double dx, double dy); + virtual double area(void) = 0; + virtual double perimeter(void) = 0; + static int nshapes; +}; + +class Circle : public Shape { +private: + double radius; +public: + Circle(double r) : radius(r) { }; + virtual double area(void); + virtual double perimeter(void); +}; + +class Square : public Shape { +private: + double width; +public: + Square(double w) : width(w) { }; + virtual double area(void); + virtual double perimeter(void); +}; diff --git a/Examples/guile/class/example.i b/Examples/guile/class/example.i new file mode 100644 index 000000000..fbdf7249f --- /dev/null +++ b/Examples/guile/class/example.i @@ -0,0 +1,9 @@ +/* File : example.i */ +%module example + +%{ +#include "example.h" +%} + +/* Let's just grab the original header file here */ +%include "example.h" diff --git a/Examples/guile/std_vector/Makefile b/Examples/guile/std_vector/Makefile index 08bf82c87..fa138f43f 100644 --- a/Examples/guile/std_vector/Makefile +++ b/Examples/guile/std_vector/Makefile @@ -1,17 +1,17 @@ TOP = ../.. SWIG = $(TOP)/../preinst-swig -SRCS = +CXXSRCS = TARGET = example INTERFACE = example.i check: build build: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_cpp static: - $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ + $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ TARGET='my-guile' INTERFACE='$(INTERFACE)' guile_static_cpp clean: From 4b1e8828658d9464cb9f4adf56db9d764d78bf23 Mon Sep 17 00:00:00 2001 From: Terrell Russell Date: Tue, 30 Apr 2013 22:49:12 -0300 Subject: [PATCH 472/538] subject/verb agreement --- Doc/Manual/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/Manual/README b/Doc/Manual/README index f01013d54..66daaec90 100644 --- a/Doc/Manual/README +++ b/Doc/Manual/README @@ -1,9 +1,9 @@ This directory contains the HTML for the SWIG users manual. All of this HTML is hand-written. However, section numbering, indices, -and the table of contents is generated automatically by the 'maketoc.py' +and the table of contents are generated automatically by the 'maketoc.py' script. The Makefile has further information on how the various alternative -forms of the documentation is generated from the hand-written HTML. +forms of the documentation are generated from the hand-written HTML. There are 4 types of boxes that code or whatever can be inside: -
        ...
        From 8767e4e29e3214ea91565c7e2dce7bd7860f2c9a Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 1 May 2013 11:19:14 +0200 Subject: [PATCH 473/538] guile: make constants example display some output similar to other languages --- Examples/guile/constants/constants.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Examples/guile/constants/constants.scm b/Examples/guile/constants/constants.scm index 5220150f1..59fd26e5a 100644 --- a/Examples/guile/constants/constants.scm +++ b/Examples/guile/constants/constants.scm @@ -1,10 +1,19 @@ (or (= (ICONST) 42) (exit 1)) +(display "ICONST = ")(display (ICONST))(display " (should be 42)\n") (or (< (abs (- (FCONST) 2.1828)) 0.00001) (exit 1)) +(display "FCONST = ")(display (FCONST))(display " (should be 2.1828)\n") (or (char=? (CCONST) #\x) (exit 1)) +(display "CCONST = ")(display (CCONST))(display " (should be 'x')\n") (or (char=? (CCONST2) #\newline) (exit 1)) +(display "CCONST2 = ")(display (CCONST2))(display " (this should be on a new line)\n") (or (string=? (SCONST) "Hello World") (exit 1)) +(display "SCONST = ")(display (SCONST))(display " (should be 'Hello World')\n") (or (string=? (SCONST2) "\"Hello World\"") (exit 1)) +(display "SCONST2 = ")(display (SCONST2))(display " (should be \"Hello World\")\n") (or (< (abs (- (EXPR) (+ (ICONST) (* 3 (FCONST))))) 0.00001) (exit 1)) +(display "EXPR = ")(display (abs (- (EXPR) (+ (ICONST) (* 3 (FCONST))))))(display " (should round to 0.0)\n") (or (= (iconst) 37) (exit 1)) +(display "iconst = ")(display (iconst))(display " (should be 37)\n") (or (< (abs (- (fconst) 3.14)) 0.00001) (exit 1)) +(display "fconst = ")(display (fconst))(display " (should be 3.14)\n") (exit 0) From fbb1978eb459ffa6bbae2192e86608fab4781d99 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 1 May 2013 12:13:13 +0200 Subject: [PATCH 474/538] guile: get multimap example to run --- Examples/guile/Makefile.in | 8 +++++++- Examples/guile/multimap/Makefile | 1 + Examples/guile/multimap/runme.scm | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in index 69c7bb696..f84d54a38 100644 --- a/Examples/guile/Makefile.in +++ b/Examples/guile/Makefile.in @@ -7,7 +7,8 @@ SWIG = ../$(top_srcdir)/preinst-swig CC = @CC@ CXX = @CXX@ CFLAGS = @PLATFLAGS@ -LIBS = +LIBS = +GUILE = @GUILE@ GUILE_CFLAGS = @GUILE_CFLAGS@ GUILE_LIBS = @GUILE_LIBS@ SWIGOPT = @@ -38,4 +39,9 @@ sub-all-cxx: $(SWIG) -c++ -guile $(SWIGOPT) $(IFILE) $(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) +run_example: + if [ -f $(RUNSCRIPT) ]; then \ + env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(RUNSCRIPT); \ + fi + # Makefile ends here diff --git a/Examples/guile/multimap/Makefile b/Examples/guile/multimap/Makefile index 00fa5df28..7b2f264ba 100644 --- a/Examples/guile/multimap/Makefile +++ b/Examples/guile/multimap/Makefile @@ -5,6 +5,7 @@ TARGET = example INTERFACE = example.i check: build + $(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example build: $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ diff --git a/Examples/guile/multimap/runme.scm b/Examples/guile/multimap/runme.scm index edc197259..1654fd3a8 100644 --- a/Examples/guile/multimap/runme.scm +++ b/Examples/guile/multimap/runme.scm @@ -1,6 +1,6 @@ ;;; Test out some multi-argument typemaps -(use-modules (example)) +(dynamic-call "scm_init_example_module" (dynamic-link "./libexample.so")) ; Call the GCD function @@ -27,4 +27,4 @@ (display (capitalize "hello world")) (newline) - +(exit 0) From 6704501aad77eb0fad25468515d37e3c9e95ef21 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 1 May 2013 16:02:02 +0100 Subject: [PATCH 475/538] Guile multimap example fix for 64 bit systems --- Examples/guile/multimap/example.i | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Examples/guile/multimap/example.i b/Examples/guile/multimap/example.i index 135b6b123..c24d45ddc 100644 --- a/Examples/guile/multimap/example.i +++ b/Examples/guile/multimap/example.i @@ -18,13 +18,15 @@ extern int gcd(int x, int y); %typemap(in) (int argc, char *argv[]) %{ scm_t_array_handle handle; size_t i; + size_t lenp; ssize_t inc; const SCM *v; if (!(SCM_NIMP($input) && scm_is_vector($input))) { SWIG_exception(SWIG_ValueError, "Expecting a vector"); return 0; } - v = scm_vector_elements($input, &handle, &$1, &inc); + v = scm_vector_elements($input, &handle, &lenp, &inc); + $1 = (int)lenp; if ($1 == 0) { SWIG_exception(SWIG_ValueError, "Vector must contain at least 1 element"); } From 5690323b8f970297d5ed8c5ad3a743654ca17b53 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 3 May 2013 19:39:11 +0100 Subject: [PATCH 476/538] Rework perl5 compiler and linker flags This fixes perl on cygwin. Probably on other platforms too. --- Examples/Makefile.in | 13 ++++++++----- configure.ac | 34 +++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 403e6191c..8ffb667f6 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -24,7 +24,7 @@ TARGET = CC = @CC@ CXX = @CXX@ -CFLAGS = @PLATFLAGS@ +CFLAGS = @BOOST_CPPFLAGS@ @PLATFLAGS@ prefix = @prefix@ exec_prefix= @exec_prefix@ SRCS = @@ -217,6 +217,9 @@ PERL5_INCLUDE= @PERL5EXT@ # Extra Perl specific dynamic linking options PERL5_DLNK = @PERL5DYNAMICLINKING@ PERL5_CCFLAGS = @PERL5CCFLAGS@ +PERL5_CCDLFLAGS = @PERL5CCDLFLAGS@ +PERL5_CCCDLFLAGS = @PERL5CCCDLFLAGS@ +PERL5_LDFLAGS = @PERL5LDFLAGS@ PERL = @PERL@ PERL5_LIB = -L$(PERL5_INCLUDE) -l@PERL5LIB@ @LIBS@ $(SYSLIBS) PERL5_SCRIPT = $(RUNME).pl @@ -227,8 +230,8 @@ PERL5_SCRIPT = $(RUNME).pl perl5: $(SRCS) $(SWIG) -perl5 $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) - $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) + $(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PERL5_CCFLAGS) $(PERL5_CCCDLFLAGS) -I$(PERL5_INCLUDE) + $(LDSHARED) $(CFLAGS) $(PERL5_CCDLFLAGS) $(OBJS) $(IOBJS) $(PERL5_LDFLAGS) $(PERL5_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO) # ---------------------------------------------------------------- # Build a Perl5 dynamically loadable module (C++) @@ -236,8 +239,8 @@ perl5: $(SRCS) perl5_cpp: $(SRCS) $(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) -I$(PERL5_INCLUDE) - $(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) + $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PERL5_CCFLAGS) $(PERL5_CCCDLFLAGS) -I$(PERL5_INCLUDE) + $(CXXSHARED) $(CFLAGS) $(PERL5_CCDLFLAGS) $(OBJS) $(IOBJS) $(PERL5_LDFLAGS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO) # ---------------------------------------------------------------- # Build a module from existing XS C source code. (ie. from xsubpp). diff --git a/configure.ac b/configure.ac index 2a86e9fa7..1fcdadfca 100644 --- a/configure.ac +++ b/configure.ac @@ -847,7 +847,7 @@ fi AC_MSG_CHECKING(for Perl5 header files) if test -n "$PERL"; then PERL5DIR=`($PERL -e 'use Config; print $Config{archlib}, "\n";') 2>/dev/null` - if test "$PERL5DIR" != ""; then + if test -n "$PERL5DIR" ; then dirs="$PERL5DIR $PERL5DIR/CORE" PERL5EXT=none for i in $dirs; do @@ -863,19 +863,40 @@ if test -n "$PERL"; then fi AC_MSG_CHECKING(for Perl5 library) - PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; print $_, "\n"') 2>/dev/null` - if test "$PERL5LIB" = "" ; then + PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; s/\.$Config{so}.*//; print $_, "\n"') 2>/dev/null` + if test -z "$PERL5LIB" ; then AC_MSG_RESULT(not found) else AC_MSG_RESULT($PERL5LIB) fi - AC_MSG_CHECKING(for Perl5 compiler options) + AC_MSG_CHECKING(for Perl5 ccflags) PERL5CCFLAGS=`($PERL -e 'use Config; print $Config{ccflags}, "\n"' | sed "s/-Wdeclaration-after-statement//" | sed "s/-I/$ISYSTEM/") 2>/dev/null` - if test "$PERL5CCFLAGS" = "" ; then + if test -z "$PERL5CCFLAGS" ; then AC_MSG_RESULT(not found) else AC_MSG_RESULT($PERL5CCFLAGS) fi + AC_MSG_CHECKING(for Perl5 ccdlflags) + PERL5CCDLFLAGS=`($PERL -e 'use Config; print $Config{ccdlflags}, "\n"') 2>/dev/null` + if test -z "$PERL5CCDLFLAGS" ; then + AC_MSG_RESULT(not found) + else + AC_MSG_RESULT($PERL5CCDLFLAGS) + fi + AC_MSG_CHECKING(for Perl5 cccdlflags) + PERL5CCCDLFLAGS=`($PERL -e 'use Config; print $Config{cccdlflags}, "\n"') 2>/dev/null` + if test -z "$PERL5CCCDLFLAGS" ; then + AC_MSG_RESULT(not found) + else + AC_MSG_RESULT($PERL5CCCDLFLAGS) + fi + AC_MSG_CHECKING(for Perl5 ldflags) + PERL5LDFLAGS=`($PERL -e 'use Config; print $Config{ldflags}, "\n"') 2>/dev/null` + if test -z "$PERL5LDFLAGS" ; then + AC_MSG_RESULT(not found) + else + AC_MSG_RESULT($PERL5LDFLAGS) + fi else AC_MSG_RESULT(unable to determine perl5 configuration) PERL5EXT=$PERL5DIR @@ -896,6 +917,9 @@ AC_SUBST(PERL5EXT) AC_SUBST(PERL5DYNAMICLINKING) AC_SUBST(PERL5LIB) AC_SUBST(PERL5CCFLAGS) +AC_SUBST(PERL5CCDLFLAGS) +AC_SUBST(PERL5CCCDLFLAGS) +AC_SUBST(PERL5LDFLAGS) #---------------------------------------------------------------- # Look for Octave From 7d29f88641597a184fb28e64579d0ffbfc61b1da Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 1 May 2013 15:37:53 +0100 Subject: [PATCH 477/538] Cosmetic on unknown javac version display --- Examples/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 8ffb667f6..e57516cf1 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -602,7 +602,7 @@ java_run: java_version: $(JAVA) -version - $(JAVAC) -version || echo "unknown javac version" + $(JAVAC) -version || echo "Unknown javac version" # ----------------------------------------------------------------- # Cleaning the java examples From 067b883813a2e324931a2d689b5c0ff6ae63c598 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 1 May 2013 21:44:31 +0100 Subject: [PATCH 478/538] Guile doc sections update --- Doc/Manual/Contents.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index 42e135140..8ef413fcb 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -803,8 +803,9 @@
        -

        1.4 Prerequisites

        +

        1.5 Prerequisites

        @@ -127,7 +142,7 @@ However, this isn't meant to be a tutorial on C++ programming. For many of the gory details, you will almost certainly want to consult a good C++ reference. If you don't program in C++, you may just want to skip those parts of the manual. -

        1.5 Organization of this manual

        +

        1.6 Organization of this manual

        @@ -139,7 +154,7 @@ can probably skip to that chapter and find almost everything you need to know.

        -

        1.6 How to avoid reading the manual

        +

        1.7 How to avoid reading the manual

        @@ -151,7 +166,7 @@ The SWIG distribution also comes with a large directory of examples that illustrate different topics.

        -

        1.7 Backwards compatibility

        +

        1.8 Backwards compatibility

        @@ -162,8 +177,8 @@ this isn't always possible as the primary goal over time is to make SWIG better---a process that would simply be impossible if the developers are constantly bogged down with backwards compatibility issues. -Potential incompatibilities are clearly marked in the detailed release notes -(CHANGES files). +Potential incompatibilities are clearly marked in the detailed +release notes.

        @@ -187,7 +202,16 @@ Note: The version symbol is not defined in the generated SWIG wrapper file. The SWIG preprocessor has defined SWIG_VERSION since SWIG-1.3.11.

        -

        1.8 Credits

        +

        1.9 Release notes

        + + +

        +The CHANGES.current, CHANGES and RELEASENOTES files shipped with SWIG in the top level directory +contain, respectively, detailed release notes for the current version, +detailed release notes for previous releases and summary release notes from SWIG-1.3.22 onwards. +

        + +

        1.10 Credits

        @@ -200,7 +224,7 @@ who have made contributions at all levels over time. Contributors are mentioned either in the COPYRIGHT file or CHANGES files shipped with SWIG or in submitted bugs.

        -

        1.9 Bug reports

        +

        1.11 Bug reports

        diff --git a/README b/README index d69e7c6d8..6df8a4fbd 100644 --- a/README +++ b/README @@ -24,7 +24,11 @@ A SWIG FAQ and other hints can be found on the SWIG Wiki: License ======= -Please see the LICENSE file for details of the SWIG license. +Please see the LICENSE file for details of the SWIG license. For +further insight into the license including the license of SWIG's +output code, please visit + + http://www.swig.org/legal.html Release Notes ============= From 4bf045ce2c72f3cf3a20caa9dc42b26c9e6b6458 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 2 May 2013 07:29:30 +0100 Subject: [PATCH 480/538] Move installation and install check instructions from README to Preface section in the documentation. --- Doc/Manual/Contents.html | 8 ++ Doc/Manual/Preface.html | 208 +++++++++++++++++++++++++++++++++++++++ README | 129 ++---------------------- 3 files changed, 225 insertions(+), 120 deletions(-) diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html index 3e9c844ed..ac21bcd1e 100644 --- a/Doc/Manual/Contents.html +++ b/Doc/Manual/Contents.html @@ -25,6 +25,14 @@

      • Release notes
      • Credits
      • Bug reports +
      • Installation +
      diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html index d489912bd..d17dc229c 100644 --- a/Doc/Manual/Preface.html +++ b/Doc/Manual/Preface.html @@ -21,6 +21,14 @@
    • Release notes
    • Credits
    • Bug reports +
    • Installation +
    @@ -117,6 +125,7 @@ about this can be obtained at: +

    1.5 Prerequisites

    @@ -239,5 +248,204 @@ used, and any important pieces of the SWIG generated wrapper code. We can only fix bugs if we know about them.

    +

    1.12 Installation

    + + +

    1.12.1 Windows installation

    + + +

    +Please see the dedicated Windows chapter for instructions on installing +SWIG on Windows and running the examples. The Windows distribution is +called swigwin and includes a prebuilt SWIG executable, swig.exe, included in +the top level directory. Otherwise it is exactly the same as +the main SWIG distribution. There is no need to download anything else. +

    + +

    1.12.2 Unix installation

    + + +

    +You must use GNU make to build and install SWIG. +

    + +

    +PCRE +needs to be installed on your system to build SWIG, in particular +pcre-config must be available. If you have PCRE headers and libraries but not +pcre-config itself or, alternatively, wish to override the compiler or linker +flags returned by pcre-config, you may set PCRE_LIBS and PCRE_CFLAGS variables +to be used instead. And if you don't have PCRE at all, the configure script +will provide instructions for obtaining it. +

    + +

    +To build and install SWIG, simply type the following: +

    + +
    +$ ./configure
+$ make
+$ make install
+
    + +

    +By default SWIG installs itself in /usr/local. If you need to install SWIG in +a different location or in your home directory, use the --prefix option +to ./configure. For example: +

    + +
    +$ ./configure --prefix=/home/yourname/projects
+$ make
+$ make install
+
    + +

    +Note: the directory given to --prefix must be an absolute pathname. Do not use +the ~ shell-escape to refer to your home directory. SWIG won't work properly +if you do this. +

    + +

    +The INSTALL file shipped in the top level directory details more about using configure. Also try +

    + +
    +$ ./configure --help.
+
    + +

    +The configure script will attempt to locate various packages on your machine +including Tcl, Perl5, Python and all the other target languages that SWIG +supports. Don't panic if you get 'not found' messages -- SWIG does not need these +packages to compile or run. The configure script is actually looking for +these packages so that you can try out the SWIG examples contained +in the 'Examples' directory without having to hack Makefiles. +Note that the --without-xxx options, where xxx is a target language, have +minimal effect. All they do is reduce the amount of testing done with +'make check'. The SWIG executable and library files installed cannot currently +be configured with a subset of target languages. +

    + +

    +SWIG used to include a set of runtime libraries for some languages for working +with multiple modules. These are no longer built during the installation stage. +However, users can build them just like any wrapper module as described in +the Modules chapter. +The CHANGES file shipped with SWIG in the top level directory +also lists some examples which build the runtime library. +

    + +

    +Note: +

    + +
      +
    • +If you checked the code out via Git, you will have to run ./autogen.sh +before ./configure. In addition, a full build of SWIG requires +a number of packages to be installed. Full instructions at +SWIG bleeding edge. +
      • +
    + +

    1.12.3 Macintosh OS X installation

    + + +

    +SWIG is known to work on various flavors of OS X. Follow the Unix installation +instructions above. However, as of this writing, there is still great deal of +inconsistency with how shared libaries are handled by various scripting languages +on OS X. +

    + +

    +Users of OS X should be aware that Darwin handles shared libraries and linking in +a radically different way than most Unix systems. In order to test SWIG and run +the examples, SWIG configures itself to use flat namespaces and to allow undefined +symbols (-flat_namespace -undefined suppress). This mostly closely follows the Unix +model and makes it more likely that the SWIG examples will work with whatever +installation of software you might have. However, this is generally not the recommended +technique for building larger extension modules. Instead, you should utilize +Darwin's two-level namespaces. Some details about this can be found here + +http://developer.apple.com/documentation/ReleaseNotes/DeveloperTools/TwoLevelNamespaces.html. + +

    + +

    +Needless to say, you might have to experiment a bit to get things working at first. +

    + +

    1.12.4 Testing

    + + +

    +If you want to test SWIG after building it, a check can be performed on Unix operating systems. +Type the following: +

    + +
    +    $ make -k check
+
    + +

    +This step can be performed either before or after installation. +The check requires at least one of the target languages to be +installed. If it fails, it may mean that you have an uninstalled +language module or that the file 'Examples/Makefile' has been +incorrectly configured. It may also fail due to compiler issues such +as a broken C++ compiler. Even if the check fails, there is a +pretty good chance SWIG still works correctly --- you will just have to +mess around with one of the examples and some makefiles to get it to work. +Some tests may also fail due to missing dependency packages, eg PCRE +or Boost, but this will require careful analysis of the configure output +done during configuration. +

    + +

    +The test suite executed by the check is designed to stress-test +many parts of the implementation including obscure corner cases. If some +of these tests fail or generate warning messages, there is no reason for +alarm --- the test may be related to some new SWIG feature or a difficult bug +that we're trying to resolve. Chances are that SWIG will work just fine +for you. Note that if you have more than one CPU/core, then you can use +parallel make to speed up the check as it does take quite some time to run, +for example: +

    + +
    +    $ make -j2 -k check
+
    + +

    +Also, SWIG's support for C++ is sufficiently advanced that certain +tests may fail on older C++ compilers (for instance if your compiler +does not support member templates). These errors are harmless if you +don't intend to use these features in your own programs. +

    + +

    +Note: The test-suite currently contains over 500 tests. If you +have many different target languages installed and a slow machine, it +might take more than an hour to run the test-suite. +

    + +

    1.12.5 Examples

    + + +

    +The Examples directory contains a variety of examples of using SWIG +and it has some browsable documentation. Simply point your browser to +the file "Example/index.html". +

    + +

    +The Examples directory also includes Visual C++ project 6 (.dsp) files for +building some of the examples on Windows. Later versions of Visual Studio +will convert these old style project files into a current solution file. +

    + diff --git a/README b/README index 6df8a4fbd..444643a0d 100644 --- a/README +++ b/README @@ -65,128 +65,17 @@ See the documentation for details of the SWIG_VERSION preprocessor symbol if you have backward compatibility issues and need to use more than one version of SWIG. -Windows Installation -==================== -Please see the Doc/Manual/Windows.html file for instructions on installing -SWIG on Windows and running the examples. The Windows distribution is -called swigwin and includes a prebuilt SWIG executable, swig.exe, included in -the same directory as this README file. Otherwise it is exactly the same as -the main SWIG distribution. There is no need to download anything else. - -Unix Installation -================= -You must use GNU `make' to build SWIG. - -http://www.gnu.org/software/make/ - -PCRE needs to be installed on your system to build SWIG, in particular -pcre-config must be available. If you have PCRE headers and libraries but not -pcre-config itself or, alternatively, wish to override the compiler or linker -flags returned by pcre-config, you may set PCRE_LIBS and PCRE_CFLAGS variables -to be used instead. And if you don't have PCRE at all, the configure script -will provide instructions for obtaining it. - -To build and install SWIG, simply type the following: - - % ./configure - % make - % make install - -By default SWIG installs itself in /usr/local. If you need to install SWIG in -a different location or in your home directory, use the --prefix option -to ./configure. For example: - - % ./configure --prefix=/home/yourname/projects - % make - % make install - -Note: the directory given to --prefix must be an absolute pathname. Do *NOT* use -the ~ shell-escape to refer to your home directory. SWIG won't work properly -if you do this. - -The file INSTALL details more about using configure. Also try - - % ./configure --help. - -The configure script will attempt to locate various packages on your machine -including Tcl, Perl5, Python and all the other target languages that SWIG -uses. Don't panic if you get 'not found' messages--SWIG does not need these -packages to compile or run. The configure script is actually looking for -these packages so that you can try out the SWIG examples contained -in the 'Examples' directory without having to hack Makefiles. -Note that the --without-xxx options, where xxx is a target language, have -minimal effect. All they do is reduce the amount of testing done with -'make check'. The SWIG executable and library files installed cannot currently -be configured with a subset of target languages. - -SWIG used to include a set of runtime libraries for some languages for working -with multiple modules. These are no longer built during the installation stage. -However, users can build them just like any wrapper module as described in -the documentation, Doc/Manual/Modules.html. The CHANGES file also lists some -examples which build the runtime library. - -Notes: - -(1) If you checked the code out via Git, you will have to run ./autogen.sh - before typing 'configure'. In addition, a full build of SWIG requires - the a number of packages to be installed. Full instructions at - http://www.swig.org/svn.html - -Macintosh OS X Installation -============================ -SWIG is known to work on various flavors of OS X. Follow the Unix installation -instructions above. However, as of this writing, there is still great deal of -inconsistency with how shared libaries are handled by various scripting languages -on OS X. We've tried to resolve these differences to the extent of our knowledge. - -Users of OS X should be aware that Darwin handles shared libraries and linking in -a radically different way than most Unix systems. In order to test SWIG and run -the examples, SWIG configures itself to use flat namespaces and to allow undefined -symbols (-flat_namespace -undefined suppress). This mostly closely follows the Unix -model and makes it more likely that the SWIG examples will work with whatever -installation of software you might have. However, this is generally not the recommended -technique for building larger extension modules. Instead, you should utilize -Darwin's two-level namespaces. Some details about this can be found here - -http://developer.apple.com/documentation/ReleaseNotes/DeveloperTools/TwoLevelNamespaces.html - -Needless to say, you might have to experiment a bit to get things working at first. +Installation +============ +Please read the Doc/Manual/Preface.html#Preface_installation for +full installation instructions for Windows, Unix and Mac OS X. +The INSTALL file has generic build and installation instructions for +Unix users. Testing ======= -If you want to test SWIG before installation, type the following: - - % make -k check - -'make -k check' requires at least one of the target languages to be -installed. If it fails, it may mean that you have an uninstalled -language module or that the file 'Examples/Makefile' has been -incorrectly configured. It may also fail due to compiler issues such -as broken C++ compiler. Even if 'make -k check' fails, there is a -pretty good chance SWIG still works correctly---you will just have to -mess around with one of the examples and some makefiles to get it to work. -Some tests may also fail due to missing dependency packages, eg PCRE -or Boost, but this will require careful analysis of the configure output. - -The testing suite executed by 'make -k check' is designed to stress-test -many parts of the implementation including obscure corner cases. If some -of these tests fail or generate warning messages, there is no reason for -alarm---the test may be related to some new SWIG feature or a difficult bug -that we're trying to resolve. Chances are that SWIG will work just fine -for you. Note that if you have more than one CPU/core, then you can use -parallel make to speed up the check as it does take quite some time to run, -for example: - - % make -j2 -k check - -Also, SWIG's support for C++ is sufficiently advanced that certain -tests may fail on older C++ compilers (for instance if your compiler -does not support member templates). These errors are harmless if you -don't intend to use these features in your own programs. - -Note: The test-suite currently contains over 500 tests. If you -have many different target languages installed and a slow machine, it -might take more than an hour to run the test-suite. +The typical 'make -k check' can be performed on Unix operating systems. +Please read Doc/Manual/Preface.html#Preface_testing for details. Examples ======== @@ -208,7 +97,7 @@ Troubleshooting In order to operate correctly, SWIG relies upon a set of library files. If after building SWIG, you get error messages like this, - % swig foo.i + $ swig foo.i :1. Unable to find 'swig.swg' :3. Unable to find 'tcl8.swg' From 13e76c30b32b028620ecde8a17861e6629304458 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 2 May 2013 19:30:04 +0100 Subject: [PATCH 481/538] Fixes looking for Guile in configure.ac --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 1fcdadfca..e4a6b79bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1201,7 +1201,7 @@ else AC_PATH_PROG(PKG_CONFIG,pkgconfig) fi if test "x$PKG_CONFIG" = x; then - AC_MSG_NOTICE([Could not find the pkg-config (or pkgconfig) program required to set up Guile. Disabling Guile],) + AC_MSG_NOTICE([Could not find the pkg-config (or pkgconfig) program required to set up Guile. Disabling Guile.]) GUILE= GUILE_CFLAGS= GUILE_LIBS="" @@ -1220,11 +1220,11 @@ else GUILE_SERIES="" PKG_CHECK_MODULES(GUILE, [guile-1.8], [ GUILE_SERIES="18" ], [ PKG_CHECK_MODULES(GUILE, [guile-2.0], [GUILE_SERIES="20" ], [AC_MSG_NOTICE([ - Only Guile 1.8 or 2.0 is supported. Neither version appears to be installed correctly. Disabling Guile + Only Guile 1.8 or 2.0 is supported. Neither version appears to be installed correctly. Disabling Guile. ])]) ]) - if test "x$GUILE-SERIES" = x; then + if test "x$GUILE_SERIES" = x; then GUILE= GUILE_CFLAGS= GUILE_LIBS= From ca7b77cbd187a6532ea5a49bcab54b5aeaa19b74 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 3 May 2013 12:22:43 +0100 Subject: [PATCH 482/538] Fix tcl operator example crashing when run The example was accessing deleted memory and so sometimes crashed. --- Examples/tcl/operator/runme.tcl | 3 --- 1 file changed, 3 deletions(-) diff --git a/Examples/tcl/operator/runme.tcl b/Examples/tcl/operator/runme.tcl index 3b7c06838..921645536 100644 --- a/Examples/tcl/operator/runme.tcl +++ b/Examples/tcl/operator/runme.tcl @@ -9,11 +9,9 @@ puts "a = $a [$a str]" puts "b = $b [$b str]" set c [$a + $b] -Complex -this $c puts "c = $c [$c str]" set d [$a * $b] -Complex -this $d puts "a*b = [$d str]" # Alternative calling convention @@ -21,7 +19,6 @@ set e [Complex_- $a $c] puts "a-c = [Complex_str $e]" set f [new_ComplexCopy $e] -Complex -this $f puts "f = [$f str]" # Call assignment operator From f68cde8bb9a568b3285df81fbb7b33b9d3d45328 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 3 May 2013 15:29:07 +0100 Subject: [PATCH 483/538] Fix li_std_containers_int test case for Python < 2.6 Workaround bugs in older versions of Python --- .../test-suite/python/li_std_containers_int_runme.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Examples/test-suite/python/li_std_containers_int_runme.py b/Examples/test-suite/python/li_std_containers_int_runme.py index 7611ee63e..f18e33812 100644 --- a/Examples/test-suite/python/li_std_containers_int_runme.py +++ b/Examples/test-suite/python/li_std_containers_int_runme.py @@ -1,6 +1,7 @@ # Check std::vector and std::list behaves the same as Python iterable types (list) from li_std_containers_int import * +import sys def failed(a, b, msg): raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b)) @@ -76,10 +77,13 @@ def container_insert_step(i, j, step, newval): except IndexError, e: il_error = e - if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))): - raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error) + # Python 2.6 contains bug fixes in extended slicing syntax: http://docs.python.org/2/whatsnew/2.6.html + skip_check = ps_error != None and(iv_error == il_error == None) and step > 0 and (sys.version[0:2] < (2, 6)) + if not(skip_check): + if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))): + raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error) - compare_containers(ps, iv, il) + compare_containers(ps, iv, il) # Check std::vector and std::list delete behaves same as Python list delete including exceptions From 4ed422da6050b5004a14f31ab5caa9e012b99a78 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 7 May 2013 21:11:03 +0100 Subject: [PATCH 484/538] Revert guile configure to use guile-config Replace pkg-config with guile-config to look for guile. Using pkg-config requires the pkg.m4 autoconf macros to be properly installed on the machine running autogen.sh which is frequently a problem. pkg-config only supports more recent releases of guile so isn't very good at finding guile either. --- configure.ac | 116 +++++++++++++-------------------------------------- 1 file changed, 29 insertions(+), 87 deletions(-) diff --git a/configure.ac b/configure.ac index e4a6b79bc..07a768469 100644 --- a/configure.ac +++ b/configure.ac @@ -1176,8 +1176,10 @@ GUILE= GUILE_CFLAGS= GUILE_LIBS= -AC_ARG_WITH(guile, AS_HELP_STRING([--without-guile], [Disable Guile]) -AS_HELP_STRING([--with-guile=path], [Set location of Guile executable]),[GUILE="$withval"], [GUILE=yes]) +AC_ARG_WITH(guile-config, AS_HELP_STRING([--without-guile], [Disable Guile]) + AS_HELP_STRING([--with-guile-config=path], [Set location of guile-config]),[ GUILE_CONFIG="$withval"], [GUILE_CONFIG=]) +AC_ARG_WITH(guile,[ --with-guile=path Set location of Guile executable],[ + GUILE="$withval"], [GUILE=yes]) AC_ARG_WITH(guile-cflags,[ --with-guile-cflags=cflags Set cflags required to compile against Guile],[ GUILE_CFLAGS="$withval"]) AC_ARG_WITH(guile-libs,[ --with-guile-libs=ldflags Set ldflags needed to link with Guile],[ @@ -1186,95 +1188,35 @@ AC_ARG_WITH(guile-libs,[ --with-guile-libs=ldflags Set ldflags needed to lin # First, check for "--without-guile" or "--with-guile=no". if test x"${GUILE}" = xno -o x"${with_alllang}" = xno ; then AC_MSG_NOTICE([Disabling Guile]) - GUILE= - GUILE_CFLAGS= - GUILE_LIBS= else - - # Use pkg-config to find guile specific config parameters - # Note: if guile is not installed in a standard system path - # you can set the environment variable PKG_CONFIG_PATH to - # the directory where the guile package config file is stored - AC_PATH_PROG(PKG_CONFIG,pkg-config) - if test "x$PKG_CONFIG" = x; then - # @*%&$ Ximian programmers renamed this application - AC_PATH_PROG(PKG_CONFIG,pkgconfig) + if test -z "$GUILE_CONFIG" ; then + AC_PATH_PROG(GUILE_CONFIG, guile-config) fi - if test "x$PKG_CONFIG" = x; then - AC_MSG_NOTICE([Could not find the pkg-config (or pkgconfig) program required to set up Guile. Disabling Guile.]) - GUILE= - GUILE_CFLAGS= - GUILE_LIBS="" - else - - # If the user has given these values, cache them to override the - # detected values. - if test "x$GUILE_LIBS" != x; then - saved_GUILE_LIBS="$GUILE_LIBS" - fi - if test "x$GUILE_CFLAGS" != x; then - saved_GUILE_CFLAGS="$GUILE_CFLAGS" + if test -n "$GUILE_CONFIG" ; then + if test x"$GUILE" = xyes; then + AC_MSG_CHECKING([for guile bindir]) + guile_bindir="`$GUILE_CONFIG info bindir`" + AC_MSG_RESULT([$guile_bindir]) + GUILE=$guile_bindir/guile + if ! test -f "$GUILE" ; then + GUILE= + AC_PATH_PROG(GUILE, guile) + fi fi - # Look up GUILE_CFLAGS and GUILE_LIBS, and version check - GUILE_SERIES="" - PKG_CHECK_MODULES(GUILE, [guile-1.8], [ GUILE_SERIES="18" ], [ - PKG_CHECK_MODULES(GUILE, [guile-2.0], [GUILE_SERIES="20" ], [AC_MSG_NOTICE([ - Only Guile 1.8 or 2.0 is supported. Neither version appears to be installed correctly. Disabling Guile. - ])]) - ]) - - if test "x$GUILE_SERIES" = x; then - GUILE= - GUILE_CFLAGS= - GUILE_LIBS= - else - # Look up GUILE executable - if test "x$GUILE" = xyes; then - GUILE= - if test "$xGUILE_SERIES" = "x18"; then - AC_PATH_PROG(GUILE18, guile-1.8) - if test "x$GUILE18" != x; then - GUILE="$GUILE18" - fi - fi - if test "$xGUILE_SERIES" = "x20"; then - AC_PATH_PROG(GUILE20, guile-2.0) - if test "x$GUILE20" != x; then - GUILE="$GUILE20" - fi - fi - if test "x$GUILE" = x; then - AC_PATH_PROG(GUILE, guile) - fi - fi - - if test "x$saved_GUILE_LIBS" != x; then - GUILE_LIBS="$saved_GUILE_LIBS" - fi - if test "x$saved_GUILE_CFLAGS" != x; then - GUILE_CFLAGS="$saved_GUILE_CFLAGS" - fi - - guilesafe_CFLAGS=$CFLAGS - guilesafe_LIBS=$LIBS - # Filter out "-ansi -pedantic" because Guile header files will not compile with these flags. - # (The flags -ansi -pedantic are automatically added by ac_compile_warnings.m4) - CFLAGS="`echo $CFLAGS | sed 's/-ansi//g;s/-pedantic//g;'` $GUILE_CFLAGS" - LIBS="$LIBS $GUILE_LIBS" - - AC_MSG_CHECKING(whether Guile/SCM_ API works) - AC_LINK_IFELSE([AC_LANG_SOURCE([#include - int main() { SCM s; scm_slot_exists_p(SCM_BOOL_F, SCM_BOOL_F); return SCM_STRING_LENGTH(s); }])], GUILE_SCM_INTERFACE=1, ) - if test -n "$GUILE_SCM_INTERFACE" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - - CFLAGS=$guilesafe_CFLAGS - LIBS=$guilesafe_LIBS + if test -z "$GUILE_CFLAGS" ; then + AC_MSG_CHECKING([for guile compile flags]) + GUILE_CFLAGS="`$GUILE_CONFIG compile`" + AC_MSG_RESULT([$GUILE_CFLAGS]) fi + + if test -z "$GUILE_LIBS" ; then + AC_MSG_CHECKING([for guile link flags]) + GUILE_LIBS="`$GUILE_CONFIG link`" + AC_MSG_RESULT([$GUILE_LIBS]) + fi + + GUILE_SCM_INTERFACE=1 fi fi @@ -2281,7 +2223,7 @@ AC_SUBST(SKIP_JAVA) SKIP_GUILE= -if test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then +if test -z "$GUILE" || test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then SKIP_GUILE="1" fi AC_SUBST(SKIP_GUILE) From 70b9df5ee9513f263758b1b491c00f20e6e7adaf Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Wed, 8 May 2013 12:42:17 +0100 Subject: [PATCH 485/538] Portable dynamic library loading for Guile dynamic-link and load-extension work without passing the .so or .dll as the shared library extension, so these have been dropped so the examples and test-suite work on Cygwin. Also update documentation and use the 'lib' prefix as that is what we commonly name the shared libraries. --- Doc/Manual/Guile.html | 34 ++++++++++++------- Examples/guile/multimap/runme.scm | 2 +- Examples/test-suite/guile/casts_runme.scm | 2 +- .../test-suite/guile/char_constant_runme.scm | 2 +- .../test-suite/guile/class_ignore_runme.scm | 2 +- Examples/test-suite/guile/constover_runme.scm | 2 +- Examples/test-suite/guile/contract_runme.scm | 2 +- Examples/test-suite/guile/cpp_enum_runme.scm | 2 +- .../test-suite/guile/cpp_namespace_runme.scm | 2 +- .../test-suite/guile/dynamic_cast_runme.scm | 2 +- .../test-suite/guile/guile_ext_test_runme.scm | 2 +- .../guile/import_nomodule_runme.scm | 2 +- Examples/test-suite/guile/imports_runme.scm | 4 +-- .../guile/inherit_missing_runme.scm | 2 +- Examples/test-suite/guile/integers_runme.scm | 2 +- .../test-suite/guile/li_std_string_runme.scm | 2 +- .../test-suite/guile/li_typemaps_runme.scm | 2 +- .../test-suite/guile/list_vector_runme.scm | 2 +- .../test-suite/guile/multivalue_runme.scm | 2 +- Examples/test-suite/guile/name_runme.scm | 2 +- .../guile/overload_complicated_runme.scm | 2 +- .../test-suite/guile/overload_copy_runme.scm | 2 +- .../guile/overload_extend_runme.scm | 2 +- .../guile/overload_simple_runme.scm | 2 +- .../guile/overload_subtype_runme.scm | 2 +- .../test-suite/guile/pointer_in_out_runme.scm | 2 +- .../guile/reference_global_vars_runme.scm | 2 +- .../guile/throw_exception_runme.scm | 2 +- .../guile/typedef_inherit_runme.scm | 2 +- Examples/test-suite/guile/typename_runme.scm | 4 +-- Examples/test-suite/guile/unions_runme.scm | 2 +- 31 files changed, 54 insertions(+), 44 deletions(-) diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 8ecdf249c..cfbfbd0b7 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -115,7 +115,7 @@ libraries into Guile.

     (define-module (my module))
-(define my-so (dynamic-link "./example.so"))
+(define my-so (dynamic-link "./libexample.so"))
 (dynamic-call "SWIG_init" my-so) ; make SWIG bindings
 ;; Scheme definitions can go here
    @@ -128,7 +128,17 @@ and dynamic-call: 
    -(load-extension "./example.so" "SWIG_init")
+(load-extension "./libexample.so" "SWIG_init")
+
    +
    + +

    +A more portable approach would be to drop the shared library extension: +

    + +
    +
    +(load-extension "./libexample" "SWIG_init")
    @@ -171,7 +181,7 @@ information by including a directive like this in the interface file: 
    -%scheme %{ (load-extension "./example.so" "SWIG_init") %}
+%scheme %{ (load-extension "./libexample.so" "SWIG_init") %}
    @@ -225,7 +235,7 @@ shared libraries into Guile; all bindings are automatically put in newly created Guile modules. 
    -(define my-so (dynamic-link "./foo.so"))
+(define my-so (dynamic-link "./libfoo.so"))
 ;; create new module and put bindings there:
 (dynamic-call "scm_init_my_modules_foo_module" my-so)
    @@ -233,7 +243,7 @@ newly created Guile modules. Newer Guile versions have a shorthand procedure for this: 
    -(load-extension "./foo.so" "scm_init_my_modules_foo_module")
+(load-extension "./libfoo.so" "scm_init_my_modules_foo_module")
    @@ -768,10 +778,10 @@ and might conflict with names from the GOOPS guile-module (see above). Pass the argument to solve this problem. If the -exportprimitive option is passed to SWIG the (export ...) code that would be exported into the scmstub file is exported at the bottom of the generated GOOPS guile-module. -The %goops directive should contain code to load the .so library. +The %goops directive should contain code to load the shared library. 
    -%goops %{ (load-extension "./foo.so" "scm_init_my_modules_foo_module") %}
+%goops %{ (load-extension "./libfoo.so" "scm_init_my_modules_foo_module") %}

    @@ -783,7 +793,7 @@ Produces the following code at the top of the generated GOOPS guile-module (define-module (my modules foo)) ;; %goops directive goes here -(load-extension "./foo.so" "scm_init_my_modules_foo_module") +(load-extension "./libfoo.so" "scm_init_my_modules_foo_module") (use-modules (oop goops) (Swig common))

    @@ -791,7 +801,7 @@ Produces the following code at the top of the generated GOOPS guile-module

  • Passive Linkage with -scmstub: Here, the name of the scmstub file should be Module-primitive.scm (with primitive replaced with whatever is given with the -primsuffix -argument. The code to load the .so library should be located in the %scheme directive, +argument. The code to load the shared library should be located in the %scheme directive, which will then be added to the scmstub file. SWIG will automatically generate the line (use-modules (Package Module-primitive)) into the GOOPS guile-module. So if Module-primitive.scm is on the autoload path for guile, the @@ -799,7 +809,7 @@ into the GOOPS guile-module. So if Module-primitive.scm is on the autolo whatever code is needed to load the Module-primitive.scm file into guile.

    -%scheme %{ (load-extension "./foo.so" "scm_init_my_modules_foo_module") %}
+%scheme %{ (load-extension "./libfoo.so" "scm_init_my_modules_foo_module") %}
 // only include the following definition if (my modules foo) cannot
 // be loaded automatically
 %goops %{ 
@@ -832,7 +842,7 @@ SWIG will also automatically generate the line (use-modules
 directive should contain whatever code is needed to get that module loaded into guile.
    
 
 
    -%goops %{ (load-extension "./foo.so" "scm_init_my_modules_foo_module") %}
+%goops %{ (load-extension "./libfoo.so" "scm_init_my_modules_foo_module") %}
 
    
 
 
    
@@ -843,7 +853,7 @@ Produces the following code at the top of the generated GOOPS guile-module
 (define-module (my modules foo))
 
 ;; %goops directive goes here (if any)
-(load-extension "./foo.so" "scm_init_my_modules_foo_module") 
+(load-extension "./libfoo.so" "scm_init_my_modules_foo_module") 
 
 (use-modules (oop goops) (Swig common))
 (use-modules ((my modules foo-primitive) :renamer (symbol-prefix-proc
diff --git a/Examples/guile/multimap/runme.scm b/Examples/guile/multimap/runme.scm
index 1654fd3a8..d2ab8036e 100644
--- a/Examples/guile/multimap/runme.scm
+++ b/Examples/guile/multimap/runme.scm
@@ -1,6 +1,6 @@
 ;;; Test out some multi-argument typemaps
 
-(dynamic-call "scm_init_example_module" (dynamic-link "./libexample.so"))
+(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
 
 ; Call the GCD function
 
diff --git a/Examples/test-suite/guile/casts_runme.scm b/Examples/test-suite/guile/casts_runme.scm
index 7a0a0420b..5f22e7f86 100644
--- a/Examples/test-suite/guile/casts_runme.scm
+++ b/Examples/test-suite/guile/casts_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_casts_module" (dynamic-link "./libcasts.so"))
+(dynamic-call "scm_init_casts_module" (dynamic-link "./libcasts"))
 (load "../schemerunme/casts.scm")
diff --git a/Examples/test-suite/guile/char_constant_runme.scm b/Examples/test-suite/guile/char_constant_runme.scm
index d183b35e5..7061acdb1 100644
--- a/Examples/test-suite/guile/char_constant_runme.scm
+++ b/Examples/test-suite/guile/char_constant_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_char_constant_module" (dynamic-link "./libchar_constant.so"))
+(dynamic-call "scm_init_char_constant_module" (dynamic-link "./libchar_constant"))
 (load "../schemerunme/char_constant.scm")
diff --git a/Examples/test-suite/guile/class_ignore_runme.scm b/Examples/test-suite/guile/class_ignore_runme.scm
index b3229f85c..3ace843cb 100644
--- a/Examples/test-suite/guile/class_ignore_runme.scm
+++ b/Examples/test-suite/guile/class_ignore_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_class_ignore_module" (dynamic-link "./libclass_ignore.so"))
+(dynamic-call "scm_init_class_ignore_module" (dynamic-link "./libclass_ignore"))
 (load "../schemerunme/class_ignore.scm")
diff --git a/Examples/test-suite/guile/constover_runme.scm b/Examples/test-suite/guile/constover_runme.scm
index 1ab42d349..15e822fc2 100644
--- a/Examples/test-suite/guile/constover_runme.scm
+++ b/Examples/test-suite/guile/constover_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_constover_module" (dynamic-link "./libconstover.so"))
+(dynamic-call "scm_init_constover_module" (dynamic-link "./libconstover"))
 (load "../schemerunme/constover.scm")
diff --git a/Examples/test-suite/guile/contract_runme.scm b/Examples/test-suite/guile/contract_runme.scm
index ea80e321c..b31c9e9e7 100644
--- a/Examples/test-suite/guile/contract_runme.scm
+++ b/Examples/test-suite/guile/contract_runme.scm
@@ -1,6 +1,6 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_contract_module" (dynamic-link "./libcontract.so"))
+(dynamic-call "scm_init_contract_module" (dynamic-link "./libcontract"))
 (load "testsuite.scm")
 (load "../schemerunme/contract.scm")
diff --git a/Examples/test-suite/guile/cpp_enum_runme.scm b/Examples/test-suite/guile/cpp_enum_runme.scm
index 5a2d9f048..bf365e878 100644
--- a/Examples/test-suite/guile/cpp_enum_runme.scm
+++ b/Examples/test-suite/guile/cpp_enum_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_cpp_enum_module" (dynamic-link "./libcpp_enum.so"))
+(dynamic-call "scm_init_cpp_enum_module" (dynamic-link "./libcpp_enum"))
 (load "../schemerunme/cpp_enum.scm")
diff --git a/Examples/test-suite/guile/cpp_namespace_runme.scm b/Examples/test-suite/guile/cpp_namespace_runme.scm
index 2a871de24..a1f6cd4ca 100644
--- a/Examples/test-suite/guile/cpp_namespace_runme.scm
+++ b/Examples/test-suite/guile/cpp_namespace_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_cpp_namespace_module" (dynamic-link "./libcpp_namespace.so"))
+(dynamic-call "scm_init_cpp_namespace_module" (dynamic-link "./libcpp_namespace"))
 (load "../schemerunme/cpp_namespace.scm")
diff --git a/Examples/test-suite/guile/dynamic_cast_runme.scm b/Examples/test-suite/guile/dynamic_cast_runme.scm
index 7b70001d0..f69f6165a 100644
--- a/Examples/test-suite/guile/dynamic_cast_runme.scm
+++ b/Examples/test-suite/guile/dynamic_cast_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_dynamic_cast_module" (dynamic-link "./libdynamic_cast.so"))
+(dynamic-call "scm_init_dynamic_cast_module" (dynamic-link "./libdynamic_cast"))
 (load "../schemerunme/dynamic_cast.scm")
diff --git a/Examples/test-suite/guile/guile_ext_test_runme.scm b/Examples/test-suite/guile/guile_ext_test_runme.scm
index 452b08ee7..dd98580cf 100644
--- a/Examples/test-suite/guile/guile_ext_test_runme.scm
+++ b/Examples/test-suite/guile/guile_ext_test_runme.scm
@@ -1,4 +1,4 @@
-(dynamic-call "scm_init_guile_ext_test_module" (dynamic-link "./libguile_ext_test.so"))
+(dynamic-call "scm_init_guile_ext_test_module" (dynamic-link "./libguile_ext_test"))
 
 ; This is a test for SF Bug 1573892
 ; If IsPointer is called before TypeQuery, the test-is-pointer will fail
diff --git a/Examples/test-suite/guile/import_nomodule_runme.scm b/Examples/test-suite/guile/import_nomodule_runme.scm
index ffb2474fc..72f8b3a62 100644
--- a/Examples/test-suite/guile/import_nomodule_runme.scm
+++ b/Examples/test-suite/guile/import_nomodule_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_import_nomodule_module" (dynamic-link "./libimport_nomodule.so"))
+(dynamic-call "scm_init_import_nomodule_module" (dynamic-link "./libimport_nomodule"))
 (load "../schemerunme/import_nomodule.scm")
diff --git a/Examples/test-suite/guile/imports_runme.scm b/Examples/test-suite/guile/imports_runme.scm
index 2fda017ce..c319a4bae 100644
--- a/Examples/test-suite/guile/imports_runme.scm
+++ b/Examples/test-suite/guile/imports_runme.scm
@@ -6,6 +6,6 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_imports_a_module" (dynamic-link "./libimports_a.so"))
-(dynamic-call "scm_init_imports_b_module" (dynamic-link "./libimports_b.so"))
+(dynamic-call "scm_init_imports_a_module" (dynamic-link "./libimports_a"))
+(dynamic-call "scm_init_imports_b_module" (dynamic-link "./libimports_b"))
 (load "../schemerunme/imports.scm")
diff --git a/Examples/test-suite/guile/inherit_missing_runme.scm b/Examples/test-suite/guile/inherit_missing_runme.scm
index 97e950cb2..ec02e7d42 100644
--- a/Examples/test-suite/guile/inherit_missing_runme.scm
+++ b/Examples/test-suite/guile/inherit_missing_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_inherit_missing_module" (dynamic-link "./libinherit_missing.so"))
+(dynamic-call "scm_init_inherit_missing_module" (dynamic-link "./libinherit_missing"))
 (load "../schemerunme/inherit_missing.scm")
diff --git a/Examples/test-suite/guile/integers_runme.scm b/Examples/test-suite/guile/integers_runme.scm
index 14ec8b0fe..7b4c9dc13 100644
--- a/Examples/test-suite/guile/integers_runme.scm
+++ b/Examples/test-suite/guile/integers_runme.scm
@@ -1,7 +1,7 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_integers_module" (dynamic-link "./libintegers.so"))
+(dynamic-call "scm_init_integers_module" (dynamic-link "./libintegers"))
 
 (define-macro (throws-exception? form)
   `(catch #t
diff --git a/Examples/test-suite/guile/li_std_string_runme.scm b/Examples/test-suite/guile/li_std_string_runme.scm
index 05b74cd65..5dde68f8d 100644
--- a/Examples/test-suite/guile/li_std_string_runme.scm
+++ b/Examples/test-suite/guile/li_std_string_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_li_std_string_module" (dynamic-link "./libli_std_string.so"))
+(dynamic-call "scm_init_li_std_string_module" (dynamic-link "./libli_std_string"))
 (load "../schemerunme/li_std_string.scm")
diff --git a/Examples/test-suite/guile/li_typemaps_runme.scm b/Examples/test-suite/guile/li_typemaps_runme.scm
index 9824fc98e..269455ce5 100644
--- a/Examples/test-suite/guile/li_typemaps_runme.scm
+++ b/Examples/test-suite/guile/li_typemaps_runme.scm
@@ -4,7 +4,7 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_li_typemaps_module" (dynamic-link "./libli_typemaps.so"))
+(dynamic-call "scm_init_li_typemaps_module" (dynamic-link "./libli_typemaps"))
 (load "../schemerunme/li_typemaps.scm")
 
 (let ((lst (inoutr-int2 3 -2)))
diff --git a/Examples/test-suite/guile/list_vector_runme.scm b/Examples/test-suite/guile/list_vector_runme.scm
index 546d8a1ba..2025b53d5 100644
--- a/Examples/test-suite/guile/list_vector_runme.scm
+++ b/Examples/test-suite/guile/list_vector_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_list_vector_module" (dynamic-link "./liblist_vector.so"))
+(dynamic-call "scm_init_list_vector_module" (dynamic-link "./liblist_vector"))
 (load "../schemerunme/list_vector.scm")
diff --git a/Examples/test-suite/guile/multivalue_runme.scm b/Examples/test-suite/guile/multivalue_runme.scm
index d1d7fbfe7..1717e4ef4 100644
--- a/Examples/test-suite/guile/multivalue_runme.scm
+++ b/Examples/test-suite/guile/multivalue_runme.scm
@@ -3,5 +3,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_multivalue_module" (dynamic-link "./libmultivalue.so"))
+(dynamic-call "scm_init_multivalue_module" (dynamic-link "./libmultivalue"))
 (load "../schemerunme/multivalue.scm")
diff --git a/Examples/test-suite/guile/name_runme.scm b/Examples/test-suite/guile/name_runme.scm
index 831c20610..7de0e54bf 100644
--- a/Examples/test-suite/guile/name_runme.scm
+++ b/Examples/test-suite/guile/name_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_name_module" (dynamic-link "./libname.so"))
+(dynamic-call "scm_init_name_module" (dynamic-link "./libname"))
 (load "../schemerunme/name.scm")
diff --git a/Examples/test-suite/guile/overload_complicated_runme.scm b/Examples/test-suite/guile/overload_complicated_runme.scm
index 3c2b80dbf..a38fb8afe 100644
--- a/Examples/test-suite/guile/overload_complicated_runme.scm
+++ b/Examples/test-suite/guile/overload_complicated_runme.scm
@@ -1,7 +1,7 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_overload_complicated_module" (dynamic-link "./liboverload_complicated.so"))
+(dynamic-call "scm_init_overload_complicated_module" (dynamic-link "./liboverload_complicated"))
 
 (define-macro (check form)
   `(if (not ,form)
diff --git a/Examples/test-suite/guile/overload_copy_runme.scm b/Examples/test-suite/guile/overload_copy_runme.scm
index 9b93aeb8a..f6a90a57f 100644
--- a/Examples/test-suite/guile/overload_copy_runme.scm
+++ b/Examples/test-suite/guile/overload_copy_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_overload_copy_module" (dynamic-link "./liboverload_copy.so"))
+(dynamic-call "scm_init_overload_copy_module" (dynamic-link "./liboverload_copy"))
 (load "../schemerunme/overload_copy.scm")
diff --git a/Examples/test-suite/guile/overload_extend_runme.scm b/Examples/test-suite/guile/overload_extend_runme.scm
index cb0223dea..f31465891 100644
--- a/Examples/test-suite/guile/overload_extend_runme.scm
+++ b/Examples/test-suite/guile/overload_extend_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_overload_extend_module" (dynamic-link "./liboverload_extend.so"))
+(dynamic-call "scm_init_overload_extend_module" (dynamic-link "./liboverload_extend"))
 (load "../schemerunme/overload_extend.scm")
diff --git a/Examples/test-suite/guile/overload_simple_runme.scm b/Examples/test-suite/guile/overload_simple_runme.scm
index 993a5f30f..8e3dbb6ba 100644
--- a/Examples/test-suite/guile/overload_simple_runme.scm
+++ b/Examples/test-suite/guile/overload_simple_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_overload_simple_module" (dynamic-link "./liboverload_simple.so"))
+(dynamic-call "scm_init_overload_simple_module" (dynamic-link "./liboverload_simple"))
 (load "../schemerunme/overload_simple.scm")
diff --git a/Examples/test-suite/guile/overload_subtype_runme.scm b/Examples/test-suite/guile/overload_subtype_runme.scm
index 7dfa2c16c..857084d03 100644
--- a/Examples/test-suite/guile/overload_subtype_runme.scm
+++ b/Examples/test-suite/guile/overload_subtype_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_overload_subtype_module" (dynamic-link "./liboverload_subtype.so"))
+(dynamic-call "scm_init_overload_subtype_module" (dynamic-link "./liboverload_subtype"))
 (load "../schemerunme/overload_subtype.scm")
diff --git a/Examples/test-suite/guile/pointer_in_out_runme.scm b/Examples/test-suite/guile/pointer_in_out_runme.scm
index de3522749..da3542866 100644
--- a/Examples/test-suite/guile/pointer_in_out_runme.scm
+++ b/Examples/test-suite/guile/pointer_in_out_runme.scm
@@ -1,5 +1,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_pointer_in_out_module" (dynamic-link "./libpointer_in_out.so"))
+(dynamic-call "scm_init_pointer_in_out_module" (dynamic-link "./libpointer_in_out"))
 (load "../schemerunme/pointer_in_out.scm")
diff --git a/Examples/test-suite/guile/reference_global_vars_runme.scm b/Examples/test-suite/guile/reference_global_vars_runme.scm
index 8cd31c3e8..dfc9dc634 100644
--- a/Examples/test-suite/guile/reference_global_vars_runme.scm
+++ b/Examples/test-suite/guile/reference_global_vars_runme.scm
@@ -1,3 +1,3 @@
 ; copied from python runme_.py
-(dynamic-call "scm_init_reference_global_vars_module" (dynamic-link "./libreference_global_vars.so"))
+(dynamic-call "scm_init_reference_global_vars_module" (dynamic-link "./libreference_global_vars"))
 (load "../schemerunme/reference_global_vars.scm")
diff --git a/Examples/test-suite/guile/throw_exception_runme.scm b/Examples/test-suite/guile/throw_exception_runme.scm
index 377506276..aa9ff8a5c 100644
--- a/Examples/test-suite/guile/throw_exception_runme.scm
+++ b/Examples/test-suite/guile/throw_exception_runme.scm
@@ -1,7 +1,7 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_throw_exception_module" (dynamic-link "./libthrow_exception.so"))
+(dynamic-call "scm_init_throw_exception_module" (dynamic-link "./libthrow_exception"))
 
 (define-macro (check-throw form)
   `(catch 'swig-exception
diff --git a/Examples/test-suite/guile/typedef_inherit_runme.scm b/Examples/test-suite/guile/typedef_inherit_runme.scm
index d75d421d5..443e75f1b 100644
--- a/Examples/test-suite/guile/typedef_inherit_runme.scm
+++ b/Examples/test-suite/guile/typedef_inherit_runme.scm
@@ -1,2 +1,2 @@
-(dynamic-call "scm_init_typedef_inherit_module" (dynamic-link "./libtypedef_inherit.so"))
+(dynamic-call "scm_init_typedef_inherit_module" (dynamic-link "./libtypedef_inherit"))
 (load "../schemerunme/typedef_inherit.scm")
diff --git a/Examples/test-suite/guile/typename_runme.scm b/Examples/test-suite/guile/typename_runme.scm
index 4243f6974..057033521 100644
--- a/Examples/test-suite/guile/typename_runme.scm
+++ b/Examples/test-suite/guile/typename_runme.scm
@@ -1,3 +1,3 @@
-(dynamic-call "scm_init_typename_module" (dynamic-link "./libtypename.so"))
-;;(dynamic-call "scm_init_types_module" (dynamic-link "./libtypes.so"))
+(dynamic-call "scm_init_typename_module" (dynamic-link "./libtypename"))
+;;(dynamic-call "scm_init_types_module" (dynamic-link "./libtypes"))
 (load "../schemerunme/typename.scm")
diff --git a/Examples/test-suite/guile/unions_runme.scm b/Examples/test-suite/guile/unions_runme.scm
index 867e8a3c3..510a19490 100644
--- a/Examples/test-suite/guile/unions_runme.scm
+++ b/Examples/test-suite/guile/unions_runme.scm
@@ -4,5 +4,5 @@
 ;; The SWIG modules have "passive" Linkage, i.e., they don't generate
 ;; Guile modules (namespaces) but simply put all the bindings into the
 ;; current module.  That's enough for such a simple test.
-(dynamic-call "scm_init_unions_module" (dynamic-link "./libunions.so"))
+(dynamic-call "scm_init_unions_module" (dynamic-link "./libunions"))
 (load "../schemerunme/unions.scm")

From 10acae18d29b3b3d00a83dfed4eddb832da3264c Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 May 2013 13:05:11 +0100
Subject: [PATCH 486/538] Correct Guile Makefile to fix test-suite/examples on
 Cygwin

---
 Examples/Makefile.in | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index e57516cf1..a3a2b04c9 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -466,36 +466,22 @@ GUILE_LIBPREFIX = lib
 GUILE_SCRIPT  = $(RUNME).scm
 
 #------------------------------------------------------------------
-# Build a dynamically loaded module with passive linkage and the scm interface
+# Build a dynamically loaded module with passive linkage
 #------------------------------------------------------------------
 guile: $(SRCS)
 	$(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS)
-	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
+	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(GUILE_LIBS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
 
 guile_cpp: $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
 $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO): $(SRCS)
 	$(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
-	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $@
+	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(GUILE_LIBS) $(LIBS) $(CPP_DLLIBS) -o $@
 
 guile_externalhdr:
 	$(SWIG) -guile -external-runtime $(TARGET)
 
-# -----------------------------------------------------------------
-# Build a dynamically loadable module with passive linkage
-# -----------------------------------------------------------------
-
-guile_passive: $(SRCS)
-	$(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ISRCS) $(SRCS)
-	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
-
-guile_passive_cpp: $(SRCS)
-	$(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
-	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
-
 # -----------------------------------------------------------------
 # Build statically linked Guile interpreter
 # -----------------------------------------------------------------
@@ -504,23 +490,23 @@ guile_static: $(SRCS)
 	$(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \
 	  -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
-	  $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+	  $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
 
 guile_static_cpp: $(SRCS)
 	$(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
 	  -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
-	  $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+	  $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
 
 guile_simple: $(SRCS)
 	$(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH)
 	$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDES) \
-	  $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+	  $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
 
 guile_simple_cpp: $(SRCS)
 	$(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACEPATH)
 	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
-	  $(GUILE_CFLAGS) $(LIBS) -L$(GUILE_LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+	  $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) $(GUILE_LIBOPTS) -o $(TARGET)-guile
 
 # -----------------------------------------------------------------
 # Running a Guile example

From 1adb2390469576cb1a6b6e9337595fdc8a9e89e7 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 May 2013 14:10:47 +0100
Subject: [PATCH 487/538] Fix running of Guile multivalue and std_vector
 examples

---
 Examples/guile/multivalue/Makefile  | 1 +
 Examples/guile/multivalue/runme.scm | 3 ++-
 Examples/guile/std_vector/Makefile  | 1 +
 Examples/guile/std_vector/runme.scm | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Examples/guile/multivalue/Makefile b/Examples/guile/multivalue/Makefile
index 00fa5df28..7b2f264ba 100644
--- a/Examples/guile/multivalue/Makefile
+++ b/Examples/guile/multivalue/Makefile
@@ -5,6 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
+	$(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/multivalue/runme.scm b/Examples/guile/multivalue/runme.scm
index 73eb5affa..729f3fa18 100644
--- a/Examples/guile/multivalue/runme.scm
+++ b/Examples/guile/multivalue/runme.scm
@@ -1,6 +1,6 @@
 ;;;; Show the three different ways to deal with multiple return values
 
-(use-modules (example))
+(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
 
 ;;; Multiple values as lists. By default, if more than one value is to
 ;;; be returned, a list of the values is created and returned.  The
@@ -64,3 +64,4 @@
   (display remainder)
   (newline))
 
+(exit 0)
diff --git a/Examples/guile/std_vector/Makefile b/Examples/guile/std_vector/Makefile
index fa138f43f..6eca67519 100644
--- a/Examples/guile/std_vector/Makefile
+++ b/Examples/guile/std_vector/Makefile
@@ -5,6 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
+	$(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/std_vector/runme.scm b/Examples/guile/std_vector/runme.scm
index 77443a156..470f22922 100644
--- a/Examples/guile/std_vector/runme.scm
+++ b/Examples/guile/std_vector/runme.scm
@@ -1,6 +1,5 @@
-;; run with mzscheme -r example.scm
 
-(use-modules (example))
+(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
 
 ; repeatedly invoke a procedure with v and an index as arguments
 (define (with-vector v proc size-proc)
@@ -52,3 +51,4 @@
 (print-DoubleVector v)
 (delete-DoubleVector v)
 
+(exit 0)

From cd4c1d3c3f22b3bc519816cc9879141b65eb3938 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 May 2013 16:48:27 +0100
Subject: [PATCH 488/538] Tidy up target language versions display

---
 Examples/Makefile.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index a3a2b04c9..9ce0f1f81 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -440,7 +440,7 @@ octave_run:
 # -----------------------------------------------------------------
 
 octave_version:
-	$(OCTAVE) --version | grep -i version
+	$(OCTAVE) --version | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the Octave examples
@@ -520,7 +520,7 @@ guile_run:
 # -----------------------------------------------------------------
 
 guile_version:
-	$(GUILE) --version
+	$(GUILE) --version | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the Guile examples
@@ -1004,7 +1004,7 @@ php_run:
 # -----------------------------------------------------------------
 
 php_version:
-	$(PHP) -v
+	$(PHP) -v | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the PHP examples
@@ -1075,7 +1075,7 @@ pike_run:
 # -----------------------------------------------------------------
 
 pike_version:
-	$(PIKE) -v
+	$(PIKE) -v | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the Pike examples
@@ -1192,7 +1192,7 @@ chicken_run:
 # -----------------------------------------------------------------
 
 chicken_version:
-	$(CHICKEN) -version
+	$(CHICKEN) -version | grep -i version
 
 # -----------------------------------------------------------------
 # Cleaning the CHICKEN examples
@@ -1254,7 +1254,7 @@ csharp_run:
 
 # Version check below also works with MS csc.exe which does not understand --version
 csharp_version:
-	$(CSHARPCOMPILER) --version | grep -i version
+	$(CSHARPCOMPILER) --version | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the CSharp examples
@@ -1330,7 +1330,7 @@ lua_embed_run:
 # -----------------------------------------------------------------
 
 lua_version:
-	$(LUA) -v
+	$(LUA) -v | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the lua examples
@@ -1406,7 +1406,7 @@ clisp_run:
 # -----------------------------------------------------------------
 
 clisp_version:
-	$(CLISP) --version
+	$(CLISP) --version | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the CLISP examples
@@ -1545,7 +1545,7 @@ r_run:
 # -----------------------------------------------------------------
 
 r_version:
-	$(R) --version | grep -i version
+	$(R) --version | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the R examples

From efb4f7bf07e493a038ea53049fabba3bd63df64a Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 May 2013 17:30:45 +0100
Subject: [PATCH 489/538] Don't skip guile if GUILE_CFLAGS is empty as
 sometimes it is empty

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 07a768469..a618d55de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,7 +1206,7 @@ else
 
     if test -z "$GUILE_CFLAGS" ; then
       AC_MSG_CHECKING([for guile compile flags])
-      GUILE_CFLAGS="`$GUILE_CONFIG compile`"
+      GUILE_CFLAGS="`$GUILE_CONFIG compile`" # Note that this can sometimes be empty
       AC_MSG_RESULT([$GUILE_CFLAGS])
     fi
 
@@ -2223,7 +2223,7 @@ AC_SUBST(SKIP_JAVA)
 
 
 SKIP_GUILE=
-if test -z "$GUILE" || test -z "$GUILE_CFLAGS" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then
+if test -z "$GUILE" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then
     SKIP_GUILE="1"
 fi
 AC_SUBST(SKIP_GUILE)

From 7964ebe34fb12f0e61fea48ca501dee2ca0f7246 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Wed, 8 May 2013 17:36:03 +0100
Subject: [PATCH 490/538] Tidy up pike version display

---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 9ce0f1f81..a255db4c9 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1075,7 +1075,7 @@ pike_run:
 # -----------------------------------------------------------------
 
 pike_version:
-	$(PIKE) -v | head -n 1
+	$(PIKE) -v 2>&1 | head -n 1
 
 # -----------------------------------------------------------------
 # Cleaning the Pike examples

From c28d0c6c80c5254eeedcd63e0942f154dcb60871 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Wed, 8 May 2013 22:43:49 +0200
Subject: [PATCH 491/538] Fixes to Octave examples

- rename example modules from "example" to "swigexample", to avoid a
  warning from shadowing the Octave built-in function "example"
- remove deprecated "static" Makefile targets: there is no longer
  an option to build static Octave modules in the Examples Makefile
- emacs whitespace cleanup run on all files
---
 Examples/octave/callback/Makefile     |  8 +--
 Examples/octave/callback/example.cxx  |  1 -
 Examples/octave/callback/example.h    |  1 -
 Examples/octave/callback/example.i    |  3 +-
 Examples/octave/callback/runme.m      | 12 ++--
 Examples/octave/class/Makefile        |  8 +--
 Examples/octave/class/example.h       |  7 +--
 Examples/octave/class/example.i       |  3 +-
 Examples/octave/class/runme.m         | 12 ++--
 Examples/octave/constants/Makefile    | 10 +---
 Examples/octave/constants/example.i   |  4 +-
 Examples/octave/constants/runme.m     | 28 ++++------
 Examples/octave/contract/Makefile     |  6 +-
 Examples/octave/contract/example.c    |  2 -
 Examples/octave/contract/example.i    |  2 +-
 Examples/octave/contract/runme.m      | 11 ++--
 Examples/octave/enum/Makefile         |  8 +--
 Examples/octave/enum/example.h        |  1 -
 Examples/octave/enum/example.i        |  3 +-
 Examples/octave/enum/runme.m          | 32 +++++------
 Examples/octave/extend/Makefile       |  8 +--
 Examples/octave/extend/example.cxx    |  1 -
 Examples/octave/extend/example.h      |  3 +-
 Examples/octave/extend/example.i      |  3 +-
 Examples/octave/extend/runme.m        |  7 +--
 Examples/octave/funcptr/Makefile      |  6 +-
 Examples/octave/funcptr/example.h     |  1 -
 Examples/octave/funcptr/example.i     |  3 +-
 Examples/octave/funcptr/runme.m       | 15 +++--
 Examples/octave/funcptr2/Makefile     |  6 +-
 Examples/octave/funcptr2/example.h    |  1 -
 Examples/octave/funcptr2/example.i    |  3 +-
 Examples/octave/funcptr2/runme.m      | 18 +++---
 Examples/octave/functor/Makefile      | 10 +---
 Examples/octave/functor/example.i     |  6 +-
 Examples/octave/functor/runme.m       |  8 +--
 Examples/octave/module_load/Makefile  |  6 +-
 Examples/octave/module_load/runme.m   | 52 +++++++++---------
 Examples/octave/operator/Makefile     | 10 +---
 Examples/octave/operator/example.h    |  2 +-
 Examples/octave/operator/example.i    |  2 +-
 Examples/octave/operator/runme.m      |  8 +--
 Examples/octave/pointer/Makefile      |  6 +-
 Examples/octave/pointer/example.i     |  6 +-
 Examples/octave/pointer/runme.m       | 29 +++++-----
 Examples/octave/reference/Makefile    |  8 +--
 Examples/octave/reference/example.cxx |  1 -
 Examples/octave/reference/example.h   |  4 --
 Examples/octave/reference/example.i   |  8 +--
 Examples/octave/reference/runme.m     | 15 +++--
 Examples/octave/simple/Makefile       |  6 +-
 Examples/octave/simple/example.c      |  2 -
 Examples/octave/simple/example.i      |  2 +-
 Examples/octave/simple/runme.m        | 11 ++--
 Examples/octave/template/Makefile     | 10 +---
 Examples/octave/template/example.h    |  1 -
 Examples/octave/template/example.i    |  3 +-
 Examples/octave/template/runme.m      | 12 ++--
 Examples/octave/variables/Makefile    |  6 +-
 Examples/octave/variables/example.c   |  2 +-
 Examples/octave/variables/example.h   |  1 -
 Examples/octave/variables/example.i   |  3 +-
 Examples/octave/variables/runme.m     | 79 +++++++++++++--------------
 63 files changed, 211 insertions(+), 345 deletions(-)

diff --git a/Examples/octave/callback/Makefile b/Examples/octave/callback/Makefile
index ffc60e0c0..d38d7f896 100644
--- a/Examples/octave/callback/Makefile
+++ b/Examples/octave/callback/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/callback/example.cxx b/Examples/octave/callback/example.cxx
index 450d75608..893a956f4 100644
--- a/Examples/octave/callback/example.cxx
+++ b/Examples/octave/callback/example.cxx
@@ -1,4 +1,3 @@
 /* File : example.cxx */
 
 #include "example.h"
-
diff --git a/Examples/octave/callback/example.h b/Examples/octave/callback/example.h
index 1a0e8c432..74ddad954 100644
--- a/Examples/octave/callback/example.h
+++ b/Examples/octave/callback/example.h
@@ -20,4 +20,3 @@ public:
 	void setCallback(Callback *cb) { delCallback(); _callback = cb; }
 	void call() { if (_callback) _callback->run(); }
 };
-
diff --git a/Examples/octave/callback/example.i b/Examples/octave/callback/example.i
index 90beda01a..3192904db 100644
--- a/Examples/octave/callback/example.i
+++ b/Examples/octave/callback/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module(directors="1") example
+%module(directors="1") swigexample
 %{
 #include "example.h"
 %}
@@ -10,4 +10,3 @@
 %feature("director") Callback;
 
 %include "example.h"
-
diff --git a/Examples/octave/callback/runme.m b/Examples/octave/callback/runme.m
index b87925e3d..103985358 100644
--- a/Examples/octave/callback/runme.m
+++ b/Examples/octave/callback/runme.m
@@ -2,14 +2,13 @@
 
 # This file illustrates the cross language polymorphism using directors.
 
-example 
+swigexample
 
-OctCallback=@() subclass(example.Callback(), \
-			 'run',@(self) printf("OctCallback.run()\n"));
+OctCallback=@() subclass(swigexample.Callback(),"run",@(self) printf("OctCallback.run()\n"));
 
 # Create an Caller instance
 
-caller = example.Caller();
+caller = swigexample.Caller();
 
 # Add a simple C++ callback (caller owns the callback, so
 # we disown it first)
@@ -17,7 +16,7 @@ caller = example.Caller();
 printf("Adding and calling a normal C++ callback\n");
 printf("----------------------------------------\n");
 
-callback = example.Callback().__disown();
+callback = swigexample.Callback().__disown();
 caller.setCallback(callback);
 caller.call();
 caller.delCallback();
@@ -43,7 +42,7 @@ caller.call();
 caller.delCallback();
 
 # careful-- using callback here may cause problems; octave_swig_type still
-# exists, but is holding a destroyed object (the C++ example.Callback).
+# exists, but is holding a destroyed object (the C++ swigexample.Callback).
 # to manually drop the octave-side reference, you can use
 clear callback;
 
@@ -60,4 +59,3 @@ a.Callback.run();
 # All done.
 
 printf("octave exit\n");
-
diff --git a/Examples/octave/class/Makefile b/Examples/octave/class/Makefile
index ffc60e0c0..d38d7f896 100644
--- a/Examples/octave/class/Makefile
+++ b/Examples/octave/class/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/class/example.h b/Examples/octave/class/example.h
index 46d901361..0d4527e92 100644
--- a/Examples/octave/class/example.h
+++ b/Examples/octave/class/example.h
@@ -8,7 +8,7 @@ public:
   virtual ~Shape() {
     nshapes--;
   };
-  double  x, y;   
+  double  x, y;
   void    move(double dx, double dy);
   virtual double area(void) = 0;
   virtual double perimeter(void) = 0;
@@ -32,8 +32,3 @@ public:
   virtual double area(void);
   virtual double perimeter(void);
 };
-
-
-
-
-  
diff --git a/Examples/octave/class/example.i b/Examples/octave/class/example.i
index 75700b305..b109bcb78 100644
--- a/Examples/octave/class/example.i
+++ b/Examples/octave/class/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %{
 #include "example.h"
@@ -7,4 +7,3 @@
 
 /* Let's just grab the original header file here */
 %include "example.h"
-
diff --git a/Examples/octave/class/runme.m b/Examples/octave/class/runme.m
index c833a701b..04221b4bb 100644
--- a/Examples/octave/class/runme.m
+++ b/Examples/octave/class/runme.m
@@ -3,17 +3,17 @@
 # This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
-example 
+swigexample
 
 # ----- Object creation -----
 
 printf("Creating some objects:\n");
-c = example.Circle(10)
-s = example.Square(10)
+c = swigexample.Circle(10)
+s = swigexample.Square(10)
 
 # ----- Access a static member -----
 
-printf("\nA total of %i shapes were created\n", example.Shape.nshapes);
+printf("\nA total of %i shapes were created\n", swigexample.Shape.nshapes);
 
 # ----- Member data access -----
 
@@ -46,7 +46,5 @@ printf("\nGuess I'll clean up now\n");
 clear c
 clear s
 
-printf("%i shapes remain\n", example.Shape.nshapes);
+printf("%i shapes remain\n", swigexample.Shape.nshapes);
 printf("Goodbye\n");
-
-
diff --git a/Examples/octave/constants/Makefile b/Examples/octave/constants/Makefile
index 60b0578c6..03501bd81 100644
--- a/Examples/octave/constants/Makefile
+++ b/Examples/octave/constants/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = 
-TARGET     = example
+CXXSRCS    =
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/constants/example.i b/Examples/octave/constants/example.i
index 4f7b1a4d7..405974b44 100644
--- a/Examples/octave/constants/example.i
+++ b/Examples/octave/constants/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 /* A few preprocessor macros */
 
@@ -23,5 +23,3 @@
 
 %constant int iconst = 37;
 %constant double fconst = 3.14;
-
-
diff --git a/Examples/octave/constants/runme.m b/Examples/octave/constants/runme.m
index 322858734..c6ed24535 100644
--- a/Examples/octave/constants/runme.m
+++ b/Examples/octave/constants/runme.m
@@ -1,29 +1,25 @@
 # file: runme.m
 
-example 
+swigexample
 
-printf("ICONST  = %i (should be 42)\n", example.ICONST);
-printf("FCONST  = %f (should be 2.1828)\n", example.FCONST);
-printf("CCONST  = %s (should be 'x')\n", example.CCONST);
-printf("CCONST2 = %s (this should be on a new line)\n", example.CCONST2);
-printf("SCONST  = %s (should be 'Hello World')\n", example.SCONST);
-printf("SCONST2 = %s (should be '\"Hello World\"')\n", example.SCONST2);
-printf("EXPR    = %f (should be 48.5484)\n", example.EXPR);
-printf("iconst  = %i (should be 37)\n", example.iconst);
-printf("fconst  = %f (should be 3.14)\n", example.fconst);
+printf("ICONST  = %i (should be 42)\n", swigexample.ICONST);
+printf("FCONST  = %f (should be 2.1828)\n", swigexample.FCONST);
+printf("CCONST  = %s (should be 'x')\n", swigexample.CCONST);
+printf("CCONST2 = %s (this should be on a new line)\n", swigexample.CCONST2);
+printf("SCONST  = %s (should be 'Hello World')\n", swigexample.SCONST);
+printf("SCONST2 = %s (should be '\"Hello World\"')\n", swigexample.SCONST2);
+printf("EXPR    = %f (should be 48.5484)\n", swigexample.EXPR);
+printf("iconst  = %i (should be 37)\n", swigexample.iconst);
+printf("fconst  = %f (should be 3.14)\n", swigexample.fconst);
 
 try
-    printf("EXTERN = %s (Arg! This shouldn't printf(anything)\n", example.EXTERN);
+    printf("EXTERN = %s (Arg! This shouldn't printf(anything)\n", swigexample.EXTERN);
 catch
     printf("EXTERN isn't defined (good)\n");
 end_try_catch
 
 try
-    printf("FOO    = %i (Arg! This shouldn't printf(anything)\n", example.FOO);
+    printf("FOO    = %i (Arg! This shouldn't printf(anything)\n", swigexample.FOO);
 catch
     printf("FOO isn't defined (good)\n");
 end_try_catch
-
-
-
-
diff --git a/Examples/octave/contract/Makefile b/Examples/octave/contract/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/contract/Makefile
+++ b/Examples/octave/contract/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/contract/example.c b/Examples/octave/contract/example.c
index 1a644543f..fbdc054cd 100644
--- a/Examples/octave/contract/example.c
+++ b/Examples/octave/contract/example.c
@@ -19,5 +19,3 @@ int fact(int n) {
   if (n <= 0) return 1;
   return n*fact(n-1);
 }
-
-
diff --git a/Examples/octave/contract/example.i b/Examples/octave/contract/example.i
index 8fd1a80af..78c459efc 100644
--- a/Examples/octave/contract/example.i
+++ b/Examples/octave/contract/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %contract gcd(int x, int y) {
 require:
diff --git a/Examples/octave/contract/runme.m b/Examples/octave/contract/runme.m
index 62b72320b..fa36bbe10 100644
--- a/Examples/octave/contract/runme.m
+++ b/Examples/octave/contract/runme.m
@@ -1,22 +1,21 @@
 # file: runme.m
 
-example 
+swigexample
 
 # Call our gcd() function
 
 x = 42;
 y = 105;
-g = example.gcd(x,y);
+g = swigexample.gcd(x,y);
 printf("The gcd of %d and %d is %d\n",x,y,g);
 
 # Manipulate the Foo global variable
 
 # Output its current value
-printf("Foo = %f\n", example.cvar.Foo);
+printf("Foo = %f\n", swigexample.cvar.Foo);
 
 # Change its value
-example.cvar.Foo = 3.1415926;
+swigexample.cvar.Foo = 3.1415926;
 
 # See if the change took effect
-printf("Foo = %f\n", example.cvar.Foo);
-
+printf("Foo = %f\n", swigexample.cvar.Foo);
diff --git a/Examples/octave/enum/Makefile b/Examples/octave/enum/Makefile
index ffc60e0c0..d38d7f896 100644
--- a/Examples/octave/enum/Makefile
+++ b/Examples/octave/enum/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/enum/example.h b/Examples/octave/enum/example.h
index 525d62afc..490d502e8 100644
--- a/Examples/octave/enum/example.h
+++ b/Examples/octave/enum/example.h
@@ -10,4 +10,3 @@ class Foo {
 };
 
 void enum_test(color c, Foo::speed s);
-
diff --git a/Examples/octave/enum/example.i b/Examples/octave/enum/example.i
index 23ee8a822..cee9af471 100644
--- a/Examples/octave/enum/example.i
+++ b/Examples/octave/enum/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %{
 #include "example.h"
@@ -8,4 +8,3 @@
 /* Let's just grab the original header file here */
 
 %include "example.h"
-
diff --git a/Examples/octave/enum/runme.m b/Examples/octave/enum/runme.m
index a749e81db..0108135b2 100644
--- a/Examples/octave/enum/runme.m
+++ b/Examples/octave/enum/runme.m
@@ -1,32 +1,30 @@
 # file: runme.m
 
-example
+swigexample
 
 # ----- Object creation -----
 
 # Print out the value of some enums
 printf("*** color ***\n");
-printf("    RED    = %i\n", example.RED);
-printf("    BLUE   = %i\n", example.BLUE);
-printf("    GREEN  = %i\n", example.GREEN);
+printf("    RED    = %i\n", swigexample.RED);
+printf("    BLUE   = %i\n", swigexample.BLUE);
+printf("    GREEN  = %i\n", swigexample.GREEN);
 
 printf("\n*** Foo::speed ***\n");
-printf("    Foo_IMPULSE   = %i\n", example.Foo_IMPULSE);
-printf("    Foo_WARP      = %i\n", example.Foo_WARP);
-printf("    Foo_LUDICROUS = %i\n", example.Foo_LUDICROUS);
+printf("    Foo_IMPULSE   = %i\n", swigexample.Foo_IMPULSE);
+printf("    Foo_WARP      = %i\n", swigexample.Foo_WARP);
+printf("    Foo_LUDICROUS = %i\n", swigexample.Foo_LUDICROUS);
 
 printf("\nTesting use of enums with functions\n");
 
-example.enum_test(example.RED, example.Foo_IMPULSE);
-example.enum_test(example.BLUE,  example.Foo_WARP);
-example.enum_test(example.GREEN, example.Foo_LUDICROUS);
-example.enum_test(1234,5678)
+swigexample.enum_test(swigexample.RED, swigexample.Foo_IMPULSE);
+swigexample.enum_test(swigexample.BLUE,  swigexample.Foo_WARP);
+swigexample.enum_test(swigexample.GREEN, swigexample.Foo_LUDICROUS);
+swigexample.enum_test(1234,5678)
 
 printf("\nTesting use of enum with class method\n");
-f = example.Foo();
-
-f.enum_test(example.Foo_IMPULSE);
-f.enum_test(example.Foo_WARP);
-f.enum_test(example.Foo_LUDICROUS);
-
+f = swigexample.Foo();
 
+f.enum_test(swigexample.Foo_IMPULSE);
+f.enum_test(swigexample.Foo_WARP);
+f.enum_test(swigexample.Foo_LUDICROUS);
diff --git a/Examples/octave/extend/Makefile b/Examples/octave/extend/Makefile
index ffc60e0c0..d38d7f896 100644
--- a/Examples/octave/extend/Makefile
+++ b/Examples/octave/extend/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/extend/example.cxx b/Examples/octave/extend/example.cxx
index 450d75608..893a956f4 100644
--- a/Examples/octave/extend/example.cxx
+++ b/Examples/octave/extend/example.cxx
@@ -1,4 +1,3 @@
 /* File : example.cxx */
 
 #include "example.h"
-
diff --git a/Examples/octave/extend/example.h b/Examples/octave/extend/example.h
index b27ab9711..9e15cf8e4 100644
--- a/Examples/octave/extend/example.h
+++ b/Examples/octave/extend/example.h
@@ -44,7 +44,7 @@ public:
 	const Employee *get_item(int i) {
 		return list[i];
 	}
-	~EmployeeList() { 
+	~EmployeeList() {
 		std::vector::iterator i;
 		std::cout << "~EmployeeList, deleting " << list.size() << " employees." << std::endl;
 		for (i=list.begin(); i!=list.end(); i++) {
@@ -53,4 +53,3 @@ public:
 		std::cout << "~EmployeeList empty." << std::endl;
 	}
 };
-
diff --git a/Examples/octave/extend/example.i b/Examples/octave/extend/example.i
index c8ec32e09..953c2f314 100644
--- a/Examples/octave/extend/example.i
+++ b/Examples/octave/extend/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module(directors="1") example
+%module(directors="1") swigexample
 %{
 #include "example.h"
 %}
@@ -12,4 +12,3 @@
 %feature("director") Manager;
 
 %include "example.h"
-
diff --git a/Examples/octave/extend/runme.m b/Examples/octave/extend/runme.m
index c64c082c4..4536f2761 100644
--- a/Examples/octave/extend/runme.m
+++ b/Examples/octave/extend/runme.m
@@ -2,12 +2,12 @@
 
 # This file illustrates the cross language polymorphism using directors.
 
-example 
+swigexample
 
 
 # CEO class, which overrides Employee::getPosition().
 
-CEO=@(name) subclass(example.Manager(name),'getPosition',@(self) "CEO");
+CEO=@(name) subclass(swigexample.Manager(name),'getPosition',@(self) "CEO");
 
 # Create an instance of our employee extension class, CEO. The calls to
 # getName() and getPosition() are standard, the call to getTitle() uses
@@ -22,7 +22,7 @@ printf("----------------------\n");
 # Create a new EmployeeList instance.  This class does not have a C++
 # director wrapper, but can be used freely with other classes that do.
 
-list = example.EmployeeList();
+list = swigexample.EmployeeList();
 
 # EmployeeList owns its items, so we must surrender ownership of objects
 # we add. This involves first calling the __disown__ method to tell the
@@ -71,4 +71,3 @@ printf("----------------------\n");
 # All done.
 
 printf("octave exit\n");
-
diff --git a/Examples/octave/funcptr/Makefile b/Examples/octave/funcptr/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/funcptr/Makefile
+++ b/Examples/octave/funcptr/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/funcptr/example.h b/Examples/octave/funcptr/example.h
index 9936e24fc..f95ae2cc9 100644
--- a/Examples/octave/funcptr/example.h
+++ b/Examples/octave/funcptr/example.h
@@ -6,4 +6,3 @@ extern int sub(int,int);
 extern int mul(int,int);
 
 extern int (*funcvar)(int,int);
-
diff --git a/Examples/octave/funcptr/example.i b/Examples/octave/funcptr/example.i
index 8b3bef678..163a1991b 100644
--- a/Examples/octave/funcptr/example.i
+++ b/Examples/octave/funcptr/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 %{
 #include "example.h"
 %}
@@ -13,4 +13,3 @@ extern int  do_op(int a, int b, int (*op)(int, int));
 %constant int (*MUL)(int,int) = mul;
 
 extern int (*funcvar)(int,int);
-
diff --git a/Examples/octave/funcptr/runme.m b/Examples/octave/funcptr/runme.m
index 455311c16..4e2e28fbc 100644
--- a/Examples/octave/funcptr/runme.m
+++ b/Examples/octave/funcptr/runme.m
@@ -1,6 +1,6 @@
 # file: runme.m
 
-example
+swigexample
 
 a = 37
 b = 42
@@ -10,12 +10,11 @@ b = 42
 printf("Trying some C callback functions\n");
 printf("    a        = %i\n", a);
 printf("    b        = %i\n", b);
-printf("    ADD(a,b) = %i\n", example.do_op(a,b,example.ADD));
-printf("    SUB(a,b) = %i\n", example.do_op(a,b,example.SUB));
-printf("    MUL(a,b) = %i\n", example.do_op(a,b,example.MUL));
+printf("    ADD(a,b) = %i\n", swigexample.do_op(a,b,swigexample.ADD));
+printf("    SUB(a,b) = %i\n", swigexample.do_op(a,b,swigexample.SUB));
+printf("    MUL(a,b) = %i\n", swigexample.do_op(a,b,swigexample.MUL));
 
 printf("Here is what the C callback function objects look like in Octave\n");
-example.ADD
-example.SUB
-example.MUL
-
+swigexample.ADD
+swigexample.SUB
+swigexample.MUL
diff --git a/Examples/octave/funcptr2/Makefile b/Examples/octave/funcptr2/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/funcptr2/Makefile
+++ b/Examples/octave/funcptr2/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/funcptr2/example.h b/Examples/octave/funcptr2/example.h
index 9936e24fc..f95ae2cc9 100644
--- a/Examples/octave/funcptr2/example.h
+++ b/Examples/octave/funcptr2/example.h
@@ -6,4 +6,3 @@ extern int sub(int,int);
 extern int mul(int,int);
 
 extern int (*funcvar)(int,int);
-
diff --git a/Examples/octave/funcptr2/example.i b/Examples/octave/funcptr2/example.i
index 681775a3e..33378a1c1 100644
--- a/Examples/octave/funcptr2/example.i
+++ b/Examples/octave/funcptr2/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 %{
 #include "example.h"
 %}
@@ -15,4 +15,3 @@ int mul(int, int);
 %nocallback;
 
 extern int (*funcvar)(int,int);
-
diff --git a/Examples/octave/funcptr2/runme.m b/Examples/octave/funcptr2/runme.m
index 1d3d8f73a..574635ed2 100644
--- a/Examples/octave/funcptr2/runme.m
+++ b/Examples/octave/funcptr2/runme.m
@@ -1,6 +1,6 @@
 # file: runme.m
 
-example 
+swigexample
 
 a = 37
 b = 42
@@ -10,15 +10,15 @@ b = 42
 printf("Trying some C callback functions\n");
 printf("    a        = %i\n", a);
 printf("    b        = %i\n", b);
-printf("    ADD(a,b) = %i\n", example.do_op(a,b,example.ADD));
-printf("    SUB(a,b) = %i\n", example.do_op(a,b,example.SUB));
-printf("    MUL(a,b) = %i\n", example.do_op(a,b,example.MUL));
+printf("    ADD(a,b) = %i\n", swigexample.do_op(a,b,swigexample.ADD));
+printf("    SUB(a,b) = %i\n", swigexample.do_op(a,b,swigexample.SUB));
+printf("    MUL(a,b) = %i\n", swigexample.do_op(a,b,swigexample.MUL));
 
 printf("Here is what the C callback function objects look like in Octave\n");
-example.ADD
-example.SUB
-example.MUL
+swigexample.ADD
+swigexample.SUB
+swigexample.MUL
 
 printf("Call the functions directly...\n");
-printf("    add(a,b) = %i\n", example.add(a,b));
-printf("    sub(a,b) = %i\n", example.sub(a,b));
+printf("    add(a,b) = %i\n", swigexample.add(a,b));
+printf("    sub(a,b) = %i\n", swigexample.sub(a,b));
diff --git a/Examples/octave/functor/Makefile b/Examples/octave/functor/Makefile
index 09c680b4e..94fb96337 100644
--- a/Examples/octave/functor/Makefile
+++ b/Examples/octave/functor/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = 
-TARGET     = example
+CXXSRCS    =
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/functor/example.i b/Examples/octave/functor/example.i
index 2fd38176f..ade20c56c 100644
--- a/Examples/octave/functor/example.i
+++ b/Examples/octave/functor/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 
 %inline %{
@@ -23,7 +23,3 @@ public:
 // Instantiate a few versions
 %template(intSum) Sum;
 %template(doubleSum) Sum;
-
-
-
-
diff --git a/Examples/octave/functor/runme.m b/Examples/octave/functor/runme.m
index 65dabcc91..8b41691c3 100644
--- a/Examples/octave/functor/runme.m
+++ b/Examples/octave/functor/runme.m
@@ -1,8 +1,8 @@
 # Operator overloading example
-example
+swigexample
 
-a = example.intSum(0);
-b = example.doubleSum(100.0);
+a = swigexample.intSum(0);
+b = swigexample.doubleSum(100.0);
 
 # Use the objects.  They should be callable just like a normal
 # python function.
@@ -14,5 +14,3 @@ endfor
 
 a.result()
 b.result()
-
-
diff --git a/Examples/octave/module_load/Makefile b/Examples/octave/module_load/Makefile
index bead6f150..e388763bd 100644
--- a/Examples/octave/module_load/Makefile
+++ b/Examples/octave/module_load/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -13,10 +13,6 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)2' SWIGOPT='-module $$(TARGET) -globals .' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
 	rm -f $(TARGET).m
diff --git a/Examples/octave/module_load/runme.m b/Examples/octave/module_load/runme.m
index 0fda218cd..bc311b5e6 100644
--- a/Examples/octave/module_load/runme.m
+++ b/Examples/octave/module_load/runme.m
@@ -2,60 +2,60 @@
 
 # load module
 clear all;
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 clear all
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 clear all
 
 # load module in a function globally before base context
 clear all;
 function testme
-  example;
+  swigexample;
   assert(cvar.ivar == ifunc);
-  assert(exist("example","var"));
+  assert(exist("swigexample","var"));
 endfunction
 testme
 testme
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 clear all
 function testme
-  example;
+  swigexample;
   assert(cvar.ivar == ifunc);
-  assert(exist("example","var"));
+  assert(exist("swigexample","var"));
 endfunction
 testme
 testme
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 clear all
 
 # load module in a function globally after base context
 clear all;
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 function testme
-  example;
+  swigexample;
   assert(cvar.ivar == ifunc);
-  assert(exist("example","var"));
+  assert(exist("swigexample","var"));
 endfunction
 testme
 testme
 clear all
-example;
+swigexample;
 assert(cvar.ivar == ifunc);
-assert(exist("example","var"));
+assert(exist("swigexample","var"));
 function testme
-  example;
+  swigexample;
   assert(cvar.ivar == ifunc);
-  assert(exist("example","var"));
+  assert(exist("swigexample","var"));
 endfunction
 testme
 testme
@@ -69,13 +69,13 @@ endif
 
 # load module with no cvar
 clear all;
-example2;
-assert(example2.ivar == ifunc);
-assert(exist("example2","var"));
+swigexample2;
+assert(swigexample2.ivar == ifunc);
+assert(exist("swigexample2","var"));
 assert(!isglobal("cvar"))
 clear all
-example2;
-assert(example2.ivar == ifunc);
-assert(exist("example2","var"));
+swigexample2;
+assert(swigexample2.ivar == ifunc);
+assert(exist("swigexample2","var"));
 assert(!isglobal("cvar"))
 clear all
diff --git a/Examples/octave/operator/Makefile b/Examples/octave/operator/Makefile
index 09c680b4e..94fb96337 100644
--- a/Examples/octave/operator/Makefile
+++ b/Examples/octave/operator/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = 
-TARGET     = example
+CXXSRCS    =
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/operator/example.h b/Examples/octave/operator/example.h
index a9b69e009..d91adabe8 100644
--- a/Examples/octave/operator/example.h
+++ b/Examples/octave/operator/example.h
@@ -25,7 +25,7 @@ public:
   ComplexVal operator-() const {
     return ComplexVal(-rpart, -ipart);
   }
-  
+
   double re() const { return rpart; }
   double im() const { return ipart; }
 };
diff --git a/Examples/octave/operator/example.i b/Examples/octave/operator/example.i
index 7b903e69b..a2d97731d 100644
--- a/Examples/octave/operator/example.i
+++ b/Examples/octave/operator/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 #pragma SWIG nowarn=SWIGWARN_IGNORE_OPERATOR_EQ
 %{
 #include "example.h"
diff --git a/Examples/octave/operator/runme.m b/Examples/octave/operator/runme.m
index 85fd99ad4..9ab614ffb 100644
--- a/Examples/octave/operator/runme.m
+++ b/Examples/octave/operator/runme.m
@@ -1,8 +1,8 @@
 # Operator overloading example
-example
+swigexample
 
-a = example.ComplexVal(2,3);
-b = example.ComplexVal(-5,10);
+a = swigexample.ComplexVal(2,3);
+b = swigexample.ComplexVal(-5,10);
 
 printf("a   = %s\n",disp(a));
 printf("b   = %s\n",disp(b));
@@ -12,7 +12,7 @@ printf("c   = %s\n",disp(c));
 printf("a*b = %s\n",disp(a*b));
 printf("a-c = %s\n",disp(a-c));
 
-e = example.ComplexVal(a-c);
+e = swigexample.ComplexVal(a-c);
 printf("e   = %s\n",disp(e));
 
 # Big expression
diff --git a/Examples/octave/pointer/Makefile b/Examples/octave/pointer/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/pointer/Makefile
+++ b/Examples/octave/pointer/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/pointer/example.i b/Examples/octave/pointer/example.i
index a8ac79499..545e3ada4 100644
--- a/Examples/octave/pointer/example.i
+++ b/Examples/octave/pointer/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %{
 extern void add(int *, int *, int *);
@@ -24,7 +24,3 @@ extern void sub(int *INPUT, int *INPUT, int *OUTPUT);
 
 %apply int *OUTPUT { int *r };
 extern int divide(int n, int d, int *r);
-
-
-
-
diff --git a/Examples/octave/pointer/runme.m b/Examples/octave/pointer/runme.m
index c36df7270..a76de67de 100644
--- a/Examples/octave/pointer/runme.m
+++ b/Examples/octave/pointer/runme.m
@@ -1,42 +1,39 @@
 # file: runme.m
 
-example;
+swigexample;
 
 # First create some objects using the pointer library.
 printf("Testing the pointer library\n");
-a = example.new_intp();
-b = example.new_intp();
-c = example.new_intp();
-example.intp_assign(a,37);
-example.intp_assign(b,42);
+a = swigexample.new_intp();
+b = swigexample.new_intp();
+c = swigexample.new_intp();
+swigexample.intp_assign(a,37);
+swigexample.intp_assign(b,42);
 
 a,b,c
 
 # Call the add() function with some pointers
-example.add(a,b,c);
+swigexample.add(a,b,c);
 
 # Now get the result
-r = example.intp_value(c);
+r = swigexample.intp_value(c);
 printf("     37 + 42 = %i\n",r);
 
 # Clean up the pointers
-example.delete_intp(a);
-example.delete_intp(b);
-example.delete_intp(c);
+swigexample.delete_intp(a);
+swigexample.delete_intp(b);
+swigexample.delete_intp(c);
 
 # Now try the typemap library
 # This should be much easier. Now how it is no longer
 # necessary to manufacture pointers.
 
 printf("Trying the typemap library\n");
-r = example.sub(37,42);
+r = swigexample.sub(37,42);
 printf("     37 - 42 = %i\n",r);
 
 # Now try the version with multiple return values
 
 printf("Testing multiple return values\n");
-[q,r] = example.divide(42,37);
+[q,r] = swigexample.divide(42,37);
 printf("     42/37 = %d remainder %d\n",q,r);
-
-
-
diff --git a/Examples/octave/reference/Makefile b/Examples/octave/reference/Makefile
index ffc60e0c0..d38d7f896 100644
--- a/Examples/octave/reference/Makefile
+++ b/Examples/octave/reference/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/reference/example.cxx b/Examples/octave/reference/example.cxx
index 8a513bf49..9b72ca6a2 100644
--- a/Examples/octave/reference/example.cxx
+++ b/Examples/octave/reference/example.cxx
@@ -43,4 +43,3 @@ Vector &VectorArray::operator[](int index) {
 int VectorArray::size() {
   return maxsize;
 }
-
diff --git a/Examples/octave/reference/example.h b/Examples/octave/reference/example.h
index 4915adb1b..697afafe0 100644
--- a/Examples/octave/reference/example.h
+++ b/Examples/octave/reference/example.h
@@ -20,7 +20,3 @@ public:
   Vector &operator[](int);
   int size();
 };
-
-
-
-  
diff --git a/Examples/octave/reference/example.i b/Examples/octave/reference/example.i
index 8c95b3213..da09800c0 100644
--- a/Examples/octave/reference/example.i
+++ b/Examples/octave/reference/example.i
@@ -2,7 +2,7 @@
 
 /* This file has a few "typical" uses of C++ references. */
 
-%module example
+%module swigexample
 
 %{
 #include "example.h"
@@ -31,7 +31,7 @@ public:
   VectorArray(int maxsize);
   ~VectorArray();
   int size();
-  
+
   /* This wrapper provides an alternative to the [] operator */
   %extend {
     Vector &get(int index) {
@@ -42,7 +42,3 @@ public:
     }
   }
 };
-
-
-
-
diff --git a/Examples/octave/reference/runme.m b/Examples/octave/reference/runme.m
index f59c8eb7d..630ee0cd2 100644
--- a/Examples/octave/reference/runme.m
+++ b/Examples/octave/reference/runme.m
@@ -2,13 +2,13 @@
 
 # This file illustrates the manipulation of C++ references in Octave
 
-example
+swigexample
 
 # ----- Object creation -----
 
 printf("Creating some objects:\n");
-a = example.Vector(3,4,5)
-b = example.Vector(10,11,12)
+a = swigexample.Vector(3,4,5)
+b = swigexample.Vector(10,11,12)
 
 printf("    Created %s\n",a.cprint());
 printf("    Created %s\n",b.cprint());
@@ -17,12 +17,12 @@ printf("    Created %s\n",b.cprint());
 
 # This calls the wrapper we placed around
 #
-#      operator+(const Vector &a, const Vector &) 
+#      operator+(const Vector &a, const Vector &)
 #
 # It returns a new allocated object.
 
 printf("Adding a+b\n");
-c = example.addv(a,b);
+c = swigexample.addv(a,b);
 printf("    a+b = %s\n", c.cprint());
 
 clear c
@@ -31,7 +31,7 @@ clear c
 
 # Note: Using the high-level interface here
 printf("Creating an array of vectors\n");
-va = example.VectorArray(10)
+va = swigexample.VectorArray(10)
 
 # ----- Set some values in the array -----
 
@@ -39,7 +39,7 @@ va = example.VectorArray(10)
 va.set(0,a);
 va.set(1,b);
 
-va.set(2,example.addv(a,b))
+va.set(2,swigexample.addv(a,b))
 
 # Get some values from the array
 
@@ -60,4 +60,3 @@ printf("Cleaning up\n");
 clear va
 clear a
 clear b
-
diff --git a/Examples/octave/simple/Makefile b/Examples/octave/simple/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/simple/Makefile
+++ b/Examples/octave/simple/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/simple/example.c b/Examples/octave/simple/example.c
index 1c2af789c..8df41189c 100644
--- a/Examples/octave/simple/example.c
+++ b/Examples/octave/simple/example.c
@@ -14,5 +14,3 @@ int gcd(int x, int y) {
   }
   return g;
 }
-
-
diff --git a/Examples/octave/simple/example.i b/Examples/octave/simple/example.i
index 24093b9bf..127bfcd84 100644
--- a/Examples/octave/simple/example.i
+++ b/Examples/octave/simple/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %inline %{
 extern int    gcd(int x, int y);
diff --git a/Examples/octave/simple/runme.m b/Examples/octave/simple/runme.m
index 8dc5eaa58..6345df0cf 100644
--- a/Examples/octave/simple/runme.m
+++ b/Examples/octave/simple/runme.m
@@ -1,22 +1,21 @@
 # file: runme.m
 
-example 
+swigexample
 
 # Call our gcd() function
 
 x = 42
 y = 105
-g = example.gcd(x,y)
+g = swigexample.gcd(x,y)
 printf("The gcd of %d and %d is %d\n",x,y,g);
 
 # Manipulate the Foo global variable
 
 # Output its current value
-example.cvar.Foo
+swigexample.cvar.Foo
 
 # Change its value
-example.cvar.Foo = 3.1415926
+swigexample.cvar.Foo = 3.1415926
 
 # See if the change took effect
-printf("Foo = %f\n", example.cvar.Foo);
-
+printf("Foo = %f\n", swigexample.cvar.Foo);
diff --git a/Examples/octave/template/Makefile b/Examples/octave/template/Makefile
index 527e3cec6..94fb96337 100644
--- a/Examples/octave/template/Makefile
+++ b/Examples/octave/template/Makefile
@@ -1,10 +1,10 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
-CXXSRCS    = 
-TARGET     = example
+CXXSRCS    =
+TARGET     = swigexample
 INTERFACE  = example.i
 LIBS       = -lm
-SWIGOPT    = 
+SWIGOPT    =
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile octave_run
@@ -13,9 +13,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
 
-static:
-	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_cpp_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/template/example.h b/Examples/octave/template/example.h
index 7401df650..5eb65dabb 100644
--- a/Examples/octave/template/example.h
+++ b/Examples/octave/template/example.h
@@ -29,4 +29,3 @@ template class vector {
   }
 #endif
 };
-
diff --git a/Examples/octave/template/example.i b/Examples/octave/template/example.i
index 8f94c4da1..cfff18ded 100644
--- a/Examples/octave/template/example.i
+++ b/Examples/octave/template/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 
 %{
 #include "example.h"
@@ -14,4 +14,3 @@
 %template(maxdouble) max;
 %template(vecint) vector;
 %template(vecdouble) vector;
-
diff --git a/Examples/octave/template/runme.m b/Examples/octave/template/runme.m
index a9891d459..b0abbf22f 100644
--- a/Examples/octave/template/runme.m
+++ b/Examples/octave/template/runme.m
@@ -1,15 +1,15 @@
 # file: runme.m
 
-example
+swigexample
 
 # Call some templated functions
-example.maxint(3,7)
-example.maxdouble(3.14,2.18)
+swigexample.maxint(3,7)
+swigexample.maxdouble(3.14,2.18)
 
 # Create some class
 
-iv = example.vecint(100)
-dv = example.vecdouble(1000)
+iv = swigexample.vecint(100)
+dv = swigexample.vecdouble(1000)
 
 for i=0:99,
   iv.setitem(i,2*i);
@@ -33,5 +33,3 @@ sum
 
 clear iv
 clear dv
-
-      
diff --git a/Examples/octave/variables/Makefile b/Examples/octave/variables/Makefile
index 2c33cd3d8..73e3962ed 100644
--- a/Examples/octave/variables/Makefile
+++ b/Examples/octave/variables/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = example
+TARGET     = swigexample
 INTERFACE  = example.i
 
 check: build
@@ -11,9 +11,5 @@ build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
 
-static:
-	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='myoctave' INTERFACE='$(INTERFACE)' octave_static
-
 clean:
 	$(MAKE) -f $(TOP)/Makefile octave_clean
diff --git a/Examples/octave/variables/example.c b/Examples/octave/variables/example.c
index aa4ffe9b3..15dcc1b8e 100644
--- a/Examples/octave/variables/example.c
+++ b/Examples/octave/variables/example.c
@@ -11,7 +11,7 @@
 #include 
 #include "example.h"
 
-int              ivar = 0;                    
+int              ivar = 0;
 short            svar = 0;
 long             lvar = 0;
 unsigned int     uivar = 0;
diff --git a/Examples/octave/variables/example.h b/Examples/octave/variables/example.h
index 0f7e89594..8d95fa1a4 100644
--- a/Examples/octave/variables/example.h
+++ b/Examples/octave/variables/example.h
@@ -3,4 +3,3 @@
 typedef struct {
   int x,y;
 } Point;
-
diff --git a/Examples/octave/variables/example.i b/Examples/octave/variables/example.i
index 639b6c704..3e11495ad 100644
--- a/Examples/octave/variables/example.i
+++ b/Examples/octave/variables/example.i
@@ -1,5 +1,5 @@
 /* File : example.i */
-%module example
+%module swigexample
 %{
 #include "example.h"
 %}
@@ -50,4 +50,3 @@ extern Point *new_Point(int x, int y);
 extern char  *Point_print(Point *p);
 extern void  pt_print();
 %}
-
diff --git a/Examples/octave/variables/runme.m b/Examples/octave/variables/runme.m
index db88b18b0..c6788398b 100644
--- a/Examples/octave/variables/runme.m
+++ b/Examples/octave/variables/runme.m
@@ -1,56 +1,56 @@
 # file: runme.m
 
-example
+swigexample
 
 # Try to set the values of some global variables
 
-example.cvar.ivar   =  42;
-example.cvar.svar   = -31000;
-example.cvar.lvar   =  65537;
-example.cvar.uivar  =  123456;
-example.cvar.usvar  =  61000;
-example.cvar.ulvar  =  654321;
-example.cvar.scvar  =  -13;
-example.cvar.ucvar  =  251;
-example.cvar.cvar   =  "S";
-example.cvar.fvar   =  3.14159;
-example.cvar.dvar   =  2.1828;
-example.cvar.strvar =  "Hello World";
-example.cvar.iptrvar= example.new_int(37);
-example.cvar.ptptr  = example.new_Point(37,42);
-example.cvar.name   = "Bill";
+swigexample.cvar.ivar   =  42;
+swigexample.cvar.svar   = -31000;
+swigexample.cvar.lvar   =  65537;
+swigexample.cvar.uivar  =  123456;
+swigexample.cvar.usvar  =  61000;
+swigexample.cvar.ulvar  =  654321;
+swigexample.cvar.scvar  =  -13;
+swigexample.cvar.ucvar  =  251;
+swigexample.cvar.cvar   =  "S";
+swigexample.cvar.fvar   =  3.14159;
+swigexample.cvar.dvar   =  2.1828;
+swigexample.cvar.strvar =  "Hello World";
+swigexample.cvar.iptrvar= swigexample.new_int(37);
+swigexample.cvar.ptptr  = swigexample.new_Point(37,42);
+swigexample.cvar.name   = "Bill";
 
 # Now print out the values of the variables
 
 printf("Variables (values printed from Octave)\n");
 
-printf("ivar      = %i\n", example.cvar.ivar);
-printf("svar      = %i\n", example.cvar.svar);
-printf("lvar      = %i\n", example.cvar.lvar);
-printf("uivar     = %i\n", example.cvar.uivar);
-printf("usvar     = %i\n", example.cvar.usvar);
-printf("ulvar     = %i\n", example.cvar.ulvar);
-printf("scvar     = %i\n", example.cvar.scvar);
-printf("ucvar     = %i\n", example.cvar.ucvar);
-printf("fvar      = %i\n", example.cvar.fvar);
-printf("dvar      = %i\n", example.cvar.dvar);
-printf("cvar      = %s\n", example.cvar.cvar);
-printf("strvar    = %s\n", example.cvar.strvar);
-#printf("cstrvar   = %s\n", example.cvar.cstrvar);
-example.cvar.iptrvar
-printf("name      = %i\n", example.cvar.name);
-printf("ptptr     = %s\n", example.Point_print(example.cvar.ptptr));
-#printf("pt        = %s\n", example.cvar.Point_print(example.cvar.pt));
+printf("ivar      = %i\n", swigexample.cvar.ivar);
+printf("svar      = %i\n", swigexample.cvar.svar);
+printf("lvar      = %i\n", swigexample.cvar.lvar);
+printf("uivar     = %i\n", swigexample.cvar.uivar);
+printf("usvar     = %i\n", swigexample.cvar.usvar);
+printf("ulvar     = %i\n", swigexample.cvar.ulvar);
+printf("scvar     = %i\n", swigexample.cvar.scvar);
+printf("ucvar     = %i\n", swigexample.cvar.ucvar);
+printf("fvar      = %i\n", swigexample.cvar.fvar);
+printf("dvar      = %i\n", swigexample.cvar.dvar);
+printf("cvar      = %s\n", swigexample.cvar.cvar);
+printf("strvar    = %s\n", swigexample.cvar.strvar);
+#printf("cstrvar   = %s\n", swigexample.cvar.cstrvar);
+swigexample.cvar.iptrvar
+printf("name      = %i\n", swigexample.cvar.name);
+printf("ptptr     = %s\n", swigexample.Point_print(swigexample.cvar.ptptr));
+#printf("pt        = %s\n", swigexample.cvar.Point_print(swigexample.cvar.pt));
 
 printf("\nVariables (values printed from C)\n");
 
-example.print_vars();
+swigexample.print_vars();
 
 printf("\nNow I'm going to try and modify some read only variables\n");
 
 printf("     Tring to set 'path'\n");
 try
-    example.cvar.path = "Whoa!";
+    swigexample.cvar.path = "Whoa!";
     printf("Hey, what's going on?!?! This shouldn't work\n");
 catch
     printf("Good.\n");
@@ -58,7 +58,7 @@ end_try_catch
 
 printf("     Trying to set 'status'\n");
 try
-    example.cvar.status = 0;
+    swigexample.cvar.status = 0;
     printf("Hey, what's going on?!?! This shouldn't work\n");
 catch
     printf("Good.\n");
@@ -67,9 +67,6 @@ end_try_catch
 
 printf("\nI'm going to try and update a structure variable.\n");
 
-example.cvar.pt = example.cvar.ptptr;
-
-printf("The new value is %s\n", example.Point_print(example.cvar.pt));
-
-
+swigexample.cvar.pt = swigexample.cvar.ptptr;
 
+printf("The new value is %s\n", swigexample.Point_print(swigexample.cvar.pt));

From 95e2142347fa2c69e2ddbe329584ce4a5eb09d51 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Thu, 9 May 2013 18:32:27 +0100
Subject: [PATCH 492/538] Update Octave manual to use "swigexample" instead of
 "example"

Closes #46
---
 Doc/Manual/Octave.html | 100 ++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html
index 0340c2fd5..84c0a0f46 100644
--- a/Doc/Manual/Octave.html
+++ b/Doc/Manual/Octave.html
@@ -74,7 +74,7 @@ Let's start with a very simple SWIG interface file, example.i:
 
    
 
 
    -%module example
+%module swigexample
 %{
 #include "example.h"
 %}
@@ -143,10 +143,10 @@ $ mkoctfile example_wrap.cpp example.c
 
    
 
 
    
-        mkoctfile will produce "example.oct", which contains the compiled extension module. Loading it into Octave is then a matter of invoking 
+        mkoctfile will produce "swigexample.oct", which contains the compiled extension module. Loading it into Octave is then a matter of invoking 
 
    
 
-          
    octave:1> example
    
+          
    octave:1> swigexample
    
 
 
    30.2.3 Using your module
    
 
@@ -157,13 +157,13 @@ Assuming all goes well, you will be able to do this:
 
    
 
           
    $ octave -q
-octave:1> example
-octave:2> example.gcd(4,6)
+octave:1> swigexample
+octave:2> swigexample.gcd(4,6)
 ans =  2
-octave:3> example.cvar.Foo
+octave:3> swigexample.cvar.Foo
 ans =  3
-octave:4> example.cvar.Foo=4;
-octave:5> example.cvar.Foo
+octave:4> swigexample.cvar.Foo=4;
+octave:5> swigexample.cvar.Foo
 ans =  4 
    
 
 
    30.3 A tour of basic C/C++ wrapping
    
@@ -173,11 +173,11 @@ ans =  4 
    
 
 
 
    
-The SWIG module directive specifies the name of the Octave module. If you specify "module example", then in Octave everything in the module will be accessible under "example", as in the above example. When choosing a module name, make sure you don't use the same name as a built-in Octave command or standard module name.
+The SWIG module directive specifies the name of the Octave module. If you specify "module swigexample", then in Octave everything in the module will be accessible under "swigexample", as in the above example. When choosing a module name, make sure you don't use the same name as a built-in Octave command or standard module name.
 
    
 
 
    
-When Octave is asked to invoke example, it will try to find the ".m" or ".oct" file that defines the function "example". You therefore need to make sure that "example.oct" is in Octave's search path, which can be specified with the environment variable "OCTAVE_PATH".
+When Octave is asked to invoke swigexample, it will try to find the ".m" or ".oct" file that defines the function "swigexample". You therefore need to make sure that "swigexample.oct" is in Octave's search path, which can be specified with the environment variable "OCTAVE_PATH".
 
    
 
 
    
@@ -185,7 +185,7 @@ To load an Octave module, simply type its name:
 
    
 
 
    -octave:1> example;
+octave:1> swigexample;
 octave:2> gcd(4,6)
 ans =  2
 octave:3> cvar.Foo
@@ -202,15 +202,15 @@ If the module is also used in the base context, however, it must first be loaded
 
 
     octave:1> function l = my_lcm(a,b)
-> example
-> l = abs(a*b)/example.gcd(a,b);
+> swigexample
+> l = abs(a*b)/swigexample.gcd(a,b);
 > endfunction
 octave:2> my_lcm(4,6)
 ans =  12
-octave:3> example.gcd(4,6)
+octave:3> swigexample.gcd(4,6)
 error: can't perform indexing operations for <unknown type> type
-octave:3> example;
-octave:4> example.gcd(4,6)
+octave:3> swigexample;
+octave:4> swigexample.gcd(4,6)
 ans =  2
 
    
 
@@ -221,14 +221,14 @@ ans =  2
 Global functions are wrapped as new Octave built-in functions. For example, 
 
    
 
-      
    %module example
+      
    %module swigexample
 int fact(int n); 
    
 
 
    
-     creates a built-in function example.fact(n) that works exactly like you think it does: 
+     creates a built-in function swigexample.fact(n) that works exactly like you think it does: 
 
    
 
-    
    octave:1> example.fact(4)
+    
    octave:1> swigexample.fact(4)
 24 
    
 
 
    30.3.3 Global variables
    
@@ -238,7 +238,7 @@ int fact(int n); 
    
      Global variables are a little special in Octave. Given a global variable: 
 
    
 
-
    %module example
+
    %module swigexample
 extern double Foo;
 
    
 
@@ -246,20 +246,20 @@ extern double Foo;
     To expose variables, SWIG actually generates two functions, to get and set the value. In this case, Foo_set and Foo_set would be generated. SWIG then automatically calls these functions when you get and set the variable-- in the former case creating a local copy in the interpreter of the C variables, and in the latter case copying an interpreter variables onto the C variable. 
 
    
 
-    
    octave:1> example;
-octave:2> c=example.cvar.Foo
+    
    octave:1> swigexample;
+octave:2> c=swigexample.cvar.Foo
 c =  3
-octave:3> example.cvar.Foo=4;
+octave:3> swigexample.cvar.Foo=4;
 octave:4> c
 c =  3
-octave:5> example.cvar.Foo
+octave:5> swigexample.cvar.Foo
 ans =  4
    
 
 
    
 If a variable is marked with the %immutable directive then any attempts to set this variable will cause an Octave error. Given a global variable: 
 
    
 
-    
    %module example
+    
    %module swigexample
 %immutable;
 extern double Foo;
 %mutable;
@@ -269,8 +269,8 @@ extern double Foo;
      SWIG will allow the reading of Foo but when a set attempt is made, an error function will be called. 
 
    
 
-    
    octave:1> example
-octave:2> example.Foo=4
+    
    octave:1> swigexample
+octave:2> swigexample.Foo=4
 error: attempt to set immutable member variable
 error: assignment failed, or no method for `swig_type = scalar'
 error: evaluating assignment expression near line 2, column 12 
    
@@ -279,9 +279,9 @@ error: evaluating assignment expression near line 2, column 12 
    
     It is possible to add new functions or variables to the module. This also allows the user to rename/remove existing functions and constants (but not linked variables, mutable or immutable). Therefore users are recommended to be careful when doing so. 
 
    
 
-    
    octave:1> example;
-octave:2> example.PI=3.142;
-octave:3> example.PI
+    
    octave:1> swigexample;
+octave:2> swigexample.PI=3.142;
+octave:3> swigexample.PI
 ans =  3.1420 
    
 
 
    30.3.4 Constants and enums
    
@@ -291,7 +291,7 @@ ans =  3.1420 
    
      Because Octave doesn't really have the concept of constants, C/C++ constants are not really constant in Octave. They are actually just a copy of the value into the Octave interpreter. Therefore they can be changed just as any other value. For example given some constants: 
 
    
 
-    
    %module example
+    
    %module swigexample
 %constant int ICONST=42;
 #define    SCONST      "Hello World"
 enum Days{SUNDAY,MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY,SATURDAY};
@@ -301,9 +301,9 @@ enum Days{SUNDAY,MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY,SATURDAY};
     This is 'effectively' converted into the following Octave code: 
 
    
 
-    
    example.ICONST=42
-example.SCONST="Hello World"
-example.SUNDAY=0
+    
    swigexample.ICONST=42
+swigexample.SCONST="Hello World"
+swigexample.SUNDAY=0
 .... 
    
 
 
    30.3.5 Pointers
    
@@ -314,7 +314,7 @@ example.SUNDAY=0
        C/C++ pointers are fully supported by SWIG. Furthermore, SWIG has no problem working with incomplete type information. Given a wrapping of the <file.h> interface:
 
    
 
-
    %module example
+
    %module swigexample
 FILE *fopen(const char *filename, const char *mode);
 int fputs(const char *, FILE *);
 int fclose(FILE *);
@@ -325,18 +325,18 @@ When wrapped, you will be able to use the functions in a natural way from Octave
 
    
 
 
    -octave:1> example;
-octave:2> f=example.fopen("w","junk");
-octave:3> example.fputs("Hello world",f);
-octave:4> example.fclose(f);
+octave:1> swigexample;
+octave:2> f=swigexample.fopen("w","junk");
+octave:3> swigexample.fputs("Hello world",f);
+octave:4> swigexample.fclose(f);
 
    
 
 
    
      Simply printing the value of a wrapped C++ type will print it's typename. E.g., 
 
    
 
-    
    octave:1> example;
-octave:2> f=example.fopen("junk","w");
+    
    octave:1> swigexample;
+octave:2> f=swigexample.fopen("junk","w");
 octave:3> f
 f =
 
@@ -348,8 +348,8 @@ f =
     As the user of the pointer, you are responsible for freeing it, or closing any resources associated with it (just as you would in a C program). This does not apply so strictly to classes and structs (see below).
 
    
 
-    
    octave:1> example;
-octave:2> f=example.fopen("not there","r");
+    
    octave:1> swigexample;
+octave:2> f=swigexample.fopen("not there","r");
 error: value on right hand side of assignment is undefined
 error: evaluating assignment expression near line 2, column 2 
    
 
@@ -371,8 +371,8 @@ For each wrapped structure and class, a swig_ref will be exposed that h
 
    
 
     
    
-      
    octave:1> example;
-octave:2> p=example.Point();
+      
    octave:1> swigexample;
+octave:2> p=swigexample.Point();
 octave:3> p.x=3;
 octave:4> p.y=5;
 octave:5> p.x, p.y
@@ -406,9 +406,9 @@ public:
 can be used from Octave like this
 
    
     
    
-      
    octave:1> example;
-octave:2> p1=example.Point(3,5);
-octave:3> p2=example.Point(1,2);
+      
    octave:1> swigexample;
+octave:2> p1=swigexample.Point(3,5);
+octave:3> p2=swigexample.Point(1,2);
 octave:4> p1.distance(p2)
 ans =  3.6056
 
    
@@ -649,7 +649,7 @@ C++ class and function templates are fully supported as in other modules, in tha
 For example, function templates can be instantiated as follows:
 
    
 
-
    %module example
+
    %module swigexample
 %inline {
  template<class __scalar>
    __scalar mul(__scalar a,__scalar b) {
@@ -677,7 +677,7 @@ ans =  22 + 46i
 Similarly, class templates can be instantiated as in the following example,
 
    
 
-
    %module example
+
    %module swigexample
 %include <std_complex.i>
 %include <std_string.i>
 %inline {

From d974e9aced1d371e156deca25fcc22f65d15a3f8 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 9 May 2013 08:21:02 +0100
Subject: [PATCH 493/538] Guile examples consistency changes

Use new guile_embedded_run target or guile_run target for running the
examples like the other target languages (for suppressing stdout if run
from top level).

Consistency with other target language file renames: use runme.scm for
scripts and example.i, example.c for example code.

Add class example to examples being tested.
---
 Examples/Makefile.in                          |  3 +++
 Examples/guile/check.list                     |  1 +
 Examples/guile/class/Makefile                 |  2 ++
 Examples/guile/constants/Makefile             |  3 ++-
 .../constants/{constants.scm => runme.scm}    |  0
 Examples/guile/matrix/Makefile                |  5 ++--
 Examples/guile/matrix/README                  |  6 ++---
 .../guile/matrix/{package.i => example.i}     |  5 +---
 Examples/guile/matrix/main.c                  | 24 -------------------
 .../guile/matrix/{matrix.scm => runme.scm}    |  1 -
 Examples/guile/multimap/Makefile              |  2 +-
 Examples/guile/multivalue/Makefile            |  2 +-
 Examples/guile/port/Makefile                  |  7 +++---
 Examples/guile/port/README                    |  2 +-
 Examples/guile/port/{port.c => example.c}     |  0
 Examples/guile/port/{port.i => example.i}     |  0
 Examples/guile/port/{port.scm => runme.scm}   |  0
 Examples/guile/simple/Makefile                |  3 ++-
 Examples/guile/simple/README                  |  4 ++--
 .../guile/simple/{example.scm => runme.scm}   |  2 --
 Examples/guile/std_vector/Makefile            |  2 +-
 21 files changed, 27 insertions(+), 47 deletions(-)
 rename Examples/guile/constants/{constants.scm => runme.scm} (100%)
 rename Examples/guile/matrix/{package.i => example.i} (72%)
 delete mode 100644 Examples/guile/matrix/main.c
 rename Examples/guile/matrix/{matrix.scm => runme.scm} (99%)
 mode change 100644 => 100755
 rename Examples/guile/port/{port.c => example.c} (100%)
 rename Examples/guile/port/{port.i => example.i} (100%)
 rename Examples/guile/port/{port.scm => runme.scm} (100%)
 rename Examples/guile/simple/{example.scm => runme.scm} (93%)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index a255db4c9..20f1cfea6 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -515,6 +515,9 @@ guile_simple_cpp: $(SRCS)
 guile_run:
 	$(RUNTOOL) $(GUILE) -l $(GUILE_SCRIPT) $(RUNPIPE)
 
+guile_embedded_run:
+	$(RUNTOOL) ./$(TARGET) $(GUILE_RUNOPTIONS) -s $(GUILE_SCRIPT) $(RUNPIPE)
+
 # -----------------------------------------------------------------
 # Version display
 # -----------------------------------------------------------------
diff --git a/Examples/guile/check.list b/Examples/guile/check.list
index 08524a8f7..726e6ab75 100644
--- a/Examples/guile/check.list
+++ b/Examples/guile/check.list
@@ -1,5 +1,6 @@
 # see top-level Makefile.in
 constants
+class
 port
 simple
 std_vector
diff --git a/Examples/guile/class/Makefile b/Examples/guile/class/Makefile
index 827b2fe03..189610800 100644
--- a/Examples/guile/class/Makefile
+++ b/Examples/guile/class/Makefile
@@ -3,8 +3,10 @@ SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
+TOP        = ../..
 
 check: build
+#	$(MAKE) -f $(TOP)/Makefile guile_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/constants/Makefile b/Examples/guile/constants/Makefile
index 946323b89..5e60d9b34 100644
--- a/Examples/guile/constants/Makefile
+++ b/Examples/guile/constants/Makefile
@@ -2,9 +2,10 @@ SRCS   =
 TARGET = my-guile
 IFILE  = example.i
 MKDIR  = ..
+TOP        = ../..
 
 check: build
-	./my-guile -s constants.scm
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_embedded_run
 
 build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
diff --git a/Examples/guile/constants/constants.scm b/Examples/guile/constants/runme.scm
similarity index 100%
rename from Examples/guile/constants/constants.scm
rename to Examples/guile/constants/runme.scm
diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile
index 988a0ee5c..3d488f6f6 100644
--- a/Examples/guile/matrix/Makefile
+++ b/Examples/guile/matrix/Makefile
@@ -1,10 +1,11 @@
 SRCS   = matrix.c vector.c
 TARGET = matrix
-IFILE  = package.i
+IFILE  = example.i
 MKDIR  = ..
+TOP        = ../..
 
 check: build
-	./$(TARGET) -e do-test -s matrix.scm
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' GUILE_RUNOPTIONS='-e do-test' guile_embedded_run
 
 build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
diff --git a/Examples/guile/matrix/README b/Examples/guile/matrix/README
index dc1957719..db7395b70 100644
--- a/Examples/guile/matrix/README
+++ b/Examples/guile/matrix/README
@@ -1,13 +1,13 @@
 Matrix example.  To run the example, execute the program 'matrix' and
 type the following :
 
-	(load "matrix.scm")
+	(load "runme.scm")
 	(do-test 0)
 
 Alternatively, use the command-line:
 
-	./matrix -e do-test -s matrix.scm
+	./matrix -e do-test -s runme.scm
 
 Or, if your operating system is spiffy enough:
 
-	./matrix.scm
+	./runme.scm
diff --git a/Examples/guile/matrix/package.i b/Examples/guile/matrix/example.i
similarity index 72%
rename from Examples/guile/matrix/package.i
rename to Examples/guile/matrix/example.i
index aaa55511c..3f801dcdf 100644
--- a/Examples/guile/matrix/package.i
+++ b/Examples/guile/matrix/example.i
@@ -1,7 +1,4 @@
-// FILE : package.i
-// See the SWIG users manual
-
-/*** Matrix and vector package ***/
+/*** Matrix and vector example ***/
 
 %module Matrix
 %{
diff --git a/Examples/guile/matrix/main.c b/Examples/guile/matrix/main.c
deleted file mode 100644
index 88209aea7..000000000
--- a/Examples/guile/matrix/main.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include 
-extern int matrix_init(Tcl_Interp *);    /* Init function from matrix.i */
-
-int main() {
-
-  int        code;
-  char       input[1024];
-  Tcl_Interp *interp;
-  
-  interp = Tcl_CreateInterp();
-
-  /* Initialize the wrappers */
-
-  if (matrix_init(interp) == TCL_ERROR)
-    exit(0);
-  
-  fprintf(stdout,"matrix > ");
-  while(fgets(input, 1024, stdin) != NULL) {
-    code = Tcl_Eval(interp, input);
-    fprintf(stdout,"%s\n",interp->result);
-    fprintf(stdout,"matrix > ");
-  }
-}
-
diff --git a/Examples/guile/matrix/matrix.scm b/Examples/guile/matrix/runme.scm
old mode 100644
new mode 100755
similarity index 99%
rename from Examples/guile/matrix/matrix.scm
rename to Examples/guile/matrix/runme.scm
index d7cab84f4..f11061e56
--- a/Examples/guile/matrix/matrix.scm
+++ b/Examples/guile/matrix/runme.scm
@@ -211,4 +211,3 @@
 
   (cleanup M-list))
 
-;;; matrix.scm ends here
diff --git a/Examples/guile/multimap/Makefile b/Examples/guile/multimap/Makefile
index 7b2f264ba..4ca82a3d3 100644
--- a/Examples/guile/multimap/Makefile
+++ b/Examples/guile/multimap/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example
+	$(MAKE) -f $(TOP)/Makefile guile_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/multivalue/Makefile b/Examples/guile/multivalue/Makefile
index 7b2f264ba..4ca82a3d3 100644
--- a/Examples/guile/multivalue/Makefile
+++ b/Examples/guile/multivalue/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example
+	$(MAKE) -f $(TOP)/Makefile guile_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile
index 33eeab2e9..0088dd92f 100644
--- a/Examples/guile/port/Makefile
+++ b/Examples/guile/port/Makefile
@@ -1,10 +1,10 @@
-SRCS   = port.c
+SRCS   = example.c
 TARGET = port
-IFILE  = port.i
+IFILE  = example.i
 MKDIR  = ..
 
 check: build
-	./$(TARGET) -s port.scm
+	./$(TARGET) -s runme.scm
 
 build:
 	$(MAKE) -f $(MKDIR)/Makefile		\
@@ -16,3 +16,4 @@ build:
 
 clean:
 	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
+	rm -f test.out
diff --git a/Examples/guile/port/README b/Examples/guile/port/README
index 5ed0199e2..784e39e5d 100644
--- a/Examples/guile/port/README
+++ b/Examples/guile/port/README
@@ -1,2 +1,2 @@
 This example illustrates the translation from Scheme file ports to
-temporary FILE streams. Read the source and run ./port -s port.scm
+temporary FILE streams. Read the source and run ./port -s runme.scm
diff --git a/Examples/guile/port/port.c b/Examples/guile/port/example.c
similarity index 100%
rename from Examples/guile/port/port.c
rename to Examples/guile/port/example.c
diff --git a/Examples/guile/port/port.i b/Examples/guile/port/example.i
similarity index 100%
rename from Examples/guile/port/port.i
rename to Examples/guile/port/example.i
diff --git a/Examples/guile/port/port.scm b/Examples/guile/port/runme.scm
similarity index 100%
rename from Examples/guile/port/port.scm
rename to Examples/guile/port/runme.scm
diff --git a/Examples/guile/simple/Makefile b/Examples/guile/simple/Makefile
index d4021073e..66c7e26af 100644
--- a/Examples/guile/simple/Makefile
+++ b/Examples/guile/simple/Makefile
@@ -2,9 +2,10 @@ SRCS   = example.c
 TARGET = my-guile
 IFILE  = example.i
 MKDIR  = ..
+TOP        = ../..
 
 check: $(TARGET)
-	./$(TARGET) -s example.scm
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_embedded_run
 
 build: $(TARGET)
 
diff --git a/Examples/guile/simple/README b/Examples/guile/simple/README
index 982216eaa..27b54dc5b 100644
--- a/Examples/guile/simple/README
+++ b/Examples/guile/simple/README
@@ -2,8 +2,8 @@ A very simple example.
 
 To run it, start the program 'my-guile' and type:
 
-	(load "example.scm")
+	(load "runme.scm")
 
 Alternatively, you can use the shell command:
 
-	./my-guile -s example.scm
+	./my-guile -s runme.scm
diff --git a/Examples/guile/simple/example.scm b/Examples/guile/simple/runme.scm
similarity index 93%
rename from Examples/guile/simple/example.scm
rename to Examples/guile/simple/runme.scm
index 9408b1aa6..c3fd0b41f 100644
--- a/Examples/guile/simple/example.scm
+++ b/Examples/guile/simple/runme.scm
@@ -1,4 +1,3 @@
-;;; example.scm
 
 (define (mdisplay-newline . args)       ; does guile-1.3.4 have `format #t'?
   (for-each display args)
@@ -25,4 +24,3 @@
 (exit (and (= 1932053504 (fact 13))
            (= 745470.0 (My-variable))))
 
-;;; example.scm ends here
diff --git a/Examples/guile/std_vector/Makefile b/Examples/guile/std_vector/Makefile
index 6eca67519..fd7a8439a 100644
--- a/Examples/guile/std_vector/Makefile
+++ b/Examples/guile/std_vector/Makefile
@@ -5,7 +5,7 @@ TARGET     = example
 INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f ../Makefile RUNSCRIPT=runme.scm run_example
+	$(MAKE) -f $(TOP)/Makefile guile_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \

From dd36f28ac7b28ecb78736894796bdcab9d945e07 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 9 May 2013 19:28:09 +0100
Subject: [PATCH 494/538] Migrate Guile examples build into common Examples
 makefile

- Now Guile examples are built in a consistent way to other target
languages.
- Also set GUILE_AUTO_COMPILE=0 to remove auto-compilation is enabled
  warnings
---
 Examples/Makefile.in              | 15 +++++++---
 Examples/guile/Makefile.in        | 47 -------------------------------
 Examples/guile/README             |  1 +
 Examples/guile/constants/Makefile | 19 ++++++-------
 Examples/guile/matrix/Makefile    | 21 ++++++--------
 Examples/guile/port/Makefile      | 19 ++++++-------
 Examples/guile/simple/Makefile    | 25 +++++++---------
 configure.ac                      |  1 -
 8 files changed, 46 insertions(+), 102 deletions(-)
 delete mode 100644 Examples/guile/Makefile.in

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 20f1cfea6..5d521f5a1 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -111,7 +111,6 @@ OBJS      = $(SRCS:.c=.@OBJEXT@) $(CXXSRCS:.cxx=.@OBJEXT@)
 
 distclean:
 	rm -f Makefile
-	rm -f guile/Makefile
 	rm -f xml/Makefile
 
 ##################################################################
@@ -482,6 +481,14 @@ $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO): $(SRCS)
 guile_externalhdr:
 	$(SWIG) -guile -external-runtime $(TARGET)
 
+# -----------------------------------------------------------------
+# Build Guile interpreter augmented with extra functions
+# -----------------------------------------------------------------
+
+guile_augmented:
+	$(SWIG) -guile $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS) -o $(TARGET)
+
 # -----------------------------------------------------------------
 # Build statically linked Guile interpreter
 # -----------------------------------------------------------------
@@ -513,10 +520,10 @@ guile_simple_cpp: $(SRCS)
 # -----------------------------------------------------------------
 
 guile_run:
-	$(RUNTOOL) $(GUILE) -l $(GUILE_SCRIPT) $(RUNPIPE)
+	env GUILE_AUTO_COMPILE=0 $(RUNTOOL) $(GUILE) -l $(GUILE_SCRIPT) $(RUNPIPE)
 
-guile_embedded_run:
-	$(RUNTOOL) ./$(TARGET) $(GUILE_RUNOPTIONS) -s $(GUILE_SCRIPT) $(RUNPIPE)
+guile_augmented_run:
+	env GUILE_AUTO_COMPILE=0 $(RUNTOOL) ./$(TARGET) $(GUILE_RUNOPTIONS) -s $(GUILE_SCRIPT) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display
diff --git a/Examples/guile/Makefile.in b/Examples/guile/Makefile.in
deleted file mode 100644
index f84d54a38..000000000
--- a/Examples/guile/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# Makefile for Guile.  Used by all of the example programs.
-
-subdirs		= simple matrix port constants multimap multivalue
-
-top_srcdir	= @top_srcdir@
-SWIG		= ../$(top_srcdir)/preinst-swig
-CC		= @CC@
-CXX		= @CXX@
-CFLAGS		= @PLATFLAGS@
-LIBS		=
-GUILE		= @GUILE@
-GUILE_CFLAGS	= @GUILE_CFLAGS@
-GUILE_LIBS	= @GUILE_LIBS@
-SWIGOPT		=
-
-WRAP		= $(IFILE:.i=_wrap.c)
-CXXWRAP		= $(IFILE:.i=_wrap.cxx)
-
-SO		= @SO@
-
-all:
-	for d in $(subdirs) ; do (cd $$d ; $(MAKE)) ; done
-
-clean:
-	for d in $(subdirs) ; do (cd $$d ; $(MAKE) clean) ; done
-	rm -f *~ .~*
-
-guile_clean:
-	rm -f *.@OBJEXT@ *$(SO) *_wrap* *~ .~* core my-guile $(TARGET)
-
-# This is meant to be used w/ "make -f ../Makefile" from subdirs.
-# Doesn't make sense to use it from here.
-
-sub-all:
-	$(SWIG) -guile $(SWIGOPT) $(IFILE)
-	$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
-
-sub-all-cxx:
-	$(SWIG) -c++ -guile $(SWIGOPT) $(IFILE)
-	$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
-
-run_example:
-	if [ -f $(RUNSCRIPT) ]; then \
-          env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(RUNSCRIPT); \
-        fi
-
-# Makefile ends here
diff --git a/Examples/guile/README b/Examples/guile/README
index 7d726619e..03ce8e450 100644
--- a/Examples/guile/README
+++ b/Examples/guile/README
@@ -1,6 +1,7 @@
 This directory contains examples for Guile.
 
 constants   -- handling #define and %constant literals
+class       -- classic c++ class example
 matrix      -- a very simple Matrix example
 multimap    -- typemaps with multiple sub-types
 multivalue  -- using the %values_as_list directive
diff --git a/Examples/guile/constants/Makefile b/Examples/guile/constants/Makefile
index 5e60d9b34..d8a3cfebd 100644
--- a/Examples/guile/constants/Makefile
+++ b/Examples/guile/constants/Makefile
@@ -1,18 +1,15 @@
-SRCS   = 
-TARGET = my-guile
-IFILE  = example.i
-MKDIR  = ..
 TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+SRCS       = 
+TARGET     = my-guile
+INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_embedded_run
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
 
 build:
-	$(MAKE) -f $(MKDIR)/Makefile		\
-		SRCS='$(SRCS)'			\
-		TARGET=$(TARGET)		\
-		IFILE=$(IFILE)			\
-	    sub-all
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile
index 3d488f6f6..8a6ff81de 100644
--- a/Examples/guile/matrix/Makefile
+++ b/Examples/guile/matrix/Makefile
@@ -1,20 +1,15 @@
-SRCS   = matrix.c vector.c
-TARGET = matrix
-IFILE  = example.i
-MKDIR  = ..
 TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+SRCS       = matrix.c vector.c
+TARGET     = matrix
+INTERFACE  = example.i
 
 check: build
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' GUILE_RUNOPTIONS='-e do-test' guile_embedded_run
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' GUILE_RUNOPTIONS='-e do-test' guile_augmented_run
 
 build:
-	$(MAKE) -f $(MKDIR)/Makefile		\
-		SRCS='$(SRCS)'			\
-		TARGET=$(TARGET)		\
-		IFILE=$(IFILE)			\
-		MODULE=$(MODULE)		\
-		LIBS="-lm"			\
-	  sub-all
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile
index 0088dd92f..ec5d5198a 100644
--- a/Examples/guile/port/Makefile
+++ b/Examples/guile/port/Makefile
@@ -1,19 +1,16 @@
-SRCS   = example.c
-TARGET = port
-IFILE  = example.i
-MKDIR  = ..
+TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+SRCS       = example.c
+TARGET     = port
+INTERFACE  = example.i
 
 check: build
 	./$(TARGET) -s runme.scm
 
 build:
-	$(MAKE) -f $(MKDIR)/Makefile		\
-		SRCS='$(SRCS)'			\
-		TARGET=$(TARGET)		\
-		IFILE=$(IFILE)			\
-		MODULE=$(MODULE)		\
-	  sub-all
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
 	rm -f test.out
diff --git a/Examples/guile/simple/Makefile b/Examples/guile/simple/Makefile
index 66c7e26af..da4eb9015 100644
--- a/Examples/guile/simple/Makefile
+++ b/Examples/guile/simple/Makefile
@@ -1,20 +1,15 @@
-SRCS   = example.c
-TARGET = my-guile
-IFILE  = example.i
-MKDIR  = ..
 TOP        = ../..
+SWIG       = $(TOP)/../preinst-swig
+SRCS       = example.c
+TARGET     = my-guile
+INTERFACE  = example.i
 
-check: $(TARGET)
-	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_embedded_run
+check: build
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
 
-build: $(TARGET)
-
-$(TARGET):
-	$(MAKE) -f $(MKDIR)/Makefile		\
-		SRCS='$(SRCS)'			\
-		TARGET=$(TARGET)		\
-		IFILE=$(IFILE)			\
-	    sub-all
+build:
+	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
 
 clean:
-	$(MAKE) -f $(MKDIR)/Makefile TARGET='$(TARGET)' guile_clean
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean
diff --git a/configure.ac b/configure.ac
index a618d55de..968764715 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2397,7 +2397,6 @@ AC_CONFIG_FILES([			        \
     swig.spec				        \
     Source/Makefile			        \
     Examples/Makefile			        \
-    Examples/guile/Makefile		        \
     Examples/xml/Makefile		        \
     Examples/test-suite/chicken/Makefile	\
     Examples/test-suite/csharp/Makefile	        \

From 042d0dfdc221eead3df0e0e779d82d75411fce59 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 9 May 2013 19:41:29 +0100
Subject: [PATCH 495/538] Guile port example Makefile correction

---
 Examples/guile/port/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile
index ec5d5198a..d6ec0ac24 100644
--- a/Examples/guile/port/Makefile
+++ b/Examples/guile/port/Makefile
@@ -5,7 +5,7 @@ TARGET     = port
 INTERFACE  = example.i
 
 check: build
-	./$(TARGET) -s runme.scm
+	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_augmented_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \

From 199c1f3249abd677e7d5d5e8b3c709e8d8019331 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 9 May 2013 20:03:50 +0100
Subject: [PATCH 496/538] Add skeleton for run test for Guile class example

---
 Examples/guile/class/Makefile  | 2 +-
 Examples/guile/class/runme.scm | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 Examples/guile/class/runme.scm

diff --git a/Examples/guile/class/Makefile b/Examples/guile/class/Makefile
index 189610800..0130e5fc1 100644
--- a/Examples/guile/class/Makefile
+++ b/Examples/guile/class/Makefile
@@ -6,7 +6,7 @@ INTERFACE  = example.i
 TOP        = ../..
 
 check: build
-#	$(MAKE) -f $(TOP)/Makefile guile_run
+	$(MAKE) -f $(TOP)/Makefile guile_run
 
 build:
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
diff --git a/Examples/guile/class/runme.scm b/Examples/guile/class/runme.scm
new file mode 100644
index 000000000..6bd7bf299
--- /dev/null
+++ b/Examples/guile/class/runme.scm
@@ -0,0 +1,6 @@
+
+(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
+
+(format (current-error-port) "TODO: code to demonstrate the class example\n")
+
+(exit 0)

From e5f6ec8912628ac27447e4d8c276098a4d8b24c6 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Fri, 10 May 2013 18:29:26 +0200
Subject: [PATCH 497/538] Guile fix matrix example

Got broken in commit dd36f28ac7b28ecb78736894796bdcab9d945e07
(Migrate Guile examples build into common Examples makefile)
---
 Examples/guile/matrix/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile
index 8a6ff81de..a32210e65 100644
--- a/Examples/guile/matrix/Makefile
+++ b/Examples/guile/matrix/Makefile
@@ -9,7 +9,7 @@ check: build
 
 build:
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' guile_augmented
+	TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' LIBS='-lm' guile_augmented
 
 clean:
 	$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' guile_clean

From ef160ec07297252524ccab6949e17834c8b5aafc Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Thu, 9 May 2013 14:35:41 +0200
Subject: [PATCH 498/538] Octave: remove allocation of new octave_value in
 SWIG_Octave_SetGlobalValue()

- this introduces a memory leak, which becomes significant for large
  modules (many global variables) and many module re-loadings (e.g.
  during a long-running script)
- the original motivation was to prevent double-frees on exit, but this
  problem appears to have been fixed by the _Exit() hack in later commits,
  and in any case is an issue only for Octave ~3.2, so it should be safe to
  remove; tested by running Octave examples/test suite with Debian 3.2.4 and
  built-from-source 3.2.4, 3.4.3, and 3.6.3
---
 Lib/octave/octrun.swg | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg
index dfb4a7702..8fdb12086 100644
--- a/Lib/octave/octrun.swg
+++ b/Lib/octave/octrun.swg
@@ -1289,16 +1289,7 @@ SWIGRUNTIMEINLINE octave_value SWIG_Octave_GetGlobalValue(std::string name) {
 }
 
 SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value& value) {
-  // It is critical that a newly-allocated octave_value is passed to set_global_value(),
-  // since it and the Octave symbol table take references to the values assigned to it.
-  // If we were to pass a reference to 'value' to set_global_value(), then the Octave
-  // symbol table would hold a reference to a variable owned by the SWIG .oct module.
-  // Both will think that they own the reference (since the .oct module is dynamically
-  // loaded, it appears to have its own C++ runtime), and so they will both try to
-  // de-allocate the octave_value on exit, resulting in a double-free or seg-fault.
-  // This is prevented by giving Octave its own heap-allocated copy of 'value'.
-  octave_value *pov = new octave_value(value);
-  set_global_value(name, *pov);
+  set_global_value(name, value);
 }
 
 SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) {

From 93650b2911588fa1a91c6c0081b3dd7f61707969 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Thu, 9 May 2013 14:55:04 +0200
Subject: [PATCH 499/538] Octave: install functions only once, when creating
 module

- once installed, Octave functions can never really be uninstalled
  (clear -f doesn't prevent the function being called again), so
  it makes no sense to install functions more than once
- this can lead to a significant speed-up of module loading times,
  up to a factor of 10 for a large module loaded multiple times
---
 Lib/octave/octruntime.swg | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg
index 66b6e265a..43313c3d4 100644
--- a/Lib/octave/octruntime.swg
+++ b/Lib/octave/octruntime.swg
@@ -288,6 +288,15 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
 
     SWIG_InstallOps(octave_swig_ref::static_type_id());
 
+    octave_swig_type::swig_member_const_iterator mb;
+    for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
+      if (mb->second.first && mb->second.first->method) {
+        if (!SWIG_Octave_InstallFunction(me, mb->first)) {
+          return octave_value_list();
+        }
+      }
+    }
+
 #if OCTAVE_API_VERSION_NUMBER < 37
     mlock(me->name());
 #else
@@ -296,16 +305,9 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) {
 
   }
 
-  octave_function *me = octave_call_stack::current();
-
   octave_swig_type::swig_member_const_iterator mb;
   for (mb = module_ns->swig_members_begin(); mb != module_ns->swig_members_end(); ++mb) {
-    if (mb->second.first && mb->second.first->method) {
-      if (!SWIG_Octave_InstallFunction(me, mb->first)) {
-        return octave_value_list();
-      }
-    }
-    else if (mb->second.second.is_defined()) {
+    if (mb->second.second.is_defined()) {
       SWIG_Octave_SetGlobalValue(mb->first, mb->second.second);
       SWIG_Octave_LinkGlobalValue(mb->first);
     }

From d7839ce5701f628b8d8d50b5c207e0bc967b7576 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Thu, 9 May 2013 19:43:52 +0200
Subject: [PATCH 500/538] Update changelog for the previous two Octave patches

---
 CHANGES.current | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 46b0d5589..eb3b0a8d1 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-05-09: kwwette
+            [Octave] Fix bugs in Octave module loading:
+            - fix a memory leak in setting of global variables
+            - install functions only once, to speed up module loads
+
 2013-04-28: gjanssens
             [Guile] Updates in guile module:
             - Add support for guile 2.0

From 2733a0f7a318627f049998ed58d4d2041ac6666b Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 11 May 2013 10:31:16 +0100
Subject: [PATCH 501/538] Update htmldoc patch to htmldoc-1.8.27

Note: Best to use the patched source from Ubuntu/Debian which fixes some
bugs.

Also added "Patched with margin-left.patch" text to output of
  htmldoc --version
---
 Doc/Manual/margin-left.patch | 100 +++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/Doc/Manual/margin-left.patch b/Doc/Manual/margin-left.patch
index 70f087b92..8bef6305c 100644
--- a/Doc/Manual/margin-left.patch
+++ b/Doc/Manual/margin-left.patch
@@ -1,25 +1,66 @@
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-# This patch is against htmldoc 1.8.24, and it hacks in support for
+# This patch is against htmldoc 1.8.27, and it hacks in support for
 # correctly indenting the 
     sections in the SWIG manual.
 # This patch should only be used until the 1.9 branch of htmldoc
-# stabalizes, since the 1.9 branch includes true CSS1 support.
+# stabilizes, since the 1.9 branch includes true CSS1 support.
 #
 # This patch only affects the PDF generation, an unpatched htmldoc
 # creates the one-page html documentation just fine.
 #
---- htmldoc-1.8.24/htmldoc/ps-pdf.cxx~margin-left
-+++ htmldoc-1.8.24/htmldoc/ps-pdf.cxx
-@@ -158,6 +158,7 @@
+diff -Naur htmldoc-1.8.27/htmldoc/htmldoc.cxx htmldoc-1.8.27-margin-left/htmldoc/htmldoc.cxx
+--- htmldoc-1.8.27/htmldoc/htmldoc.cxx	2006-03-30 14:01:20.000000000 +0100
++++ htmldoc-1.8.27-margin-left/htmldoc/htmldoc.cxx	2013-05-11 10:11:47.428435647 +0100
+@@ -65,6 +65,8 @@
+ const char *__XOS2RedirRoot(const char *);
+ }
+ #endif
++
++extern void parse_style(char *);
+
+
+ /*
+@@ -1115,6 +1117,7 @@
+     else if (compare_strings(argv[i], "--version", 6) == 0)
+     {
+       puts(SVERSION);
++      puts("Patched with margin-left.patch");
+       return (0);
+     }
+     else if (compare_strings(argv[i], "--webpage", 3) == 0)
+@@ -2403,6 +2406,10 @@
+     }
+     else if (strcmp(temp, "--cookies") == 0)
+       file_cookies(temp2);
++    else if (strcmp(temp, "--stylesheet") == 0)
++    {
++      parse_style(temp2);
++    }
+   }
+ }
+
+diff -Naur htmldoc-1.8.27/htmldoc/Makefile htmldoc-1.8.27-margin-left/htmldoc/Makefile
+--- htmldoc-1.8.27/htmldoc/Makefile	2005-10-28 21:32:59.000000000 +0100
++++ htmldoc-1.8.27-margin-left/htmldoc/Makefile	2013-05-11 09:39:04.392367869 +0100
+@@ -36,7 +36,7 @@
+ OBJS	=	gui.o file.o html.o htmldoc.o htmllib.o htmlsep.o \
+		http.o http-addr.o http-addrlist.o http-support.o image.o \
+		iso8859.o license.o md5.o progress.o ps-pdf.o rc4.o \
+-		snprintf.o string.o toc.o util.o
++		snprintf.o string.o toc.o util.o style.o
+
+
+ #
+diff -Naur htmldoc-1.8.27/htmldoc/ps-pdf.cxx htmldoc-1.8.27-margin-left/htmldoc/ps-pdf.cxx
+--- htmldoc-1.8.27/htmldoc/ps-pdf.cxx	2006-08-01 17:58:50.000000000 +0100
++++ htmldoc-1.8.27-margin-left/htmldoc/ps-pdf.cxx	2013-05-11 09:37:40.096364957 +0100
+@@ -160,6 +160,7 @@
  #  undef page_t
  #endif // __hpux
  
 +extern int lookup_div_class(uchar *);
  
  /*
-  * Constants...
-@@ -4188,9 +4189,24 @@
+  * Output options...
+@@ -4230,9 +4231,24 @@
              para->child = para->last_child = NULL;
            }
  
@@ -45,30 +86,9 @@
            if (para->child != NULL)
            {
              parse_paragraph(para, *left, *right, *bottom, *top, x, y, page, *needspace);
---- htmldoc-1.8.24/htmldoc/htmldoc.cxx~margin-left
-+++ htmldoc-1.8.24/htmldoc/htmldoc.cxx
-@@ -62,6 +62,8 @@
- const char *__XOS2RedirRoot(const char *);
- }
- #endif
-+
-+extern void parse_style(char *);
-  
- 
- /*
-@@ -2140,6 +2142,10 @@
-     }
-     else if (strcmp(temp, "--cookies") == 0)
-       file_cookies(temp2);
-+    else if (strcmp(temp, "--stylesheet") == 0)
-+    {
-+      parse_style(temp2);
-+    }
-   }
- }
- 
---- /dev/null
-+++ htmldoc-1.8.24/htmldoc/style.cxx
+diff -Naur htmldoc-1.8.27/htmldoc/style.cxx htmldoc-1.8.27-margin-left/htmldoc/style.cxx
+--- htmldoc-1.8.27/htmldoc/style.cxx	1970-01-01 01:00:00.000000000 +0100
++++ htmldoc-1.8.27-margin-left/htmldoc/style.cxx	2013-05-11 09:37:40.096364957 +0100
 @@ -0,0 +1,185 @@
 +/* Extreamly simple parsing routines for CSS style sheets.
 + * We only parse div.class { } sections, and only look
@@ -255,15 +275,3 @@
 +
 +	fclose(f);
 +}
---- htmldoc-1.8.24/htmldoc/Makefile~margin-left
-+++ htmldoc-1.8.24/htmldoc/Makefile
-@@ -35,7 +35,7 @@
- 
- OBJS	=	gui.o file.o html.o htmldoc.o htmllib.o htmlsep.o http.o \
- 		http-addr.o http-support.o image.o iso8859.o license.o md5.o \
--		progress.o ps-pdf.o rc4.o snprintf.o string.o toc.o util.o
-+		progress.o ps-pdf.o rc4.o snprintf.o string.o toc.o util.o style.o
- 
- 
- #
-

From ea2e615cec87a469850605c6eda4f966ec1450da Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 12 May 2013 13:18:01 +0100
Subject: [PATCH 502/538] Fix some typos in directive names

---
 Doc/Manual/Allegrocl.html | 4 ++--
 Doc/Manual/Lua.html       | 2 +-
 Doc/Manual/Varargs.html   | 2 +-
 Lib/typemaps/implicit.swg | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html
index 283ff7e2c..12b915ee2 100644
--- a/Doc/Manual/Allegrocl.html
+++ b/Doc/Manual/Allegrocl.html
@@ -1613,7 +1613,7 @@ opoverload>
     
    
       Variable length argument lists are not supported, by default. If
       such a function is encountered, a warning will generated to
-      stderr. Varargs are supported via the SWIG %vararg
+      stderr. Varargs are supported via the SWIG %varargs
       directive. This directive allows you to specify a (finite)
       argument list which will be inserted into the wrapper in place
       of the variable length argument indicator.  As an example,
@@ -1624,7 +1624,7 @@ opoverload>
     
    
       See the following section
       on Variable Length arguments
-      provides examples on how %vararg can be used, along
+      provides examples on how %varargs can be used, along
       with other ways such functions can be wrapped.
     
    
 
diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html
index 1fd41f907..88d26f385 100644
--- a/Doc/Manual/Lua.html
+++ b/Doc/Manual/Lua.html
@@ -1359,7 +1359,7 @@ extern void sort_double(double* arr, int len);
 to create an array in C/C++ then this can be filled within Lua and passed into the function. It works, but it's a bit tedious.
 More details can be found in the carrays.i documentation.
    
 
-
    The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %appy in the correct manner.
    
+
    The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %apply in the correct manner.
    
 
 
    The wrapper file below, shows both the use of carrays as well as the use of the typemap to wrap arrays. 
    
 
diff --git a/Doc/Manual/Varargs.html b/Doc/Manual/Varargs.html
index 13abc8cee..a580c83bd 100644
--- a/Doc/Manual/Varargs.html
+++ b/Doc/Manual/Varargs.html
@@ -398,7 +398,7 @@ int execlp(const char *path, const char *arg, ...);
 
    
 
 
    
-Note that str3 is the name of the last argument, as we have used %vargars with 3.
+Note that str3 is the name of the last argument, as we have used %varargs with 3.
 Now execlp("a", "b", "c", "d", "e") will result in an error as one too many arguments has been passed,
 as now only 2 additional 'str' arguments can be passed with the 3rd one always using the specified default NULL.
 
    
diff --git a/Lib/typemaps/implicit.swg b/Lib/typemaps/implicit.swg
index 24bb3dcce..702fb52b8 100644
--- a/Lib/typemaps/implicit.swg
+++ b/Lib/typemaps/implicit.swg
@@ -1,5 +1,5 @@
 /*
-  The %implict macro allows a SwigType (Class) to be accepted
+  The %implicit macro allows a SwigType (Class) to be accepted
   as an input parameter and use its implicit constructors when needed.
 
   For example:

From 9812b27fb0a7e097a6b7a1a54a632ab39f48a2b4 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 11 May 2013 07:47:52 +0100
Subject: [PATCH 503/538] Add .gitattributes file

For specifying what not to export when running 'git archive'
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..596615322
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore

From a5b0e34dea544ffcc61cb4f587e32cbebce3d727 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 12 May 2013 15:31:33 +0100
Subject: [PATCH 504/538] Update release scripts to use git instead of svn

---
 Tools/mkdist.py    | 39 ++++++++++++++++++++++++++++++++++++---
 Tools/mkrelease.py |  5 +----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/Tools/mkdist.py b/Tools/mkdist.py
index f2a04542c..1585523cf 100755
--- a/Tools/mkdist.py
+++ b/Tools/mkdist.py
@@ -6,6 +6,7 @@
 import sys
 import string
 import os
+import subprocess
 
 def failed():
   print "mkdist.py failed to complete"
@@ -34,10 +35,42 @@ os.system("rm -f "+dirname+".tar.gz")
 print "Removing "+dirname+".tar.gz if exists"
 os.system("rm -f "+dirname+".tar")
 
-# Do a SVN export into the directory name
+# Grab the code from git
 
-print "Grabbing latest SWIG from svn"
-os.system("svn export -r HEAD https://swig.svn.sourceforge.net/svnroot/swig/trunk "+dirname) == 0 or failed()
+print "Checking git repository is in sync with remote repository"
+os.system("git remote update") == 0 or failed()
+command = ["git", "status", "--porcelain", "-uno"]
+out = subprocess.check_output(command)
+if out.strip() != "":
+  print "Local git repository has modifications"
+  print " ".join(command)
+  print out
+  sys.exit(3)
+
+command = ["git", "log", "--oneline", "master..origin/master"]
+out = subprocess.check_output(command)
+if out.strip() != "":
+  print "Remote repository has additional modifications to local repository"
+  print " ".join(command)
+  print out
+  sys.exit(3)
+
+command = ["git", "log", "--oneline", "origin/master..master"]
+out = subprocess.check_output(command)
+if out.strip() != "":
+  print "Local repository has modifications not pushed to the remote repository"
+  print "These should be pushed and checked that they pass Continuous Integration testing before continuing"
+  print " ".join(command)
+  print out
+  sys.exit(3)
+
+print "Tagging release"
+tag = "'rel-" + version + "'"
+os.system("git tag -a -m " + tag + " " + tag) == 0 or failed()
+
+print "Grabbing tagged release git repository using 'git archive' into " + outdir
+outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/"
+os.system("(cd .. && git archive --prefix=" + outdir + tag + " . | tar -xf -)") == 0 or failed()
 
 # Remove the debian directory -- it's not official
 
diff --git a/Tools/mkrelease.py b/Tools/mkrelease.py
index 9ca96bc6f..9eceba07e 100755
--- a/Tools/mkrelease.py
+++ b/Tools/mkrelease.py
@@ -43,9 +43,6 @@ os.system("cat swig-" + version + "/README " + "swig-" + version + "/CHANGES.cur
 os.system("rsync --archive --verbose -P --times -e ssh " + "swig-" + version + ".tar.gz " + full_readme_file + " " + swig_dir_sf) and failed("")
 os.system("rsync --archive --verbose -P --times -e ssh " + "swigwin-" + version + ".zip " + full_readme_file + " " + swigwin_dir_sf) and failed("")
 
-print "Tagging release"
-os.system("svn copy -m \"rel-" + version + "\" https://swig.svn.sourceforge.net/svnroot/swig/trunk https://swig.svn.sourceforge.net/svnroot/swig/tags/rel-" + version + "/")
-
 print "Finished"
 
-print "Now log in to SourceForge and set the operating systems applicable to the newly uploaded tarball and zip file."
+print "Now log in to SourceForge and set the operating systems applicable to the newly uploaded tarball and zip file. Also remember to do a 'git push'."

From a3e23668824aa2f4a397fef95cedaee25d6d381f Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 12 May 2013 19:16:42 +0100
Subject: [PATCH 505/538] Fix release script

---
 Tools/mkdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/mkdist.py b/Tools/mkdist.py
index 1585523cf..8bec81ea5 100755
--- a/Tools/mkdist.py
+++ b/Tools/mkdist.py
@@ -68,8 +68,8 @@ print "Tagging release"
 tag = "'rel-" + version + "'"
 os.system("git tag -a -m " + tag + " " + tag) == 0 or failed()
 
-print "Grabbing tagged release git repository using 'git archive' into " + outdir
 outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/"
+print "Grabbing tagged release git repository using 'git archive' into " + outdir
 os.system("(cd .. && git archive --prefix=" + outdir + tag + " . | tar -xf -)") == 0 or failed()
 
 # Remove the debian directory -- it's not official

From de12f6c25e6e50724626d4bf954d16bde59ef4cd Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 12 May 2013 21:27:38 +0100
Subject: [PATCH 506/538] Fix release script

---
 Tools/mkdist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/mkdist.py b/Tools/mkdist.py
index 8bec81ea5..234c768f2 100755
--- a/Tools/mkdist.py
+++ b/Tools/mkdist.py
@@ -70,7 +70,7 @@ os.system("git tag -a -m " + tag + " " + tag) == 0 or failed()
 
 outdir = os.path.basename(os.getcwd()) + "/" + dirname + "/"
 print "Grabbing tagged release git repository using 'git archive' into " + outdir
-os.system("(cd .. && git archive --prefix=" + outdir + tag + " . | tar -xf -)") == 0 or failed()
+os.system("(cd .. && git archive --prefix=" + outdir + " " + tag + " . | tar -xf -)") == 0 or failed()
 
 # Remove the debian directory -- it's not official
 

From f09231d282f005e2b91664920ac3e64b85bea7b5 Mon Sep 17 00:00:00 2001
From: Karl Wette 
Date: Mon, 13 May 2013 12:27:21 +0200
Subject: [PATCH 507/538] Add CCache/ccache-swig.1 to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fbeebc67d..eb3aa012c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@ swig.spec
 # Build Artifacts
 .dirstamp
 CCache/ccache-swig
+CCache/ccache-swig.1
 Source/CParse/parser.c
 Source/CParse/parser.h
 Source/eswig

From 3ddea71f332449a38b9c1827a1406dd0bfc66d62 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 13 May 2013 18:10:59 +0100
Subject: [PATCH 508/538] Clear up license ambiguity in swigwarn.swg.

Also tidies up swigwarn.swg a bit.
---
 Makefile.in | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index cfa6d0933..0ac8c88f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -432,12 +432,8 @@ maintainer-clean:
 
 $(srcdir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h
 	mkdir -p Lib
-	echo "/* Automatically generated file containing all the swig warning codes.  */" > $@
-	echo "/* Do not modify this file by hand, change 'Source/Include/swigwarn.h'  */" >> $@
-	echo "/* and use the command 'make Lib/swigwarn.swg' instead.                 */" >> $@
-	echo >> $@; echo >> $@
-	awk '/#define WARN/{$$1="%define"; $$2="SWIG"$$2; $$3=sprintf("%d %%enddef", $$3); print $$0; next;}\
-	      /#/{next;} {print $0}' < $? >> $@
+	echo "/* SWIG warning codes */" > $@
+	cat $? | grep "^#define WARN\|/\*.*\*/\|^[ \t]*$$" | sed 's/^#define \(WARN.*[0-9]\+\)\(.*\)$$/%define SWIG\1 %enddef\2/' >> $@
 
 #####################################################################
 # TARGETS: install & friends

From 090d2505d1152b682527f80d6ac90b4382ff967d Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Mon, 13 May 2013 21:40:01 +0200
Subject: [PATCH 509/538] Guile create functional class example

---
 Examples/guile/class/runme.scm | 56 +++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/Examples/guile/class/runme.scm b/Examples/guile/class/runme.scm
index 6bd7bf299..70fe63151 100644
--- a/Examples/guile/class/runme.scm
+++ b/Examples/guile/class/runme.scm
@@ -1,6 +1,60 @@
+; file: runme.py
+
+; This file illustrates the proxy class C++ interface generated
+; by SWIG.
 
 (dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
 
-(format (current-error-port) "TODO: code to demonstrate the class example\n")
+; Convenience wrapper around the display function
+; (which only accepts one argument at the time)
+
+(define (mdisplay-newline . args)
+  (for-each display args)
+  (newline))
+
+; ----- Object creation -----
+
+(mdisplay-newline "Creating some objects:")
+(define c (new-Circle 10))
+(mdisplay-newline "    Created circle " c)
+(define s (new-Square 10))
+(mdisplay-newline "    Created square " s)
+
+; ----- Access a static member -----
+
+(mdisplay-newline "\nA total of " (Shape-nshapes) " shapes were created")
+
+; ----- Member data access -----
+
+; Set the location of the object
+
+(Shape-x-set c 20)
+(Shape-y-set c 30)
+
+(Shape-x-set s -10)
+(Shape-y-set s 5)
+
+(mdisplay-newline "\nHere is their current position:")
+(mdisplay-newline "    Circle = (" (Shape-x-get c) "," (Shape-y-get c) ")")
+(mdisplay-newline "    Square = (" (Shape-x-get s) "," (Shape-y-get s) ")")
+
+; ----- Call some methods -----
+
+(mdisplay-newline "\nHere are some properties of the shapes:")
+(define (shape-props o)
+  (mdisplay-newline "   " o)
+  (mdisplay-newline "   area      = " (Shape-area o))
+  (mdisplay-newline "   perimeter = " (Shape-perimeter o)))
+(for-each  shape-props (list c s))
+
+(mdisplay-newline "\nGuess I'll clean up now")
+
+; Note: this invokes the virtual destructor
+(delete-Shape c)
+(delete-Shape s)
+
+(define s 3)
+(mdisplay-newline (Shape-nshapes) " shapes remain")
+(mdisplay-newline "Goodbye")
 
 (exit 0)

From cb24c110df2e52d87c6f454e20002a2f342ff8e3 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Mon, 13 May 2013 22:31:29 +0200
Subject: [PATCH 510/538] Guile remove references to -gh and -scm from manual

---
 Doc/Manual/Guile.html | 65 +++++++++++--------------------------------
 1 file changed, 16 insertions(+), 49 deletions(-)

diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html
index cfbfbd0b7..17e3a3fab 100644
--- a/Doc/Manual/Guile.html
+++ b/Doc/Manual/Guile.html
@@ -27,8 +27,7 @@
 
  • Typemaps
 
  • Representation of pointers as smobs
 
 
  • Exception Handling
@@ -73,16 +72,13 @@ we explicitly prefix the context, e.g., "guile-module".
 
    23.3 Old GH Guile API
    
 
 
-
    Support for the guile GH wrapper code generation has been dropped. The last
-version of SWIG that can still generate guile GH wrapper code is 2.0.9. Please
-use that version if you really need the GH wrapper code.
-
-
    Guile 1.8 and older could be interfaced using a two different api's, the SCM
+
    Guile 1.8 and older could be interfaced using two different api's, the SCM
 or the GH API. The GH interface to guile is deprecated.  Read more about why in the 
 Guile manual.
 
-
    The SCM wrapper generation assumes a guile version >= 1.8 and has several advantages over
-the "-gh" wrapper generation including garbage collection and GOOPS support.
+
    Support for the guile GH wrapper code generation has been dropped from SWIG. The last
+version of SWIG that can still generate guile GH wrapper code is 2.0.9. Please
+use that version if you really need the GH wrapper code.
 
 
    23.4 Linkage
    
 
@@ -212,7 +208,7 @@ are using multiple modules.
 
 
    SWIG can also generate wrapper code that does all the Guile module
 declarations on its own if you pass it the -Linkage
-module command-line option. This requires Guile 1.5.0 or later.
+module command-line option.
 
 
    The module name is set with the -package and
 -module command-line options. Suppose you want to define
@@ -235,7 +231,7 @@ shared libraries into Guile; all bindings are automatically put in
 newly created Guile modules. 
 
    
 
    -(define my-so (dynamic-link "./libfoo.so"))
+(define my-so (dynamic-link "./libfoo"))
 ;; create new module and put bindings there:
 (dynamic-call "scm_init_my_modules_foo_module" my-so) 
 
    
@@ -424,7 +420,7 @@ representing the expected pointer type.  See also
 If the Scheme object passed was not a SWIG smob representing a compatible
 pointer, a wrong-type-arg exception is raised.
 
-
    23.7.1 GH Smobs
    
+
    23.7.1 Smobs
    
 
 
 
    
@@ -435,44 +431,19 @@ mangled type name.  As Guile allows registering user types, so-called
 implemented now.  The details will be discussed in the following.
 
    
 
-
     A smob is a cons cell where the lower half of the CAR contains the smob type
-tag, while the upper half of the CAR and the whole CDR are available. Every
-module creates its own smob type in the clientdata field of the module. So the
-lower 16 bits of the car of the smob store the tag and the upper 16 bits store
-the index this type is in the array. We can then, given a smob, find its
-swig_type_info struct by using the tag (lower 16 bits of car) to find which
-module this type is in (since each tag is unique for the module). Then we use
-the upper 16 bits to index into the array of types attached to this module.
-Looking up the module from the tag is worst case O(# of modules) but average
-case O(1). This is because the modules are stored in a circularly linked list,
-and when we start searching the modules for the tag, we start looking with the
-module that the function doing the lookup is in. SWIG_Guile_ConvertPtr() takes
-as its first argument the swig_module_info * of the calling function, which is
-where we start comparing tags. Most types will be looked up in the same module
-that created them, so the first module we check will most likely be correct.
-Once we have a swig_type_info structure, we loop through the linked list of
-casts, using pointer comparisons.
    
-
-
    23.7.2 SCM Smobs
    
-
-
-
    The SCM interface (using the "-scm" argument to swig) uses swigrun.swg.
-The whole type system, when it is first initialized, creates two smobs named "swig" and "collected_swig".
+
    The whole type system, when it is first initialized, creates two smobs named "swig" and "collected_swig".
 The swig smob is used for non-garbage collected smobs, while the collected_swig smob is used as described
 below.  Each smob has the same format, which is a double cell created by SCM_NEWSMOB2()
 The first word of data is the pointer to the object and the second word of data is the swig_type_info *
-structure describing this type.  This is a lot easier than the GH interface above because we can store
-a pointer to the type info structure right in the type.  With the GH interface, there was not enough
-room in the smob to store two whole words of data so we needed to store part of the "swig_type_info address"
-in the smob tag.  If a generated GOOPS module has been loaded, smobs will be wrapped by the corresponding
-GOOPS class.
    
+structure describing this type.  If a generated GOOPS module has been loaded, smobs will be wrapped by
+the corresponding GOOPS class.
    
 
 
-
    23.7.3 Garbage Collection
    
+
    23.7.2 Garbage Collection
    
 
 
-
    Garbage collection is a feature of the new SCM interface, and it is automatically included
-if you pass the "-scm" flag to swig.  Thus the swig garbage collection support requires guile >1.6.
+
    Garbage collection is a feature of Guile since version 1.6. As SWIG now requires Guile > 1.8,
+it is automatically included.
 Garbage collection works like this.  Every swig_type_info structure stores in its clientdata field a pointer
 to the destructor for this type.  The destructor is the generated wrapper around the delete function.
 So swig still exports a wrapper for the destructor, it just does not call scm_c_define_gsubr() for
@@ -514,8 +485,7 @@ See Lib/exception.i for details.
 
    If invoked with the command-line option -procdoc
 file, SWIG creates documentation strings for the
 generated wrapper functions, describing the procedure signature and
-return value, and writes them to file. You need Guile 1.4
-or later to make use of the documentation files.
+return value, and writes them to file.
 
 
    SWIG can generate documentation strings in three formats, which are
 selected via the command-line option -procdocformat
@@ -580,10 +550,7 @@ Guile's Object-Oriented Programming System (GOOPS).  GOOPS is a
 sophisticated object system in the spirit of the Common Lisp Object
 System (CLOS).
 
-
    GOOPS support is
-only available with the new SCM interface (enabled with the
--scm command-line option of SWIG).  To enable GOOPS
-support, pass the -proxy argument to
+
    To enable GOOPS support, pass the -proxy argument to
 swig.  This will export the GOOPS wrapper definitions into the
 module.scm file in the directory specified by -outdir or the
 current directory.  GOOPS support requires either passive or module linkage.
    

From 4e4b73e7c005bc074c41f57db99b64bbcfc8b138 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Mon, 13 May 2013 22:39:13 +0200
Subject: [PATCH 511/538] Put guile Example Makefile back under revision
 control

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index eb3aa012c..fb36302f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,6 @@ CCache/config.h
 CCache/config.log
 CCache/config.status
 Examples/Makefile
-Examples/guile/Makefile
 Examples/test-suite/*/Makefile
 Examples/xml/Makefile
 Lib/ocaml/swigp4.ml

From d3cddb135599fa614a49fd0828fa1f1247275c8b Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Mon, 13 May 2013 22:40:16 +0200
Subject: [PATCH 512/538] Guile add two more examples and use load-extension
 instead of dynamic-load

---
 Examples/guile/Makefile             | 47 +++++++++++++++++++++++++++++
 Examples/guile/class/runme.scm      |  4 +--
 Examples/guile/multimap/runme.scm   |  2 +-
 Examples/guile/multivalue/runme.scm |  2 +-
 Examples/guile/std_vector/runme.scm |  2 +-
 5 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 Examples/guile/Makefile

diff --git a/Examples/guile/Makefile b/Examples/guile/Makefile
new file mode 100644
index 000000000..93381dfc0
--- /dev/null
+++ b/Examples/guile/Makefile
@@ -0,0 +1,47 @@
+# Makefile for Guile.  Used by all of the example programs.
+
+subdirs		= simple matrix port constants class multimap multivalue std_vector
+
+top_srcdir	= ../..
+SWIG		= ../$(top_srcdir)/preinst-swig
+CC		= gcc
+CXX		= g++
+CFLAGS		= 
+LIBS		=
+GUILE		= /usr/bin/guile
+GUILE_CFLAGS	=   -pthread
+GUILE_LIBS	=  -pthread  -lguile  
+SWIGOPT		=
+
+WRAP		= $(IFILE:.i=_wrap.c)
+CXXWRAP		= $(IFILE:.i=_wrap.cxx)
+
+SO		= .so
+
+all:
+	for d in $(subdirs) ; do (cd $$d ; $(MAKE)) ; done
+
+clean:
+	for d in $(subdirs) ; do (cd $$d ; $(MAKE) clean) ; done
+	rm -f *~ .~*
+
+guile_clean:
+	rm -f *.o *$(SO) *_wrap* *~ .~* core my-guile $(TARGET)
+
+# This is meant to be used w/ "make -f ../Makefile" from subdirs.
+# Doesn't make sense to use it from here.
+
+sub-all:
+	$(SWIG) -guile $(SWIGOPT) $(IFILE)
+	$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
+
+sub-all-cxx:
+	$(SWIG) -c++ -guile $(SWIGOPT) $(IFILE)
+	$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
+
+run_example:
+	if [ -f $(RUNSCRIPT) ]; then \
+          env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(RUNSCRIPT); \
+        fi
+
+# Makefile ends here
diff --git a/Examples/guile/class/runme.scm b/Examples/guile/class/runme.scm
index 70fe63151..4e47d458d 100644
--- a/Examples/guile/class/runme.scm
+++ b/Examples/guile/class/runme.scm
@@ -1,9 +1,9 @@
-; file: runme.py
+; file: runme.scm
 
 ; This file illustrates the proxy class C++ interface generated
 ; by SWIG.
 
-(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
+(load-extension "./libexample" "scm_init_example_module")
 
 ; Convenience wrapper around the display function
 ; (which only accepts one argument at the time)
diff --git a/Examples/guile/multimap/runme.scm b/Examples/guile/multimap/runme.scm
index d2ab8036e..a4a518a02 100644
--- a/Examples/guile/multimap/runme.scm
+++ b/Examples/guile/multimap/runme.scm
@@ -1,6 +1,6 @@
 ;;; Test out some multi-argument typemaps
 
-(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
+(load-extension "./libexample" "scm_init_example_module")
 
 ; Call the GCD function
 
diff --git a/Examples/guile/multivalue/runme.scm b/Examples/guile/multivalue/runme.scm
index 729f3fa18..0f65797ca 100644
--- a/Examples/guile/multivalue/runme.scm
+++ b/Examples/guile/multivalue/runme.scm
@@ -1,6 +1,6 @@
 ;;;; Show the three different ways to deal with multiple return values
 
-(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
+(load-extension "./libexample" "scm_init_example_module")
 
 ;;; Multiple values as lists. By default, if more than one value is to
 ;;; be returned, a list of the values is created and returned.  The
diff --git a/Examples/guile/std_vector/runme.scm b/Examples/guile/std_vector/runme.scm
index 470f22922..64f56a147 100644
--- a/Examples/guile/std_vector/runme.scm
+++ b/Examples/guile/std_vector/runme.scm
@@ -1,5 +1,5 @@
 
-(dynamic-call "scm_init_example_module" (dynamic-link "./libexample"))
+(load-extension "./libexample" "scm_init_example_module")
 
 ; repeatedly invoke a procedure with v and an index as arguments
 (define (with-vector v proc size-proc)

From 4de24d1d11b4b8eec27ffcd5cf91bba9b009fdc6 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Tue, 14 May 2013 17:06:04 +0200
Subject: [PATCH 513/538] Guile check for at least guile 1.8

---
 configure.ac | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure.ac b/configure.ac
index 968764715..65d2a4c20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1204,6 +1204,17 @@ else
       fi
     fi
 
+    if test -f "$GUILE" ; then
+      AC_MSG_CHECKING([for guile version])
+      guile_version=`guile -c '(display (effective-version))'`
+      AC_MSG_RESULT([$guile_version])
+      guile -c '(if (>= (string->number (effective-version)) 1.8) (exit 0) (exit 1))'
+      if test $? -ne 0 ; then
+        AC_MSG_WARN(Not Guile >= 1.8, SWIG does not support this version of Guile)
+        GUILE=
+      fi
+    fi
+
     if test -z "$GUILE_CFLAGS" ; then
       AC_MSG_CHECKING([for guile compile flags])
       GUILE_CFLAGS="`$GUILE_CONFIG compile`" # Note that this can sometimes be empty

From f3870303c6a2d922832b624d2e3fbafe46d7ba56 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Tue, 14 May 2013 17:06:35 +0200
Subject: [PATCH 514/538] Guile drop unused GUILE_SCM_INTERFACE parameter from
 configure.ac

---
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65d2a4c20..d0b6b66e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1226,15 +1226,12 @@ else
       GUILE_LIBS="`$GUILE_CONFIG link`"
       AC_MSG_RESULT([$GUILE_LIBS])
     fi
-
-    GUILE_SCM_INTERFACE=1
   fi
 fi
 
 AC_SUBST(GUILE)
 AC_SUBST(GUILE_CFLAGS)
 AC_SUBST(GUILE_LIBS)
-AC_SUBST(GUILE_SCM_INTERFACE)
 
 #----------------------------------------------------------------
 # Look for MzScheme
@@ -2234,7 +2231,7 @@ AC_SUBST(SKIP_JAVA)
 
 
 SKIP_GUILE=
-if test -z "$GUILE" || test -z "$GUILE_LIBS" || test -z "$GUILE_SCM_INTERFACE"; then
+if test -z "$GUILE" || test -z "$GUILE_LIBS" ; then
     SKIP_GUILE="1"
 fi
 AC_SUBST(SKIP_GUILE)

From 2560210bfdc9ab76feef26b2f820de092b48190e Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Wed, 15 May 2013 09:38:50 +0200
Subject: [PATCH 515/538] Guile delete Example makefile

---
 .gitignore              |  1 +
 Examples/guile/Makefile | 47 -----------------------------------------
 2 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100644 Examples/guile/Makefile

diff --git a/.gitignore b/.gitignore
index fb36302f6..eb3aa012c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ CCache/config.h
 CCache/config.log
 CCache/config.status
 Examples/Makefile
+Examples/guile/Makefile
 Examples/test-suite/*/Makefile
 Examples/xml/Makefile
 Lib/ocaml/swigp4.ml
diff --git a/Examples/guile/Makefile b/Examples/guile/Makefile
deleted file mode 100644
index 93381dfc0..000000000
--- a/Examples/guile/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Makefile for Guile.  Used by all of the example programs.
-
-subdirs		= simple matrix port constants class multimap multivalue std_vector
-
-top_srcdir	= ../..
-SWIG		= ../$(top_srcdir)/preinst-swig
-CC		= gcc
-CXX		= g++
-CFLAGS		= 
-LIBS		=
-GUILE		= /usr/bin/guile
-GUILE_CFLAGS	=   -pthread
-GUILE_LIBS	=  -pthread  -lguile  
-SWIGOPT		=
-
-WRAP		= $(IFILE:.i=_wrap.c)
-CXXWRAP		= $(IFILE:.i=_wrap.cxx)
-
-SO		= .so
-
-all:
-	for d in $(subdirs) ; do (cd $$d ; $(MAKE)) ; done
-
-clean:
-	for d in $(subdirs) ; do (cd $$d ; $(MAKE) clean) ; done
-	rm -f *~ .~*
-
-guile_clean:
-	rm -f *.o *$(SO) *_wrap* *~ .~* core my-guile $(TARGET)
-
-# This is meant to be used w/ "make -f ../Makefile" from subdirs.
-# Doesn't make sense to use it from here.
-
-sub-all:
-	$(SWIG) -guile $(SWIGOPT) $(IFILE)
-	$(CC) $(CFLAGS) -o $(TARGET) $(SRCS) $(WRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
-
-sub-all-cxx:
-	$(SWIG) -c++ -guile $(SWIGOPT) $(IFILE)
-	$(CXX) $(CFLAGS) -o $(TARGET) $(SRCS) $(CXXWRAP) $(GUILE_CFLAGS) $(GUILE_LIBS) $(LIBS)
-
-run_example:
-	if [ -f $(RUNSCRIPT) ]; then \
-          env GUILE_AUTO_COMPILE=0 LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(GUILE) -l $(RUNSCRIPT); \
-        fi
-
-# Makefile ends here

From b14b1c6de09ae48675722c2aa7709c7ace63de12 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 14 May 2013 19:49:32 +0100
Subject: [PATCH 516/538] Use given Guile version when checking if version is >
 1.8

Also use conventional output for our configure if something is not
working as expected.
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d0b6b66e4..c94c2e962 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,11 +1206,12 @@ else
 
     if test -f "$GUILE" ; then
       AC_MSG_CHECKING([for guile version])
-      guile_version=`guile -c '(display (effective-version))'`
+      guile_version=`$GUILE -c '(display (effective-version))'`
       AC_MSG_RESULT([$guile_version])
-      guile -c '(if (>= (string->number (effective-version)) 1.8) (exit 0) (exit 1))'
-      if test $? -ne 0 ; then
-        AC_MSG_WARN(Not Guile >= 1.8, SWIG does not support this version of Guile)
+      AC_MSG_CHECKING([for guile version >= 1.8])
+      guile_good_version=`$GUILE -c '(if (>= (string->number (effective-version)) 1.8) (display "yes") (display "no"))'`
+      AC_MSG_RESULT([$guile_good_version])
+      if test x"$guile_good_version" != xyes ; then
         GUILE=
       fi
     fi

From 6f1aea7a12772ade649a4a92ff4f07dafe0cd520 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Tue, 14 May 2013 21:32:09 +0100
Subject: [PATCH 517/538] Cosmetic makefile tidy up

---
 Examples/guile/class/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Examples/guile/class/Makefile b/Examples/guile/class/Makefile
index 0130e5fc1..8de4f292b 100644
--- a/Examples/guile/class/Makefile
+++ b/Examples/guile/class/Makefile
@@ -3,7 +3,6 @@ SWIG       = $(TOP)/../preinst-swig
 CXXSRCS    = example.cxx
 TARGET     = example
 INTERFACE  = example.i
-TOP        = ../..
 
 check: build
 	$(MAKE) -f $(TOP)/Makefile guile_run

From 3f9d7ed4165602af52e3bdad6d2641b8106427d5 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 16 May 2013 08:07:09 +0100
Subject: [PATCH 518/538] Minor fixes after Coverity analysis

---
 Source/Modules/csharp.cxx | 2 +-
 Source/Modules/java.cxx   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 6d5c570b1..44db84264 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -3671,7 +3671,7 @@ public:
 		Replaceall(pre, "$iminput", ln);
 		if (Len(pre_code) > 0)
 		  Printf(pre_code, "\n");
-		  Printv(pre_code, pre, NIL);
+		Printv(pre_code, pre, NIL);
 	      }
 	      String *post = Getattr(p, "tmap:csdirectorin:post");
 	      if (post) {
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index dbd110d56..b99bbb4ee 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -138,6 +138,7 @@ public:
       imclass_imports(NULL),
       module_imports(NULL),
       imclass_baseclass(NULL),
+      imclass_package(NULL),
       module_baseclass(NULL),
       imclass_interfaces(NULL),
       module_interfaces(NULL),

From 04b9037c707f3fd179ded0648fa654aa9c95a2a8 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 16 May 2013 19:21:59 +0100
Subject: [PATCH 519/538] Simplify and improve Guile FILE * in typemap

Fix incorrect special variable $name and remove unnecessary temporary
variable.
---
 Lib/guile/ports.i | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/Lib/guile/ports.i b/Lib/guile/ports.i
index 5940b4d3b..7691d3e31 100644
--- a/Lib/guile/ports.i
+++ b/Lib/guile/ports.i
@@ -21,33 +21,30 @@
  */
 
 %typemap(in, doc="$NAME is a file port or a FILE * pointer") FILE *
-  ( int closep )
 {
-  if (SWIG_ConvertPtr($input, (void**) &($1), $1_descriptor, 0) == 0) {
-    closep = 0;
-  }
-  else if(!(SCM_FPORTP($input)))
-    scm_wrong_type_arg("$name", $argnum, $input);
-  else {
-    int fd;
-    if (SCM_OUTPUT_PORT_P($input))
-      scm_force_output($input);
-    fd=dup(SCM_FPORT_FDES($input));
-    if(fd==-1) 
-      scm_misc_error("$name", strerror(errno), SCM_EOL);
-    $1=fdopen(fd,
-		   SCM_OUTPUT_PORT_P($input)
-		   ? (SCM_INPUT_PORT_P($input)
-		      ? "r+" : "w")
-		   : "r");
-    if($1==NULL)
-      scm_misc_error("$name", strerror(errno), SCM_EOL);
-    closep = 1;
+  if (SWIG_ConvertPtr($input, (void**) &($1), $1_descriptor, 0) != 0) {
+    if (!(SCM_FPORTP($input))) {
+      scm_wrong_type_arg("$symname", $argnum, $input);
+    } else {
+      int fd;
+      if (SCM_OUTPUT_PORT_P($input)) {
+        scm_force_output($input);
+      }
+      fd=dup(SCM_FPORT_FDES($input));
+      if (fd==-1) {
+        scm_misc_error("$symname", strerror(errno), SCM_EOL);
+      }
+      $1=fdopen(fd, SCM_OUTPUT_PORT_P($input) ? (SCM_INPUT_PORT_P($input) ? "r+" : "w") : "r");
+      if ($1==NULL) {
+        scm_misc_error("$symname", strerror(errno), SCM_EOL);
+      }
+    }
   }
 }
 
 %typemap(freearg) FILE*  {
-  if (closep$argnum)
+  if ($1) {
     fclose($1);
+  }
 }
 

From 4ba9365e0f398b9cec0dbb9f8950b23e47507c28 Mon Sep 17 00:00:00 2001
From: William Fulton 
Date: Sun, 19 May 2013 00:44:06 +0100
Subject: [PATCH 520/538] Fix ccache-swig internal error bug due to premature
 file cleanup

Fixes SF bug 1319 which shows up as a failure in the ccache tests on
Debian 64 bit Wheezy, possibly because ENABLE_ZLIB is defined.

This bug is due to files being too aggressively cleaned up part way
through the caching. The .stderr file is cached and then retrieved
from the cache for displaying to stderr. However, the stats are updated
between caching and using the .stderr file. During the stats update the
cache is cleaned and the newly cached files can be removed if the max
number of files per directory is low. Really the cache should be cleaned
up at exit to solve this (as is done in ccache-3.1). The workaround fix
ensures the cached files are ignored during cleanup, which is a bit
tricky as sometimes files from a previous run have the same time stamp,
so that don't appear to be the oldest in the cache.
---
 CCache/ccache.h  |  2 +-
 CCache/cleanup.c | 28 ++++++++++++++++++++++++----
 CCache/stats.c   |  3 ++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CCache/ccache.h b/CCache/ccache.h
index 668ce8288..3c3e22311 100644
--- a/CCache/ccache.h
+++ b/CCache/ccache.h
@@ -159,7 +159,7 @@ int asprintf(char **ptr, const char *format, ...);
 int snprintf(char *,size_t ,const char *, ...);
 #endif
 
-void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize);
+void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize, size_t minfiles);
 void cleanup_all(const char *dir);
 void wipe_all(const char *dir);
 
diff --git a/CCache/cleanup.c b/CCache/cleanup.c
index 99312283e..f54ee54d9 100644
--- a/CCache/cleanup.c
+++ b/CCache/cleanup.c
@@ -75,21 +75,40 @@ static void traverse_fn(const char *fname, struct stat *st)
 
 /* sort the files we've found and delete the oldest ones until we are
    below the thresholds */
-static void sort_and_clean(void)
+static void sort_and_clean(size_t minfiles)
 {
 	unsigned i;
+	size_t adjusted_minfiles = minfiles;
 
 	if (num_files > 1) {
 		/* sort in ascending data order */
 		qsort(files, num_files, sizeof(struct files *), 
 		      (COMPAR_FN_T)files_compare);
 	}
+	/* ensure newly cached files (minfiles) are kept - instead of matching
+	   the filenames of those newly cached, a faster and simpler approach
+	   assumes these are the most recent in the cache and if any other
+	   cached files have an identical time stamp, they will also be kept -
+	   this approach would not be needed if the cleanup was done at exit. */
+	if (minfiles != 0 && minfiles < num_files) {
+		unsigned minfiles_index = num_files - minfiles;
+		time_t minfiles_time = files[minfiles_index]->mtime;
+		for (i=1; i<=minfiles_index; i++) {
+			if (files[minfiles_index-i]->mtime == minfiles_time)
+				adjusted_minfiles++;
+			else
+				break;
+		}
+	}
 	
 	/* delete enough files to bring us below the threshold */
 	for (i=0;ifname) != 0 && errno != ENOENT) {
 			fprintf(stderr, "unlink %s - %s\n", 
 				files[i]->fname, strerror(errno));
@@ -103,7 +122,7 @@ static void sort_and_clean(void)
 }
 
 /* cleanup in one cache subdir */
-void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize)
+void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize, size_t minfiles)
 {
 	unsigned i;
 
@@ -117,7 +136,7 @@ void cleanup_dir(const char *dir, size_t maxfiles, size_t maxsize)
 	traverse(dir, traverse_fn);
 
 	/* clean the cache */
-	sort_and_clean();
+	sort_and_clean(minfiles);
 
 	stats_set_sizes(dir, total_files, total_size);
 
@@ -151,7 +170,8 @@ void cleanup_all(const char *dir)
 
 		cleanup_dir(dname, 
 			    counters[STATS_MAXFILES], 
-			    counters[STATS_MAXSIZE]);
+			    counters[STATS_MAXSIZE],
+			    0);
 		free(dname);
 		free(sfile);
 	}
diff --git a/CCache/stats.c b/CCache/stats.c
index 92bc4a835..d2122bcd3 100644
--- a/CCache/stats.c
+++ b/CCache/stats.c
@@ -168,7 +168,8 @@ static void stats_update_size(enum stats stat, size_t size, size_t numfiles)
 
 	if (need_cleanup) {
 		char *p = dirname(stats_file);
-		cleanup_dir(p, counters[STATS_MAXFILES], counters[STATS_MAXSIZE]);
+		cleanup_dir(p, counters[STATS_MAXFILES], counters[STATS_MAXSIZE],
+			    numfiles);
 		free(p);
 	}
 }

From 149972542ed42753ff3d67c98c46020f7df94e5c Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 19 May 2013 01:16:23 +0100
Subject: [PATCH 521/538] Add note on ccache-swig internal error bug due to
 premature file cleanup to changes file

---
 CHANGES.current | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index eb3b0a8d1..3d41780c2 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,15 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-05-19: wsfulton
+            Fix ccache-swig internal error bug due to premature file cleanup.
+
+            Fixes SF bug 1319 which shows up as a failure in the ccache tests on
+            Debian 64 bit Wheezy, possibly because ENABLE_ZLIB is defined.
+
+            This is a corner case which will be hit when the maximum number of files
+            in the cache is set to be quite low (-F option), resulting in a cache miss.
+
 2013-05-09: kwwette
             [Octave] Fix bugs in Octave module loading:
             - fix a memory leak in setting of global variables

From 6e794da3f3d74cef1a049780d0dab40a1a4326b3 Mon Sep 17 00:00:00 2001
From: Geert Janssens 
Date: Tue, 21 May 2013 17:23:37 +0200
Subject: [PATCH 522/538] Guile port example - print a message to show the
 error is expected

---
 Examples/guile/port/runme.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Examples/guile/port/runme.scm b/Examples/guile/port/runme.scm
index 68e9b8e85..1a9b93038 100644
--- a/Examples/guile/port/runme.scm
+++ b/Examples/guile/port/runme.scm
@@ -21,6 +21,8 @@
 	   (lambda ()
 	     (print-int (current-output-port) 314159))))
        (lambda args
+	 (display "Attempting to write to a string or soft port will result in this error:")
+	 (newline)
 	 (write args) (newline)))
 
 ;; Read from a file port. Note that it is a bad idea to mix Scheme and

From 0f1e3da5deae77c100ed3d72243208d63ae4c1db Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 23 May 2013 19:30:58 +0100
Subject: [PATCH 523/538] Fix the high passed to PyTuple_GetSlice in varargs
 wrappers.

Harmless bug as slices can take any size larger than the actual size for
the high value. Reported in SF Bug 1326.
---
 .../test-suite/python/python_varargs_typemap_runme.py     | 3 +++
 Examples/test-suite/python_varargs_typemap.i              | 8 ++++++--
 Source/Modules/python.cxx                                 | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/python/python_varargs_typemap_runme.py b/Examples/test-suite/python/python_varargs_typemap_runme.py
index 3c3f042eb..79479e449 100644
--- a/Examples/test-suite/python/python_varargs_typemap_runme.py
+++ b/Examples/test-suite/python/python_varargs_typemap_runme.py
@@ -2,3 +2,6 @@ import python_varargs_typemap
 
 if (python_varargs_typemap.testfunc(1, 2.0, "three") != "three") :
     raise RuntimeError("testfunc failed!")
+
+if (python_varargs_typemap.testfunc(1, 2.0, "three", "four", "five") != "threefourfive") :
+    raise RuntimeError("testfunc failed!")
diff --git a/Examples/test-suite/python_varargs_typemap.i b/Examples/test-suite/python_varargs_typemap.i
index 4bc6f3fbd..09189f654 100644
--- a/Examples/test-suite/python_varargs_typemap.i
+++ b/Examples/test-suite/python_varargs_typemap.i
@@ -51,10 +51,14 @@ char* testfunc (int arg1, double arg2, ...)
 {
   va_list ap;
   char *c;
+  static char buffer[1024];
+  buffer[0] = 0;
   va_start(ap, arg2);
-  c = va_arg(ap, char*);
+  while ((c = va_arg(ap, char *))) {
+    strcat(buffer, c);
+  }
   va_end(ap);
-  return c;
+  return buffer;
 }
 }
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index e3d8c7d50..9a068a40a 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2614,7 +2614,7 @@ public:
 	Printf(f->code, "}\n");
       } else {
 	Printf(f->code, "newargs = PyTuple_GetSlice(args,0,%d);\n", num_fixed_arguments);
-	Printf(f->code, "varargs = PyTuple_GetSlice(args,%d,PyTuple_Size(args)+1);\n", num_fixed_arguments);
+	Printf(f->code, "varargs = PyTuple_GetSlice(args,%d,PyTuple_Size(args));\n", num_fixed_arguments);
       }
       Printf(f->code, "resultobj = %s__varargs__(%s,newargs,varargs);\n", wname, builtin ? "self" : "NULL");
       Append(f->code, "Py_XDECREF(newargs);\n");

From 8700e79b3e6036898475c436d0ad291254eb42de Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Thu, 23 May 2013 23:24:19 +0100
Subject: [PATCH 524/538] Guile port example fix for Guile 2.0

Rewinding the file before passing it to C fixed the problem of not being
able to read the file contents.

Also explain the error about writing to a string.
---
 Examples/guile/port/runme.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Examples/guile/port/runme.scm b/Examples/guile/port/runme.scm
index 1a9b93038..3ff447eff 100644
--- a/Examples/guile/port/runme.scm
+++ b/Examples/guile/port/runme.scm
@@ -21,14 +21,15 @@
 	   (lambda ()
 	     (print-int (current-output-port) 314159))))
        (lambda args
-	 (display "Attempting to write to a string or soft port will result in this error:")
+	 (display "Below shows that attempting to write to a string or soft port will result in a wrong-type-error...")
 	 (newline)
 	 (write args) (newline)))
 
 ;; Read from a file port. Note that it is a bad idea to mix Scheme and
-;; C input because of buffering.
+;; C input because of buffering, hence the call to seek to rewind the file.
 (with-input-from-file "test.out"
   (lambda ()
+    (seek (current-input-port) 0 SEEK_SET)
     (display (read-int (current-input-port)))
     (newline)))
 

From 074c0039db34009e0ba138f958719197feae5581 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 24 May 2013 18:57:26 +0100
Subject: [PATCH 525/538] Fix Python version checking in Python tests

---
 Examples/test-suite/python/autodoc_runme.py               | 2 +-
 Examples/test-suite/python/file_test_runme.py             | 2 +-
 Examples/test-suite/python/li_std_containers_int_runme.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/python/autodoc_runme.py b/Examples/test-suite/python/autodoc_runme.py
index 634b2dccf..5776ad3ef 100644
--- a/Examples/test-suite/python/autodoc_runme.py
+++ b/Examples/test-suite/python/autodoc_runme.py
@@ -122,7 +122,7 @@ check(A.func3static.__doc__,  "\n"
 "        "
 )
 
-if sys.version[0:2] > (2, 4):
+if sys.version_info[0:2] > (2, 4):
   # Python 2.4 does not seem to work
   check(A.variable_a.__doc__, "A_variable_a_get(self) -> int")
   check(A.variable_b.__doc__, "A_variable_b_get(A self) -> int")
diff --git a/Examples/test-suite/python/file_test_runme.py b/Examples/test-suite/python/file_test_runme.py
index 3d8b153db..9b94fa3b3 100644
--- a/Examples/test-suite/python/file_test_runme.py
+++ b/Examples/test-suite/python/file_test_runme.py
@@ -1,7 +1,7 @@
 import sys
 import file_test
 
-if sys.version[0:2] > (3, 0):
+if sys.version_info[0:2] < (3, 0):
   file_test.nfile(sys.stdout)
 
 cstdout = file_test.GetStdOut()
diff --git a/Examples/test-suite/python/li_std_containers_int_runme.py b/Examples/test-suite/python/li_std_containers_int_runme.py
index f18e33812..3cbbb2862 100644
--- a/Examples/test-suite/python/li_std_containers_int_runme.py
+++ b/Examples/test-suite/python/li_std_containers_int_runme.py
@@ -78,7 +78,7 @@ def container_insert_step(i, j, step, newval):
     il_error = e
 
   # Python 2.6 contains bug fixes in extended slicing syntax: http://docs.python.org/2/whatsnew/2.6.html
-  skip_check = ps_error != None and(iv_error == il_error == None) and step > 0 and (sys.version[0:2] < (2, 6))
+  skip_check = ps_error != None and(iv_error == il_error == None) and step > 0 and (sys.version_info[0:2] < (2, 6))
   if not(skip_check):
     if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
       raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error)

From f15eb3f5ec3ee77d521d675f42654edde9c46509 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Fri, 24 May 2013 22:51:27 +0100
Subject: [PATCH 526/538] Fix vararg documentation for Python 3

Memory handling is different to Python 2.
---
 Doc/Manual/Varargs.html                       | 32 +++++++++++++------
 .../python/python_varargs_typemap_runme.py    |  2 +-
 Examples/test-suite/python_varargs_typemap.i  | 28 +++++++++-------
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/Doc/Manual/Varargs.html b/Doc/Manual/Varargs.html
index a580c83bd..9564fe00b 100644
--- a/Doc/Manual/Varargs.html
+++ b/Doc/Manual/Varargs.html
@@ -509,10 +509,10 @@ like this:
 
 
    
 
    -%typemap(in) (...)(char *args[10]) {
+%typemap(in) (...)(char *vargs[10]) {
   int i;
   int argc;
-  for (i = 0; i < 10; i++) args[i] = 0;
+  for (i = 0; i < 10; i++) vargs[i] = 0;
   argc = PyTuple_Size(varargs);
   if (argc > 10) {
     PyErr_SetString(PyExc_ValueError, "Too many arguments");
@@ -528,7 +528,7 @@ like this:
        return NULL;
     }
     pystr = PyUnicode_AsUTF8String(pyobj);
-    str = PyBytes_AsString(pystr);
+    str = strdup(PyBytes_AsString(pystr));
     Py_XDECREF(pystr);
 %#else  
     if (!PyString_Check(pyobj)) {
@@ -537,22 +537,34 @@ like this:
     }
     str = PyString_AsString(pyobj);
 %#endif
-    args[i] = str;
+    vargs[i] = str;
   }
-  $1 = (void *) args;
+  $1 = (void *)vargs;
+}
+
+%typemap(freearg) (...) {
+%#if PY_VERSION_HEX>=0x03000000
+  int i;
+  for (i = 0; i < 10; i++) {
+    free(vargs$argnum[i]);
+  }
+%#endif
 }
 
    
 
    
 
 
    
-In this typemap, the special variable varargs is a tuple
+In the 'in' typemap, the special variable varargs is a tuple
 holding all of the extra arguments passed (this is specific to the
 Python module).  The typemap then pulls this apart and sticks the
 values into the array of strings args.  Then, the array is
 assigned to $1 (recall that this is the void *
 variable corresponding to (...)).  However, this assignment
 is only half of the picture----clearly this alone is not enough to
-make the function work.  To patch everything up, you have to rewrite the
+make the function work.  The 'freearg' typemap cleans up memory
+allocated in the 'in' typemap; this code is generated to be called
+after the execlp function is called. To patch everything
+up, you have to rewrite the
 underlying action code using the %feature directive like
 this:
 
    
@@ -560,9 +572,9 @@ this:
 
    
 
     %feature("action") execlp {
-   char *args = (char **) arg3;
-   result = execlp(arg1, arg2, args[0], args[1], args[2], args[3], args[4],
-                   args[5],args[6],args[7],args[8],args[9], NULL);
+  char **vargs = (char **) arg3;
+  result = execlp(arg1, arg2, vargs[0], vargs[1], vargs[2], vargs[3], vargs[4],
+                  vargs[5], vargs[6], vargs[7], vargs[8], vargs[9], NULL);
 }
 
 int execlp(const char *path, const char *arg, ...);
diff --git a/Examples/test-suite/python/python_varargs_typemap_runme.py b/Examples/test-suite/python/python_varargs_typemap_runme.py
index 79479e449..65be757c8 100644
--- a/Examples/test-suite/python/python_varargs_typemap_runme.py
+++ b/Examples/test-suite/python/python_varargs_typemap_runme.py
@@ -4,4 +4,4 @@ if (python_varargs_typemap.testfunc(1, 2.0, "three") != "three") :
     raise RuntimeError("testfunc failed!")
 
 if (python_varargs_typemap.testfunc(1, 2.0, "three", "four", "five") != "threefourfive") :
-    raise RuntimeError("testfunc failed!")
+    raise RuntimeError("testfunc failed! {}")
diff --git a/Examples/test-suite/python_varargs_typemap.i b/Examples/test-suite/python_varargs_typemap.i
index 09189f654..09deea3b7 100644
--- a/Examples/test-suite/python_varargs_typemap.i
+++ b/Examples/test-suite/python_varargs_typemap.i
@@ -4,13 +4,10 @@
   * chapter of the SWIG manual.
   */
 
-%{
-%}
-
-%typemap(in) (...)(char *args[10]) {
+%typemap(in) (...)(char *vargs[10]) {
   int i;
   int argc;
-  for (i = 0; i < 10; i++) args[i] = 0;
+  for (i = 0; i < 10; i++) vargs[i] = 0;
   argc = PyTuple_Size(varargs);
   if (argc > 10) {
     PyErr_SetString(PyExc_ValueError, "Too many arguments");
@@ -26,7 +23,7 @@
        return NULL;
     }
     pystr = PyUnicode_AsUTF8String(pyobj);
-    str = PyBytes_AsString(pystr);
+    str = strdup(PyBytes_AsString(pystr));
     Py_XDECREF(pystr);
 %#else  
     if (!PyString_Check(pyobj)) {
@@ -35,15 +32,24 @@
     }
     str = PyString_AsString(pyobj);
 %#endif
-    args[i] = str;
+    vargs[i] = str;
   }
-  $1 = (void *) args;
+  $1 = (void *)vargs;
 }
 
 %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);
+  char **vargs = (char **) arg3;
+  result = testfunc(arg1, arg2, vargs[0], vargs[1], vargs[2], vargs[3], vargs[4],
+                    vargs[5], vargs[6], vargs[7], vargs[8], vargs[9], NULL);
+}
+
+%typemap(freearg) (...) {
+%#if PY_VERSION_HEX>=0x03000000
+  int i;
+  for (i = 0; i < 10; i++) {
+    free(vargs$argnum[i]);
+  }
+%#endif
 }
 
 %inline {

From 030b97c891ce13a66801632e875169a2485413c6 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 25 May 2013 00:15:48 +0100
Subject: [PATCH 527/538] Documentation sectioning update

---
 Doc/Manual/Contents.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index ac21bcd1e..32fa32e96 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -828,8 +828,7 @@
 
  • Typemaps
 
  • Representation of pointers as smobs
 
 
  • Exception Handling

From 3357ee85cd7de581b78b28839e8dc5229d6c99ab Mon Sep 17 00:00:00 2001
From: Artem Serebriyskiy 
Date: Fri, 24 May 2013 13:34:37 +0400
Subject: [PATCH 528/538] Fix all attributes macroses

---
 Lib/typemaps/attribute.swg | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg
index 214133edc..d30b51183 100644
--- a/Lib/typemaps/attribute.swg
+++ b/Lib/typemaps/attribute.swg
@@ -195,42 +195,42 @@
 
 %define %attribute(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
   #if #SetMethod != ""
-    %attribute_custom(Class, AttributeType, AttributeName, GetMethod, SetMethod, self_->GetMethod(), self_->SetMethod(val_))
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, GetMethod, SetMethod, self_->GetMethod(), self_->SetMethod(val_))
   #else
-    %attribute_readonly(Class, AttributeType, AttributeName, GetMethod, self_->GetMethod())
+    %attribute_readonly(%arg(Class), AttributeType, AttributeName, GetMethod, self_->GetMethod())
   #endif
 %enddef
 
 %define %attribute2(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
   #if #SetMethod != ""
-    %attribute_custom(Class, AttributeType, AttributeName, GetMethod, SetMethod, &self_->GetMethod(), self_->SetMethod(*val_))
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, GetMethod, SetMethod, &self_->GetMethod(), self_->SetMethod(*val_))
   #else
-    %attribute_readonly(Class, AttributeType, AttributeName, GetMethod, &self_->GetMethod())
+    %attribute_readonly(%arg(Class), AttributeType, AttributeName, GetMethod, &self_->GetMethod())
   #endif
 %enddef
 
 %define %attributeref(Class, AttributeType, AttributeName, AccessorMethod...)
   #if #AccessorMethod != ""
-    %attribute_custom(Class, AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #else
-    %attribute_custom(Class, AttributeType, AttributeName, AttributeName, AttributeName, self_->AttributeName(), self_->AttributeName() = val_)
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, AttributeName, AttributeName, self_->AttributeName(), self_->AttributeName() = val_)
   #endif
 %enddef
 
 %define %attribute2ref(Class, AttributeType, AttributeName, AccessorMethod...)
   #if #AccessorMethod != ""
-    %attribute_custom(Class, AttributeType, AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
   #else
-    %attribute_custom(Class, AttributeType, AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
+    %attribute_custom(%arg(Class), AttributeType, AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
   #endif
 %enddef
 
 // deprecated (same as %attributeref, but there is an argument order inconsistency)
 %define %attribute_ref(Class, AttributeType, AccessorMethod, AttributeName...)
   #if #AttributeName != ""
-    %attribute_custom(Class, AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #else
-    %attribute_custom(Class, AttributeType, AccessorMethod, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), AttributeType, AccessorMethod, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #endif
 %enddef
 

From c956c4c87f1bd84ff0b3b1e78b4d8bd9487134c4 Mon Sep 17 00:00:00 2001
From: Artem Serebriyskiy 
Date: Fri, 24 May 2013 13:37:00 +0400
Subject: [PATCH 529/538] Fix %arg in Lib/attribute.i

---
 Lib/attribute.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/attribute.i b/Lib/attribute.i
index 0cc3ff1a3..d580dbfe9 100644
--- a/Lib/attribute.i
+++ b/Lib/attribute.i
@@ -11,7 +11,7 @@
 #define %attribute_exception(code,msg) printf("%s\n",msg)
 
 #ifndef %arg
-#define %arg(x) x
+#define %arg(x...) x
 #endif
 
 #ifndef %mangle

From 3e188e508d877e9c459a4fa09425456c17d7cf97 Mon Sep 17 00:00:00 2001
From: Artem Serebriyskiy 
Date: Sat, 25 May 2013 02:08:26 +0400
Subject: [PATCH 530/538] Add test case for attributes with moderately complex
 templates

* New test case tests that %attribute macros correctly supports passing
  template with multiple parameters as class name or attribute type name

* Some further changes were made to %attribute macros - now
  AttributeType is protected with %arg as well. This allows you
  to have attributes of type e.g. std::pair etc

Update CHANGES file for %attribute template fixes

Closes #48
---
 CHANGES.current                               |   4 +
 Examples/test-suite/common.mk                 |   1 +
 Examples/test-suite/li_attribute_template.i   | 110 ++++++++++++++++++
 .../python/li_attribute_template_runme.py     |  67 +++++++++++
 Lib/typemaps/attribute.swg                    |  20 ++--
 5 files changed, 192 insertions(+), 10 deletions(-)
 create mode 100644 Examples/test-suite/li_attribute_template.i
 create mode 100644 Examples/test-suite/python/li_attribute_template_runme.py

diff --git a/CHANGES.current b/CHANGES.current
index 3d41780c2..565a4ec0f 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-05-25: Artem Serebriyskiy
+            SVN Patch ticket #338 - fixes to %attribute macros for template usage
+            with %arg.
+
 2013-05-19: wsfulton
             Fix ccache-swig internal error bug due to premature file cleanup.
 
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 793055097..9a335b46e 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -238,6 +238,7 @@ CPP_TEST_CASES += \
 	kind \
 	langobj \
 	li_attribute \
+	li_attribute_template \
 	li_boost_shared_ptr \
 	li_boost_shared_ptr_bits \
 	li_boost_shared_ptr_template \
diff --git a/Examples/test-suite/li_attribute_template.i b/Examples/test-suite/li_attribute_template.i
new file mode 100644
index 000000000..3d4c108ef
--- /dev/null
+++ b/Examples/test-suite/li_attribute_template.i
@@ -0,0 +1,110 @@
+%module li_attribute_template
+
+%include 
+
+//#define SWIG_ATTRIBUTE_TEMPLATE
+%include 
+%include 
+
+%inline
+{
+  class Foo {
+  public:
+        Foo( int _value ) { value = _value; }
+        int value;
+  };
+
+  template< class T1, class T2>
+  struct pair{
+     pair( T1 t1, T2 t2 ):
+        first(t1), second(t2) {;}
+
+     T1 first;
+     T2 second;
+  };
+
+  template< class T1, class T2>
+  struct C
+  {
+    C(int a, int b, int c) :
+        _a(a), _b(b), _c(c), _d(a), _e(b),
+        _f(a,b), _g(b,c)
+    {
+
+/*
+        _f.first = _a;
+        _f.second = _b;
+
+        _g.first = _b;
+        _g.second = _c;
+*/
+
+    }
+
+    int get_value() const
+    {
+      return _a;
+    }
+
+    void set_value(int aa)
+    {
+      _a = aa;
+    }
+
+    /* only one ref method */
+    int& get_ref()
+    {
+      return _b;
+    }
+
+    Foo get_class_value() const { return _d; }
+    void set_class_value( Foo foo) { _d = foo; }
+
+    const Foo& get_class_ref() const { return _e; }
+    void set_class_ref( const Foo& foo ) { _e = foo; }
+
+    pair get_template_value() const { return _f; }
+    void set_template_value( const pair f ) { _f = f; }
+
+    const pair& get_template_ref() const { return _g; }
+    void set_template_ref( const pair& g ) {  _g = g; }
+
+    std::string get_string() { return str; }
+    void set_string(std::string other) { str = other; }
+
+  private:
+    int _a;
+    int _b;
+    int _c;
+    Foo _d;
+    Foo _e;
+    pair _f;
+    pair _g;
+
+    std::string str;
+  };
+
+}
+
+%define %instantiate_C( T1, T2 )
+%template (pair_ ## T1 ## T2 ) pair;
+// Primitive types
+%attribute( %arg(C), int, a, get_value, set_value );
+%attributeref( %arg(C), int, b, get_ref );
+
+// Strings
+%attributestring(%arg(C), std::string, str, get_string, set_string);
+
+// Class types
+%attributeval( %arg(C), Foo, d, get_class_value, set_class_value  );
+%attribute2( %arg(C), Foo, e, get_class_ref, set_class_ref  );
+
+// Moderately templated types
+%attributeval( %arg(C), %arg(pair), f, get_template_value, set_template_value );
+%attribute2( %arg(C), %arg(pair), g, get_template_ref, set_template_ref );
+
+%template (C ## T1 ## T2) C;
+%enddef
+
+
+%instantiate_C(int,int);
diff --git a/Examples/test-suite/python/li_attribute_template_runme.py b/Examples/test-suite/python/li_attribute_template_runme.py
new file mode 100644
index 000000000..7423053f9
--- /dev/null
+++ b/Examples/test-suite/python/li_attribute_template_runme.py
@@ -0,0 +1,67 @@
+# Check usage of template attributes
+
+import li_attribute_template
+
+chell = li_attribute_template.Cintint(1,2,3)
+
+def rassert( what, master ):
+    if what != master:
+        print what
+        raise RuntimeError
+
+## Testing primitive by value attribute
+rassert( chell.a, 1 )
+
+chell.a = 3
+rassert( chell.a, 3 )
+
+## Testing primitive by ref attribute
+
+rassert( chell.b, 2 )
+
+chell.b = 5
+rassert( chell.b,5 )
+
+## Testing string
+chell.str = "abc"
+rassert( chell.str, "abc" )
+
+# Testing class by value
+
+rassert( chell.d.value, 1 )
+
+chell.d = li_attribute_template.Foo(2)
+rassert( chell.d.value, 2 )
+
+# Testing class by reference
+
+rassert( chell.e.value, 2 )
+
+chell.e= li_attribute_template.Foo(3)
+rassert( chell.e.value, 3 )
+
+chell.e.value = 4
+rassert( chell.e.value, 4 )
+
+# Testing moderately complex template by value
+rassert( chell.f.first, 1 )
+rassert( chell.f.second, 2 )
+
+pair = li_attribute_template.pair_intint(3,4)
+chell.f = pair
+rassert( chell.f.first, 3 )
+rassert( chell.f.second, 4 )
+
+# Testing moderately complex template by ref
+rassert( chell.g.first, 2 )
+rassert( chell.g.second, 3 )
+
+pair = li_attribute_template.pair_intint(4,5)
+chell.g = pair
+rassert( chell.g.first, 4 )
+rassert( chell.g.second, 5 )
+
+chell.g.first = 6
+chell.g.second = 7
+rassert( chell.g.first, 6 )
+rassert( chell.g.second, 7 )
diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg
index d30b51183..46fc80fd2 100644
--- a/Lib/typemaps/attribute.swg
+++ b/Lib/typemaps/attribute.swg
@@ -195,42 +195,42 @@
 
 %define %attribute(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
   #if #SetMethod != ""
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, GetMethod, SetMethod, self_->GetMethod(), self_->SetMethod(val_))
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, SetMethod, self_->GetMethod(), self_->SetMethod(val_))
   #else
-    %attribute_readonly(%arg(Class), AttributeType, AttributeName, GetMethod, self_->GetMethod())
+    %attribute_readonly(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, self_->GetMethod())
   #endif
 %enddef
 
 %define %attribute2(Class, AttributeType, AttributeName, GetMethod, SetMethod...)
   #if #SetMethod != ""
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, GetMethod, SetMethod, &self_->GetMethod(), self_->SetMethod(*val_))
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, SetMethod, &self_->GetMethod(), self_->SetMethod(*val_))
   #else
-    %attribute_readonly(%arg(Class), AttributeType, AttributeName, GetMethod, &self_->GetMethod())
+    %attribute_readonly(%arg(Class), %arg(AttributeType), AttributeName, GetMethod, &self_->GetMethod())
   #endif
 %enddef
 
 %define %attributeref(Class, AttributeType, AttributeName, AccessorMethod...)
   #if #AccessorMethod != ""
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #else
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, AttributeName, AttributeName, self_->AttributeName(), self_->AttributeName() = val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AttributeName, AttributeName, self_->AttributeName(), self_->AttributeName() = val_)
   #endif
 %enddef
 
 %define %attribute2ref(Class, AttributeType, AttributeName, AccessorMethod...)
   #if #AccessorMethod != ""
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
   #else
-    %attribute_custom(%arg(Class), AttributeType, AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
   #endif
 %enddef
 
 // deprecated (same as %attributeref, but there is an argument order inconsistency)
 %define %attribute_ref(Class, AttributeType, AccessorMethod, AttributeName...)
   #if #AttributeName != ""
-    %attribute_custom(%arg(Class), AttributeType, AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AttributeName, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #else
-    %attribute_custom(%arg(Class), AttributeType, AccessorMethod, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
+    %attribute_custom(%arg(Class), %arg(AttributeType), AccessorMethod, AccessorMethod, AccessorMethod, self_->AccessorMethod(), self_->AccessorMethod() = val_)
   #endif
 %enddef
 

From 5481270c2a53add0cf9f7a01044a25a6b3013aaf Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 25 May 2013 10:36:14 +0100
Subject: [PATCH 531/538] Fix Python 3 inconsistency handling -ve numbers for
 unsigned C types.

An OverFlow error is now consistently thrown instead of a TypeError.

Fixes primitive_types testcase for Python 3
---
 CHANGES.current                               |  5 +++
 .../python/primitive_types_runme.py           | 42 +++++++++++++++++--
 Lib/python/pyprimtypes.swg                    | 12 ++++++
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 565a4ec0f..fe11a2952 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.10 (in progress)
 ============================
 
+2013-05-25: wsfulton
+            [Python] Fix Python 3 inconsistency when negative numbers are passed
+            where a parameter expects an unsigned C type. An OverFlow error is
+            now consistently thrown instead of a TypeError.
+
 2013-05-25: Artem Serebriyskiy
             SVN Patch ticket #338 - fixes to %attribute macros for template usage
             with %arg.
diff --git a/Examples/test-suite/python/primitive_types_runme.py b/Examples/test-suite/python/primitive_types_runme.py
index 2495cd60d..be8d38bad 100644
--- a/Examples/test-suite/python/primitive_types_runme.py
+++ b/Examples/test-suite/python/primitive_types_runme.py
@@ -275,10 +275,22 @@ try:
 except TypeError:
   if a != t.var_char:
     error = 1
-  pass 
+  pass
 if error:
   raise RuntimeError, "bad char typemap"
 
+try:
+  error = 0
+  a = t.var_ushort
+  t.var_ushort = -1
+  error = 1
+except OverflowError:
+  if a != t.var_ushort:
+    error = 1
+  pass
+if error:
+  raise RuntimeError, "bad ushort typemap"
+
 try:
   error = 0
   a = t.var_uint
@@ -287,10 +299,34 @@ try:
 except OverflowError:
   if a != t.var_uint:
     error = 1
-  pass 
+  pass
 if error:
   raise RuntimeError, "bad uint typemap"
 
+try:
+  error = 0
+  a = t.var_sizet
+  t.var_sizet = -1
+  error = 1
+except OverflowError:
+  if a != t.var_sizet:
+    error = 1
+  pass
+if error:
+  raise RuntimeError, "bad sizet typemap"
+
+try:
+  error = 0
+  a = t.var_ulong
+  t.var_ulong = -1
+  error = 1
+except OverflowError:
+  if a != t.var_ulong:
+    error = 1
+  pass
+if error:
+  raise RuntimeError, "bad ulong typemap"
+
 #
 #
 try:
@@ -301,7 +337,7 @@ try:
 except TypeError:
   if a != t.var_namet:
     error = 1
-  pass 
+  pass
 if error:
   raise RuntimeError, "bad namet typemap"
 
diff --git a/Lib/python/pyprimtypes.swg b/Lib/python/pyprimtypes.swg
index 3fbd86a21..66ff104a6 100644
--- a/Lib/python/pyprimtypes.swg
+++ b/Lib/python/pyprimtypes.swg
@@ -127,6 +127,18 @@ SWIG_AsVal_dec(unsigned long)(PyObject *obj, unsigned long *val)
       return SWIG_OK;
     } else {
       PyErr_Clear();
+%#if PY_VERSION_HEX >= 0x03000000
+      {
+        long v = PyLong_AsLong(obj);
+        if (!PyErr_Occurred()) {
+          if (v < 0) {
+            return SWIG_OverflowError;
+          }
+        } else {
+          PyErr_Clear();
+        }
+      }
+%#endif
     }
   }
 %#ifdef SWIG_PYTHON_CAST_MODE

From fd93beadf4283b7394aa470e8a7040df3a30bcb3 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sat, 25 May 2013 22:29:18 +0100
Subject: [PATCH 532/538] Fix 'make check-python-test-suite PY3=1' and -j (make
 jobs)

---
 Examples/test-suite/python/Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 43ba2717e..fa64d5e31 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -112,17 +112,17 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
 %.cpptest: 
 	$(setup)
 	+$(swig_and_compile_cpp)
-	$(run_testcase)
+	+$(run_testcase)
 
 %.ctest:
 	$(setup)
 	+$(swig_and_compile_c)
-	$(run_testcase)
+	+$(run_testcase)
 
 %.multicpptest: 
 	$(setup)
 	+$(swig_and_compile_multi_cpp)
-	$(run_testcase)
+	+$(run_testcase)
 
 
 # Call 2to3 to generate Python 3.x test from the Python 2.x's *_runme.py file

From b3ca22dc339ca18873079bd96bbb19dd00bc8f0a Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 26 May 2013 22:34:07 +0100
Subject: [PATCH 533/538] Fix Python examples to compile and run under Python 3

---
 Examples/python/index.html         | 17 ++---------
 Examples/python/multimap/example.i | 47 +++++++++++++++++++++++-------
 Examples/python/varargs/example.i  | 10 +++++--
 Examples/python/varargs/runme.py   |  7 +++--
 4 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/Examples/python/index.html b/Examples/python/index.html
index 8443a85e1..37f4b55af 100644
--- a/Examples/python/index.html
+++ b/Examples/python/index.html
@@ -89,21 +89,10 @@ to look at the distutils
 
 
    Compatibility
    
 
-The examples have been extensively tested on the following platforms:
-
-
      
-
    • Linux
-
    • Solaris
-
    
-
-All of the examples were last tested with the following configuration (9/1/2000):
-
-
      
-
    • Sparc Solaris 2.8.
-
    • gcc-2.95.2
-
    • Python 1.6b1.
-
    
+For Python 3, set the environment variable PY3=1.
+This will ensure the 2to3 program is run prior to running any example.
 
+
    
 Your mileage may vary.  If you experience a problem, please let us know by 
 contacting us on the mailing lists.
 
diff --git a/Examples/python/multimap/example.i b/Examples/python/multimap/example.i
index f1c4d9990..3f6fc3db3 100644
--- a/Examples/python/multimap/example.i
+++ b/Examples/python/multimap/example.i
@@ -38,27 +38,44 @@ extern int    gcd(int x, int y);
     }
 %#if PY_VERSION_HEX >= 0x03000000
     {
-    int l;
-    $2[i] = PyUnicode_AsStringAndSize(s, &l);
+      PyObject *utf8str = PyUnicode_AsUTF8String(s);
+      const char *cstr = PyBytes_AsString(utf8str);
+      $2[i] = strdup(cstr);
+      Py_DECREF(utf8str);
     }
 %#else
     $2[i] = PyString_AsString(s);
 %#endif
-
   }
   $2[i] = 0;
 }
 
+%typemap(freearg) (int argc, char *argv[]) {
+%#if PY_VERSION_HEX >= 0x03000000
+  int i;
+  for (i = 0; i < $1; i++) {
+    free($2[i]);
+  }
+%#endif
+}
+
 extern int gcdmain(int argc, char *argv[]);
 
 %typemap(in) (char *bytes, int len) {
 
 %#if PY_VERSION_HEX >= 0x03000000
+  char *cstr;
+  Py_ssize_t len;
+  PyObject *utf8str;
   if (!PyUnicode_Check($input)) {
     PyErr_SetString(PyExc_ValueError,"Expected a string");
     return NULL;
   }
-  $1 = PyUnicode_AsStringAndSize($input, &$2);
+  utf8str = PyUnicode_AsUTF8String($input);
+  PyBytes_AsStringAndSize(utf8str, &cstr, &len);
+  $1 = strndup(cstr, (size_t)len);
+  $2 = (int)len;
+  Py_DECREF(utf8str);
 %#else
   if (!PyString_Check($input)) {
     PyErr_SetString(PyExc_ValueError,"Expected a string");
@@ -69,6 +86,12 @@ extern int gcdmain(int argc, char *argv[]);
 %#endif
 }
 
+%typemap(freearg) (char *bytes, int len) {
+%#if PY_VERSION_HEX >= 0x03000000
+  free($1);
+%#endif
+}
+
 extern int count(char *bytes, int len, char c);
 
 
@@ -79,13 +102,17 @@ extern int count(char *bytes, int len, char c);
 
 %typemap(in) (char *str, int len) {
 %#if PY_VERSION_HEX >= 0x03000000
-   $2 = PyUnicode_GetSize($input);
-   $1 = (char *) malloc($2+1);
-   memmove($1,PyUnicode_AsString($input),$2);
+  char *cstr;
+  Py_ssize_t len;
+  PyObject *utf8str = PyUnicode_AsUTF8String($input);
+  PyBytes_AsStringAndSize(utf8str, &cstr, &len);
+  $1 = strndup(cstr, (size_t)len);
+  $2 = (int)len;
+  Py_DECREF(utf8str);
 %#else
-   $2 = PyString_Size($input);
-   $1 = (char *) malloc($2+1);
-   memmove($1,PyString_AsString($input),$2);
+  $2 = PyString_Size($input);
+  $1 = (char *) malloc($2+1);
+  memmove($1,PyString_AsString($input),$2);
 %#endif
 }
 
diff --git a/Examples/python/varargs/example.i b/Examples/python/varargs/example.i
index 6cb88f5f4..a581bca5d 100644
--- a/Examples/python/varargs/example.i
+++ b/Examples/python/varargs/example.i
@@ -32,9 +32,6 @@ int printf(const char *fmt, ...);
 }
 #endif
 
-/* Typemap just to make the example work */
-%typemap(in) FILE * "$1 = PyFile_AsFile($input);";
-
 int fprintf(FILE *, const char *fmt, ...);
 
 /* Here is somewhat different example.  A variable length argument
@@ -48,6 +45,13 @@ int fprintf(FILE *, const char *fmt, ...);
 %varargs(20, char *x = NULL) printv;
 
 %inline %{
+
+/* In Python 2 we could use PyFile_AsFile for converting Python sys.stdout to C's stdout.
+   This API disappeared in Python 3, so instead we use a helper function to get stdout */
+FILE * stdout_stream(void) {
+  return stdout;
+}
+
 void printv(char *s, ...) {
     va_list ap;
     char *x;
diff --git a/Examples/python/varargs/runme.py b/Examples/python/varargs/runme.py
index a01cb6769..8eab77041 100644
--- a/Examples/python/varargs/runme.py
+++ b/Examples/python/varargs/runme.py
@@ -13,13 +13,14 @@ for i in range(0,10):
 # This will probably be garbled because %d is interpreted by C
 example.printf("The value is %d\n")
 
+stdout = example.stdout_stream()
 # Call fprintf
-example.fprintf(sys.stdout,"Hello World. I'm fprintf\n")
+example.fprintf(stdout,"Hello World. I'm fprintf\n")
 for i in range(0,10):
-    example.fprintf(sys.stdout,"i is %d\n" % i)
+    example.fprintf(stdout,"i is %d\n" % i)
 
 # This won't be garbled since %d is not interpreted
-example.fprintf(sys.stdout,"The value is %d\n")
+example.fprintf(stdout,"The value is %d\n")
 
 # This function calls our NULL-terminated function
 

From 2004b9fc0370a2134153ba6227422aced19f35f8 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Sun, 26 May 2013 23:58:12 +0100
Subject: [PATCH 534/538] Add Python 3 Travis tests

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7d7204b6a..13502de0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ matrix:
       env: SWIGLANG=php
     - compiler: gcc
       env: SWIGLANG=python
+    - compiler: gcc
+      env: SWIGLANG=python PY3=1
     - compiler: gcc
       env: SWIGLANG=ruby
     - compiler: gcc
@@ -40,6 +42,7 @@ before_install:
   - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi
   - if test "$SWIGLANG" = "octave"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi
   - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi
+  - if test "$SWIGLANG" = "python" -a "$PY3"; then sudo apt-get install python3-dev; fi
   - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
 script:
   - ./autogen.sh && ./configure

From af8f77a627cce49422cced96666c739b7f4c1032 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 27 May 2013 00:27:31 +0100
Subject: [PATCH 535/538] Fix to ensure 2to3 for Python 3 examples is run

---
 Examples/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 5d521f5a1..280923df2 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -366,7 +366,7 @@ endif
 
 PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
 
-python_run:
+python_run: $(PYSCRIPT)
 	$(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE)
 
 $(RUNME)3.py: $(RUNME).py

From 72f2d8ac8f417ace9706897d15a90749d5a7bc3a Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 27 May 2013 10:24:02 +0100
Subject: [PATCH 536/538] Fix Python test-suite makefile to show which tests
 have runtime tests (for Python 3).

---
 Examples/test-suite/python/Makefile.in | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index fa64d5e31..5e8388311 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -110,19 +110,22 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
 
 # Rules for the different types of tests
 %.cpptest: 
+	+$(convert_testcase)
 	$(setup)
 	+$(swig_and_compile_cpp)
-	+$(run_testcase)
+	$(run_testcase)
 
 %.ctest:
+	+$(convert_testcase)
 	$(setup)
 	+$(swig_and_compile_c)
-	+$(run_testcase)
+	$(run_testcase)
 
 %.multicpptest: 
+	+$(convert_testcase)
 	$(setup)
 	+$(swig_and_compile_multi_cpp)
-	+$(run_testcase)
+	$(run_testcase)
 
 
 # Call 2to3 to generate Python 3.x test from the Python 2.x's *_runme.py file
@@ -139,17 +142,17 @@ run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=.:$(srcdir):$$PY
 py2_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX)
 py3_runme = $(srcdir)/$(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX)
 
-ifeq (,$(PY3))
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(run_python);\
 	fi
+
+ifeq (,$(PY3))
+convert_testcase =
 else
-run_testcase = \
+convert_testcase = \
 	if [ -f $(py2_runme) ]; then \
-	  $(MAKE) -f $(srcdir)/Makefile $(py3_runme) && $(run_python); \
-        elif [ -f $(py3_runme) ]; then \
-          $(run_python); \
+	  $(MAKE) -f $(srcdir)/Makefile $(py3_runme); \
 	fi
 endif
 

From 1524d02e1316e6dedfb0dbd9f26765172dde4f1c Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 27 May 2013 19:15:42 +0100
Subject: [PATCH 537/538] Add swig-2.0.10 release date and release notes

---
 ANNOUNCE                 |  2 +-
 CHANGES.current          |  2 +-
 Doc/Manual/Sections.html |  2 +-
 README                   |  2 +-
 RELEASENOTES             | 11 +++++++++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 1c3297a5c..b8c852dfa 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 2.0.10 (in progress) ***
+*** ANNOUNCE: SWIG 2.0.10 (27 May 2013) ***
 
 http://www.swig.org
 
diff --git a/CHANGES.current b/CHANGES.current
index fe11a2952..215fdb203 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,7 +2,7 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.10 (in progress)
+Version 2.0.10 (27 May 2013)
 ============================
 
 2013-05-25: wsfulton
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 9e4a3dd17..5212c9301 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
    SWIG-2.0 Documentation
    
 
-Last update : SWIG-2.0.10 (in progress)
+Last update : SWIG-2.0.10 (27 May 2013)
 
 
    Sections
    
 
diff --git a/README b/README
index 444643a0d..a79b6b84f 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.10 (in progress)
+Version: 2.0.10 (27 May 2013)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
diff --git a/RELEASENOTES b/RELEASENOTES
index af9f4fb6b..49eacf28a 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -4,6 +4,17 @@ and CHANGES files.
 
 Release Notes
 =============
+SWIG-2.0.10 summary:
+- Ruby 1.9 support is now complete.
+- Add support for Guile 2.0 and Guile 1.6 support (GH interface) has
+  been dropped.
+- Various small language neutral improvements and fixes.
+- Various bug fixes and minor improvements specific to C#, CFFI, D,
+  Java, Octave, PHP, Python,
+- Minor bug fix in ccache-swig.
+- Development has moved to Github with Travis continuous integration
+  testing - patches using https://github.com/swig/swig are welcome.
+
 SWIG-2.0.9 summary:
 - Improved typemap matching.
 - Ruby 1.9 support is much improved.

From 8e89cad271a8c021e05abda2b0a72d4ef2aac0a4 Mon Sep 17 00:00:00 2001
From: William S Fulton 
Date: Mon, 27 May 2013 20:27:50 +0100
Subject: [PATCH 538/538] Bump version to 2.0.11

---
 ANNOUNCE                 |   2 +-
 CHANGES                  | 237 +++++++++++++++++++++++++++++++++++++++
 CHANGES.current          | 236 +-------------------------------------
 Doc/Manual/Sections.html |   2 +-
 README                   |   2 +-
 configure.ac             |   2 +-
 6 files changed, 242 insertions(+), 239 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index b8c852dfa..1c3297a5c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 2.0.10 (27 May 2013) ***
+*** ANNOUNCE: SWIG 2.0.10 (in progress) ***
 
 http://www.swig.org
 
diff --git a/CHANGES b/CHANGES
index 8b1945ad9..488bf7286 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,243 @@ SWIG (Simplified Wrapper and Interface Generator)
 See the CHANGES.current file for changes in the current version.
 See the RELEASENOTES file for a summary of changes in each release.
 
+Version 2.0.10 (27 May 2013)
+============================
+
+2013-05-25: wsfulton
+            [Python] Fix Python 3 inconsistency when negative numbers are passed
+            where a parameter expects an unsigned C type. An OverFlow error is
+            now consistently thrown instead of a TypeError.
+
+2013-05-25: Artem Serebriyskiy
+            SVN Patch ticket #338 - fixes to %attribute macros for template usage
+            with %arg.
+
+2013-05-19: wsfulton
+            Fix ccache-swig internal error bug due to premature file cleanup.
+
+            Fixes SF bug 1319 which shows up as a failure in the ccache tests on
+            Debian 64 bit Wheezy, possibly because ENABLE_ZLIB is defined.
+
+            This is a corner case which will be hit when the maximum number of files
+            in the cache is set to be quite low (-F option), resulting in a cache miss.
+
+2013-05-09: kwwette
+            [Octave] Fix bugs in Octave module loading:
+            - fix a memory leak in setting of global variables
+            - install functions only once, to speed up module loads
+
+2013-04-28: gjanssens
+            [Guile] Updates in guile module:
+            - Add support for guile 2.0
+            - Drop support for guile 1.6
+            - Drop support for generating wrappers using guile's gh interface.
+              All generated wrappers will use the scm interface from now on.
+            - Deprecate -gh and -scm options. They are no longer needed.
+              A warning will be issued when these options are still used.
+            - Fix all tests and examples to have a successful travis test
+
+2013-04-18: wsfulton
+            Apply Patch #36 from Jesus Lopez to add support for $descriptor() special variable macro expansion 
+            in fragments. For example:
+
+              %fragment("nameDescriptor", "header")
+              %{
+                static const char *nameDescriptor = "$descriptor(Name)";
+              %}
+
+            which will generate into the wrapper if the fragment is used:
+
+              static const char *nameDescriptor = "SWIGTYPE_Name";
+
+2013-04-18: wsfulton
+            Fix SF Bug #428 - Syntax error when preprocessor macros are defined inside of enum lists, such as:
+
+              typedef enum {
+                eZero = 0
+              #define ONE 1
+              } EFoo;
+
+            The macros are silently ignored.
+
+2013-04-17: wsfulton
+            [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors.
+
+2013-04-15: kwwette
+            [Octave] Fix bugs in output of cleanup code.
+            - Cleanup code is now written also after the "fail:" label, so it will be called if
+              a SWIG_exception is raised by the wrapping function, consistent with other modules.
+            - Octave module now also recognises the "$cleanup" special variable, if needed.
+
+2013-04-08: kwwette
+            Add -MP option to SWIG for generating phony targets for all dependencies.
+            - Prevents make from complaining if header files have been deleted before
+              the dependency file has been updated.
+            - Modelled on similar option in GCC.
+
+2013-04-09: olly
+	    [PHP] Add missing directorin typemap for char* and char[] which
+	    fixes director_string testcase failure.
+
+2013-04-05: wsfulton
+            [Ruby] SF Bug #1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL
+            wrappers that override the default predicate, such as:
+
+              %template(Map) std::map >;
+
+2013-04-05: wsfulton
+            [Ruby] SF Bug #1159 - Correctly check rb_respond_to call return values to fix some
+            further 1.9 problems with functors and use of Complex wrappers.
+
+2013-04-02: wsfulton
+            [Ruby] Runtime fixes for std::complex wrappers for ruby-1.9 - new native Ruby complex numbers are used.
+
+2013-03-30: wsfulton
+            [Ruby] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT,
+            on exit of the Ruby interpreter. More frequently observed in ruby-1.9.
+
+2013-03-29: wsfulton
+            [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would
+            sometimes seg fault or not work.
+
+2013-03-25: wsfulton
+            [Python] Fix some undefined behaviour deleting slices in the STL containers.
+
+2013-03-19: wsfulton
+            [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are
+            the same except being in different namespaces when the %nspace feature is not being used.
+
+2013-02-19: kwwette
+            Fix bug in SWIG's handling of qualified (e.g. const) variables of array type. Given the typedef
+              a(7).q(volatile).double myarray     // typedef volatile double[7] myarray;
+            the type
+              q(const).myarray                    // const myarray
+            becomes
+              a(7).q(const volatile).double       // const volatile double[7]
+            Previously, SwigType_typedef_resolve() produces the type
+              q(const).a(7).q(volatile).double    // non-sensical type
+            which would never match %typemap declarations, whose types were parsed correctly.
+            Add typemap_array_qualifiers.i to the test suite which checks for the correct behaviour.
+
+2013-02-18: wsfulton
+            Deprecate typedef names used as constructor and destructor names in %extend. The real
+            class/struct name should be used.
+
+              typedef struct tagEStruct {
+                int ivar;
+              } EStruct;
+
+              %extend tagEStruct {
+                EStruct() // illegal name, should be tagEStruct()
+                {
+                  EStruct *s = new EStruct();
+                  s->ivar = ivar0;
+                  return s;
+                }
+                ~EStruct() // illegal name, should be ~tagEStruct()
+                {
+                  delete $self;
+                }
+              }
+
+            For now these trigger a warning:
+
+              extend_constructor_destructor.i:107: Warning 522: Use of an illegal constructor name 'EStruct' in
+              %extend is deprecated, the constructor name should be 'tagEStruct'.
+              extend_constructor_destructor.i:111: Warning 523: Use of an illegal destructor name 'EStruct' in
+              %extend is deprecated, the destructor name should be 'tagEStruct'.
+
+            These %extend destructor and constructor names were valid up to swig-2.0.4, however swig-2.0.5 ignored
+            them altogether for C code as reported in SF bug #1306. The old behaviour of using them has been
+            restored for now, but is officially deprecated. This does not apply to anonymously defined typedef
+            classes/structs such as:
+
+              typedef struct {...} X;
+
+2013-02-17: kwwette
+            When generating functions provided by %extend, use "(void)" for no-argument functions
+            instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
+
+2013-02-17: kwwette
+            [Octave] Minor fix to autodoc generation: get the right type for functions returning structs.
+
+2013-02-15: wsfulton
+            Deprecate typedef names used in %extend that are not the real class/struct name. For example:
+
+              typedef struct StructBName {
+                int myint;
+              } StructB;
+
+              %extend StructB {
+                void method() {}
+              }
+
+            will now trigger a warning:
+
+              swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name StructBName
+              should be used instead of the typedef name StructB.
+
+            This is only partially working anyway (the %extend only worked if placed after the class
+            definition). 
+
+2013-02-09: wsfulton
+            [CFFI] Apply patch #22 - Fix missing package before &body
+
+2013-01-29: wsfulton
+            [Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5.
+
+2013-01-28: wsfulton
+            [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False.
+
+2013-01-28: wsfulton
+            [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore.
+
+2013-01-18: Brant Kyser
+            [Java] Patch #15 - Allow the use of the nspace feature without the -package commandline option.
+            This works as long and the new jniclasspackage pragma is used to place the JNI intermediate class
+            into a package and the nspace feature is used to place all exposed types into a package.
+
+2013-01-15: wsfulton
+            Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces.
+
+2013-01-15: wsfulton
+            [C#] Fix cstype typemap lookup for member variables so that a fully qualified variable name
+            matches. For example:
+              %typemap(cstype) bool MVar::mvar "MyBool"
+              struct MVar {
+                bool mvar;
+              };
+
+2013-01-11: Brant Kyser
+	    [Java, C#, D] SF Bug #1299 - Fix generated names for when %nspace is used on
+            classes with the same name in two different namespaces.
+
+2013-01-11: Vladimir Kalinin
+	    [C#] Add support for csdirectorin 'pre', 'post' and 'terminator' attributes.
+
+2013-01-08: olly
+	    [PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7).
+
+2013-01-07: olly
+	    Fix bashism in configure, introduced in 2.0.9.
+
+2013-01-06: wsfulton
+            Pull patch #4 from ptomulik to fix SF Bug #1296 - Fix incorrect warning for virtual destructors
+            in templates, such as:
+             Warning 521: Illegal destructor name B< A >::~B(). Ignored.
+
+2013-01-05: wsfulton
+            [Python] Pull patch #3 from ptomulik to fix SF Bug #1295 - standard exceptions as
+            classes using the SWIG_STD_EXCEPTIONS_AS_CLASSES macro.
+
+2013-01-04: wsfulton
+            [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction
+            with directors.
+
+2013-01-03: wsfulton
+            [Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when
+            multilevel namespaces are used.
+
 Version 2.0.9 (16 December 2012)
 ================================
 
diff --git a/CHANGES.current b/CHANGES.current
index 215fdb203..98166efca 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,240 +2,6 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 2.0.10 (27 May 2013)
+Version 2.0.11 (in progress)
 ============================
 
-2013-05-25: wsfulton
-            [Python] Fix Python 3 inconsistency when negative numbers are passed
-            where a parameter expects an unsigned C type. An OverFlow error is
-            now consistently thrown instead of a TypeError.
-
-2013-05-25: Artem Serebriyskiy
-            SVN Patch ticket #338 - fixes to %attribute macros for template usage
-            with %arg.
-
-2013-05-19: wsfulton
-            Fix ccache-swig internal error bug due to premature file cleanup.
-
-            Fixes SF bug 1319 which shows up as a failure in the ccache tests on
-            Debian 64 bit Wheezy, possibly because ENABLE_ZLIB is defined.
-
-            This is a corner case which will be hit when the maximum number of files
-            in the cache is set to be quite low (-F option), resulting in a cache miss.
-
-2013-05-09: kwwette
-            [Octave] Fix bugs in Octave module loading:
-            - fix a memory leak in setting of global variables
-            - install functions only once, to speed up module loads
-
-2013-04-28: gjanssens
-            [Guile] Updates in guile module:
-            - Add support for guile 2.0
-            - Drop support for guile 1.6
-            - Drop support for generating wrappers using guile's gh interface.
-              All generated wrappers will use the scm interface from now on.
-            - Deprecate -gh and -scm options. They are no longer needed.
-              A warning will be issued when these options are still used.
-            - Fix all tests and examples to have a successful travis test
-
-2013-04-18: wsfulton
-            Apply Patch #36 from Jesus Lopez to add support for $descriptor() special variable macro expansion 
-            in fragments. For example:
-
-              %fragment("nameDescriptor", "header")
-              %{
-                static const char *nameDescriptor = "$descriptor(Name)";
-              %}
-
-            which will generate into the wrapper if the fragment is used:
-
-              static const char *nameDescriptor = "SWIGTYPE_Name";
-
-2013-04-18: wsfulton
-            Fix SF Bug #428 - Syntax error when preprocessor macros are defined inside of enum lists, such as:
-
-              typedef enum {
-                eZero = 0
-              #define ONE 1
-              } EFoo;
-
-            The macros are silently ignored.
-
-2013-04-17: wsfulton
-            [C#] Pull patch #34 from BrantKyser to fix smart pointers in conjuction with directors.
-
-2013-04-15: kwwette
-            [Octave] Fix bugs in output of cleanup code.
-            - Cleanup code is now written also after the "fail:" label, so it will be called if
-              a SWIG_exception is raised by the wrapping function, consistent with other modules.
-            - Octave module now also recognises the "$cleanup" special variable, if needed.
-
-2013-04-08: kwwette
-            Add -MP option to SWIG for generating phony targets for all dependencies.
-            - Prevents make from complaining if header files have been deleted before
-              the dependency file has been updated.
-            - Modelled on similar option in GCC.
-
-2013-04-09: olly
-	    [PHP] Add missing directorin typemap for char* and char[] which
-	    fixes director_string testcase failure.
-
-2013-04-05: wsfulton
-            [Ruby] SF Bug #1292 - Runtime fixes for Proc changes in ruby-1.9 when using STL
-            wrappers that override the default predicate, such as:
-
-              %template(Map) std::map >;
-
-2013-04-05: wsfulton
-            [Ruby] SF Bug #1159 - Correctly check rb_respond_to call return values to fix some
-            further 1.9 problems with functors and use of Complex wrappers.
-
-2013-04-02: wsfulton
-            [Ruby] Runtime fixes for std::complex wrappers for ruby-1.9 - new native Ruby complex numbers are used.
-
-2013-03-30: wsfulton
-            [Ruby] Fix seg fault when using STL containers of generic Ruby types, GC_VALUE or LANGUAGE_OBJECT,
-            on exit of the Ruby interpreter. More frequently observed in ruby-1.9.
-
-2013-03-29: wsfulton
-            [Ruby] Fix delete_if (reject!) for the STL container wrappers which previously would
-            sometimes seg fault or not work.
-
-2013-03-25: wsfulton
-            [Python] Fix some undefined behaviour deleting slices in the STL containers.
-
-2013-03-19: wsfulton
-            [C#, Java, D] Fix seg fault in SWIG using directors when class and virtual method names are
-            the same except being in different namespaces when the %nspace feature is not being used.
-
-2013-02-19: kwwette
-            Fix bug in SWIG's handling of qualified (e.g. const) variables of array type. Given the typedef
-              a(7).q(volatile).double myarray     // typedef volatile double[7] myarray;
-            the type
-              q(const).myarray                    // const myarray
-            becomes
-              a(7).q(const volatile).double       // const volatile double[7]
-            Previously, SwigType_typedef_resolve() produces the type
-              q(const).a(7).q(volatile).double    // non-sensical type
-            which would never match %typemap declarations, whose types were parsed correctly.
-            Add typemap_array_qualifiers.i to the test suite which checks for the correct behaviour.
-
-2013-02-18: wsfulton
-            Deprecate typedef names used as constructor and destructor names in %extend. The real
-            class/struct name should be used.
-
-              typedef struct tagEStruct {
-                int ivar;
-              } EStruct;
-
-              %extend tagEStruct {
-                EStruct() // illegal name, should be tagEStruct()
-                {
-                  EStruct *s = new EStruct();
-                  s->ivar = ivar0;
-                  return s;
-                }
-                ~EStruct() // illegal name, should be ~tagEStruct()
-                {
-                  delete $self;
-                }
-              }
-
-            For now these trigger a warning:
-
-              extend_constructor_destructor.i:107: Warning 522: Use of an illegal constructor name 'EStruct' in
-              %extend is deprecated, the constructor name should be 'tagEStruct'.
-              extend_constructor_destructor.i:111: Warning 523: Use of an illegal destructor name 'EStruct' in
-              %extend is deprecated, the destructor name should be 'tagEStruct'.
-
-            These %extend destructor and constructor names were valid up to swig-2.0.4, however swig-2.0.5 ignored
-            them altogether for C code as reported in SF bug #1306. The old behaviour of using them has been
-            restored for now, but is officially deprecated. This does not apply to anonymously defined typedef
-            classes/structs such as:
-
-              typedef struct {...} X;
-
-2013-02-17: kwwette
-            When generating functions provided by %extend, use "(void)" for no-argument functions
-            instead of "()". This prevents warnings when compiling with "gcc -Wstrict-prototypes".
-
-2013-02-17: kwwette
-            [Octave] Minor fix to autodoc generation: get the right type for functions returning structs.
-
-2013-02-15: wsfulton
-            Deprecate typedef names used in %extend that are not the real class/struct name. For example:
-
-              typedef struct StructBName {
-                int myint;
-              } StructB;
-
-              %extend StructB {
-                void method() {}
-              }
-
-            will now trigger a warning:
-
-              swig_extend.i:19: Warning 326: Deprecated %extend name used - the struct name StructBName
-              should be used instead of the typedef name StructB.
-
-            This is only partially working anyway (the %extend only worked if placed after the class
-            definition). 
-
-2013-02-09: wsfulton
-            [CFFI] Apply patch #22 - Fix missing package before &body
-
-2013-01-29: wsfulton
-            [Java] Ensure 'javapackage' typemap is used as it stopped working from version 2.0.5.
-
-2013-01-28: wsfulton
-            [Python] Apply patch SF #334 - Fix default value conversions "TRUE"->True, "FALSE"->False.
-
-2013-01-28: wsfulton
-            [Java] Apply patch SF #335 - Truly ignore constructors in directors with %ignore.
-
-2013-01-18: Brant Kyser
-            [Java] Patch #15 - Allow the use of the nspace feature without the -package commandline option.
-            This works as long and the new jniclasspackage pragma is used to place the JNI intermediate class
-            into a package and the nspace feature is used to place all exposed types into a package.
-
-2013-01-15: wsfulton
-            Fix Visual Studio examples to work when SWIG is unzipped into a directory containing spaces.
-
-2013-01-15: wsfulton
-            [C#] Fix cstype typemap lookup for member variables so that a fully qualified variable name
-            matches. For example:
-              %typemap(cstype) bool MVar::mvar "MyBool"
-              struct MVar {
-                bool mvar;
-              };
-
-2013-01-11: Brant Kyser
-	    [Java, C#, D] SF Bug #1299 - Fix generated names for when %nspace is used on
-            classes with the same name in two different namespaces.
-
-2013-01-11: Vladimir Kalinin
-	    [C#] Add support for csdirectorin 'pre', 'post' and 'terminator' attributes.
-
-2013-01-08: olly
-	    [PHP] Fix to work with a ZTS build of PHP (broken in 2.0.7).
-
-2013-01-07: olly
-	    Fix bashism in configure, introduced in 2.0.9.
-
-2013-01-06: wsfulton
-            Pull patch #4 from ptomulik to fix SF Bug #1296 - Fix incorrect warning for virtual destructors
-            in templates, such as:
-             Warning 521: Illegal destructor name B< A >::~B(). Ignored.
-
-2013-01-05: wsfulton
-            [Python] Pull patch #3 from ptomulik to fix SF Bug #1295 - standard exceptions as
-            classes using the SWIG_STD_EXCEPTIONS_AS_CLASSES macro.
-
-2013-01-04: wsfulton
-            [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction
-            with directors.
-
-2013-01-03: wsfulton
-            [Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when
-            multilevel namespaces are used.
-
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 5212c9301..9e4a3dd17 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
    SWIG-2.0 Documentation
    
 
-Last update : SWIG-2.0.10 (27 May 2013)
+Last update : SWIG-2.0.10 (in progress)
 
 
    Sections
    
 
diff --git a/README b/README
index a79b6b84f..444643a0d 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 2.0.10 (27 May 2013)
+Version: 2.0.10 (in progress)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
diff --git a/configure.ac b/configure.ac
index c94c2e962..616610eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl The macros which aren't shipped with the autotools are stored in the
 dnl Tools/config directory in .m4 files.
 
-AC_INIT([swig],[2.0.10],[http://www.swig.org])
+AC_INIT([swig],[2.0.11],[http://www.swig.org])
 
 dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
 dnl     definition below can be removed