diff --git a/ANNOUNCE b/ANNOUNCE index cdf246e07..1a13e074f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,8 +1,8 @@ -*** ANNOUNCE: SWIG 2.0.2 (in progress) *** +*** ANNOUNCE: SWIG 2.0.4 (29 March 2011) *** http://www.swig.org -We're pleased to announce SWIG-2.0.1, the latest SWIG release. +We're pleased to announce SWIG-2.0.4, the latest SWIG release. What is SWIG? ============= @@ -10,22 +10,22 @@ 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), 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. +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. Availability ============ The release is available for download on Sourceforge at - http://prdownloads.sourceforge.net/swig/swig-2.0.1.tar.gz + http://prdownloads.sourceforge.net/swig/swig-2.0.4.tar.gz A Windows version is also available at - http://prdownloads.sourceforge.net/swig/swigwin-2.0.1.zip + http://prdownloads.sourceforge.net/swig/swigwin-2.0.4.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 bf5e20da1..7e930159e 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,241 @@ 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.3 (29 March 2011) +============================= + +2011-03-29: wsfulton + [R] Apply patch #3239076 from Marie White fixing strings for R >= 2.7.0 + +2011-03-29: wsfulton + [Tcl] Apply patch #3248280 from Christian Delbaere which adds better error messages when + the incorrect number or type of arguments are passed to overloaded methods. + +2011-03-29: wsfulton + [Tcl] Apply patch #3224663 from Christian Delbaere. + 1. Fix when function returns a NULL value, a "NULL" command will be created in the Tcl interpreter + and calling this command will cause a segmentation fault. + + 2. Previous implementation searches for class methods using a linear search causing performance issues + in wrappers for classes with many member functions. The patch adds a method hash table to classes and + changes method name lookup to use the hash table instead of doing a linear search. + +2011-03-26: wsfulton + [C#, Java] SF bug #3195112 - fix wrapping of enums that are type char, for example: + enum { X = 'X'; } + +2011-03-21: vadz + Allow setting PCRE_CFLAGS and PCRE_LIBS during configuration to override the values returned by + pcre-config, e.g. to allow using a static version of PCRE library. + +2011-03-17: wsfulton + [UTL] Add missing headers in generated STL wrappers to fix compilation with gcc-4.6. + +2011-03-17: wsfulton + Fix regression introduced in swig-2.0.2 where filenames with spaces were not found + when used with %include and %import. Reported by Shane Liesegang. + +2011-03-15: wsfulton + [UTL] Fix overloading when using const char[], problem reported by David Maxwell. + Similarly for char[ANY] and const char[ANY]. + +2011-03-15: wsfulton + [C#] Apply patch #3212624 fixing std::map Keys property. + +2011-03-14: olly + [PHP] Fix handling of overloaded methods/functions where some + return void and others don't - whether this worked or not depended + on the order they were encountered in (SF#3208299). + +2011-03-13: klickverbot + [D] Extended support for C++ namespaces (nspace feature). + +2011-03-12: olly + [PHP] Fix sharing of type information between multiple SWIG-wrapped + modules (SF#3202463). + +2011-03-09: wsfulton + [Python] Fix SF #3194294 - corner case bug when 'NULL' is used as the default value + for a primitive type parameter in a method declaration. + +2011-03-07: olly + [PHP] Don't use zend_error_noreturn() for cases where the function + returns void - now this issue can only matter if you have a function + or method which is directed and returns non-void. + +2011-03-06: olly + [PHP] Add casts to the typemaps for long long and unsigned long + long to avoid issues when they are used with shorter types via + %apply. + +2011-03-02: wsfulton + Templated smart pointers overloaded with both const and non const operator-> generated uncompilable + code when the pointee was a class with either public member variables or static methods. + Regression in 2.0.x reported as working in 1.3.40 by xantares on swig-user mailing list. + +Version 2.0.2 (20 February 2011) +================================ + +2011-02-19: wsfulton + [PHP] Add missing INPUT, OUTPUT and INOUT typemaps in the typemaps.i library + for primitive reference types as well as signed char * and bool *. + +2011-02-19: olly + [PHP] Address bug in PHP on some platforms/architectures which + results in zend_error_noreturn() not being available using + SWIG_ZEND_ERROR_NORETURN which defaults to zend_error_noreturn but + can be overridden when building the module by passing + -DSWIG_ZEND_ERROR_NORETURN=zend_error to the compiler. This may + result in compiler warnings, but should at least allow a module + to be built on those platforms/architectures (SF#3166423). + +2011-02-18: wsfulton + Fix #3184549 - vararg functions and function overloading when using the -fastdispatch option. + +2011-02-18: olly + [PHP] An overloaded method which can return an object or a + primitive type no longer causes SWIG to segfault. Reported by Paul + Colby in SF#3168531. + +2011-02-18: olly + [PHP] Fix invalid erase during iteration of std::map in generated + director code. Reported by Cory Bennett in SF#3175820. + +2011-02-17: wsfulton + Preprocessing now warns if extra tokens appear after #else and #end. + +2011-02-16: wsfulton + Fix #1653092 Preprocessor does not error out when #elif is missing an expression. + This and other cases of missing preprocessor expressions now result in an error. + +2011-02-14: wsfulton + [Ocaml] Apply patch #3151788 from Joel Reymont. Brings Ocaml support up to date + (ver 3.11 and 3.12), including std::string. + +2011-02-13: wsfulton + [Ruby] Apply patch #3176274 from James Masters - typecheck typemap for time_t. + +2011-02-13: wsfulton + Apply patch #3171793 from szager - protected director methods failing when -fvirtual is used. + +2011-02-13: wsfulton + Fix #1927852 - #include directives don't preprocess the file passed to it. The fix is for + #include with -importall or -includeall, %include and %import, for example: + #define FILENAME "abc.h" + %include FILENAME + +2011-02-12: wsfulton + Fix #1940536, overactive preprocessor which was expanding defined(...) outside of #if and #elif + preprocessor directives. + +2011-02-05: wsfulton + [MzScheme] SF #2942899 Add user supplied documentation to help getting started with MzScheme. + Update chapter name to MzScheme/Racket accounting for the rename of MzScheme to Racket. + +2011-02-05: wsfulton + [C#] SF #3085906 - Possible fix running test-suite on Mac OSX. + +2011-02-05: wsfulton + SF #3173367 Better information during configure about Boost prerequisite for running + the test-suite. + +2011-02-05: wsfulton + SF #3127633 Fix infinite loop in recursive typedef resolution. + +2011-02-04: wsfulton + [R] SF #3168676 Fix %rename not working for member variables and methods. + +2011-02-04: wsfulton + [clisp] SF #3148200 Fix segfault parsing nested unions. + +2011-02-01: wsfulton + [C#] Directors - a call to a method being defined in the base class, not + overridden in a subclass, but again overridden in a class derived from + the first subclass was not being dispatched correctly to the most derived class. + See director_alternating.i for an example. + +2011-02-01: wsfulton + [C#, Java] Any 'using' statements in the protected section of a class were previously + ignored with director protected (dirprot) mode. + +2011-01-30: wsfulton + Fix overloading with const pointer reference (SWIGTYPE *const&) parameters for a + number of scripting languages. + +2011-01-17: wsfulton + New warning for smart pointers if only some of the classes in the inheritance + chain are marked as smart pointer, eg, %shared_ptr should be used for all classes + in an inheritance hierarchy, so this new warning highlights code where this is + not the case. + + example.i:12: Warning 520: Base class 'A' of 'B' is not similarly marked as a smart pointer. + example.i:16: Warning 520: Derived class 'C' of 'B' is not similarly marked as a smart pointer. + +2011-01-14: wsfulton + Added some missing multi-argument typemaps: (char *STRING, size_t LENGTH) and + (char *STRING, int LENGTH). Documentation for this updated. Java patch from + Volker Grabsch. + +2011-01-11: iant + Require Go version 7077 or later. + +2010-12-30: klickverbot + [C#, D, Java] Check for collision of parameter names with target + language keywords when generating the director glue code. + + The situation in which the generated could would previously be + invalid is illustrated in the new 'director_keywords' test case. + +2010-12-23: wsfulton + [C#] Fix $csinput special variable not being expanded for csvarin typemaps + when used for global variables. Reported by Vadim Zeitlin. + +2010-12-14: wsfulton + Fix $basemangle expansion in array typemaps. For example if type is int *[3], + $basemangle expands to _p_int. + +2010-12-07: iant + Check that we are using a sufficiently new version of the + 6g or 8g Go compiler during configure time. If not, disable Go. + Minimum version is now 6707. + + *** POTENTIAL INCOMPATIBILITY *** + +2010-12-06: wsfulton + Fix #3127394 - use of network paths on Windows/MSys. + +2010-11-18: klickverbot + [D] Added the D language module. + +2010-11-12: vadz + Fix handling of multiple regex-using %renames attached to the same + declaration. For example, now + + %rename("%(regex/^Set(.*)/put\\1/)s") ""; + %rename("%(regex/^Get(.*)/get\\1/)s") ""; + + works as expected whereas before only the last anonymous rename was + taken into account. + +2010-10-17: drjoe + [R] Fix failure in overloaded functions which was breaking + QuantLib-SWIG + +2010-10-14: olly + [PHP] Allow compilation on non-conforming Microsoft C++ compilers + which don't accept: return function_returning_void(); + Reported by Frank Vanden Berghen on the SWIG mailing list. + +2010-10-12: wsfulton + Fix unary scope operator (::) (global scope) regression introduced in 2.0.0, reported by + Ben Walker. The mangled symbol names were incorrect, sometimes resulting in types being + incorrectly treated as opaque types. + + Also fixes #2958781 and some other type problems due to better typedef resolution, eg + std::vector::value_type didn't resolve to T * when it should have. The mangled type + was incorrectly SWIGTYPE_std__vectorT_Test_p_std__allocatorT_Test_p_t_t__value_type and now + it is correctly SWIGTYPE_p_Test. + Version 2.0.1 (4 October 2010) ============================== diff --git a/CHANGES.current b/CHANGES.current index a5f149421..f928203d8 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -2,19 +2,80 @@ This file contains 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.2 (in progress) +Version 2.0.4 (in progress) =========================== +2011-05-05: wsfulton + [Lua, Python, Tcl] C/C++ prototypes shown in error message when calling an overloaded + method with incorrect arguments improved to show always show fully qualified name + and if a const method. -2010-10-14: olly - [PHP] Allow compilation on non-conforming Microsoft C++ compilers - which don't accept: return function_returning_void(); - Reported by Frank Vanden Berghen on the SWIG mailing list. + Also fixed other Lua error messages in generated code which weren't consistently + using the fully qualified C++ name - requested by Gedalia Pasternak. -2010-10-12: wsfulton - Fix unary scope operator (::) (global scope) regression introduced in 2.0.0, reported by - Ben Walker. The mangled symbol names were incorrect, sometimes resulting in types being - incorrectly treated as opaque types. +2011-04-29: szager + Bug 2635919: Convenience method to convert std::map to a python dict. -2010-10-14: Sylvestre Ledru - Fails the configure if cannot find a yacc implementation - (like bison) +2011-04-29: szager + Fixed bug 2811549: return non-const iterators from STL + methods begin(), end(), rbegin(), rend(). + +2011-04-25: szager + Fixed bug 1498929: Access to member fields in map elements + +2011-04-23: klickverbot + [D] nspace: Correctly generate identifiers for base classes when + not in split proxy mode. + +2011-04-13: szager + Fixed bug 3286333: infite recursion with mutual 'using namespace' clauses. + +2011-04-12: szager + Fixed bug 1163440: vararg typemaps. + +2011-04-12: szager + Fixed bug #3285386: parse error from 'operator T*&()'. Added operator_pointer_ref + test case to demonstrate. + +2011-04-11: szager + Fixed PyVarObject_HEAD_INIT to eliminate VC++ compiler errors about + static initialization of struct members with pointers. + +2011-04-11: wsfulton + [Tcl] Apply patch #3284326 from Colin McDonald to fix some compiler warnings. + +2011-04-11: szager + Fixed PyVarObject_HEAD_INIT to eliminate VC++ compiler errors about + static initialization of struct members with pointers. + +2011-04-10: klickverbot + [D] Fixed wrapping of enums that are type char, for example: + enum { X = 'X'; } (this was already in 2.0.3 for C# and Java) + +2011-04-10: klickverbot + [D] nspace: Fixed referencing types in the root namespace when + not in split proxy mode. + +2011-04-09: szager + Applied patch #1932484: migrate PyCObject to PyCapsule. + +2011-04-09: szager + Added preprocessor guards for python functions PyUnicode_AsWideChar and + PySlice_GetIndices, which changed signatures in python3.2. + +2011-04-07: wsfulton + Fix wrapping of const array typedefs which were generating uncompileable code as + reported by Karl Wette. + +2011-04-03: szager + Fixed the behavior of %pythonnondynamic to conform to the spec in Lib/pyuserdir.swg. + +2011-04-03: szager + Merged in the szager-python-builtin branch, adding the -builtin feature + for python. The -builtin option may provide a significant performance gain + in python wrappers. For full details and limitations, refer to Doc/Manual/Python.html. + A small test suite designed to demonstrate the performance gain is in + Examples/python/performance. + +2011-04-01: wsfulton + Add in missing wrappers for friend functions for some target languages, mostly + the non-scripting languages like Java and C#. diff --git a/COPYRIGHT b/COPYRIGHT index 4e801e53e..855425431 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ SWIG Copyright and Authors -------------------------- -Copyright (c) 1995-2010 The SWIG Developers +Copyright (c) 1995-2011 The SWIG Developers Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). Copyright (c) 1998-2005 University of Chicago. Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California @@ -15,6 +15,7 @@ Active SWIG Developers: Olly Betts (olly@survex.com) (PHP) Joseph Wang (joequant@gmail.com) (R) Xavier Delacour (xavier.delacour@gmail.com) (Octave) + David Nadlinger (code@klickverbot.at) (D) Past SWIG developers and major contributors include: Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) @@ -58,6 +59,7 @@ Past SWIG developers and major contributors include: Baozeng Ding (Scilab) Ian Lance Taylor (Go) Vadim Zeitlin (PCRE) + Stefan Zager (szager@gmail.com) (Python) Past contributors include: James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran @@ -68,7 +70,7 @@ Past contributors include: Past students: Songyan Feng (Chicago). - Xinghua Shi (Chicago). + Xinghua Shi (Chicago). Jing Cao (Chicago). Aquinas Hobor (Chicago). @@ -98,5 +100,5 @@ Mike Weiblen, Paul Brannan, Ram Bhamidipaty, Reinhard Fobbe, Rich Wales, Richard Salz, Roy Lecates, Rudy Albachten, Scott Drummonds Scott Michel, Shaun Lowry, Steve Galser, Tarn Weisner Burton, Thomas Weidner, Tony Seward, Uwe Steinmann, Vadim Chugunov, Wyss Clemens, -Zhong Ren. +Zhong Ren. diff --git a/Doc/Devel/index.html b/Doc/Devel/index.html index 55c612ec3..4ddc63a76 100644 --- a/Doc/Devel/index.html +++ b/Doc/Devel/index.html @@ -21,6 +21,7 @@ The following documentation describe the internal APIs used by SWIG. These may
  • Parameter and Parameter list handling functions
  • Generic C/C++ Scanner interface
  • Wrapper objects. +
  • SWIG Runtime.
    diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html index 909357f37..6691400b7 100644 --- a/Doc/Manual/CSharp.html +++ b/Doc/Manual/CSharp.html @@ -57,7 +57,7 @@ PInvoke is part of the ECMA/ISO C# specification. It is also better suited for robust production environments due to the Managed C++ flaw called the Mixed DLL Loading Problem. SWIG C# works equally well on non-Microsoft operating systems such as Linux, Solaris and Apple Mac using -Mono and Portable.NET. +Mono and Portable.NET.

    @@ -575,7 +575,8 @@ marshalling for the arrays: 

     [DllImport("example", EntryPoint="CSharp_myArrayCopy")]
 public static extern void myArrayCopy([In, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
-                                      [Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
+                                      [Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2,
+                                       int jarg3);
    @@ -624,7 +625,8 @@ and intermediate class method 
       [DllImport("example", EntryPoint="CSharp_myArraySwap")]
   public static extern void myArraySwap([In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg1, 
-                                        [In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2, int jarg3);
+                                        [In, Out, MarshalAs(UnmanagedType.LPArray)]int[] jarg2,
+                                         int jarg3);
    @@ -696,7 +698,8 @@ As a result, we get the following method in the module class: fixed ( int *swig_ptrTo_sourceArray = sourceArray ) { fixed ( int *swig_ptrTo_targetArray = targetArray ) { { - examplePINVOKE.myArrayCopy((IntPtr)swig_ptrTo_sourceArray, (IntPtr)swig_ptrTo_targetArray, nitems); + examplePINVOKE.myArrayCopy((IntPtr)swig_ptrTo_sourceArray, (IntPtr)swig_ptrTo_targetArray, + nitems); } } } @@ -2109,7 +2112,8 @@ public class example { try { examplePINVOKE.addYears(CDate.getCPtr(temppDate), years); } finally { - pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(), 0, 0, 0); + pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(), + 0, 0, 0); } } ... @@ -2126,13 +2130,13 @@ The subtractYears method is nearly identical to the above addYears< 
     %typemap(csin,
-         pre="    using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {",
-         post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
-              " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
-         terminator="    } // terminate temp$csinput using block",
-         cshin="ref $csinput"
-        ) CDate *
-         "$csclassname.getCPtr(temp$csinput)"
+  pre="    using (CDate temp$csinput = new CDate($csinput.Year, $csinput.Month, $csinput.Day)) {",
+  post="      $csinput = new System.DateTime(temp$csinput.getYear(),"
+       " temp$csinput.getMonth(), temp$csinput.getDay(), 0, 0, 0);", 
+  terminator="    } // terminate temp$csinput using block",
+  cshin="ref $csinput"
+ ) CDate *
+  "$csclassname.getCPtr(temp$csinput)"
 
 void subtractYears(CDate *pDate, int years) {
   *pDate = CDate(pDate->getYear() - years, pDate->getMonth(), pDate->getDay());
@@ -2152,7 +2156,8 @@ public class example {
     try {
       examplePINVOKE.subtractYears(CDate.getCPtr(temppDate), years);
     } finally {
-      pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(), 0, 0, 0);
+      pDate = new System.DateTime(temppDate.getYear(), temppDate.getMonth(), temppDate.getDay(),
+                                  0, 0, 0);
     }
     } // terminate temppDate using block
   }
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index f4fdb9d24..74a201bc6 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -5,7 +5,7 @@
 SWIG Users Manual
 
 
-
    SWIG Users Manual
    
+
    SWIG Users Manual
    
 
 
    
 
@@ -706,7 +706,41 @@
    -

    20 SWIG and Go

    +

    20 SWIG and D

    + + +
    + +
    + + +

    21 SWIG and Go

    @@ -735,7 +769,7 @@
    -

    21 SWIG and Guile

    +

    22 SWIG and Guile

    @@ -770,7 +804,7 @@
    -

    22 SWIG and Java

    +

    23 SWIG and Java

    @@ -867,6 +901,7 @@
  • Simple pointers
  • Wrapping C arrays with Java arrays
  • Unbounded C Arrays +
  • Binary data vs Strings
  • Overriding new and delete to allocate from Java heap
  • Java typemaps @@ -912,7 +947,7 @@ -

    23 SWIG and Common Lisp

    +

    24 SWIG and Common Lisp

    @@ -935,7 +970,7 @@
    -

    24 SWIG and Lua

    +

    25 SWIG and Lua

    @@ -992,7 +1027,7 @@
    -

    25 SWIG and Modula-3

    +

    26 SWIG and Modula-3

    @@ -1030,17 +1065,19 @@
    -

    26 SWIG and MzScheme

    +

    27 SWIG and MzScheme/Racket

    -

    27 SWIG and Ocaml

    +

    28 SWIG and Ocaml

    @@ -1091,7 +1128,7 @@
    -

    28 SWIG and Octave

    +

    29 SWIG and Octave

    @@ -1126,7 +1163,7 @@
    -

    29 SWIG and Perl5

    +

    30 SWIG and Perl5

    @@ -1193,7 +1230,7 @@
    -

    30 SWIG and PHP

    +

    31 SWIG and PHP

    @@ -1233,7 +1270,7 @@
    -

    31 SWIG and Pike

    +

    32 SWIG and Pike

    @@ -1257,7 +1294,7 @@
    -

    32 SWIG and Python

    +

    33 SWIG and Python

    @@ -1360,7 +1397,7 @@
    -

    33 SWIG and R

    +

    34 SWIG and R

    @@ -1376,7 +1413,7 @@
    -

    34 SWIG and Ruby

    +

    35 SWIG and Ruby

    @@ -1510,7 +1547,7 @@
    -

    35 SWIG and Tcl

    +

    36 SWIG and Tcl

    @@ -1576,7 +1613,7 @@
    -

    36 Extending SWIG to support new languages

    +

    37 Extending SWIG to support new languages

    diff --git a/Doc/Manual/D.html b/Doc/Manual/D.html new file mode 100644 index 000000000..abcffa58e --- /dev/null +++ b/Doc/Manual/D.html @@ -0,0 +1,454 @@ + + + +SWIG and D + + + + +

    20 SWIG and D

    + +
    + +
    + + + + +

    20.1 Introduction

    + + +

    From the D Programming Language web site: »D is a systems programming language. Its focus is on combining the power and high performance of C and C++ with the programmer productivity of modern languages like Ruby and Python. [...] The D language is statically typed and compiles directly to machine code.« As such, it is not very surprising that D is able to directly interface with C libraries. Why would a SWIG module for D be needed then in the first place?

    + +

    Well, besides the obvious downside that the C header files have to be manually converted to D modules for this to work, there is one major inconvenience with this approach: D code usually is on a higher abstraction level than C, and many of the features that make D interesting are simply not available when dealing with C libraries, requiring you e.g. to manually convert strings between pointers to \0-terminated char arrays and D char arrays, making the algorithms from the D2 standard library unusable with C arrays and data structures, and so on.

    + +

    While these issues can be worked around relatively easy by hand-coding a thin wrapper layer around the C library in question, there is another issue where writing wrapper code per hand is not feasible: C++ libraries. D did not support interfacing to C++ in version 1 at all, and even if extern(C++) has been added to D2, the support is still very limited, and a custom wrapper layer is still required in many cases.

    + +

    To help addressing these issues, the SWIG C# module has been forked to support D. Is has evolved quite a lot since then, but there are still many similarities, so if you do not find what you are looking for on this page, it might be worth having a look at the chapter on C# (and also on Java, since the C# module was in turn forked from it).

    + + +

    20.2 Command line invocation

    + + +

    To activate the D module, pass the -d option to SWIG at the command line. The same standard command line switches as with any other language module are available, plus the following D specific ones:

    + +
    +
    -d2
    +
    +

    By default, SWIG generates code for D1/Tango. Use the -d2 flag to target D2/Phobos instead.

    +
    + +
    -splitproxy
    +
    +

    By default, SWIG generates two D modules: the proxy module, named like the source module (either specified via the %module directive or via the module command line switch), which contains all the proxy classes, functions, enums, etc., and the intermediary module (named like the proxy module, but suffixed with _im), which contains all the extern(C) function declarations and other private parts only used internally by the proxy module.

    +

    If the split proxy mode is enabled by passing this switch at the command line, all proxy classes and enums are emitted to their own D module instead. The main proxy module only contains free functions and constants in this case.

    +
    + +
    -package <pkg>
    +
    +

    By default, the proxy D modules and the intermediary D module are written to the root package. Using this option, you can specify another target package instead.

    +
    + +
    -wrapperlibrary <wl>
    +
    +

    The code SWIG generates to dynamically load the C/C++ wrapper layer looks for a library called $module_wrap by default. With this switch, you can override the name of the file the wrapper code loads at runtime (the lib prefix and the suffix for shared libraries are appended automatically, depending on the OS).

    +

    This might especially be useful if you want to invoke SWIG several times on separate modules, but compile the resulting code into a single shared library.

    +
    +
    + + +

    20.3 Typemaps

    + + +

    20.3.1 C# <-> D name comparison

    + + +

    If you already know the SWIG C# module, you might find the following name comparison table useful:

    + +
    + ctype                  <->  ctype
+ imtype                 <->  imtype
+ cstype                 <->  dtype
+ csin                   <->  din
+ csout                  <->  dout
+ csdirectorin           <->  ddirectorin
+ csdirectorout          <->  ddirectorout
+ csinterfaces           <->  dinterfaces
+ csinterfaces_derived   <->  dinterfaces_derived
+ csbase                 <->  dbase
+ csclassmodifiers       <->  dclassmodifiers
+ cscode                 <->  dcode
+ csimports              <->  dimports
+ csbody                 <->  dbody
+ csfinalize             <->  ddestructor
+ csdestruct             <->  ddispose
+ csdestruct_derived     <->  ddispose_derived
+
    + + +

    20.3.2 ctype, imtype, dtype

    + + +

    Mapping of types between the C/C++ library, the C/C++ library wrapper exposing the C functions, the D wrapper module importing these functions and the D proxy code.

    + +

    The ctype typemap is used to determine the types to use in the C wrapper functions. The types from the imtype typemap are used in the extern(C) declarations of these functions in the intermediary D module. The dtype typemap contains the D types used in the D proxy module/class.

    + + +

    20.3.3 in, out, directorin, directorout

    + + +

    Used for converting between the types for C/C++ and D when generating the code for the wrapper functions (on the C++ side).

    + +

    The code from the in typemap is used to convert arguments to the C wrapper function to the type used in the wrapped code (ctype->original C++ type), the out typemap is utilized to convert values from the wrapped code to wrapper function return types (original C++ type->ctype).

    + +

    The directorin typemap is used to convert parameters to the type used in the D director callback function, its return value is processed by directorout (see below).

    + + +

    20.3.4 din, dout, ddirectorin, ddirectorout

    + + +

    Typemaps for code generation in D proxy and type wrapper classes.

    + +

    The din typemap is used for converting function parameter types from the type used in the proxy module or class to the type used in the intermediary D module (the $dinput macro is replaced). To inject further parameter processing code before or after the call to the intermediary layer, the pre, post and terminator attributes can be used (please refer to the C# date marshalling example for more information on these).

    + +

    The dout typemap is used for converting function return values from the return type used in the intermediary D module to the type returned by the proxy function. The $excode special variable in dout typemaps is replaced by the excode typemap attribute code if the method can throw any exceptions from unmanaged code, otherwise by nothing (the $imcall and $owner macros are replaced).

    + +

    The code from the ddirectorin and ddirectorout typemaps is used for conversion in director callback functions. Arguments are converted to the type used in the proxy class method they are calling by using the code from ddirectorin, the proxy class method return value is converted to the type the C++ code expects via the ddirectorout typemap (the $dcall and $winput macros are replaced).

    + +

    The full chain of type conversions when a director callback is invoked looks like this:

    + + 
    +      type              CPPClass::method(type a)
+        ↑                       ↓
+   <directorout>          <directorin>
+        ↑                       ↓
+      ctype             methodCallback(ctype a)           C++
+ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+      imtype            methodCallback(imtype a)           D
+        ↑                       ↓
+  <ddirectorout>          <ddirectorin>
+        ↑                       ↓
+      dtype             DClass.method(dtype a)
    + + +

    20.3.5 typecheck typemaps

    + + +

    Because, unlike many scripting languages supported by SWIG, D does not need any dynamic dispatch helper to access an overloaded function, the purpose of these is merely to issue a warning for overloaded C++ functions that cannot be overloaded in D (as more than one C++ type maps to a single D type).

    + + +

    20.3.6 Code injection typemaps

    + + +

    These typemaps are used for generating the skeleton of proxy classes for C++ types.

    + +

    By overriding dbase, dinterfaces or dinterfaces_derived, the inheritance chain of the generated proxy class for a type can be modified. dclassmodifiers allows you to add any custom modifiers around the class keyword.

    + +

    Using dcode and dimports, you can specify additional D code which will be emitted into the class body respectively the imports section of the D module the class is written to.

    + +

    dconstructor, ddestructor, ddispose and ddispose_derived are used to generate the class constructor, destructor and dispose() method, respectively. The auxiliary code for handling the pointer to the C++ object is stored in dbody and dbody_derived. You can override them for specific types.

    + + +

    20.3.7 Special variable macros

    + + +

    The standard SWIG special variables are available for use within typemaps as described in the Typemaps documentation, for example $1, $input, $result etc.

    + +

    When generating D wrappers, a few additional macros are available:

    +
    +
    $dclassname (C#: $csclassname)
    +
    +

    This special variable works similar to $n_type in that it returns the name of a type - it expands to the D proxy class name of the type being wrapped. If the type does not have an associated proxy class, it expands to the type wrapper class name, for example, SWIGTYPE_p_p_SomeCppClass is generated when wrapping SomeCppClass **.

    +

    There are two other variants available, $&dclassname and $*dclassname. The former adds a level of indirection, while the latter removes one. For instance, when wrapping Foo **, $*dclassname would be replaced by the proxy class name corresponding to Foo *.

    +
    + +
    $dclazzname (C#: $csclazzname)
    +
    +

    This special variable expands the fully qualified C++ class into the package name, if used by the nspace feature, and the proxy class name, mangled for use as a function name. For example, Namespace1::Namespace2::Klass is expanded into Namespace1_Namespace2_Klass_.

    +

    This special variable might be useful for calling certain functions in the wrapper layer (e.g. upcast wrappers) which are mangled like this.

    +
    + +
    $null
    +

    In code inserted into the generated C/C++ wrapper functions, this variable is replaced by either 0 or nothing at all, depending on whether the function has a return value or not. It can be used to bail out early e.g. in case of errors (return $null;).

    + +
    $dinput (C#: $csinput)
    +
    +

    This variable is used in din typemaps and is replaced by the expression which is to be passed to C/C++.

    +

    For example, this input

    + 
    +%typemap(din) SomeClass * "SomeClass.getCPointer($dinput)"
+
+%inline %{
+  class SomeClass {};
+  void foo(SomeClass *arg);
+%}
    +

    leads to the following D proxy code being generated:

    +
    +void foo(SomeClass arg) {
+  example_im.foo(SomeClass.getCPointer(arg));
+}
    + +
    $imcall and $owner (C#: $imcall)
    +
    +

    These variables are used in dout typemaps. $imcall contains the call to the intermediary module which provides the value to be used, and $owner signals if the caller is responsible for managing the object lifetime (that is, if the called method is a constructor or has been marked via %newobject).

    +

    Consider the following example:

    +
    +%typemap(dout) SomeClass * {
+  return new SomeClass($imcall, $owner);
+}
+
+%inline %{
+  class SomeClass;
+  SomeClass *foo();
+
+  %newobject bar();
+  SomeClass *bar();
+%}
    +

    The code generated for foo() and bar() looks like this:

    +
    +SomeClass foo() {
+  return new SomeClass(example_im.foo(), false);
+}
+
+SomeClass bar() {
+  return new SomeClass(example_im.bar(), true);
+}
+
    +
    + +
    $dcall and $winput (C#: $cscall, $iminput)
    +

    These variables are used in the director-specific typemaps ddirectorin and ddirectorout. They are more or less the reverse of the $imcall and $dinput macros: $dcall contains the invocation of the D proxy method of which the return value is to be passed back to C++, $winput contains the parameter value from C++.

    + +
    $excode
    +

    This variable is used in dout and dconstructor typemaps and is filled with the contents of the excode typemap attribute if an exception could be thrown from the C++ side. See the C# documentation for details.

    + +
    $dbaseclass
    +

    Currently for internal use only, it contains the D name of the C++ base class (if any) inside proxy classes.

    + +
    $directorconnect
    +
    +

    This macro is only valid inside the dconstructor typemap and contains the value of the dconstructor typemap attribute if the currently wrapped class has directors enabled.

    +

    This is how the default dconstructor typemap looks like (you usually do not want to specify a custom one):

    +
    +%typemap(dconstructor, excode=SWIGEXCODE,
+         directorconnect="\n  swigDirectorConnect();") SWIGTYPE {
+  this($imcall, true);$excode$directorconnect
+}
+
    +
    + +
    $importtype(SomeDType)
    +
    +

    This macro is used in the dimports typemap if a dependency on another D type generated by SWIG is added by a custom typemap.

    +

    Consider the following code snippet:

    +
    +%typemap(dinterfaces) SomeClass "AnInterface, AnotherInterface";
+
    +

    This causes SWIG to add AnInterface and AnotherInterface to the base class list of SomeClass:

    +
    +class SomeClass : AnInterface, AnotherInterface {
+  ...
+}
+
    +

    For this to work, AnInterface and AnotherInterface have to be in scope. If SWIG is not in split proxy mode, this is already the case, but it it is, they have to be added to the import list via the dimports typemap. Additionally, the import statement depends on the package SWIG is configured to emit the modules to.

    +

    The $importtype macro helps you to elegantly solve this problem:

    +
    +%typemap(dimports) RemoteMpe %{
+$importtype(AnInterface)
+$importtype(AnotherInterface)
+%}
+
    +

    If SWIG is in split proxy mode, it expands to an import statement for the specified type, to nothing if not.

    +
    + +
    $module
    +

    Expands to the name of the main proxy D module.

    + +
    $imdmodule
    +

    Contains the fully qualified name of the intermediary D module.

    +
    + + +

    20.4 %features

    + + +

    The D module defines a number of directives which modify the SWIG features set globally or for a specific declaration:

    + + +
    +
    %dmanifestconst and %dconstvalue(value)
    +
    +

    Out of the box, SWIG generates accessor methods for C #defines and C++ constants. The %dmanifestconst directive enables wrapping these constants as D manifest constants (const in D1, enum in D2).

    +

    For this to work, the C/C++ code for the constant value must directly compile as D code, though. If this is not the case, you can manually override the expression written to the D proxy module using the %dconstvalue directive, passing the new value as parameter.

    +

    For enums, again %dconstvalue can be used to override the value of an enum item if the initializer should not compile in D.

    +
    + +
    %dmethodmodifiers
    +
    +

    This directive can be used to override the modifiers for a proxy function. For instance, you could make a public C++ member function private in D like this:

    +
    +%dmethodmodifiers A::foo "private";
+
+%inline %{
+struct A {
+  void foo();
+};
+%}
+
    +
    +
    + + +

    20.5 Pragmas

    + + +

    There are a few SWIG pragmas specific to the D module, which you can use to influence the D code SWIG generates:

    + +
    +
    %pragma(d) imdmodulecode
    +

    The passed text (D code) is copied verbatim to the intermediary D module. For example, it can be (and is, internally) used to emit additional private helper code for the use by proxy typemaps.

    + +
    %pragma(d) imdmoduleimports
    +

    Additional code to be emitted to the imports section of the intermediary D module (the $importtype macro can be used here). You probably want to use this in conjunction with the imdmodulecode pragma.

    + +
    %pragma(d) proxydmodulecode
    +

    Just like proxydmodulecode, the argument is copied to the proxy D module (if SWIG is in split proxy mode and/or the nspace feature is used, it is emitted to the main proxy D module only).

    + +
    %pragma(d) globalproxyimports
    +
    +

    The D module currently does not support specifying dependencies on external modules (e.g. from the standard library) for the D typemaps. To add the import statements to the proxy modules (resp. to all proxy modules if in split proxy mode), you can use the globalproxyimports directive.

    +

    For example:

    +
    +%typemap(din) char[] "($dinput ? tango.stdc.stringz.toStringz($dinput) : null)"
+%pragma(d) globalproxyimports = "static import tango.stdc.stringz;";
+
    +
    + +
    %pragma(d) wrapperloadercode
    +
    +

    The D code for loading the wrapper library (it is copied to the intermediary D module). The $wrapperloaderbindcode variable is replaced by the list of commands for binding the functions from the wrapper library to the symbols in the intermediary D module.

    +

    Each time this pragma is specified, the previous value is overwritten.

    +
    + +
    %pragma(d) wrapperloaderbindcommand
    +
    +

    The D command to use for binding the wrapper functions from the C/C++ library to the symbols in the intermediary D module. The $function variable contains the name of the D function in the wrap module, the $symbol variable is replaced by the name of the symbol in the library.

    +

    Each time this pragma is specified, the previous value is overwritten.

    +
    +
    + + +

    20.6 D Exceptions

    + + +

    Out of the box, C++ exceptions are fundamentally incompatible to their equivalent in the D world and cannot simply be propagated to a calling D method. There is, however, an easy way to solve this problem: Just catch the exception in the C/C++ wrapper layer, pass the contents to D, and make the wrapper code rethrow the exception in the D world.

    + +

    The implementation details of this are a bit crude, but the SWIG D module automatically takes care of this, as long as it is able to detect that an exception could potentially be thrown (e.g. because the C++ method has a throw(...) exception specification).

    + +

    As this feature is implemented in exactly the same way it is for C#, please see the C# documentation for a more detailed explanation.

    + + +

    20.7 D Directors

    + + +

    When the directors feature is activated, SWIG generates extra code on both the C++ and the D side to enable cross-language polymorphism. Essentially, this means that if you subclass a proxy class in D, C++ code can access any overridden virtual methods just as if you created a derived class in C++.

    + +

    There is no D specific documentation yet, but the way the feature is implemented is very similar to how it is done in Java and C#. +

    + + +

    20.8 Other features

    + + +

    20.8.1 Extended namespace support (nspace)

    + + +

    By default, SWIG flattens all C++ namespaces into a single target language namespace, but as for Java and C#, the nspace feature is supported for D. If it is active, C++ namespaces are mapped to D packages/modules. Note, however, that like for the other languages, free variables and functions are not supported yet; currently, they are all allows written to the main proxy D module.

    + + +

    20.8.2 Native pointer support

    + + +

    Contrary to many of the scripting languages supported by SWIG, D fully supports C-style pointers. The D module thus includes a custom mechanism to wrap C pointers directly as D pointers where applicable, that is, if the type that is pointed to is represented the same in C and D (on the bit-level), dubbed a »primtive type« below.

    + +

    Central to this custom pointer handling scheme are two typemap attributes: the cprimitive attribute on the dtype typemap and the nativepointer attribute on all the typemaps which influence the D side of the code (dtype, din, dout, ...). When a D typemap is looked up, the following happens behind the scenes:

    + +

    First, the matching typemap is determined by the usual typemap lookup rules. Then, it is checked if the result has the nativepointer attribute set. If it is present, it means that its value should replace the typemap value if and only if the actual type the typemap is looked up for is a primitive type, a pointer to a primitive type (through an arbitrary level of indirections), or a function pointer with only primitive types in its signature.

    + +

    To determine if a type should be considered primitive, the cprimitive attribute on its dtype attribute is used. For example, the dtype typemap for float has cprimitive="1", so the code from the nativepointer attribute is taken into account e.g. for float ** or the function pointer float (*)(float *).

    + + +

    20.8.3 Operator overloading

    + + +

    The D module comes with basic operator overloading support for both D1 and D2. There are, however, a few limitations arising from conceptual differences between C++ and D:

    + +

    The first key difference is that C++ supports free functions as operators (along with argument-dependent lookup), while D requires operators to be member functions of the class they are operating on. SWIG can only automatically generate wrapping code for member function operators; if you want to use operators defined as free functions in D, you need to handle them manually.

    + +

    Another set of differences between C++ and D concerns individual operators. For example, there are quite a few operators which are overloadable in C++, but not in D, for example && and ||, but also !, and prefix increment/decrement operators in D1 resp. their postfix pendants in D2.

    + +

    There are also some cases where the operators can be translated to D, but the differences in the implementation details are big enough that a rather involved scheme would be required for automatic wrapping them, which has not been implemented yet. This affects, for example, the array subscript operator, [], in combination with assignments - while operator [] in C++ simply returns a reference which is then written to, D resorts to a separate opIndexAssign method -, or implicit casting (which was introduced in D2 via alias this). Despite the lack of automatic support, manually handling these cases should be perfectly possible.

    + + +

    20.8.4 Running the test-suite

    + + +

    As with any other language, the SWIG test-suite can be built for D using the *-d-test-suite targets of the top-level Makefile. By default, D1 is targeted, to build it with D2, use the optional D_VERSION variable, e.g. make check-d-test-suite D_VERSION=2.

    + +

    Note: If you want to use GDC on Linux or another platform which requires you to link libdl for dynamically loading the shared library, you might have to add -ldl manually to the d_compile target in Examples/Makefile, because GDC does not currently honor the pragma(lib,...) statement.

    + + +

    20.9 D Typemap examples

    + + +

    There are no D-specific typemap examples yet. However, with the above name comparison table, you should be able to get an idea what can be done by looking at the corresponding C# section.

    + + + +

    20.10 Work in progress and planned features

    + + +

    There are a couple of features which are not implemented yet, but would be very useful and might be added in the near future:

    + +
      +
    • Static linking: Currently, the C wrapper code is compiled into a dynamic library, out of which the symbol addresses are looked up at runtime by the D part. If statically linking the different languages into one binary was supported, a tool-chain capable of performing IPO at link time could inline the wrapping code, effectively reducing the overhead for simple calls to zero.
      • +
    • C array handling: Many data structures in some C/C++ libraries contain array containing of a pointer to the first element and the element count. Currently, one must manually writing wrapper code to be able to access these from D. It should be possible to add a set of SWIG macros to semi-automatically generate conversion code.
      • +
    + +

    Some generated code might also be a bit rough around the edges, particularly in the following areas:

    + +
      +
    • Memory management: Although the currently generated wrapper code works fine with regard to the GC for the test-suite, there might be issues coming up in real-world multi-threaded usage.
      • +
    • D2 support: Originally, the module has been developed for the use with D1, D2/Phobos support has been added in later. The basic features should work equally well for both, but there could be issues concerning const-correctness etc.
      • +
    + + + + + diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index 072f28963..c6e006033 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -6,7 +6,7 @@ -

    36 Extending SWIG to support new languages

    +

    37 Extending SWIG to support new languages

      @@ -75,7 +75,7 @@ -

      36.1 Introduction

      +

      37.1 Introduction

      @@ -91,7 +91,7 @@ Also, this chapter is not meant to be a hand-holding tutorial. As a starting po you should probably look at one of SWIG's existing modules.

      -

      36.2 Prerequisites

      +

      37.2 Prerequisites

      @@ -121,7 +121,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of wrapper code are driven by C++ datatypes.

      -

      36.3 The Big Picture

      +

      37.3 The Big Picture

      @@ -158,7 +158,7 @@ role in making the system work. For example, both typemaps and declaration anno based on pattern matching and interact heavily with the underlying type system.

      -

      36.4 Execution Model

      +

      37.4 Execution Model

      @@ -203,7 +203,7 @@ latter stage of compilation. The next few sections briefly describe some of these stages.

      -

      36.4.1 Preprocessing

      +

      37.4.1 Preprocessing

      @@ -284,7 +284,7 @@ been expanded as well as everything else that goes into the low-level construction of the wrapper code.

      -

      36.4.2 Parsing

      +

      37.4.2 Parsing

      @@ -385,7 +385,7 @@ returning a foo and taking types a and b as arguments).

      -

      36.4.3 Parse Trees

      +

      37.4.3 Parse Trees

      @@ -640,7 +640,7 @@ $ swig -c++ -python -debug-module 4 example.i

    -

    36.4.4 Attribute namespaces

    +

    37.4.4 Attribute namespaces

    @@ -659,7 +659,7 @@ that matches the name of the target language. For example, python:foo perl:foo.

    -

    36.4.5 Symbol Tables

    +

    37.4.5 Symbol Tables

    @@ -750,7 +750,7 @@ example.i:5. Previous declaration is foo_i(int )

    -

    36.4.6 The %feature directive

    +

    37.4.6 The %feature directive

    @@ -806,7 +806,7 @@ For example, the exception code above is simply stored without any modifications.

    -

    36.4.7 Code Generation

    +

    37.4.7 Code Generation

    @@ -928,7 +928,7 @@ public : The role of these functions is described shortly.

    -

    36.4.8 SWIG and XML

    +

    37.4.8 SWIG and XML

    @@ -941,7 +941,7 @@ internal data structures, it may be useful to keep XML in the back of your mind as a model.

    -

    36.5 Primitive Data Structures

    +

    37.5 Primitive Data Structures

    @@ -987,7 +987,7 @@ typedef Hash Typetab; -

    36.5.1 Strings

    +

    37.5.1 Strings

    @@ -1128,7 +1128,7 @@ Returns the number of replacements made (if any). -

    36.5.2 Hashes

    +

    37.5.2 Hashes

    @@ -1205,7 +1205,7 @@ Returns the list of hash table keys. -

    36.5.3 Lists

    +

    37.5.3 Lists

    @@ -1294,7 +1294,7 @@ If t is not a standard object, it is assumed to be a char * and is used to create a String object. -

    36.5.4 Common operations

    +

    37.5.4 Common operations

    The following operations are applicable to all datatypes. @@ -1349,7 +1349,7 @@ objects and report errors. Gets the line number associated with x. -

    36.5.5 Iterating over Lists and Hashes

    +

    37.5.5 Iterating over Lists and Hashes

    To iterate over the elements of a list or a hash table, the following functions are used: @@ -1394,7 +1394,7 @@ for (j = First(j); j.item; j= Next(j)) { -

    36.5.6 I/O

    +

    37.5.6 I/O

    Special I/O functions are used for all internal I/O. These operations @@ -1531,7 +1531,7 @@ Similarly, the preprocessor and parser all operate on string-files. -

    36.6 Navigating and manipulating parse trees

    +

    37.6 Navigating and manipulating parse trees

    Parse trees are built as collections of hash tables. Each node is a hash table in which @@ -1665,7 +1665,7 @@ Deletes a node from the parse tree. Deletion reconnects siblings and properly u the parent so that sibling nodes are unaffected. -

    36.7 Working with attributes

    +

    37.7 Working with attributes

    @@ -1782,7 +1782,7 @@ the attribute is optional. Swig_restore() must always be called after function. -

    36.8 Type system

    +

    37.8 Type system

    @@ -1791,7 +1791,7 @@ pointers, references, and pointers to members. A detailed discussion of type theory is impossible here. However, let's cover the highlights.

    -

    36.8.1 String encoding of types

    +

    37.8.1 String encoding of types

    @@ -1892,7 +1892,7 @@ make the final type, the two parts are just joined together using string concatenation.

    -

    36.8.2 Type construction

    +

    37.8.2 Type construction

    @@ -2061,7 +2061,7 @@ Returns the prefix of a type. For example, if ty is ty is unmodified. -

    36.8.3 Type tests

    +

    37.8.3 Type tests

    @@ -2148,7 +2148,7 @@ Checks if ty is a varargs type. Checks if ty is a templatized type. -

    36.8.4 Typedef and inheritance

    +

    37.8.4 Typedef and inheritance

    @@ -2250,7 +2250,7 @@ Fully reduces ty according to typedef rules. Resulting datatype will consist only of primitive typenames. -

    36.8.5 Lvalues

    +

    37.8.5 Lvalues

    @@ -2287,7 +2287,7 @@ Literal y; // type = 'Literal', ltype='p.char' -

    36.8.6 Output functions

    +

    37.8.6 Output functions

    @@ -2349,7 +2349,7 @@ SWIG, but is most commonly associated with type-descriptor objects that appear in wrappers (e.g., SWIGTYPE_p_double). -

    36.9 Parameters

    +

    37.9 Parameters

    @@ -2448,7 +2448,7 @@ included. Used to emit prototypes. Returns the number of required (non-optional) arguments in p. -

    36.10 Writing a Language Module

    +

    37.10 Writing a Language Module

    @@ -2463,7 +2463,7 @@ describes the creation of a minimal Python module. You should be able to extra this to other languages.

    -

    36.10.1 Execution model

    +

    37.10.1 Execution model

    @@ -2473,7 +2473,7 @@ the parsing of command line options, all aspects of code generation are controll different methods of the Language that must be defined by your module.

    -

    36.10.2 Starting out

    +

    37.10.2 Starting out

    @@ -2581,7 +2581,7 @@ that activates your module. For example, swig -python foo.i. The messages from your new module should appear.

    -

    36.10.3 Command line options

    +

    37.10.3 Command line options

    @@ -2640,7 +2640,7 @@ to mark the option as valid. If you forget to do this, SWIG will terminate wit unrecognized command line option error.

    -

    36.10.4 Configuration and preprocessing

    +

    37.10.4 Configuration and preprocessing

    @@ -2689,7 +2689,7 @@ an implementation file python.cxx and a configuration file python.swg.

    -

    36.10.5 Entry point to code generation

    +

    37.10.5 Entry point to code generation

    @@ -2747,7 +2747,7 @@ int Python::top(Node *n) { -

    36.10.6 Module I/O and wrapper skeleton

    +

    37.10.6 Module I/O and wrapper skeleton

    @@ -2895,7 +2895,7 @@ functionWrapper : void Shape_y_set(Shape *self,double y) -

    36.10.7 Low-level code generators

    +

    37.10.7 Low-level code generators

    @@ -3049,7 +3049,7 @@ but without the typemaps, there is still work to do.

    -

    36.10.8 Configuration files

    +

    37.10.8 Configuration files

    @@ -3193,7 +3193,7 @@ politely displays the ignoring language message. -

    36.10.9 Runtime support

    +

    37.10.9 Runtime support

    @@ -3202,7 +3202,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g. the SWIG files that implement those functions.

    -

    36.10.10 Standard library files

    +

    37.10.10 Standard library files

    @@ -3221,7 +3221,7 @@ The following are the minimum that are usually supported: Please copy these and modify for any new language.

    -

    36.10.11 User examples

    +

    37.10.11 User examples

    @@ -3250,7 +3250,7 @@ during this process, see the section on .

    -

    36.10.12 Test driven development and the test-suite

    +

    37.10.12 Test driven development and the test-suite

    @@ -3309,7 +3309,7 @@ It is therefore essential that the runtime tests are written in a manner that di but error/exception out with an error message on stderr on failure.

    -

    36.10.12.1 Running the test-suite

    +

    37.10.12.1 Running the test-suite

    @@ -3477,7 +3477,25 @@ A debugger can also be invoked easily on an individual test, for example gdb: make ret_by_value.ctest RUNTOOL="gdb --args" -

    36.10.13 Documentation

    +

    +SWIG reads the SWIG_FEATURES environment variable to obtain options in addition to those passed on the command line. +This is particularly useful as the entire test-suite or a particular testcase can be run customized by using additional +arguments, for example the -O optimization flag can be added in, as shown below for the bash shell: +

    + +
    +env SWIG_FEATURES=-O make check-python-test-suite
+
    + +

    +The syntax for setting environment variables varies from one shell to the next, but it also works as shown in the example below, where some typemap debugging is added in: +

    + +
    +make ret_by_value.ctest SWIG_FEATURES="-debug-tmsearch"
+
    + +

    37.10.13 Documentation

    @@ -3509,7 +3527,7 @@ Some topics that you'll want to be sure to address include: if available. -

    36.10.14 Prerequisites for adding a new language module to the SWIG distribution

    +

    37.10.14 Prerequisites for adding a new language module to the SWIG distribution

    @@ -3566,7 +3584,7 @@ should be added should there be an area not already covered by the existing tests.

    -

    36.10.15 Coding style guidelines

    +

    37.10.15 Coding style guidelines

    @@ -3590,7 +3608,7 @@ The generated C/C++ code should also follow this style as close as possible. How should be avoided as unlike the SWIG developers, users will never have consistent tab settings.

    -

    36.11 Debugging Options

    +

    37.11 Debugging Options

    @@ -3617,7 +3635,7 @@ There are various command line options which can aid debugging a SWIG interface The complete list of command line options for SWIG are available by running swig -help.

    -

    36.12 Guide to parse tree nodes

    +

    37.12 Guide to parse tree nodes

    @@ -4025,7 +4043,7 @@ extern "X" { ... } declaration. -

    36.13 Further Development Information

    +

    37.13 Further Development Information

    diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html index 5e99a5156..8681927c3 100644 --- a/Doc/Manual/Go.html +++ b/Doc/Manual/Go.html @@ -5,7 +5,7 @@ -

    20 SWIG and Go

    +

    21 SWIG and Go

      @@ -41,7 +41,7 @@ the Go programming language see golang.org.

      -

      20.1 Overview

      +

      21.1 Overview

      @@ -65,7 +65,7 @@ checking and runtime library are not used with Go. This should be borne in mind when reading the rest of the SWIG documentation.

      -

      20.2 Running SWIG with Go

      +

      21.2 Running SWIG with Go

      @@ -74,7 +74,7 @@ default SWIG will generate code for the gc compilers. To generate code for gccgo, you should also use the -gccgo option.

      -

      20.2.1 Additional Commandline Options

      +

      21.2.1 Additional Commandline Options

      @@ -94,7 +94,7 @@ swig -go -help -gccgo Generate code for gccgo. The default is to generate code for - 6g/8g/6g. + 6g/8g/5g. @@ -103,6 +103,15 @@ swig -go -help package name is the SWIG module name. + +-soname %lt;name%gt; +Set the runtime name of the shared library that the dynamic linker + should include at runtime. The default is the package name with + ".so" appended. This is only used when generating code for + 6g/8g/5g; when using gccgo, the equivalent name will be taken from + the -soname option passed to the linker. + + -go-prefix <prefix> When generating code for gccgo, set the prefix to use. This @@ -118,7 +127,7 @@ swig -go -help -

      20.2.2 Go Output Files

      +

      21.2.2 Go Output Files

      When generating Go code, SWIG will generate the following @@ -163,7 +172,7 @@ A typical command sequence would look like this: % 6l main.6

    -

    20.3 A tour of basic C/C++ wrapping

    +

    21.3 A tour of basic C/C++ wrapping

    @@ -173,7 +182,7 @@ modifications have to occur. This section briefly covers the essential aspects of this wrapping.

    -

    20.3.1 Go Package Name

    +

    21.3.1 Go Package Name

    @@ -183,7 +192,7 @@ directive. You may override this by using SWIG's -package command line option.

    -

    20.3.2 Go Names

    +

    21.3.2 Go Names

    @@ -215,7 +224,7 @@ followed by that name, and the destructor will be named Delete followed by that name.

    -

    20.3.3 Go Constants

    +

    21.3.3 Go Constants

    @@ -223,7 +232,7 @@ C/C++ constants created via #define or the %constant directive become Go constants, declared with a const declaration. -

    20.3.4 Go Enumerations

    +

    21.3.4 Go Enumerations

    @@ -233,7 +242,7 @@ usual). The values of the enumeration will become variables in Go; code should avoid modifying those variables.

    -

    20.3.5 Go Classes

    +

    21.3.5 Go Classes

    @@ -280,7 +289,7 @@ to reinterpret_cast. This should only be used for very special cases, such as where C++ would use a dynamic_cast.

    -

    20.3.5.1 Go Class Inheritance

    +

    21.3.5.1 Go Class Inheritance

    @@ -292,7 +301,7 @@ Doing the reverse will require an explicit type assertion, which will be checked dynamically.

    -

    20.3.6 Go Templates

    +

    21.3.6 Go Templates

    @@ -300,7 +309,7 @@ In order to use C++ templates in Go, you must tell SWIG to create wrappers for a particular template instantation. To do this, use the %template directive. -

    20.3.7 Go Director Classes

    +

    21.3.7 Go Director Classes

    @@ -343,7 +352,7 @@ method defined in Go. The Go code may of course call other methods on itself, and those methods may be defined either in Go or in C++.

    -

    20.3.8 Default Go primitive type mappings

    +

    21.3.8 Default Go primitive type mappings

    diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html index 75c3d3473..111c48214 100644 --- a/Doc/Manual/Guile.html +++ b/Doc/Manual/Guile.html @@ -8,7 +8,7 @@ -

    21 SWIG and Guile

    +

    22 SWIG and Guile

      @@ -47,7 +47,7 @@

      This section details guile-specific support in SWIG. -

      21.1 Meaning of "Module"

      +

      22.1 Meaning of "Module"

      @@ -55,7 +55,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". -

      21.2 Using the SCM or GH Guile API

      +

      22.2 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 +103,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.

      -

      21.3 Linkage

      +

      22.3 Linkage

      @@ -111,7 +111,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. -

      21.3.1 Simple Linkage

      +

      22.3.1 Simple Linkage

      @@ -206,7 +206,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. -

      21.3.2 Passive Linkage

      +

      22.3.2 Passive Linkage

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

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

      21.3.3 Native Guile Module Linkage

      +

      22.3.3 Native Guile Module Linkage

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

    -

    21.3.4 Old Auto-Loading Guile Module Linkage

    +

    22.3.4 Old Auto-Loading Guile Module Linkage

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

    21.3.5 Hobbit4D Linkage

    +

    22.3.5 Hobbit4D Linkage

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

    -

    21.4 Underscore Folding

    +

    22.4 Underscore Folding

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

    21.5 Typemaps

    +

    22.5 Typemaps

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

    -

    21.6 Representation of pointers as smobs

    +

    22.6 Representation of pointers as smobs

    @@ -429,11 +429,11 @@ upper half of the CAR is read from this struct. To get the pointer represented by a smob, the wrapper code calls the function SWIG_ConvertPtr(), passing a pointer to a struct representing the expected pointer type. See also -The run-time type checker. +The run-time type checker. If the Scheme object passed was not a SWIG smob representing a compatible pointer, a wrong-type-arg exception is raised. -

    21.6.1 GH Smobs

    +

    22.6.1 GH Smobs

    @@ -462,7 +462,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.

    -

    21.6.2 SCM Smobs

    +

    22.6.2 SCM Smobs

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

    -

    21.6.3 Garbage Collection

    +

    22.6.3 Garbage Collection

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

    22.7 Exception Handling

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

    21.8 Procedure documentation

    +

    22.8 Procedure documentation

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

    21.9 Procedures with setters

    +

    22.9 Procedures with setters

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

    21.10 GOOPS Proxy Classes

    +

    22.10 GOOPS Proxy Classes

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

    -

    21.10.1 Naming Issues

    +

    22.10.1 Naming Issues

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

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

    21.10.2 Linking

    +

    22.10.2 Linking

    The guile-modules generated above all need to be linked together. GOOPS support requires diff --git a/Doc/Manual/Introduction.html b/Doc/Manual/Introduction.html index 3bac9484e..a8d15a5c2 100644 --- a/Doc/Manual/Introduction.html +++ b/Doc/Manual/Introduction.html @@ -195,9 +195,9 @@ extern int my_mod(int n, int m);

    The interface file contains ANSI C function prototypes and variable declarations. The %module directive defines the name of the -module that will be created by SWIG. The %{,%} block -provides a location for inserting additional code such as C header -files or additional C declarations. +module that will be created by SWIG. The %{ %} block +provides a location for inserting additional code, such as C header +files or additional C declarations, into the generated C wrapper code.

    2.3.2 The swig command

    @@ -372,9 +372,9 @@ Microsoft Visual Studio.

    If you are using the GNU Autotools -(Autoconf/ -Automake/ -Libtool) +(Autoconf/ +Automake/ +Libtool) to configure SWIG use in your project, the SWIG Autoconf macros can be used. The primary macro is ax_pkg_swig, see http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html#ax_pkg_swig. diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index d32a7fb9a..2ae9f7b95 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -5,7 +5,7 @@ -

    22 SWIG and Java

    +

    23 SWIG and Java

  • Java typemaps @@ -154,7 +155,7 @@ It covers most SWIG features, but certain low-level details are covered in less

    -

    22.1 Overview

    +

    23.1 Overview

    @@ -189,7 +190,7 @@ Various customisation tips and techniques using SWIG directives are covered. The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.

    -

    22.2 Preliminaries

    +

    23.2 Preliminaries

    @@ -205,7 +206,7 @@ Run make -k check from the SWIG root directory after installing SWIG on The Java module requires your system to support shared libraries and dynamic loading. This is the commonly used method to load JNI code so your system will more than likely support this.

    -

    22.2.1 Running SWIG

    +

    23.2.1 Running SWIG

    @@ -264,7 +265,7 @@ The following sections have further practical examples and details on how you mi compiling and using the generated files.

    -

    22.2.2 Additional Commandline Options

    +

    23.2.2 Additional Commandline Options

    @@ -301,7 +302,7 @@ swig -java -help Their use will become clearer by the time you have finished reading this section on SWIG and Java.

    -

    22.2.3 Getting the right header files

    +

    23.2.3 Getting the right header files

    @@ -316,7 +317,7 @@ They are usually in directories like this:

    The exact location may vary on your machine, but the above locations are typical.

    -

    22.2.4 Compiling a dynamic module

    +

    23.2.4 Compiling a dynamic module

    @@ -352,7 +353,7 @@ The name of the shared library output file is important. If the name of your SWIG module is "example", the name of the corresponding shared library file should be "libexample.so" (or equivalent depending on your machine, see Dynamic linking problems for more information). The name of the module is specified using the %module directive or -module command line option.

    -

    22.2.5 Using your module

    +

    23.2.5 Using your module

    @@ -387,7 +388,7 @@ $ If it doesn't work have a look at the following section which discusses problems loading the shared library.

    -

    22.2.6 Dynamic linking problems

    +

    23.2.6 Dynamic linking problems

    @@ -474,7 +475,7 @@ The following section also contains some C++ specific linking problems and solut

    -

    22.2.7 Compilation problems and compiling with C++

    +

    23.2.7 Compilation problems and compiling with C++

    @@ -527,7 +528,7 @@ Finally make sure the version of JDK header files matches the version of Java th

    -

    22.2.8 Building on Windows

    +

    23.2.8 Building on Windows

    @@ -536,7 +537,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine. This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers. In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.

    -

    22.2.8.1 Running SWIG from Visual Studio

    +

    23.2.8.1 Running SWIG from Visual Studio

    @@ -575,7 +576,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa If the library fails to load have a look at Dynamic linking problems.

    -

    22.2.8.2 Using NMAKE

    +

    23.2.8.2 Using NMAKE

    @@ -634,7 +635,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -

    -

    22.3 A tour of basic C/C++ wrapping

    +

    23.3 A tour of basic C/C++ wrapping

    @@ -644,7 +645,7 @@ variables are wrapped with JavaBean type getters and setters and so forth. This section briefly covers the essential aspects of this wrapping.

    -

    22.3.1 Modules, packages and generated Java classes

    +

    23.3.1 Modules, packages and generated Java classes

    @@ -680,7 +681,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i SWIG won't create the directory, so make sure it exists beforehand.

    -

    22.3.2 Functions

    +

    23.3.2 Functions

    @@ -714,7 +715,7 @@ System.out.println(example.fact(4)); -

    22.3.3 Global variables

    +

    23.3.3 Global variables

    @@ -801,7 +802,7 @@ extern char *path; // Read-only (due to %immutable) -

    22.3.4 Constants

    +

    23.3.4 Constants

    @@ -941,7 +942,7 @@ Or if you decide this practice isn't so bad and your own class implements ex

    -

    22.3.5 Enumerations

    +

    23.3.5 Enumerations

    @@ -955,7 +956,7 @@ The final two approaches use simple integers for each enum item. Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.

    -

    22.3.5.1 Anonymous enums

    +

    23.3.5.1 Anonymous enums

    @@ -1018,7 +1019,7 @@ As in the case of constants, you can access them through either the module class

    -

    22.3.5.2 Typesafe enums

    +

    23.3.5.2 Typesafe enums

    @@ -1112,7 +1113,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit The following section details proper Java enum generation.

    -

    22.3.5.3 Proper Java enums

    +

    23.3.5.3 Proper Java enums

    @@ -1165,7 +1166,7 @@ The additional support methods need not be generated if none of the enum items h Simpler Java enums for enums without initializers section.

    -

    22.3.5.4 Type unsafe enums

    +

    23.3.5.4 Type unsafe enums

    @@ -1213,7 +1214,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.

    -

    22.3.5.5 Simple enums

    +

    23.3.5.5 Simple enums

    @@ -1232,7 +1233,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach. The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.

    -

    22.3.6 Pointers

    +

    23.3.6 Pointers

    @@ -1320,7 +1321,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return a NULL pointer if the conversion can't be performed.

    -

    22.3.7 Structures

    +

    23.3.7 Structures

    @@ -1488,7 +1489,7 @@ x.setA(3); // Modify x.a - this is the same as b.f.a -

    22.3.8 C++ classes

    +

    23.3.8 C++ classes

    @@ -1551,7 +1552,7 @@ int bar = Spam.getBar(); -

    22.3.9 C++ inheritance

    +

    23.3.9 C++ inheritance

    @@ -1612,7 +1613,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance A warning is given when multiple inheritance is detected and only the first base class is used.

    -

    22.3.10 Pointers, references, arrays and pass by value

    +

    23.3.10 Pointers, references, arrays and pass by value

    @@ -1667,7 +1668,7 @@ to hold the result and a pointer is returned (Java will release this memory when the returned object's finalizer is run by the garbage collector).

    -

    22.3.10.1 Null pointers

    +

    23.3.10.1 Null pointers

    @@ -1691,7 +1692,7 @@ For spam1 and spam4 above the Java null gets translat The converse also occurs, that is, NULL pointers are translated into null Java objects when returned from a C/C++ function.

    -

    22.3.11 C++ overloaded functions

    +

    23.3.11 C++ overloaded functions

    @@ -1806,7 +1807,7 @@ void spam(unsigned short); // Ignored -

    22.3.12 C++ default arguments

    +

    23.3.12 C++ default arguments

    @@ -1849,7 +1850,7 @@ Further details on default arguments and how to restore this approach are given

    -

    22.3.13 C++ namespaces

    +

    23.3.13 C++ namespaces

    @@ -1922,12 +1923,14 @@ So if SWIG is run using the -package com.myco option, a wrapped class, 

    -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.
+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.
    -

    22.3.14 C++ templates

    +

    23.3.14 C++ templates

    @@ -1976,7 +1979,7 @@ Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter.

    -

    22.3.15 C++ Smart Pointers

    +

    23.3.15 C++ Smart Pointers

    @@ -2060,7 +2063,7 @@ Foo f = p.__deref__(); // Returns underlying Foo * -

    22.4 Further details on the generated Java classes

    +

    23.4 Further details on the generated Java classes

    @@ -2075,7 +2078,7 @@ Finally enum classes are covered. First, the crucial intermediary JNI class is considered.

    -

    22.4.1 The intermediary JNI class

    +

    23.4.1 The intermediary JNI class

    @@ -2195,7 +2198,7 @@ If name is the same as modulename then the module class name g from modulename to modulenameModule.

    -

    22.4.1.1 The intermediary JNI class pragmas

    +

    23.4.1.1 The intermediary JNI class pragmas

    @@ -2274,7 +2277,7 @@ For example, let's change the intermediary JNI class access to just the default All the methods in the intermediary JNI class will then not be callable outside of the package as the method modifiers have been changed from public access to default access. This is useful if you want to prevent users calling these low level functions.

    -

    22.4.2 The Java module class

    +

    23.4.2 The Java module class

    @@ -2305,7 +2308,7 @@ example.egg(new Foo()); The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a Foo can be passed to the egg function, whereas any long can be passed to the egg function in the intermediary JNI class.

    -

    22.4.2.1 The Java module class pragmas

    +

    23.4.2.1 The Java module class pragmas

    @@ -2356,7 +2359,7 @@ See The intermediary JNI class pragmas secti

    -

    22.4.3 Java proxy classes

    +

    23.4.3 Java proxy classes

    @@ -2432,7 +2435,7 @@ int y = f.spam(5, new Foo()); -

    22.4.3.1 Memory management

    +

    23.4.3.1 Memory management

    @@ -2594,7 +2597,7 @@ and

    -

    22.4.3.2 Inheritance

    +

    23.4.3.2 Inheritance

    @@ -2710,7 +2713,7 @@ However, true cross language polymorphism can be achieved using the 22.4.3.3 Proxy classes and garbage collection +

    23.4.3.3 Proxy classes and garbage collection

    @@ -2743,7 +2746,7 @@ Call the System.runFinalizersOnExit(true) or Runtime.getRuntime().r This method is inherently unsafe. It may result in finalizers being called on live objects while other threads are concurrently manipulating those objects, resulting in erratic behavior or deadlock.

    In many cases you will be lucky and find that it works, but it is not to be advocated. -Have a look at Sun's Java web site and search for runFinalizersOnExit. +Have a look at Java web site and search for runFinalizersOnExit.

  • @@ -2793,7 +2796,7 @@ The section on Java typemaps details how to specify See the How to Handle Java Finalization's Memory-Retention Issues article for alternative approaches to managing memory by avoiding finalizers altogether.

    -

    22.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    +

    23.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling

    @@ -2915,7 +2918,7 @@ For example: Compatibility note: The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.

    -

    22.4.3.5 Single threaded applications and thread safety

    +

    23.4.3.5 Single threaded applications and thread safety

    @@ -3003,7 +3006,7 @@ for (int i=0; i<100000; i++) { -

    22.4.4 Type wrapper classes

    +

    23.4.4 Type wrapper classes

    @@ -3090,7 +3093,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... } -

    22.4.5 Enum classes

    +

    23.4.5 Enum classes

    @@ -3099,7 +3102,7 @@ The Enumerations section discussed these but om The following sub-sections detail the various types of enum classes that can be generated.

    -

    22.4.5.1 Typesafe enum classes

    +

    23.4.5.1 Typesafe enum classes

    @@ -3183,7 +3186,7 @@ The swigValue method is used for marshalling in the other direction. The toString method is overridden so that the enum name is available.

    -

    22.4.5.2 Proper Java enum classes

    +

    23.4.5.2 Proper Java enum classes

    @@ -3261,7 +3264,7 @@ These needn't be generated if the enum being wrapped does not have any initializ Simpler Java enums for enums without initializers section describes how typemaps can be used to achieve this.

    -

    22.4.5.3 Type unsafe enum classes

    +

    23.4.5.3 Type unsafe enum classes

    @@ -3292,7 +3295,7 @@ public final class Beverage { -

    22.5 Cross language polymorphism using directors

    +

    23.5 Cross language polymorphism using directors

    @@ -3314,7 +3317,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.

    -

    22.5.1 Enabling directors

    +

    23.5.1 Enabling directors

    @@ -3385,7 +3388,7 @@ public: -

    22.5.2 Director classes

    +

    23.5.2 Director classes

    @@ -3412,7 +3415,7 @@ If the correct implementation is in Java, the Java API is used to call the metho

    -

    22.5.3 Overhead and code bloat

    +

    23.5.3 Overhead and code bloat

    @@ -3430,7 +3433,7 @@ This situation can be optimized by selectively enabling director methods (using

    -

    22.5.4 Simple directors example

    +

    23.5.4 Simple directors example

    @@ -3495,7 +3498,7 @@ DirectorDerived::upcall_method() invoked. -

    22.5.5 Director threading issues

    +

    23.5.5 Director threading issues

    @@ -3515,7 +3518,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern -

    22.6 Accessing protected members

    +

    23.6 Accessing protected members

    @@ -3611,7 +3614,7 @@ class MyProtectedBase extends ProtectedBase -

    22.7 Common customization features

    +

    23.7 Common customization features

    @@ -3623,7 +3626,7 @@ be awkward. This section describes some common SWIG features that are used to improve the interface to existing C/C++ code.

    -

    22.7.1 C/C++ helper functions

    +

    23.7.1 C/C++ helper functions

    @@ -3689,7 +3692,7 @@ hard to implement. It is possible to improve on this using Java code, typemaps, customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.

    -

    22.7.2 Class extension with %extend

    +

    23.7.2 Class extension with %extend

    @@ -3752,7 +3755,7 @@ Vector(2,3,4) in any way---the extensions only show up in the Java interface.

    -

    22.7.3 Exception handling with %exception and %javaexception

    +

    23.7.3 Exception handling with %exception and %javaexception

    @@ -3911,7 +3914,7 @@ to raise exceptions. See the SWIG Library ch The typemap example Handling C++ exception specifications as Java exceptions provides further exception handling capabilities.

    -

    22.7.4 Method access with %javamethodmodifiers

    +

    23.7.4 Method access with %javamethodmodifiers

    @@ -3937,7 +3940,7 @@ protected static void protect_me() { -

    22.8 Tips and techniques

    +

    23.8 Tips and techniques

    @@ -3947,7 +3950,7 @@ strings and arrays. This chapter discusses the common techniques for solving these problems.

    -

    22.8.1 Input and output parameters using primitive pointers and references

    +

    23.8.1 Input and output parameters using primitive pointers and references

    @@ -4121,7 +4124,7 @@ void foo(Bar *OUTPUT); will not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

    -

    22.8.2 Simple pointers

    +

    23.8.2 Simple pointers

    @@ -4187,7 +4190,7 @@ System.out.println("3 + 4 = " + result); See the SWIG Library chapter for further details.

    -

    22.8.3 Wrapping C arrays with Java arrays

    +

    23.8.3 Wrapping C arrays with Java arrays

    @@ -4254,7 +4257,7 @@ Please be aware that the typemaps in this library are not efficient as all the e There is an alternative approach using the SWIG array library and this is covered in the next section.

    -

    22.8.4 Unbounded C Arrays

    +

    23.8.4 Unbounded C Arrays

    @@ -4399,7 +4402,51 @@ well suited for applications in which you need to create buffers, package binary data, etc.

    -

    22.8.5 Overriding new and delete to allocate from Java heap

    +

    23.8.5 Binary data vs Strings

    + + +

    +By default SWIG handles char * as a string but there is a handy multi-argument typemap available as mentioned in Passing binary data. +The following simple example demonstrates using a byte array instead of passing the default string type and length to the wrapped function. +

    + + +
    +
    +%apply (char *STRING, size_t LENGTH) { (const char data[], size_t len) }
+%inline %{
+void binaryChar1(const char data[], size_t len) {
+  printf("len: %d data: ", len);
+  for (size_t i=0; i<len; ++i)
+    printf("%x ", data[i]);
+  printf("\n");
+}
+%}
+
    +
    + +

    +Calling from Java requires just the byte array to be passed in as the multi-argument typemap being applied reduces the number of arguments in the target language to one, from the original two: +

    + +
    +
    +byte[] data = "hi\0jk".getBytes();
+example.binaryChar1(data);     
+
    +
    + +

    +resulting in the output +

    + +
    +$ java runme
+len: 5 data: 68 69 0 6a 6b
+
    + + +

    23.8.6 Overriding new and delete to allocate from Java heap

    @@ -4516,7 +4563,7 @@ model and use these functions in place of malloc and free in your own code.

    -

    22.9 Java typemaps

    +

    23.9 Java typemaps

    @@ -4537,7 +4584,7 @@ Before proceeding, it should be stressed that typemaps are not a required part of using SWIG---the default wrapping behavior is enough in most cases. Typemaps are only used if you want to change some aspect of the generated code. -

    22.9.1 Default primitive type mappings

    +

    23.9.1 Default primitive type mappings

    @@ -4689,7 +4736,7 @@ However, the mappings allow the full range of values for each C type from Java.

    -

    22.9.2 Default typemaps for non-primitive types

    +

    23.9.2 Default typemaps for non-primitive types

    @@ -4704,7 +4751,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit The Java type is either the proxy class or type wrapper class.

    -

    22.9.3 Sixty four bit JVMs

    +

    23.9.3 Sixty four bit JVMs

    @@ -4717,7 +4764,7 @@ Unfortunately it won't of course hold true for JNI code.

    -

    22.9.4 What is a typemap?

    +

    23.9.4 What is a typemap?

    @@ -4840,7 +4887,7 @@ int c = example.count('e',"Hello World"); -

    22.9.5 Typemaps for mapping C/C++ types to Java types

    +

    23.9.5 Typemaps for mapping C/C++ types to Java types

    @@ -5100,7 +5147,7 @@ These are listed below: -

    22.9.6 Java typemap attributes

    +

    23.9.6 Java typemap attributes

    @@ -5146,7 +5193,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes. Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a this call. In Java the this call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a Date marshalling example showing 'pre', 'post' and 'pgcppname' attributes in action.

    -

    22.9.7 Java special variables

    +

    23.9.7 Java special variables

    @@ -5297,7 +5344,7 @@ This special variable expands to the intermediary class name. Usually this is th unless the jniclassname attribute is specified in the %module directive.

    -

    22.9.8 Typemaps for both C and C++ compilation

    +

    23.9.8 Typemaps for both C and C++ compilation

    @@ -5334,7 +5381,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps

    -

    22.9.9 Java code typemaps

    +

    23.9.9 Java code typemaps

    @@ -5540,7 +5587,7 @@ For the typemap to be used in all type wrapper classes, all the different types Again this is the same that is in "java.swg", barring the method modifier for getCPtr.

    -

    22.9.10 Director specific typemaps

    +

    23.9.10 Director specific typemaps

    @@ -5765,7 +5812,7 @@ The basic strategy here is to provide a default package typemap for the majority -

    22.10 Typemap Examples

    +

    23.10 Typemap Examples

    @@ -5775,7 +5822,7 @@ the SWIG library.

    -

    22.10.1 Simpler Java enums for enums without initializers

    +

    23.10.1 Simpler Java enums for enums without initializers

    @@ -5854,7 +5901,7 @@ This would be done by using the original versions of these typemaps in "enums.sw

    -

    22.10.2 Handling C++ exception specifications as Java exceptions

    +

    23.10.2 Handling C++ exception specifications as Java exceptions

    @@ -5979,7 +6026,7 @@ We could alternatively have used %rename to rename what() into

    -

    22.10.3 NaN Exception - exception handling for a particular type

    +

    23.10.3 NaN Exception - exception handling for a particular type

    @@ -6134,7 +6181,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.

    -

    22.10.4 Converting Java String arrays to char **

    +

    23.10.4 Converting Java String arrays to char **

    @@ -6278,7 +6325,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify what Java types to use.

    -

    22.10.5 Expanding a Java object to multiple arguments

    +

    23.10.5 Expanding a Java object to multiple arguments

    @@ -6360,7 +6407,7 @@ example.foo(new String[]{"red", "green", "blue", "white"}); -

    22.10.6 Using typemaps to return arguments

    +

    23.10.6 Using typemaps to return arguments

    @@ -6478,7 +6525,7 @@ $ java runme 1 12.0 340.0 -

    22.10.7 Adding Java downcasts to polymorphic return types

    +

    23.10.7 Adding Java downcasts to polymorphic return types

    @@ -6684,7 +6731,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.

    -

    22.10.8 Adding an equals method to the Java classes

    +

    23.10.8 Adding an equals method to the Java classes

    @@ -6728,7 +6775,7 @@ System.out.println("foo1? " + foo1.equals(foo2)); -

    22.10.9 Void pointers and a common Java base class

    +

    23.10.9 Void pointers and a common Java base class

    @@ -6787,7 +6834,7 @@ This example contains some useful functionality which you may want in your code.

  • It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer. -

    22.10.10 Struct pointer to pointer

    +

    23.10.10 Struct pointer to pointer

    @@ -6967,7 +7014,7 @@ The C functional interface has been completely morphed into an object-oriented i the Butler class would behave much like any pure Java class and feel more natural to Java users.

    -

    22.10.11 Memory management when returning references to member variables

    +

    23.10.11 Memory management when returning references to member variables

    @@ -7090,7 +7137,7 @@ public class Bike { Note the addReference call.

    -

    22.10.12 Memory management for objects passed to the C++ layer

    +

    23.10.12 Memory management for objects passed to the C++ layer

    @@ -7206,7 +7253,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla -

    22.10.13 Date marshalling using the javain typemap and associated attributes

    +

    23.10.13 Date marshalling using the javain typemap and associated attributes

    @@ -7383,7 +7430,7 @@ A few things to note: -

    22.11 Living with Java Directors

    +

    23.11 Living with Java Directors

    @@ -7564,10 +7611,10 @@ public abstract class UserVisibleFoo extends Foo {

    • -

    22.12 Odds and ends

    +

    23.12 Odds and ends

    -

    22.12.1 JavaDoc comments

    +

    23.12.1 JavaDoc comments

    @@ -7623,7 +7670,7 @@ public class Barmy { -

    22.12.2 Functional interface without proxy classes

    +

    23.12.2 Functional interface without proxy classes

    @@ -7684,7 +7731,7 @@ All destructors have to be called manually for example the delete_Foo(foo) -

    22.12.3 Using your own JNI functions

    +

    23.12.3 Using your own JNI functions

    @@ -7734,7 +7781,7 @@ This directive is only really useful if you want to mix your own hand crafted JN

    -

    22.12.4 Performance concerns and hints

    +

    23.12.4 Performance concerns and hints

    @@ -7755,7 +7802,7 @@ However, you will have to be careful about memory management and make sure that This method normally calls the C++ destructor or free() for C code.

    -

    22.12.5 Debugging

    +

    23.12.5 Debugging

    @@ -7777,7 +7824,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh

    -

    22.13 Examples

    +

    23.13 Examples

    diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html index 285192d5e..02b8e53bd 100644 --- a/Doc/Manual/Library.html +++ b/Doc/Manual/Library.html @@ -824,20 +824,20 @@ If you have a function that expects binary data, 

    -int parity(char *str, int len, int initial);
+size_t parity(char *str, size_t len, size_t initial);

    -you can wrap the parameters (char *str, int len) as a single +you can wrap the parameters (char *str, size_t len) as a single argument using a typemap. Just do this: 

    -%apply (char *STRING, int LENGTH) { (char *str, int len) };
+%apply (char *STRING, size_t LENGTH) { (char *str, size_t len) };
 ...
-int parity(char *str, int len, int initial);
+size_t parity(char *str, size_t len, size_t initial);
    @@ -854,6 +854,7 @@ Now, in the target language, you can use binary string data like this:

    In the wrapper function, the passed string will be expanded to a pointer and length parameter. +The (char *STRING, int LENGTH) multi-argument typemap is also available in addition to (char *STRING, size_t LENGTH).

    8.3.3 Using %newobject to release memory

    @@ -1801,19 +1802,6 @@ struct DerivedIntValue : IntValue { -

    -Note that if the %shared_ptr macro is omitted for any class in the inheritance hierarchy, it will -result in a C++ compiler error. -For example if the above %shared_ptr(DerivedIntValue) is omitted, the following is typical of the compiler error that will result: -

    - -
    -
    -example_wrap.cxx: In function 'void Java_exampleJNI_delete_1DerivedIntValue(JNIEnv*, _jclass*, jlong)':
-example_wrap.cxx:3169: error: 'smartarg1' was not declared in this scope
-
    -
    -

    A shared_ptr of the derived class can now be passed to a method where the base is expected in the target language, just as it can in C++:

    @@ -1826,6 +1814,59 @@ int val4 = example.extractValueSmart(div); +

    +If the %shared_ptr macro is omitted for any class in the inheritance hierarchy, SWIG will warn about this and the generated code may or may not result in a C++ compilation error. +For example, the following input: +

    + +
    +
    +%include "boost_shared_ptr.i"
+%shared_ptr(Parent);
+
+%inline %{
+  #include <boost/shared_ptr.hpp>
+  struct GrandParent {
+    virtual ~GrandParent() {}
+  };
+
+  struct Parent : GrandParent {
+    virtual ~Parent() {}
+  };
+
+  struct Child : Parent {
+    virtual ~Child() {}
+  };
+%}
+
    +
    + +

    +warns about the missing smart pointer information: +

    + +
    +
    +example.i:12: Warning 520: Base class 'GrandParent' of 'Parent' is not similarly marked as a smart pointer.
+example.i:16: Warning 520: Derived class 'Child' of 'Parent' is not similarly marked as a smart pointer.
+
    +
    + +

    +Adding the missing %shared_ptr macros will fix this: +

    + +
    +
    +%include "boost_shared_ptr.i"
+%shared_ptr(GrandParent);
+%shared_ptr(Parent);
+%shared_ptr(Child);
+
+... as before ...
+
    +
    +

    8.5 Utility Libraries

    diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html index b9b5b6c1e..92af4e6c9 100644 --- a/Doc/Manual/Lisp.html +++ b/Doc/Manual/Lisp.html @@ -6,7 +6,7 @@ -

    23 SWIG and Common Lisp

    +

    24 SWIG and Common Lisp

      @@ -41,7 +41,7 @@ Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI foreign function interfaces.

      -

      23.1 Allegro Common Lisp

      +

      24.1 Allegro Common Lisp

      @@ -50,7 +50,7 @@ here

      -

      23.2 Common Foreign Function Interface(CFFI)

      +

      24.2 Common Foreign Function Interface(CFFI)

      @@ -77,7 +77,7 @@ swig -cffi -module module-name file-name files and the various things which you can do with them.

      -

      23.2.1 Additional Commandline Options

      +

      24.2.1 Additional Commandline Options

      @@ -118,7 +118,7 @@ swig -cffi -help -

      23.2.2 Generating CFFI bindings

      +

      24.2.2 Generating CFFI bindings

      As we mentioned earlier the ideal way to use SWIG is to use interface @@ -392,7 +392,7 @@ The feature intern_function ensures that all C names are
    -

    23.2.3 Generating CFFI bindings for C++ code

    +

    24.2.3 Generating CFFI bindings for C++ code

    This feature to SWIG (for CFFI) is very new and still far from @@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI module feel free to contact us on the SWIG mailing list, and also please add a "[CFFI]" tag in the subject line. -

    23.2.4 Inserting user code into generated files

    +

    24.2.4 Inserting user code into generated files

    @@ -608,7 +608,7 @@ Note that the block %{ ... %} is effectively a shortcut for

    -

    23.3 CLISP

    +

    24.3 CLISP

    @@ -638,7 +638,7 @@ swig -clisp -module module-name file-name interface file for the CLISP module. The CLISP module tries to produce code which is both human readable and easily modifyable.

    -

    23.3.1 Additional Commandline Options

    +

    24.3.1 Additional Commandline Options

    @@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for
    -

    23.3.2 Details on CLISP bindings

    +

    24.3.2 Details on CLISP bindings

    @@ -795,7 +795,7 @@ struct bar { -

    23.4 UFFI

    +

    24.4 UFFI

    diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index c07fe66c8..04f96f2f3 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -6,7 +6,7 @@ -

    24 SWIG and Lua

    +

    25 SWIG and Lua

      @@ -67,13 +67,13 @@

      Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a really tiny language, less than 6000 lines of code, which compiles to <100 kilobytes of binary code. It can be found at http://www.lua.org

      -

      24.1 Preliminaries

      +

      25.1 Preliminaries

      The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).

      -

      24.2 Running SWIG

      +

      25.2 Running SWIG

      @@ -105,7 +105,7 @@ This creates a C/C++ source file example_wrap.c or example_wrap.cxx

      The name of the wrapper file is derived from the name of the input file. For example, if the input file is example.i, the name of the wrapper file is example_wrap.c. To change this, you can use the -o option. The wrappered module will export one function "int luaopen_example(lua_State* L)" which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.

      -

      24.2.1 Compiling and Linking and Interpreter

      +

      25.2.1 Compiling and Linking and Interpreter

      @@ -152,7 +152,7 @@ $ gcc -c example.c -o example.o $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua

    -

    24.2.2 Compiling a dynamic module

    +

    25.2.2 Compiling a dynamic module

    @@ -220,7 +220,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib -

    24.2.3 Using your module

    +

    25.2.3 Using your module

    @@ -238,19 +238,19 @@ $ ./my_lua > -

    24.3 A tour of basic C/C++ wrapping

    +

    25.3 A tour of basic C/C++ wrapping

    By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.

    -

    24.3.1 Modules

    +

    25.3.1 Modules

    The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.

    -

    24.3.2 Functions

    +

    25.3.2 Functions

    @@ -288,7 +288,7 @@ It is also possible to rename the module with an assignment. 24 -

    24.3.3 Global variables

    +

    25.3.3 Global variables

    @@ -362,7 +362,7 @@ nil 3.142 -

    24.3.4 Constants and enums

    +

    25.3.4 Constants and enums

    @@ -385,7 +385,7 @@ example.SUNDAY=0

    Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

    -

    24.3.5 Pointers

    +

    25.3.5 Pointers

    @@ -423,7 +423,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor nil -

    24.3.6 Structures

    +

    25.3.6 Structures

    @@ -509,7 +509,7 @@ Because the pointer points inside the structure, you can modify the contents and > x.a = 3 -- Modifies the same structure -

    24.3.7 C++ classes

    +

    25.3.7 C++ classes

    @@ -570,7 +570,7 @@ It is not (currently) possible to access static members of an instance: -- does NOT work -

    24.3.8 C++ inheritance

    +

    25.3.8 C++ inheritance

    @@ -595,7 +595,7 @@ then the function spam() accepts a Foo pointer or a pointer to any clas

    It is safe to use multiple inheritance with SWIG.

    -

    24.3.9 Pointers, references, values, and arrays

    +

    25.3.9 Pointers, references, values, and arrays

    @@ -626,7 +626,7 @@ Foo spam7();

    then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.

    -

    24.3.10 C++ overloaded functions

    +

    25.3.10 C++ overloaded functions

    @@ -712,7 +712,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin

    Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.

    -

    24.3.11 C++ operators

    +

    25.3.11 C++ operators

    @@ -824,7 +824,7 @@ It is also possible to overload the operator[], but currently this cann }; -

    24.3.12 Class extension with %extend

    +

    25.3.12 Class extension with %extend

    @@ -879,7 +879,7 @@ true

    Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).

    -

    24.3.13 C++ templates

    +

    25.3.13 C++ templates

    @@ -914,7 +914,7 @@ In Lua:

    Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.

    -

    24.3.14 C++ Smart Pointers

    +

    25.3.14 C++ Smart Pointers

    @@ -966,7 +966,7 @@ If you ever need to access the underlying pointer returned by operator->( > f = p:__deref__() -- Returns underlying Foo * -

    24.3.15 C++ Exceptions

    +

    25.3.15 C++ Exceptions

    @@ -1110,12 +1110,12 @@ add exception specification to functions or globally (respectively).

    -

    24.4 Typemaps

    +

    25.4 Typemaps

    This section explains what typemaps are and the usage of them. The default wrappering behaviour of SWIG is enough in most cases. However sometimes SWIG may need a little additional assistance to know which typemap to apply to provide the best wrappering. This section will be explaining how to use typemaps to best effect

    -

    24.4.1 What is a typemap?

    +

    25.4.1 What is a typemap?

    A typemap is nothing more than a code generation rule that is attached to a specific C datatype. For example, to convert integers from Lua to C, you might define a typemap like this:

    @@ -1143,7 +1143,7 @@ Received an integer : 6 720 -

    24.4.2 Using typemaps

    +

    25.4.2 Using typemaps

    There are many ready written typemaps built into SWIG for all common types (int, float, short, long, char*, enum and more), which SWIG uses automatically, with no effort required on your part.

    @@ -1196,7 +1196,7 @@ void swap(int *sx, int *sy);

    Note: C++ references must be handled exactly the same way. However SWIG will automatically wrap a const int& as an input parameter (since that it obviously input).

    -

    24.4.3 Typemaps and arrays

    +

    25.4.3 Typemaps and arrays

    Arrays present a challenge for SWIG, because like pointers SWIG does not know whether these are input or output values, nor @@ -1260,7 +1260,7 @@ and Lua tables to be 1..N, (the indexing follows the norm for the language). In

    Note: SWIG also can support arrays of pointers in a similar manner.

    -

    24.4.4 Typemaps and pointer-pointer functions

    +

    25.4.4 Typemaps and pointer-pointer functions

    Several C++ libraries use a pointer-pointer functions to create its objects. These functions require a pointer to a pointer which is then filled with the pointer to the new object. Microsoft's COM and DirectX as well as many other libraries have this kind of function. An example is given below:

    @@ -1294,7 +1294,7 @@ int Create_Math(iMath** pptr); // its creator (assume it mallocs) ptr=nil -- the iMath* will be GC'ed as normal -

    24.5 Writing typemaps

    +

    25.5 Writing typemaps

    This section describes how you can modify SWIG's default wrapping behavior for various C/C++ datatypes using the %typemap directive. This is an advanced topic that assumes familiarity with the Lua C API as well as the material in the "Typemaps" chapter.

    @@ -1303,7 +1303,7 @@ ptr=nil -- the iMath* will be GC'ed as normal

    Before proceeding, you should read the previous section on using typemaps, as well as read the ready written typemaps found in luatypemaps.swg and typemaps.i. These are both well documented and fairly easy to read. You should not attempt to write your own typemaps until you have read and can understand both of these files (they may well also give you a idea to base your worn on).

    -

    24.5.1 Typemaps you can write

    +

    25.5.1 Typemaps you can write

    There are many different types of typemap that can be written, the full list can be found in the "Typemaps" chapter. However the following are the most commonly used ones.

    @@ -1316,7 +1316,7 @@ ptr=nil -- the iMath* will be GC'ed as normal (the syntax for the typecheck is different from the typemap, see typemaps for details). -

    24.5.2 SWIG's Lua-C API

    +

    25.5.2 SWIG's Lua-C API

    This section explains the SWIG specific Lua-C API. It does not cover the main Lua-C api, as this is well documented and not worth covering.

    @@ -1365,7 +1365,7 @@ This macro, when called within the context of a SWIG wrappered function, will di
    Similar to SWIG_fail_arg, except that it will display the swig_type_info information instead.
    -

    24.6 Customization of your Bindings

    +

    25.6 Customization of your Bindings

    @@ -1374,7 +1374,7 @@ This section covers adding of some small extra bits to your module to add the la -

    24.6.1 Writing your own custom wrappers

    +

    25.6.1 Writing your own custom wrappers

    @@ -1393,7 +1393,7 @@ int native_function(lua_State*L) // my native code The %native directive in the above example, tells SWIG that there is a function int native_function(lua_State*L); which is to be added into the module under the name 'my_func'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.

    -

    24.6.2 Adding additional Lua code

    +

    25.6.2 Adding additional Lua code

    @@ -1431,7 +1431,7 @@ Good uses for this feature is adding of new code, or writing helper functions to See Examples/lua/arrays for an example of this code.

    -

    24.7 Details on the Lua binding

    +

    25.7 Details on the Lua binding

    @@ -1442,7 +1442,7 @@ See Examples/lua/arrays for an example of this code.

    -

    24.7.1 Binding global data into the module.

    +

    25.7.1 Binding global data into the module.

    @@ -1502,7 +1502,7 @@ end

    That way when you call 'a=example.Foo', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code 'example.Foo=10', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.

    -

    24.7.2 Userdata and Metatables

    +

    25.7.2 Userdata and Metatables

    @@ -1582,7 +1582,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s

    Note: Operator overloads are basically done in the same way, by adding functions such as '__add' & '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.

    -

    24.7.3 Memory management

    +

    25.7.3 Memory management

    diff --git a/Doc/Manual/Makefile b/Doc/Manual/Makefile index 011261e76..42149ba3a 100644 --- a/Doc/Manual/Makefile +++ b/Doc/Manual/Makefile @@ -69,7 +69,10 @@ test: validate: all=`sed '/^#/d' chapters`; for a in $$all; do validate --emacs $$a; done; -# Link checking using linkchecker (can take a while - 30 mins) +# Link checking using linkchecker linkchecker: - linkchecker --anchors Contents.html + @echo ----------------------------------------------------------------------- + @echo Note linkchecker versions prior to 6.1 do not work properly wrt anchors + @echo ----------------------------------------------------------------------- + linkchecker --config=./linkchecker.config index.html diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html index 71611e3c5..f9400abee 100644 --- a/Doc/Manual/Modula3.html +++ b/Doc/Manual/Modula3.html @@ -5,7 +5,7 @@ -

    25 SWIG and Modula-3

    +

    26 SWIG and Modula-3

      @@ -54,7 +54,7 @@ especially typemaps.

      -

      25.1 Overview

      +

      26.1 Overview

      @@ -84,7 +84,7 @@ FFTW -

      25.1.1 Motivation

      +

      26.1.1 Motivation

      @@ -131,10 +131,10 @@ functions), but it doesn't allow you to easily integrate a Module-3 module into a C/C++ project.

      -

      25.2 Conception

      +

      26.2 Conception

      -

      25.2.1 Interfaces to C libraries

      +

      26.2.1 Interfaces to C libraries

      @@ -142,7 +142,7 @@ Modula-3 has integrated support for calling C functions. This is also extensively used by the standard Modula-3 libraries to call OS functions. The Modula-3 part of SWIG and the corresponding SWIG library -modula3.swg +modula3.swg contain code that uses these features. Because of the built-in support there is no need for calling the SWIG kernel to generate wrappers written in C. @@ -283,7 +283,7 @@ and the principal type must be renamed (%typemap).

      -

      25.2.2 Interfaces to C++ libraries

      +

      26.2.2 Interfaces to C++ libraries

      @@ -384,24 +384,23 @@ There is no C++ library I wrote a SWIG interface for, so I'm not sure if this is possible or sensible, yet.

      -

      25.3 Preliminaries

      +

      26.3 Preliminaries

      -

      25.3.1 Compilers

      +

      26.3.1 Compilers

      There are different Modula-3 compilers around: cm3, pm3, ezm3, Klagenfurth Modula-3, Cambridge Modula-3. SWIG itself does not contain compiler specific code -but the library file -modula3.swg +but the modula3.swg library file may do so. For testing examples I use Critical Mass cm3.

      -

      25.3.2 Additional Commandline Options

      +

      26.3.2 Additional Commandline Options

      @@ -478,10 +477,10 @@ Instead generate templates for some basic typemaps. -

      25.4 Modula-3 typemaps

      +

      26.4 Modula-3 typemaps

      -

      25.4.1 Inputs and outputs

      +

      26.4.1 Inputs and outputs

      @@ -499,9 +498,7 @@ or for a return value. A further typemap may specify the direction that is used for certain parameters. I have chosen this separation -in order to be able to write general typemaps for the typemap library -modula3.swg -. +in order to be able to write general typemaps for the modula3.swg typemap library. In the library code the final usage of the type is not known. Using separate typemaps for each possible use allows appropriate definitions for each case. @@ -697,7 +694,7 @@ consist of the following parts: -

      25.4.2 Subranges, Enumerations, Sets

      +

      26.4.2 Subranges, Enumerations, Sets

      @@ -749,7 +746,7 @@ that I'd like to automate.

      -

      25.4.3 Objects

      +

      26.4.3 Objects

      @@ -762,7 +759,7 @@ is not really useful, yet.

      -

      25.4.4 Imports

      +

      26.4.4 Imports

      @@ -782,9 +779,7 @@ Unqualified import is not supported.

      It is cumbersome to add this typemap to each piece of Modula-3 code. It is especially useful when writing general typemaps -for the typemap library -modula3.swg -. +for the modula3.swg typemap library. For a monolithic module you might be better off if you add the imports directly:

      @@ -797,7 +792,7 @@ IMPORT M3toC;
    -

    25.4.5 Exceptions

    +

    26.4.5 Exceptions

    @@ -821,7 +816,7 @@ you should declare %typemap("m3wrapinconv:throws") blah * %{OSError.E%}.

    -

    25.4.6 Example

    +

    26.4.6 Example

    @@ -868,10 +863,10 @@ where almost everything is generated by a typemap: -

    25.5 More hints to the generator

    +

    26.5 More hints to the generator

    -

    25.5.1 Features

    +

    26.5.1 Features

    @@ -908,7 +903,7 @@ where almost everything is generated by a typemap:
    -

    25.5.2 Pragmas

    +

    26.5.2 Pragmas

    @@ -931,7 +926,7 @@ where almost everything is generated by a typemap:
    -

    25.6 Remarks

    +

    26.6 Remarks

      diff --git a/Doc/Manual/Modules.html b/Doc/Manual/Modules.html index 69cc58c30..70b0f1181 100644 --- a/Doc/Manual/Modules.html +++ b/Doc/Manual/Modules.html @@ -138,7 +138,8 @@ base class's methods. Typically you will get a warning when the module name is m 

      -derived_module.i:8: Warning 401: Base class 'base' ignored - unknown module name for base. Either import 
+derived_module.i:8: Warning 401: Base class 'base' ignored - unknown module name for base. Either
+import
 the appropriate module interface file or specify the name of the module in the %import directive.
      diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html index 4351e34a7..984b2dded 100644 --- a/Doc/Manual/Mzscheme.html +++ b/Doc/Manual/Mzscheme.html @@ -2,17 +2,19 @@ -SWIG and MzScheme +SWIG and MzScheme/Racket -

      26 SWIG and MzScheme

      +

      27 SWIG and MzScheme/Racket

      @@ -20,9 +22,9 @@

      -This section contains information on SWIG's support of MzScheme. +This section contains information on SWIG's support of Racket, formally known as MzScheme. -

      26.1 Creating native MzScheme structures

      +

      27.1 Creating native structures

      @@ -63,8 +65,116 @@ Then in scheme, you can use regular struct access procedures like +

      27.2 Simple example

      + +

      -That's pretty much it. It works with nested structs as well. +A few examples are available in the Examples/mzscheme directory. +The code and log of a session using SWIG below should help getting started. +

      + +

      +C header file: +

      + +
      +
      +// example.h
+int fact(int n);
+
      +
      + +

      +C source code: +

      + +
      +
      +// File: example.c
+#include "example.h"
+
+int fact(int n) {
+  if (n < 0) { /* This should probably return an error, but this is simpler */
+    return 0;
+  }
+  if (n == 0) {
+    return 1;
+  }
+  else {
+    /* testing for overflow would be a good idea here */
+    return n * fact(n-1);
+  }
+}
+
      +
      + +

      +SWIG interface file: +

      + +
      +
      +/* File: example.i */
+%module example
+
+%{
+#include "example.h"
+%}
+
+int fact(int n);
+
      +
      + +

      +The session below using the above files is on an OS X machine, but the points to be made are more general. On OS X, libtool is the tool which creates libraries, which are named .dylib, rather than .so on other unixes, or .dll on Windows. +

      + +
      +
      +% swig -mzscheme -declaremodule example.i
+% gcc -c -m32 -o example.o example.c # force 32-bit object file (mzscheme is 32-bit only)
+% libtool -dynamic -o libexample.dylib example.o # make it into a library
+% ls # what've we got so far?
+example.c example.o
+example.h example_wrap.c
+example.i libexample.dylib*
+% mzc --cgc --cc example_wrap.c # compile the wrapping code
+% LDFLAGS="-L. -lexample" mzc --ld example_wrap.dylib example_wrap.o # ...and link it
+% mzscheme -e '(path->string (build-path "compiled" "native" (system-library-subpath)))'
+"compiled/native/i386-macosx/3m"
+% mkdir -p compiled/native/i386-macosx/3m # move the extension library to a magic place
+% mv example_wrap.dylib compiled/native/i386-macosx/3m/example_ss.dylib
+% mzscheme
+Welcome to MzScheme v4.2.4 [3m], Copyright (c) 2004-2010 PLT Scheme Inc.
+> (require "example.ss")
+> (fact 5)
+120
+> ^D
+% echo 'It works!'
+
      +
      + + +

      +Some points of interest: +

      +
        +
      • This is on a 64-bit machine, so we have to include the -m32 option when building the object file +
      • If you want to declare a scheme module (and you probably do), it's important that you include the -declaremodule option to swig (if you miss this out, it'll appear to work, but fail later). +
      • Use mzc to compile and then link the wrapped code. You'll probably need to adjust the link flags to refer to the library you're wrapping (you can either do this with an LDFLAGS declaration, as here, or with multiple ++ldf options to mzc). +
      • Create the directory with path (build-path "compiled" "native" (system-library-subpath)) and move the freshly-generated .dylib to there, changing its name to module-name_ss.dylib. After that, you can REQUIRE the new module with (require "module-name.ss"). +
      • The above requests mzc to create an extension using the CGC garbage-collector. The alternative -- the 3m collector -- has generally better performance, but work is still required for SWIG to emit code which is compatible with it. +
      + +

      27.3 External documentation

      + + +

      +See the C API for more description of using the mechanism for adding extensions. The main documentation is here. +

      + +

      +Tip: mzc's --vv option is very useful for debugging the inevitable library problems you'll encounter.

      diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html index 6cbfa5510..56c3db142 100644 --- a/Doc/Manual/Ocaml.html +++ b/Doc/Manual/Ocaml.html @@ -6,7 +6,7 @@ -

      27 SWIG and Ocaml

      +

      28 SWIG and Ocaml

        @@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit The Ocaml Website.

        -

        27.1 Preliminaries

        +

        28.1 Preliminaries

        @@ -93,13 +93,13 @@ examples and test-suite which come with SWIG. You can do this by running The Ocaml module has been tested using the system's dynamic linking (the usual -lxxx against libxxx.so, as well as with Gerd Stolpmann's Dl package + href="http://download.camlcity.org/download/">Dl package . The ocaml_dynamic and ocaml_dynamic_cpp targets in the file Examples/Makefile illustrate how to compile and link SWIG modules that will be loaded dynamically. This has only been tested on Linux so far.

        -

        27.1.1 Running SWIG

        +

        28.1.1 Running SWIG

        @@ -122,7 +122,7 @@ you will compile the file example_wrap.c with ocamlc or the resulting .ml and .mli files as well, and do the final link with -custom (not needed for native link).

        -

        27.1.2 Compiling the code

        +

        28.1.2 Compiling the code

        @@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.

      -

      27.1.3 The camlp4 module

      +

      28.1.3 The camlp4 module

      @@ -234,7 +234,7 @@ let b = C_string (getenv "PATH") -

      27.1.4 Using your module

      +

      28.1.4 Using your module

      @@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom option is not needed when you build native code.

      -

      27.1.5 Compilation problems and compiling with C++

      +

      28.1.5 Compilation problems and compiling with C++

      @@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler. Most code meant to be compiled as C++ will not have problems.

      -

      27.2 The low-level Ocaml/C interface

      +

      28.2 The low-level Ocaml/C interface

      @@ -360,7 +360,7 @@ is that you must append them to the return list with swig_result = caml_list_a signature for a function that uses value in this way.

      -

      27.2.1 The generated module

      +

      28.2.1 The generated module

      @@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions. -

      27.2.2 Enums

      +

      28.2.2 Enums

      @@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a -

      27.2.2.1 Enum typing in Ocaml

      +

      28.2.2.1 Enum typing in Ocaml

      @@ -470,10 +470,10 @@ functions imported from different modules. You must convert values to master values using the swig_val function before sharing them with another module.

      -

      27.2.3 Arrays

      +

      28.2.3 Arrays

      -

      27.2.3.1 Simple types of bounded arrays

      +

      28.2.3.1 Simple types of bounded arrays

      @@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works for arrays whose bounds are completely specified.

      -

      27.2.3.2 Complex and unbounded arrays

      +

      28.2.3.2 Complex and unbounded arrays

      @@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array, so you have to specify it for yourself in the form of a typemap.

      -

      27.2.3.3 Using an object

      +

      28.2.3.3 Using an object

      @@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex, such as using a required sentinel, etc.

      -

      27.2.3.4 Example typemap for a function taking float * and int

      +

      28.2.3.4 Example typemap for a function taking float * and int

      @@ -572,7 +572,7 @@ void printfloats( float *tab, int len ); -

      27.2.4 C++ Classes

      +

      28.2.4 C++ Classes

      @@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the returned value for the same object.

      -

      27.2.4.1 STL vector and string Example

      +

      28.2.4.1 STL vector and string Example

      @@ -695,7 +695,7 @@ baz # -

      27.2.4.2 C++ Class Example

      +

      28.2.4.2 C++ Class Example

      @@ -725,7 +725,7 @@ public: }; -

      27.2.4.3 Compiling the example

      +

      28.2.4.3 Compiling the example

      @@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
      -

      27.2.4.4 Sample Session

      +

      28.2.4.4 Sample Session

      @@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 
      
 
-
      27.2.5 Director Classes
      
+
      28.2.5 Director Classes
      
 
 
-
      27.2.5.1 Director Introduction
      
+
      28.2.5.1 Director Introduction
      
 
 
 
      
@@ -800,7 +800,7 @@ class foo {
 };
      -

      27.2.5.2 Overriding Methods in Ocaml

      +

      28.2.5.2 Overriding Methods in Ocaml

      @@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing an overloaded class. This example is contained in Examples/ocaml/shapes.

      -

      27.2.5.3 Director Usage Example

      +

      28.2.5.3 Director Usage Example

      @@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the program in C++.

      -

      27.2.5.4 Creating director objects

      +

      28.2.5.4 Creating director objects

      @@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed properly.

      -

      27.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      +

      28.2.5.5 Typemaps for directors, directorin, directorout, directorargout

      @@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments, and to receive arguments the same way you normally receive function returns.

      -

      27.2.5.6 directorin typemap

      +

      28.2.5.6 directorin typemap

      @@ -950,7 +950,7 @@ code receives when you are called. In general, a simple directorin typ can use the same body as a simple out typemap.

      -

      27.2.5.7 directorout typemap

      +

      28.2.5.7 directorout typemap

      @@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object ownership, etc.

      -

      27.2.5.8 directorargout typemap

      +

      28.2.5.8 directorargout typemap

      @@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral values will read zero, and struct or object returns have undefined results.

      -

      27.2.6 Exceptions

      +

      28.2.6 Exceptions

      diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html index be512f0ce..3c08d849b 100644 --- a/Doc/Manual/Octave.html +++ b/Doc/Manual/Octave.html @@ -8,7 +8,7 @@ -

      28 SWIG and Octave

      +

      29 SWIG and Octave

        @@ -46,7 +46,7 @@

        Octave is a high-level language intended for numerical programming that is mostly compatible with MATLAB. -More information can be found at www.octave.org. +More information can be found at Octave web site.

        @@ -54,14 +54,14 @@ More information can be found at www.octave.org< Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).

        -

        28.1 Preliminaries

        +

        29.1 Preliminaries

        The SWIG implemention was first based on Octave 2.9.12, so this is the minimum version required. Testing has only been done on Linux.

        -

        28.2 Running SWIG

        +

        29.2 Running SWIG

        @@ -97,7 +97,7 @@ This creates a C++ source file example_wrap.cxx. A C++ file is generate The swig command line has a number of options you can use, like to redirect it's output. Use swig --help to learn about these.

        -

        28.2.1 Compiling a dynamic module

        +

        29.2.1 Compiling a dynamic module

        @@ -124,7 +124,7 @@ $ mkoctfile example_wrap.cxx example.c 

        octave:1> example
        -

        28.2.2 Using your module

        +

        29.2.2 Using your module

        @@ -142,10 +142,10 @@ octave:4> example.cvar.Foo=4; octave:5> example.cvar.Foo ans = 4

      -

      28.3 A tour of basic C/C++ wrapping

      +

      29.3 A tour of basic C/C++ wrapping

      -

      28.3.1 Modules

      +

      29.3.1 Modules

      @@ -187,7 +187,7 @@ One can also rename it by simple assignment, e.g., octave:1> some_vars = cvar; -

      28.3.2 Functions

      +

      29.3.2 Functions

      @@ -204,7 +204,7 @@ int fact(int n); 

      octave:1> example.fact(4)
 24
      -

      28.3.3 Global variables

      +

      29.3.3 Global variables

      @@ -257,7 +257,7 @@ octave:2> example.PI=3.142; octave:3> example.PI ans = 3.1420 -

      28.3.4 Constants and enums

      +

      29.3.4 Constants and enums

      @@ -279,7 +279,7 @@ example.SCONST="Hello World" example.SUNDAY=0 .... -

      28.3.5 Pointers

      +

      29.3.5 Pointers

      @@ -326,7 +326,7 @@ octave:2> f=example.fopen("not there","r"); error: value on right hand side of assignment is undefined error: evaluating assignment expression near line 2, column 2 -

      28.3.6 Structures and C++ classes

      +

      29.3.6 Structures and C++ classes

      @@ -461,7 +461,7 @@ ans = 1 Depending on the ownership setting of a swig_ref, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.

      -

      28.3.7 C++ inheritance

      +

      29.3.7 C++ inheritance

      @@ -470,7 +470,7 @@ This information contains the full class hierarchy. When an indexing operation ( the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the swig_ref.

      -

      28.3.8 C++ overloaded functions

      +

      29.3.8 C++ overloaded functions

      @@ -480,7 +480,7 @@ The dispatch function selects which overload to call (if any) based on the passe typecheck typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.

      -

      28.3.9 C++ operators

      +

      29.3.9 C++ operators

      @@ -580,7 +580,7 @@ On the C++ side, the default mappings are as follows: %rename(__brace) *::operator[]; -

      28.3.10 Class extension with %extend

      +

      29.3.10 Class extension with %extend

      @@ -610,7 +610,7 @@ octave:3> printf("%s\n",a); octave:4> a.__str() 4 -

      28.3.11 C++ templates

      +

      29.3.11 C++ templates

      @@ -687,14 +687,14 @@ ans = -

      28.3.12 C++ Smart Pointers

      +

      29.3.12 C++ Smart Pointers

      C++ smart pointers are fully supported as in other modules.

      -

      28.3.13 Directors (calling Octave from C++ code)

      +

      29.3.13 Directors (calling Octave from C++ code)

      @@ -755,7 +755,8 @@ Note that you have to enable directors via the %feature directive (see other mod subclass() will accept any number of C++ bases or other subclass()'ed objects, (string,octave_value) pairs, and function_handles. In the first case, these are taken as base classes; in the second case, as named members (either variables or functions, depending on whether the given value is a function handle); in the third case, as member functions whose name is taken from the given function handle. E.g., 

      -octave:1> B=@(some_var=2) subclass(A(),'some_var',some_var,@some_func,'another_func',@(self) do_stuff())
+octave:1> B=@(some_var=2) subclass(A(),'some_var',some_var,@some_func,'another_func',
+@(self) do_stuff())

      You can also assign non-C++ member variables and functions after construct time. There is no support for non-C++ static members. @@ -774,14 +775,14 @@ c-side routine called octave-side routine called -

      28.3.14 Threads

      +

      29.3.14 Threads

      The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.

      -

      28.3.15 Memory management

      +

      29.3.15 Memory management

      @@ -815,14 +816,14 @@ The %newobject directive may be used to control this behavior for pointers retur In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/subclass()'ing).

      -

      28.3.16 STL support

      +

      29.3.16 STL support

      Various STL library files are provided for wrapping STL containers.

      -

      28.3.17 Matrix typemaps

      +

      29.3.17 Matrix typemaps

      diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html index 0c2733c0e..5aae51888 100644 --- a/Doc/Manual/Perl5.html +++ b/Doc/Manual/Perl5.html @@ -6,7 +6,7 @@ -

      29 SWIG and Perl5

      +

      30 SWIG and Perl5

        @@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions may not compile or run correctly.

        -

        29.1 Overview

        +

        30.1 Overview

        @@ -108,7 +108,7 @@ described. Advanced customization features, typemaps, and other options are found near the end of the chapter.

        -

        29.2 Preliminaries

        +

        30.2 Preliminaries

        @@ -133,7 +133,7 @@ To build the module, you will need to compile the file example_wrap.c and link it with the rest of your program.

        -

        29.2.1 Getting the right header files

        +

        30.2.1 Getting the right header files

        @@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.

      -

      29.2.2 Compiling a dynamic module

      +

      30.2.2 Compiling a dynamic module

      @@ -198,7 +198,7 @@ the target should be named `example.so', `example.sl', or the appropriate dynamic module name on your system.

      -

      29.2.3 Building a dynamic module with MakeMaker

      +

      30.2.3 Building a dynamic module with MakeMaker

      @@ -232,7 +232,7 @@ the preferred approach to compilation. More information about MakeMaker can be found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen, and Randal Schwartz.

      -

      29.2.4 Building a static version of Perl

      +

      30.2.4 Building a static version of Perl

      @@ -301,7 +301,7 @@ added to it. Depending on your machine, you may need to link with additional libraries such as -lsocket, -lnsl, -ldl, etc.

      -

      29.2.5 Using the module

      +

      30.2.5 Using the module

      @@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to read the man pages).

      -

      29.2.6 Compilation problems and compiling with C++

      +

      30.2.6 Compilation problems and compiling with C++

      @@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file. Pleas any conflicting macros you find to swig-user mailing list.

      -

      29.2.7 Compiling for 64-bit platforms

      +

      30.2.7 Compiling for 64-bit platforms

      @@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one linking standard (e.g., -o32 and -n32 on Irix).

      -

      29.3 Building Perl Extensions under Windows

      +

      30.3 Building Perl Extensions under Windows

      @@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++ although the procedure may be similar with other compilers.

      -

      29.3.1 Running SWIG from Developer Studio

      +

      30.3.1 Running SWIG from Developer Studio

      @@ -700,7 +700,7 @@ print "$a\n"; -

      29.3.2 Using other compilers

      +

      30.3.2 Using other compilers

      @@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows. For general hints and suggestions refer to the Windows chapter.

      -

      29.4 The low-level interface

      +

      30.4 The low-level interface

      @@ -718,7 +718,7 @@ can be used to control your application. However, it is also used to construct more user-friendly proxy classes as described in the next section.

      -

      29.4.1 Functions

      +

      30.4.1 Functions

      @@ -741,7 +741,7 @@ use example; $a = &example::fact(2); -

      29.4.2 Global variables

      +

      30.4.2 Global variables

      @@ -811,7 +811,7 @@ extern char *path; // Declared later in the input -

      29.4.3 Constants

      +

      30.4.3 Constants

      @@ -851,7 +851,7 @@ print example::FOO,"\n"; -

      29.4.4 Pointers

      +

      30.4.4 Pointers

      @@ -960,7 +960,7 @@ as XS and xsubpp. Given the advancement of the SWIG typesystem and the SWIG and XS, this is no longer supported.

      -

      29.4.5 Structures

      +

      30.4.5 Structures

      @@ -1094,7 +1094,7 @@ void Bar_f_set(Bar *b, Foo *val) { -

      29.4.6 C++ classes

      +

      30.4.6 C++ classes

      @@ -1159,7 +1159,7 @@ provides direct access to C++ objects. A higher level interface using Perl prox can be built using these low-level accessors. This is described shortly.

      -

      29.4.7 C++ classes and type-checking

      +

      30.4.7 C++ classes and type-checking

      @@ -1195,7 +1195,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece multiple inheritance is used).

      -

      29.4.8 C++ overloaded functions

      +

      30.4.8 C++ overloaded functions

      @@ -1239,7 +1239,7 @@ example::Spam_foo_d($s,3.14); Please refer to the "SWIG Basics" chapter for more information.

      -

      29.4.9 Operators

      +

      30.4.9 Operators

      @@ -1266,7 +1266,7 @@ The following C++ operators are currently supported by the Perl module:

    • operator or
      • -

      29.4.10 Modules and packages

      +

      30.4.10 Modules and packages

      @@ -1361,7 +1361,7 @@ print Foo::fact(4),"\n"; # Call a function in package FooBar --> -

      29.5 Input and output parameters

      +

      30.5 Input and output parameters

      @@ -1580,7 +1580,7 @@ print "$c\n"; Note: The REFERENCE feature is only currently supported for numeric types (integers and floating point).

      -

      29.6 Exception handling

      +

      30.6 Exception handling

      @@ -1745,7 +1745,7 @@ This is still supported, but it is deprecated. The newer %exception di functionality, but it has additional capabilities that make it more powerful.

      -

      29.7 Remapping datatypes with typemaps

      +

      30.7 Remapping datatypes with typemaps

      @@ -1762,7 +1762,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Perl interface.

      -

      29.7.1 A simple typemap example

      +

      30.7.1 A simple typemap example

      @@ -1866,7 +1866,7 @@ example::count("e","Hello World"); -

      29.7.2 Perl5 typemaps

      +

      30.7.2 Perl5 typemaps

      @@ -1971,7 +1971,7 @@ Return of C++ member data (all languages). Check value of input parameter. -

      29.7.3 Typemap variables

      +

      30.7.3 Typemap variables

      @@ -2042,7 +2042,7 @@ properly assigned. The Perl name of the wrapper function being created. -

      29.7.4 Useful functions

      +

      30.7.4 Useful functions

      @@ -2111,7 +2111,7 @@ int sv_isa(SV *, char *0; -

      29.8 Typemap Examples

      +

      30.8 Typemap Examples

      @@ -2120,7 +2120,7 @@ might look at the files "perl5.swg" and "typemaps.i" in the SWIG library.

      -

      29.8.1 Converting a Perl5 array to a char **

      +

      30.8.1 Converting a Perl5 array to a char **

      @@ -2212,7 +2212,7 @@ print @$b,"\n"; # Print it out -

      29.8.2 Return values

      +

      30.8.2 Return values

      @@ -2241,7 +2241,7 @@ can be done using the EXTEND() macro as in : } -

      29.8.3 Returning values from arguments

      +

      30.8.3 Returning values from arguments

      @@ -2295,7 +2295,7 @@ print "multout(7,13) = @r\n"; ($x,$y) = multout(7,13); -

      29.8.4 Accessing array structure members

      +

      30.8.4 Accessing array structure members

      @@ -2358,7 +2358,7 @@ the "in" typemap in the previous section would be used to convert an to copy the converted array into a C data structure.

      -

      29.8.5 Turning Perl references into C pointers

      +

      30.8.5 Turning Perl references into C pointers

      @@ -2423,7 +2423,7 @@ print "$c\n"; -

      29.8.6 Pointer handling

      +

      30.8.6 Pointer handling

      @@ -2502,7 +2502,7 @@ For example: -

      29.9 Proxy classes

      +

      30.9 Proxy classes

      @@ -2518,7 +2518,7 @@ to the underlying code. This section describes the implementation details of the proxy interface.

      -

      29.9.1 Preliminaries

      +

      30.9.1 Preliminaries

      @@ -2540,7 +2540,7 @@ SWIG creates a collection of high-level Perl wrappers. In your scripts, you wil high level wrappers. The wrappers, in turn, interact with the low-level procedural module.

      -

      29.9.2 Structure and class wrappers

      +

      30.9.2 Structure and class wrappers

      @@ -2666,7 +2666,7 @@ $v->DESTROY(); -

      29.9.3 Object Ownership

      +

      30.9.3 Object Ownership

      @@ -2753,7 +2753,7 @@ counting, garbage collection, or advanced features one might find in sophisticated languages.

      -

      29.9.4 Nested Objects

      +

      30.9.4 Nested Objects

      @@ -2806,7 +2806,7 @@ $p->{f}->{x} = 0.0; %${$p->{v}} = ( x=>0, y=>0, z=>0); -

      29.9.5 Proxy Functions

      +

      30.9.5 Proxy Functions

      @@ -2840,7 +2840,7 @@ This function replaces the original function, but operates in an identical manner.

      -

      29.9.6 Inheritance

      +

      30.9.6 Inheritance

      @@ -2916,7 +2916,7 @@ particular, inheritance of data members is extremely tricky (and I'm not even sure if it really works).

      -

      29.9.7 Modifying the proxy methods

      +

      30.9.7 Modifying the proxy methods

      @@ -2944,7 +2944,7 @@ public: }; -

      29.10 Adding additional Perl code

      +

      30.10 Adding additional Perl code

      diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html index c9ee74f38..797cb058e 100644 --- a/Doc/Manual/Php.html +++ b/Doc/Manual/Php.html @@ -7,7 +7,7 @@ -

      30 SWIG and PHP

      +

      31 SWIG and PHP

        @@ -75,7 +75,7 @@ your extension into php directly, you will need the complete PHP source tree available.

        -

        30.1 Generating PHP Extensions

        +

        31.1 Generating PHP Extensions

        @@ -122,7 +122,7 @@ and it doesn't play nicely with package system. We don't recommend this approach, or provide explicit support for it.

        -

        30.1.1 Building a loadable extension

        +

        31.1.1 Building a loadable extension

        @@ -137,7 +137,7 @@ least work for Linux though): gcc -shared example_wrap.o -o example.so

      -

      30.1.2 Using PHP Extensions

      +

      31.1.2 Using PHP Extensions

      @@ -168,7 +168,7 @@ attempts to do the dl() call for you: include("example.php"); -

      30.2 Basic PHP interface

      +

      31.2 Basic PHP interface

      @@ -178,7 +178,7 @@ possible for names of symbols in one extension module to clash with other symbols unless care is taken to %rename them.

      -

      30.2.1 Constants

      +

      31.2.1 Constants

      @@ -303,7 +303,7 @@ both point to the same value, without the case test taking place. ( Apologies, this paragraph needs rewriting to make some sense. )

      -

      30.2.2 Global Variables

      +

      31.2.2 Global Variables

      @@ -352,7 +352,7 @@ undefined. At this time SWIG does not support custom accessor methods.

      -

      30.2.3 Functions

      +

      31.2.3 Functions

      @@ -405,7 +405,7 @@ print $s; # The value of $s was not changed. --> -

      30.2.4 Overloading

      +

      31.2.4 Overloading

      @@ -461,7 +461,7 @@ taking the integer argument.

      --> -

      30.2.5 Pointers and References

      +

      31.2.5 Pointers and References

      @@ -593,7 +593,7 @@ PHP in a number of ways: by using unset on an existing variable, or assigning NULL to a variable.

      -

      30.2.6 Structures and C++ classes

      +

      31.2.6 Structures and C++ classes

      @@ -652,7 +652,7 @@ Would be used in the following way from PHP5: Member variables and methods are accessed using the -> operator.

      -

      30.2.6.1 Using -noproxy

      +

      31.2.6.1 Using -noproxy

      @@ -678,7 +678,7 @@ Complex_im_set($obj,$d); Complex_im_get($obj); -

      30.2.6.2 Constructors and Destructors

      +

      31.2.6.2 Constructors and Destructors

      @@ -719,7 +719,7 @@ the programmer can either reassign the variable or call unset($v)

      -

      30.2.6.3 Static Member Variables

      +

      31.2.6.3 Static Member Variables

      @@ -762,7 +762,7 @@ Ko::threats(10); echo "There has now been " . Ko::threats() . " threats\n"; -

      30.2.6.4 Static Member Functions

      +

      31.2.6.4 Static Member Functions

      @@ -784,7 +784,7 @@ Ko::threats(); -

      30.2.7 PHP Pragmas, Startup and Shutdown code

      +

      31.2.7 PHP Pragmas, Startup and Shutdown code

      @@ -872,7 +872,7 @@ The %rinit and %rshutdown statements are very similar but inse into the request init (PHP_RINIT_FUNCTION) and request shutdown (PHP_RSHUTDOWN_FUNCTION) code respectively.

      -

      30.3 Cross language polymorphism

      +

      31.3 Cross language polymorphism

      @@ -907,7 +907,7 @@ wrapper functions takes care of all the cross-language method routing transparently.

      -

      30.3.1 Enabling directors

      +

      31.3.1 Enabling directors

      @@ -999,7 +999,7 @@ class MyFoo extends Foo { -

      30.3.2 Director classes

      +

      31.3.2 Director classes

      @@ -1079,7 +1079,7 @@ so there is no need for the extra overhead involved with routing the calls through PHP.

      -

      30.3.3 Ownership and object destruction

      +

      31.3.3 Ownership and object destruction

      @@ -1135,7 +1135,7 @@ In this example, we are assuming that FooContainer will take care of deleting all the Foo pointers it contains at some point.

      -

      30.3.4 Exception unrolling

      +

      31.3.4 Exception unrolling

      @@ -1194,7 +1194,7 @@ Swig::DirectorMethodException is thrown, PHP will register the exception as soon as the C wrapper function returns.

      -

      30.3.5 Overhead and code bloat

      +

      31.3.5 Overhead and code bloat

      @@ -1227,7 +1227,7 @@ optimized by selectively enabling director methods (using the %feature directive) for only those methods that are likely to be extended in PHP.

      -

      30.3.6 Typemaps

      +

      31.3.6 Typemaps

      @@ -1241,7 +1241,7 @@ need to be supported.

      -

      30.3.7 Miscellaneous

      +

      31.3.7 Miscellaneous

      Director typemaps for STL classes are mostly in place, and hence you diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html index 8f9e43735..8bd6b410f 100644 --- a/Doc/Manual/Pike.html +++ b/Doc/Manual/Pike.html @@ -6,7 +6,7 @@ -

      31 SWIG and Pike

      +

      32 SWIG and Pike

        @@ -46,10 +46,10 @@ least, make sure you read the "SWIG Basics" chapter.

        -

        31.1 Preliminaries

        +

        32.1 Preliminaries

        -

        31.1.1 Running SWIG

        +

        32.1.1 Running SWIG

        @@ -94,7 +94,7 @@ can use the -o option: 

        $ swig -pike -o pseudonym.c example.i
        -

        31.1.2 Getting the right header files

        +

        32.1.2 Getting the right header files

        @@ -114,7 +114,7 @@ You're looking for files with the names global.h, program.h and so on.

        -

        31.1.3 Using your module

        +

        32.1.3 Using your module

        @@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend) (1) Result: 24

      -

      31.2 Basic C/C++ Mapping

      +

      32.2 Basic C/C++ Mapping

      -

      31.2.1 Modules

      +

      32.2.1 Modules

      @@ -143,7 +143,7 @@ concerned), SWIG's %module directive doesn't really have any significance.

      -

      31.2.2 Functions

      +

      32.2.2 Functions

      @@ -168,7 +168,7 @@ exactly as you'd expect it to: (1) Result: 24 -

      31.2.3 Global variables

      +

      32.2.3 Global variables

      @@ -197,7 +197,7 @@ will result in two functions, Foo_get() and Foo_set(): (3) Result: 3.141590 -

      31.2.4 Constants and enumerated types

      +

      32.2.4 Constants and enumerated types

      @@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants, not as Pike enums.

      -

      31.2.5 Constructors and Destructors

      +

      32.2.5 Constructors and Destructors

      @@ -213,7 +213,7 @@ Constructors are wrapped as create() methods, and destructors are wrapped as destroy() methods, for Pike classes.

      -

      31.2.6 Static Members

      +

      32.2.6 Static Members

      diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html index 23271e649..fac680825 100644 --- a/Doc/Manual/Python.html +++ b/Doc/Manual/Python.html @@ -6,7 +6,7 @@ -

      32 SWIG and Python

      +

      33 SWIG and Python

        @@ -43,6 +43,7 @@
      • Further details on the Python class interface @@ -128,7 +129,7 @@ very least, make sure you read the "SWIG Basics" chapter.

        -

        32.1 Overview

        +

        33.1 Overview

        @@ -155,10 +156,10 @@ described followed by a discussion of low-level implementation details.

        -

        32.2 Preliminaries

        +

        33.2 Preliminaries

        -

        32.2.1 Running SWIG

        +

        33.2.1 Running SWIG

        @@ -256,13 +257,13 @@ The following sections have further practical examples and details on how you might go about compiling and using the generated files.

        -

        32.2.2 Using distutils

        +

        33.2.2 Using distutils

        The preferred approach to building an extension module for python is to compile it with distutils, which comes with all recent versions of python -(Distutils Docs). +(Distutils Docs).

        @@ -348,7 +349,7 @@ This same approach works on all platforms if the appropriate compiler is install can even build extensions to the standard Windows Python using MingGW)

        -

        32.2.3 Hand compiling a dynamic module

        +

        33.2.3 Hand compiling a dynamic module

        @@ -396,7 +397,7 @@ module actually consists of two files; socket.py and

        -

        32.2.4 Static linking

        +

        33.2.4 Static linking

        @@ -475,7 +476,7 @@ If using static linking, you might want to rely on a different approach (perhaps using distutils).

        -

        32.2.5 Using your module

        +

        33.2.5 Using your module

        @@ -632,7 +633,7 @@ system configuration (this requires root access and you will need to read the man pages).

        -

        32.2.6 Compilation of C++ extensions

        +

        33.2.6 Compilation of C++ extensions

        @@ -724,7 +725,7 @@ erratic program behavior. If working with lots of software components, you might want to investigate using a more formal standard such as COM.

        -

        32.2.7 Compiling for 64-bit platforms

        +

        33.2.7 Compiling for 64-bit platforms

        @@ -761,7 +762,7 @@ and -m64 allow you to choose the desired binary format for your python extension.

        -

        32.2.8 Building Python Extensions under Windows

        +

        33.2.8 Building Python Extensions under Windows

        @@ -870,7 +871,7 @@ SWIG Wiki.

        -

        32.3 A tour of basic C/C++ wrapping

        +

        33.3 A tour of basic C/C++ wrapping

        @@ -879,7 +880,7 @@ to your C/C++ code. Functions are wrapped as functions, classes are wrapped as This section briefly covers the essential aspects of this wrapping.

        -

        32.3.1 Modules

        +

        33.3.1 Modules

        @@ -892,7 +893,7 @@ module name, make sure you don't use the same name as a built-in Python command or standard module name.

        -

        32.3.2 Functions

        +

        33.3.2 Functions

        @@ -916,7 +917,7 @@ like you think it does: >>>

      -

      32.3.3 Global variables

      +

      33.3.3 Global variables

      @@ -1054,7 +1055,7 @@ that starts with a leading underscore. SWIG does not create cvar if there are no global variables in a module.

      -

      32.3.4 Constants and enums

      +

      33.3.4 Constants and enums

      @@ -1094,7 +1095,7 @@ other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.

      -

      32.3.5 Pointers

      +

      33.3.5 Pointers

      @@ -1235,7 +1236,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      32.3.6 Structures

      +

      33.3.6 Structures

      @@ -1424,7 +1425,7 @@ everything works just like you would expect. For example: -

      32.3.7 C++ classes

      +

      33.3.7 C++ classes

      @@ -1513,7 +1514,7 @@ they are accessed through cvar like this: -

      32.3.8 C++ inheritance

      +

      33.3.8 C++ inheritance

      @@ -1568,7 +1569,7 @@ then the function spam() accepts Foo * or a pointer to any cla It is safe to use multiple inheritance with SWIG.

      -

      32.3.9 Pointers, references, values, and arrays

      +

      33.3.9 Pointers, references, values, and arrays

      @@ -1629,7 +1630,7 @@ treated as a returning value, and it will follow the same allocation/deallocation process.

      -

      32.3.10 C++ overloaded functions

      +

      33.3.10 C++ overloaded functions

      @@ -1752,7 +1753,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      32.3.11 C++ operators

      +

      33.3.11 C++ operators

      @@ -1841,7 +1842,7 @@ Also, be aware that certain operators don't map cleanly to Python. For instance overloaded assignment operators don't map to Python semantics and will be ignored.

      -

      32.3.12 C++ namespaces

      +

      33.3.12 C++ namespaces

      @@ -1908,7 +1909,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      32.3.13 C++ templates

      +

      33.3.13 C++ templates

      @@ -1962,7 +1963,7 @@ Some more complicated examples will appear later.

      -

      32.3.14 C++ Smart Pointers

      +

      33.3.14 C++ Smart Pointers

      @@ -2047,7 +2048,7 @@ simply use the __deref__() method. For example: -

      32.3.15 C++ Reference Counted Objects (ref/unref)

      +

      33.3.15 C++ Reference Counted Objects (ref/unref)

      @@ -2190,7 +2191,7 @@ python releases the proxy instance.

      -

      32.4 Further details on the Python class interface

      +

      33.4 Further details on the Python class interface

      @@ -2203,7 +2204,17 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      32.4.1 Proxy classes

      +

      New in SWIG version 2.0.4: +The use of Python proxy classes has performance implications that may be +unacceptable for a high-performance library. The new -builtin +option instructs SWIG to forego the use of proxy classes, and instead +create wrapped types as new built-in Python types. When this option is used, +the following section ("Proxy classes") does not apply. Details on the use of +the -builtin option are in the Built-in Classes +section. +

      + +

      33.4.1 Proxy classes

      @@ -2292,8 +2303,280 @@ you can attach new Python methods to the class and you can even inherit from it by Python built-in types until Python 2.2).

      -

      32.4.2 Memory management

      +

      33.4.2 Built-in Classes

      +

      +The -builtin option provides a significant performance improvement +in the wrapped code. To understand the difference between proxy classes +and built-in types, let's take a look at what a wrapped object looks like +under both circumstances. +

      + +

      When proxy classes are used, each wrapped object in python is an instance +of a pure python class. As a reminder, here is what the __init__ method looks +like in a proxy class: +

      + +
      +
      +class Foo(object):
+     def __init__(self):
+         self.this = _example.new_Foo()
+         self.thisown = 1
+
      +
      + +

      When a Foo instance is created, the call to _example.new_Foo() +creates a new C++ Foo instance; wraps that C++ instance inside an instance of +a python built-in type called SwigPyObject; and stores the SwigPyObject +instance in the 'this' field of the python Foo object. Did you get all that? So, the +python Foo object is composed of three parts:

      + +
        +
      • The python Foo instance, which contains...
        • +
      • ... an instance of struct SwigPyObject, which contains...
        • +
      • ... a C++ Foo instance
        • +
      + +

      When -builtin is used, the pure python layer is stripped off. Each +wrapped class is turned into a new python built-in type which inherits from +SwigPyObject, and SwigPyObject instances are returned directly +from the wrapped methods. For more information about python built-in extensions, +please refer to the python documentation:

      + +

      http://docs.python.org/extending/newtypes.html

      + +

      33.4.2.1 Limitations

      + +

      Use of the -builtin option implies a couple of limitations: +

        +

      • python version support:

        • +
          +
        • Versions 2.5 and up are fully supported
          • +
        • Versions 2.3 and 2.4 are mostly supported; there are problems with director classes and/or sub-classing a wrapped type in python.
          • +
        • Versions older than 2.3 are not supported.
          • +
        +

      • Some legacy syntax is no longer supported; in particular:

        • +
          +
        • The functional interface is no longer exposed. For example, you may no longer call Whizzo.new_CrunchyFrog(). Instead, you must use Whizzo.CrunchyFrog().
          • +
        • Static member variables are no longer accessed through the 'cvar' field (e.g., Dances.cvar.FishSlap). +They are instead accessed in the idiomatic way (Dances.FishSlap).
          • +
        +

      • Wrapped types may not be raised as python exceptions. Here's why: the python internals expect that all sub-classes of Exception will have this struct layout:

        + +
        +
        +typedef struct {
+    PyObject_HEAD
+    PyObject *dict;
+    PyObject *args;
+    PyObject *message;
+} PyBaseExceptionObject;
+
        +
        + +

        But swig-generated wrappers expect that all swig-wrapped classes will have this struct layout:

        + +
        +
        +typedef struct {
+    PyObject_HEAD
+    void *ptr;
+    swig_type_info *ty;
+    int own;
+    PyObject *next;
+    PyObject *dict;
+} SwigPyObject;
+
        +
        + +

        There are workarounds for this. For example, if you wrap this class: + +

        +
        +class MyException {
+public:
+    MyException (const char *msg_);
+    ~MyException ();
+
+    const char *what () const;
+
+private:
+    char *msg;
+};
+
        +
        + +

        ... you can define this python class, which may be raised as an exception:

        + +
        +
        +class MyPyException (Exception) :
+    def __init__(self, msg, *args) :
+        Exception.__init__(self, *args)
+        self.myexc = MyException(msg)
+    def what (self) :
+        return self.myexc.what()
+
        +
        +
        • +

      • Reverse binary operators (e.g., __radd__) are not supported.

        • +
      +

      + +

      +To illustrate the last point, if you have a wrapped class called MyString, +and you want to use instances of MyString interchangeably with native python +strings, you can define an 'operator+ (const char*)' method : +

      + +
      +
      +class MyString {
+public:
+    MyString (const char *init);
+    MyString operator+ (const char *other) const;
+    ...
+};
+
      +
      + +

      +SWIG will automatically create an operator overload in python that will allow this: +

      + +
      +
      +from MyModule import MyString
+
+mystr = MyString("No one expects")
+episode = mystr + " the Spanish Inquisition"
+
      +
      + +

      +This works because the first operand (mystr) defines a way +to add a native string to itself. However, the following will not work: +

      + +
      +
      +from MyModule import MyString
+
+mystr = MyString("Parrot")
+episode = "Dead " + mystr
+
      +
      + +

      +The above code fails, because the first operand -- a native python string -- +doesn't know how to add an instance of MyString to itself. +

      + +

      33.4.2.2 Operator overloads -- use them!

      + +

      The entire justification for the -builtin option is improved +performance. To that end, the best way to squeeze maximum performance out +of your wrappers is to use operator overloads. +Named method dispatch is slow in python, even when compared to other scripting languages. +However, python built-in types have a large number of "slots", +analogous to C++ operator overloads, which allow you to short-circuit named method dispatch +for certain common operations. +

      + +

      By default, SWIG will translate most C++ arithmetic operator overloads into python +slot entries. For example, suppose you have this class: + +

      +
      +class Twit {
+public:
+    Twit operator+ (const Twit& twit) const;
+
+    // Forward to operator+
+    Twit add (const Twit& twit) const
+    { return *this + twit; }
+};
+
      +
      + +

      SWIG will automatically register operator+ as a python slot operator for addition. You may write python code like this:

      + +
      +
      +from MyModule import Twit
+
+nigel = Twit()
+emily = Twit()
+percival = nigel + emily
+percival = nigel.add(emily)
+
      +
      + +

      The last two lines of the python code are equivalent, +but the line that uses the '+' operator is much faster. +

      + +

      In-place operators (e.g., operator+=) and comparison operators +(operator==, operator<, etc.) are also converted to python +slot operators. For a complete list of C++ operators that are +automatically converted to python slot operators, refer to the file +python/pyopers.swig in the SWIG library. +

      + +

      There are other very useful python slots that you +may explicitly define using %feature directives. For example, +suppose you want to use instances of a wrapped class as keys in a native python +dict. That will work as long as you define a hash function for +instances of your class, and use it to define the python tp_hash +slot: +

      + +
      +
      +%feature("python:slot", "tp_hash", functype="hashfunc") Cheese::cheeseHashFunc;
+
+class Cheese {
+public:
+    Cheese (const char *name);
+    long cheeseHashFunc () const;
+};
+
      +
      + +

      This will allow you to write python code like this:

      + +
      +
      +from my MyPackage import Cheese
+
+inventory = {
+    Cheese("cheddar") : 0,
+    Cheese("gouda") : 0,
+    Cheese("camembert") : 0
+}
+
      +
      + +

      Because you defined the tp_hash slot, Cheese objects may +be used as hash keys; and when the cheeseHashFunc method is invoked +by a python dict, it will not go through named method dispatch. +A more detailed discussion about %feature("python:slot") can be found +in the file python/pyopers.swig in the SWIG library. +You can read about all of the available python slots here:

      + +

      http://docs.python.org/c-api/typeobj.html

      + +

      You may override (almost) all of the slots defined in the PyTypeObject, +PyNumberMethods, PyMappingMethods, PySequenceMethods, and PyBufferProcs +structs. +

      + + +

      33.4.3 Memory management

      + +

      NOTE: Although this section refers to proxy objects, everything here also applies +when the -builtin option is used.

      Associated with proxy object, is an ownership flag .thisown The value of this @@ -2484,7 +2767,7 @@ It is also possible to deal with situations like this using typemaps--an advanced topic discussed later.

      -

      32.4.3 Python 2.2 and classic classes

      +

      33.4.4 Python 2.2 and classic classes

      @@ -2521,7 +2804,7 @@ class itself. In Python-2.1 and earlier, they have to be accessed as a global function or through an instance (see the earlier section).

      -

      32.5 Cross language polymorphism

      +

      33.5 Cross language polymorphism

      @@ -2555,7 +2838,7 @@ proxy classes, director classes, and C wrapper functions takes care of all the cross-language method routing transparently.

      -

      32.5.1 Enabling directors

      +

      33.5.1 Enabling directors

      @@ -2648,7 +2931,7 @@ class MyFoo(mymodule.Foo): -

      32.5.2 Director classes

      +

      33.5.2 Director classes

      @@ -2730,7 +3013,7 @@ so there is no need for the extra overhead involved with routing the calls through Python.

      -

      32.5.3 Ownership and object destruction

      +

      33.5.3 Ownership and object destruction

      @@ -2797,7 +3080,7 @@ deleting all the Foo pointers it contains at some point. Note that no hard references to the Foo objects remain in Python.

      -

      32.5.4 Exception unrolling

      +

      33.5.4 Exception unrolling

      @@ -2856,7 +3139,7 @@ Swig::DirectorMethodException is thrown, Python will register the exception as soon as the C wrapper function returns.

      -

      32.5.5 Overhead and code bloat

      +

      33.5.5 Overhead and code bloat

      @@ -2890,7 +3173,7 @@ directive) for only those methods that are likely to be extended in Python.

      -

      32.5.6 Typemaps

      +

      33.5.6 Typemaps

      @@ -2904,7 +3187,7 @@ need to be supported.

      -

      32.5.7 Miscellaneous

      +

      33.5.7 Miscellaneous

      @@ -2951,7 +3234,7 @@ methods that return const references.

      -

      32.6 Common customization features

      +

      33.6 Common customization features

      @@ -2964,7 +3247,7 @@ This section describes some common SWIG features that are used to improve your the interface to an extension module.

      -

      32.6.1 C/C++ helper functions

      +

      33.6.1 C/C++ helper functions

      @@ -3045,7 +3328,7 @@ hard to implement. It is possible to clean this up using Python code, typemaps, customization features as covered in later sections.

      -

      32.6.2 Adding additional Python code

      +

      33.6.2 Adding additional Python code

      @@ -3194,7 +3477,7 @@ public: -

      32.6.3 Class extension with %extend

      +

      33.6.3 Class extension with %extend

      @@ -3283,7 +3566,7 @@ Vector(12,14,16) in any way---the extensions only show up in the Python interface.

      -

      32.6.4 Exception handling with %exception

      +

      33.6.4 Exception handling with %exception

      @@ -3409,7 +3692,7 @@ The language-independent exception.i library file can also be used to raise exceptions. See the SWIG Library chapter.

      -

      32.7 Tips and techniques

      +

      33.7 Tips and techniques

      @@ -3419,7 +3702,7 @@ strings, binary data, and arrays. This chapter discusses the common techniques solving these problems.

      -

      32.7.1 Input and output parameters

      +

      33.7.1 Input and output parameters

      @@ -3632,7 +3915,7 @@ void foo(Bar *OUTPUT); may not have the intended effect since typemaps.i does not define an OUTPUT rule for Bar.

      -

      32.7.2 Simple pointers

      +

      33.7.2 Simple pointers

      @@ -3701,7 +3984,7 @@ If you replace %pointer_functions() by %pointer_class(type,name)SWIG Library chapter for further details.

      -

      32.7.3 Unbounded C Arrays

      +

      33.7.3 Unbounded C Arrays

      @@ -3763,7 +4046,7 @@ well suited for applications in which you need to create buffers, package binary data, etc.

      -

      32.7.4 String handling

      +

      33.7.4 String handling

      @@ -3832,7 +4115,7 @@ If you need to return binary data, you might use the also be used to extra binary data from arbitrary pointers.

      -

      32.8 Typemaps

      +

      33.8 Typemaps

      @@ -3849,7 +4132,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Python interface or if you want to elevate your guru status.

      -

      32.8.1 What is a typemap?

      +

      33.8.1 What is a typemap?

      @@ -3965,7 +4248,7 @@ parameter is omitted): -

      32.8.2 Python typemaps

      +

      33.8.2 Python typemaps

      @@ -4006,7 +4289,7 @@ a look at the SWIG library version 1.3.20 or so.

      -

      32.8.3 Typemap variables

      +

      33.8.3 Typemap variables

      @@ -4077,7 +4360,7 @@ properly assigned. The Python name of the wrapper function being created. -

      32.8.4 Useful Python Functions

      +

      33.8.4 Useful Python Functions

      @@ -4205,7 +4488,7 @@ write me -

      32.9 Typemap Examples

      +

      33.9 Typemap Examples

      @@ -4214,7 +4497,7 @@ might look at the files "python.swg" and "typemaps.i" in the SWIG library.

      -

      32.9.1 Converting Python list to a char **

      +

      33.9.1 Converting Python list to a char **

      @@ -4294,7 +4577,7 @@ memory allocation is used to allocate memory for the array, the the C function.

      -

      32.9.2 Expanding a Python object into multiple arguments

      +

      33.9.2 Expanding a Python object into multiple arguments

      @@ -4373,7 +4656,7 @@ to supply the argument count. This is automatically set by the typemap code. F -

      32.9.3 Using typemaps to return arguments

      +

      33.9.3 Using typemaps to return arguments

      @@ -4462,7 +4745,7 @@ function can now be used as follows: >>> -

      32.9.4 Mapping Python tuples into small arrays

      +

      33.9.4 Mapping Python tuples into small arrays

      @@ -4511,7 +4794,7 @@ array, such an approach would not be recommended for huge arrays, but for small structures, this approach works fine.

      -

      32.9.5 Mapping sequences to C arrays

      +

      33.9.5 Mapping sequences to C arrays

      @@ -4592,7 +4875,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { %} %typemap(in) double [ANY](double temp[$1_dim0]) { - if (!convert_darray($input,temp,$1_dim0))) { + if (!convert_darray($input,temp,$1_dim0)) { return NULL; } $1 = &temp[0]; @@ -4600,7 +4883,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) { -

      32.9.6 Pointer handling

      +

      33.9.6 Pointer handling

      @@ -4697,7 +4980,7 @@ class object (if applicable). -

      32.10 Docstring Features

      +

      33.10 Docstring Features

      @@ -4725,7 +5008,7 @@ of your users much simpler.

      -

      32.10.1 Module docstring

      +

      33.10.1 Module docstring

      @@ -4759,7 +5042,7 @@ layout of controls on a panel, etc. to be loaded from an XML file." -

      32.10.2 %feature("autodoc")

      +

      33.10.2 %feature("autodoc")

      @@ -4786,7 +5069,7 @@ names, default values if any, and return type if any. There are also three options for autodoc controlled by the value given to the feature, described below. -

      32.10.2.1 %feature("autodoc", "0")

      +

      33.10.2.1 %feature("autodoc", "0")

      @@ -4815,7 +5098,7 @@ def function_name(*args, **kwargs): -

      32.10.2.2 %feature("autodoc", "1")

      +

      33.10.2.2 %feature("autodoc", "1")

      @@ -4840,7 +5123,7 @@ def function_name(*args, **kwargs): -

      32.10.2.3 %feature("autodoc", "docstring")

      +

      33.10.2.3 %feature("autodoc", "docstring")

      @@ -4859,7 +5142,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT); -

      32.10.3 %feature("docstring")

      +

      33.10.3 %feature("docstring")

      @@ -4891,7 +5174,7 @@ with more than one line. -

      32.11 Python Packages

      +

      33.11 Python Packages

      @@ -4918,7 +5201,7 @@ and also in base class declarations, etc. if the package name is different than its own.

      -

      32.12 Python 3 Support

      +

      33.12 Python 3 Support

      @@ -4945,7 +5228,7 @@ The following are Python 3.0 new features that are currently supported by SWIG.

      -

      32.12.1 Function annotation

      +

      33.12.1 Function annotation

      @@ -4977,7 +5260,7 @@ all overloaded functions share the same function in SWIG generated proxy class. For detailed usage of function annotation, see PEP 3107.

      -

      32.12.2 Buffer interface

      +

      33.12.2 Buffer interface

      @@ -5129,7 +5412,7 @@ modify the buffer. -

      32.12.3 Abstract base classes

      +

      33.12.3 Abstract base classes

      diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index 679718400..e8cee6448 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -6,7 +6,7 @@ -

      33 SWIG and R

      +

      34 SWIG and R

        @@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux with gcc. The R bindings also work on Microsoft Windows using Visual C++.

        -

        33.1 Bugs

        +

        34.1 Bugs

        @@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:

      • C Array wrappings
      -

      33.2 Using R and SWIG

      +

      34.2 Using R and SWIG

      @@ -119,7 +119,7 @@ Without it, inheritance of wrapped objects may fail. These two files can be loaded in any order

      -

      33.3 Precompiling large R files

      +

      34.3 Precompiling large R files

      In cases where the R file is large, one make save a lot of loading @@ -137,7 +137,7 @@ will save a large amount of loading time. -

      33.4 General policy

      +

      34.4 General policy

      @@ -146,7 +146,7 @@ wrapping over the underlying functions and rely on the R type system to provide R syntax.

      -

      33.5 Language conventions

      +

      34.5 Language conventions

      @@ -155,7 +155,7 @@ and [ are overloaded to allow for R syntax (one based indices and slices)

      -

      33.6 C++ classes

      +

      34.6 C++ classes

      @@ -167,7 +167,7 @@ keep track of the pointer object which removes the necessity for a lot of the proxy class baggage you see in other languages.

      -

      33.7 Enumerations

      +

      34.7 Enumerations

      diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html index a08f497d5..f21e353ce 100644 --- a/Doc/Manual/Ruby.html +++ b/Doc/Manual/Ruby.html @@ -7,7 +7,7 @@ -

      34 SWIG and Ruby

      +

      35 SWIG and Ruby

        @@ -148,7 +148,7 @@ -

        34.1 Preliminaries

        +

        35.1 Preliminaries

        SWIG 1.3 is known to work with Ruby versions 1.6 and later. @@ -171,7 +171,7 @@ of Ruby.

        -

        34.1.1 Running SWIG

        +

        35.1.1 Running SWIG

        To build a Ruby module, run SWIG using the -ruby @@ -225,7 +225,7 @@ to compile this file and link it with the rest of your program.

        -

        34.1.2 Getting the right header files

        +

        35.1.2 Getting the right header files

        In order to compile the wrapper code, the compiler needs the ruby.h @@ -274,7 +274,7 @@ installed, you can run Ruby to find out. For example:

        -

        34.1.3 Compiling a dynamic module

        +

        35.1.3 Compiling a dynamic module

        Ruby extension modules are typically compiled into shared @@ -428,7 +428,7 @@ manual pages for your compiler and linker to determine the correct set of options. You might also check the SWIG Wiki for additional information.

        -

        34.1.4 Using your module

        +

        35.1.4 Using your module

        Ruby module names must be capitalized, @@ -488,7 +488,7 @@ begins with:

        -

        34.1.5 Static linking

        +

        35.1.5 Static linking

        An alternative approach to dynamic linking is to rebuild the @@ -509,7 +509,7 @@ finally rebuilding Ruby.

        -

        34.1.6 Compilation of C++ extensions

        +

        35.1.6 Compilation of C++ extensions

        On most machines, C++ extension modules should be linked @@ -561,7 +561,7 @@ extension, e.g.

        -

        34.2 Building Ruby Extensions under Windows 95/NT

        +

        35.2 Building Ruby Extensions under Windows 95/NT

        Building a SWIG extension to Ruby under Windows 95/NT is @@ -600,7 +600,7 @@ files.

        -

        34.2.1 Running SWIG from Developer Studio

        +

        35.2.1 Running SWIG from Developer Studio

        If you are developing your application within Microsoft @@ -742,7 +742,7 @@ directory, then run the Ruby script from the DOS/Command prompt:

        -

        34.3 The Ruby-to-C/C++ Mapping

        +

        35.3 The Ruby-to-C/C++ Mapping

        This section describes the basics of how SWIG maps C or C++ @@ -752,7 +752,7 @@ declarations in your SWIG interface files to Ruby constructs.

        -

        34.3.1 Modules

        +

        35.3.1 Modules

        The SWIG %module directive specifies @@ -921,7 +921,7 @@ Ruby's built-in names.

        -

        34.3.2 Functions

        +

        35.3.2 Functions

        Global functions are wrapped as Ruby module methods. For @@ -984,7 +984,7 @@ module that can be used like so:

        -

        34.3.3 Variable Linking

        +

        35.3.3 Variable Linking

        C/C++ global variables are wrapped as a pair of singleton @@ -1084,7 +1084,7 @@ effect until it is explicitly disabled using %mutable. -

        34.3.4 Constants

        +

        35.3.4 Constants

        C/C++ constants are wrapped as module constants initialized @@ -1128,7 +1128,7 @@ constant values, e.g.

        -

        34.3.5 Pointers

        +

        35.3.5 Pointers

        "Opaque" pointers to arbitrary C/C++ types (i.e. types that @@ -1180,7 +1180,7 @@ the Ruby nil object.

        -

        34.3.6 Structures

        +

        35.3.6 Structures

        C/C++ structs are wrapped as Ruby classes, with accessor @@ -1355,7 +1355,7 @@ pointers. For example,

        -

        34.3.7 C++ classes

        +

        35.3.7 C++ classes

        Like structs, C++ classes are wrapped by creating a new Ruby @@ -1441,7 +1441,7 @@ class. -

        34.3.8 C++ Inheritance

        +

        35.3.8 C++ Inheritance

        The SWIG type-checker is fully aware of C++ inheritance. @@ -1672,7 +1672,7 @@ Typing").

        -

        34.3.9 C++ Overloaded Functions

        +

        35.3.9 C++ Overloaded Functions

        C++ overloaded functions, methods, and constructors are @@ -1872,7 +1872,7 @@ and C++" chapter for more information about overloading.

        -

        34.3.10 C++ Operators

        +

        35.3.10 C++ Operators

        For the most part, overloaded operators are handled @@ -1953,7 +1953,7 @@ on operator overloading.

        -

        34.3.11 C++ namespaces

        +

        35.3.11 C++ namespaces

        SWIG is aware of C++ namespaces, but namespace names do not @@ -2029,7 +2029,7 @@ identical symbol names, well, then you get what you deserve.

        -

        34.3.12 C++ templates

        +

        35.3.12 C++ templates

        C++ templates don't present a huge problem for SWIG. However, @@ -2073,7 +2073,7 @@ directive. For example:

        -

        34.3.13 C++ Standard Template Library (STL)

        +

        35.3.13 C++ Standard Template Library (STL)

        On a related note, the standard SWIG library contains a @@ -2326,7 +2326,7 @@ chapter.

        -

        34.3.14 C++ STL Functors

        +

        35.3.14 C++ STL Functors

        Some containers in the STL allow you to modify their default @@ -2526,7 +2526,7 @@ b
        -

        34.3.15 C++ STL Iterators

        +

        35.3.15 C++ STL Iterators

        The STL is well known for the use of iterators.  There @@ -2737,7 +2737,7 @@ i
        -

        34.3.16 C++ Smart Pointers

        +

        35.3.16 C++ Smart Pointers

        In certain C++ programs, it is common to use classes that @@ -2862,7 +2862,7 @@ method. For example:

        -

        34.3.17 Cross-Language Polymorphism

        +

        35.3.17 Cross-Language Polymorphism

        SWIG's Ruby module supports cross-language polymorphism @@ -2875,7 +2875,7 @@ using this feature with Ruby.

        -

        34.3.17.1 Exception Unrolling

        +

        35.3.17.1 Exception Unrolling

        Whenever a C++ director class routes one of its virtual @@ -2913,7 +2913,7 @@ caught here and a C++ exception is raised in its place.

        -

        34.4 Naming

        +

        35.4 Naming

        Ruby has several common naming conventions. Constants are @@ -3009,7 +3009,7 @@ planned to become the default option in future releases.

        -

        34.4.1 Defining Aliases

        +

        35.4.1 Defining Aliases

        It's a fairly common practice in the Ruby built-ins and @@ -3101,7 +3101,7 @@ Features") for more details).

        -

        34.4.2 Predicate Methods

        +

        35.4.2 Predicate Methods

        Ruby methods that return a boolean value and end in a @@ -3190,7 +3190,7 @@ Features") for more details).

        -

        34.4.3 Bang Methods

        +

        35.4.3 Bang Methods

        Ruby methods that modify an object in-place and end in an @@ -3254,7 +3254,7 @@ Features") for more details).

        -

        34.4.4 Getters and Setters

        +

        35.4.4 Getters and Setters

        Often times a C++ library will expose properties through @@ -3324,7 +3324,7 @@ methods to be exposed in Ruby as value and value=. -

        34.5 Input and output parameters

        +

        35.5 Input and output parameters

        A common problem in some C programs is handling parameters @@ -3575,10 +3575,10 @@ of %apply

        -

        34.6 Exception handling

        +

        35.6 Exception handling

        -

        34.6.1 Using the %exception directive

        +

        35.6.1 Using the %exception directive

        The SWIG %exception directive can be @@ -3673,7 +3673,7 @@ Features for more examples.

        -

        34.6.2 Handling Ruby Blocks

        +

        35.6.2 Handling Ruby Blocks

        One of the highlights of Ruby and most of its standard library @@ -3854,7 +3854,7 @@ RUBY_YIELD_SELF );

        For more information on typemaps, see Typemaps.

        -

        34.6.3 Raising exceptions

        +

        35.6.3 Raising exceptions

        There are three ways to raise exceptions from C++ code to @@ -4615,7 +4615,7 @@ the built-in Ruby exception types.

        -

        34.6.4 Exception classes

        +

        35.6.4 Exception classes

        Starting with SWIG 1.3.28, the Ruby module supports the %exceptionclass @@ -4673,7 +4673,7 @@ providing for a more natural integration between C++ code and Ruby code.

        -

        34.7 Typemaps

        +

        35.7 Typemaps

        This section describes how you can modify SWIG's default @@ -4696,7 +4696,7 @@ of the primitive C-Ruby interface.

        -

        34.7.1 What is a typemap?

        +

        35.7.1 What is a typemap?

        A typemap is nothing more than a code generation rule that is @@ -4958,7 +4958,7 @@ to be used as follows (notice how the length parameter is omitted):

        -

        34.7.2 Typemap scope

        +

        35.7.2 Typemap scope

        Once defined, a typemap remains in effect for all of the @@ -5006,7 +5006,7 @@ where the class itself is defined. For example:

        -

        34.7.3 Copying a typemap

        +

        35.7.3 Copying a typemap

        A typemap is copied by using assignment. For example:

        @@ -5108,7 +5108,7 @@ rules as for -

        34.7.4 Deleting a typemap

        +

        35.7.4 Deleting a typemap

        A typemap can be deleted by simply defining no code. For @@ -5160,7 +5160,7 @@ typemaps immediately after the clear operation.

        -

        34.7.5 Placement of typemaps

        +

        35.7.5 Placement of typemaps

        Typemap declarations can be declared in the global scope, @@ -5244,7 +5244,7 @@ string -

        34.7.6 Ruby typemaps

        +

        35.7.6 Ruby typemaps

        The following list details all of the typemap methods that @@ -5254,7 +5254,7 @@ can be used by the Ruby module:

        -

        34.7.6.1  "in" typemap

        +

        35.7.6.1  "in" typemap

        Converts Ruby objects to input @@ -5497,7 +5497,7 @@ arguments to be specified. For example:

        -

        34.7.6.2 "typecheck" typemap

        +

        35.7.6.2 "typecheck" typemap

        The "typecheck" typemap is used to support overloaded @@ -5538,7 +5538,7 @@ on "Typemaps and Overloading."

        -

        34.7.6.3  "out" typemap

        +

        35.7.6.3  "out" typemap

        Converts return value of a C function @@ -5770,7 +5770,7 @@ version of the C datatype matched by the typemap. -

        34.7.6.4 "arginit" typemap

        +

        35.7.6.4 "arginit" typemap

        The "arginit" typemap is used to set the initial value of a @@ -5795,7 +5795,7 @@ applications. For example:

        -

        34.7.6.5 "default" typemap

        +

        35.7.6.5 "default" typemap

        The "default" typemap is used to turn an argument into a @@ -5837,7 +5837,7 @@ default argument wrapping.

        -

        34.7.6.6 "check" typemap

        +

        35.7.6.6 "check" typemap

        The "check" typemap is used to supply value checking code @@ -5861,7 +5861,7 @@ arguments have been converted. For example:

        -

        34.7.6.7 "argout" typemap

        +

        35.7.6.7 "argout" typemap

        The "argout" typemap is used to return values from arguments. @@ -6019,7 +6019,7 @@ some function like SWIG_Ruby_AppendOutput.

        -

        34.7.6.8 "freearg" typemap

        +

        35.7.6.8 "freearg" typemap

        The "freearg" typemap is used to cleanup argument data. It is @@ -6055,7 +6055,7 @@ abort prematurely.

        -

        34.7.6.9 "newfree" typemap

        +

        35.7.6.9 "newfree" typemap

        The "newfree" typemap is used in conjunction with the %newobject @@ -6086,7 +6086,7 @@ ownership and %newobject for further details.

        -

        34.7.6.10 "memberin" typemap

        +

        35.7.6.10 "memberin" typemap

        The "memberin" typemap is used to copy data from an @@ -6119,7 +6119,7 @@ other objects.

        -

        34.7.6.11 "varin" typemap

        +

        35.7.6.11 "varin" typemap

        The "varin" typemap is used to convert objects in the target @@ -6130,7 +6130,7 @@ This is implementation specific.

        -

        34.7.6.12 "varout" typemap

        +

        35.7.6.12 "varout" typemap

        The "varout" typemap is used to convert a C/C++ object to an @@ -6141,7 +6141,7 @@ This is implementation specific.

        -

        34.7.6.13 "throws" typemap

        +

        35.7.6.13 "throws" typemap

        The "throws" typemap is only used when SWIG parses a C++ @@ -6200,7 +6200,7 @@ handling with %exception section.

        -

        34.7.6.14 directorin typemap

        +

        35.7.6.14 directorin typemap

        Converts C++ objects in director @@ -6454,7 +6454,7 @@ referring to the class itself. -

        34.7.6.15 directorout typemap

        +

        35.7.6.15 directorout typemap

        Converts Ruby objects in director @@ -6714,7 +6714,7 @@ exception.
        -

        34.7.6.16 directorargout typemap

        +

        35.7.6.16 directorargout typemap

        Output argument processing in director @@ -6954,7 +6954,7 @@ referring to the instance of the class itself -

        34.7.6.17 ret typemap

        +

        35.7.6.17 ret typemap

        Cleanup of function return values @@ -6964,7 +6964,7 @@ referring to the instance of the class itself -

        34.7.6.18 globalin typemap

        +

        35.7.6.18 globalin typemap

        Setting of C global variables @@ -6974,7 +6974,7 @@ referring to the instance of the class itself -

        34.7.7 Typemap variables

        +

        35.7.7 Typemap variables

        @@ -7084,7 +7084,7 @@ being created.

      -

      34.7.8 Useful Functions

      +

      35.7.8 Useful Functions

      When you write a typemap, you usually have to work directly @@ -7108,7 +7108,7 @@ across multiple languages.

      -

      34.7.8.1 C Datatypes to Ruby Objects

      +

      35.7.8.1 C Datatypes to Ruby Objects

      @@ -7164,7 +7164,7 @@ SWIG_From_float(float) -

      34.7.8.2 Ruby Objects to C Datatypes

      +

      35.7.8.2 Ruby Objects to C Datatypes

      Here, while the Ruby versions return the value directly, the SWIG @@ -7253,7 +7253,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      34.7.8.3 Macros for VALUE

      +

      35.7.8.3 Macros for VALUE

      RSTRING_LEN(str)

      @@ -7316,7 +7316,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input -

      34.7.8.4 Exceptions

      +

      35.7.8.4 Exceptions

      void rb_raise(VALUE exception, const char *fmt, @@ -7483,7 +7483,7 @@ arguments are interpreted as with printf().

      -

      34.7.8.5 Iterators

      +

      35.7.8.5 Iterators

      void rb_iter_break()

      @@ -7585,7 +7585,7 @@ VALUE), VALUE value)

      -

      34.7.9 Typemap Examples

      +

      35.7.9 Typemap Examples

      This section includes a few examples of typemaps. For more @@ -7596,7 +7596,7 @@ directory.

      -

      34.7.10 Converting a Ruby array to a char **

      +

      35.7.10 Converting a Ruby array to a char **

      A common problem in many C programs is the processing of @@ -7651,7 +7651,7 @@ after the execution of the C function.

      -

      34.7.11 Collecting arguments in a hash

      +

      35.7.11 Collecting arguments in a hash

      Ruby's solution to the "keyword arguments" capability of some @@ -7930,7 +7930,7 @@ directory of the SWIG distribution.

      -

      34.7.12 Pointer handling

      +

      35.7.12 Pointer handling

      Occasionally, it might be necessary to convert pointer values @@ -8029,7 +8029,7 @@ For example:

      -

      34.7.12.1 Ruby Datatype Wrapping

      +

      35.7.12.1 Ruby Datatype Wrapping

      VALUE Data_Wrap_Struct(VALUE class, void @@ -8080,7 +8080,7 @@ and assigns that pointer to ptr.

      -

      34.7.13 Example: STL Vector to Ruby Array

      +

      35.7.13 Example: STL Vector to Ruby Array

      Another use for macros and type maps is to create a Ruby array @@ -8189,7 +8189,7 @@ the C++ Standard Template Library.
      -

      34.8 Docstring Features

      +

      35.8 Docstring Features

      @@ -8250,7 +8250,7 @@ generate ri documentation from a c wrap file, you could do:

      -

      34.8.1 Module docstring

      +

      35.8.1 Module docstring

      @@ -8301,7 +8301,7 @@ macro. For example: -

      34.8.2 %feature("autodoc")

      +

      35.8.2 %feature("autodoc")

      Since SWIG does know everything about the function it wraps, @@ -8330,7 +8330,7 @@ feature, described below. -

      34.8.2.1 %feature("autodoc", "0")

      +

      35.8.2.1 %feature("autodoc", "0")

      @@ -8378,7 +8378,7 @@ Then Ruby code like this will be generated: -

      34.8.2.2 %feature("autodoc", "1")

      +

      35.8.2.2 %feature("autodoc", "1")

      @@ -8410,7 +8410,7 @@ this: -

      34.8.2.3 %feature("autodoc", "2")

      +

      35.8.2.3 %feature("autodoc", "2")

      @@ -8426,7 +8426,7 @@ this: -

      34.8.2.4 %feature("autodoc", "3")

      +

      35.8.2.4 %feature("autodoc", "3")

      @@ -8454,7 +8454,7 @@ this: -

      34.8.2.5 %feature("autodoc", "docstring")

      +

      35.8.2.5 %feature("autodoc", "docstring")

      @@ -8482,7 +8482,7 @@ generated string. For example: -

      34.8.3 %feature("docstring")

      +

      35.8.3 %feature("docstring")

      @@ -8497,10 +8497,10 @@ docstring and they are output together.

      -

      34.9 Advanced Topics

      +

      35.9 Advanced Topics

      -

      34.9.1 Operator overloading

      +

      35.9.1 Operator overloading

      SWIG allows operator overloading with, by using the %extend @@ -9517,7 +9517,7 @@ parses the expression a != b as !(a == b). -

      34.9.2 Creating Multi-Module Packages

      +

      35.9.2 Creating Multi-Module Packages

      The chapter on Working @@ -9698,7 +9698,7 @@ initialized:

      -

      34.9.3 Specifying Mixin Modules

      +

      35.9.3 Specifying Mixin Modules

      The Ruby language doesn't support multiple inheritance, but @@ -9796,7 +9796,7 @@ Features") for more details).

      -

      34.10 Memory Management

      +

      35.10 Memory Management

      One of the most common issues in generating SWIG bindings for @@ -9843,7 +9843,7 @@ understanding of how the underlying library manages memory.

      -

      34.10.1 Mark and Sweep Garbage Collector

      +

      35.10.1 Mark and Sweep Garbage Collector

      Ruby uses a mark and sweep garbage collector. When the garbage @@ -9891,7 +9891,7 @@ this memory.

      -

      34.10.2 Object Ownership

      +

      35.10.2 Object Ownership

      As described above, memory management depends on clearly @@ -10149,7 +10149,7 @@ public: -

      34.10.3 Object Tracking

      +

      35.10.3 Object Tracking

      The remaining parts of this section will use the class library @@ -10400,7 +10400,7 @@ methods.

      -

      34.10.4 Mark Functions

      +

      35.10.4 Mark Functions

      With a bit more testing, we see that our class library still @@ -10518,7 +10518,7 @@ test suite.

      -

      34.10.5 Free Functions

      +

      35.10.5 Free Functions

      By default, SWIG creates a "free" function that is called when @@ -10768,7 +10768,7 @@ been freed, and thus raises a runtime exception.

      -

      34.10.6 Embedded Ruby and the C++ Stack

      +

      35.10.6 Embedded Ruby and the C++ Stack

      As has been said, the Ruby GC runs and marks objects before diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index e51e55986..fd510f2a4 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -2002,22 +2002,6 @@ documentation is not exhaustive, see "%rename predicates" section of swig.swg for the full list of supported match expressions.

      -

      -Another important feature of match is that it can be applied not -only to the declaration itself but also to its enclosing declaration. So -match$parentNode$name="SomeClass" would be true only for members of -the C++ class with the specified name. This can, of course, be combined with -more complicated matches making it possible to write -

      -
      -
      -%rename("%(lowercase)s", match$parentNode$name="SomeClass", %$isenum) "";
-
      -
      -

      -to rename all enums nested in the given class to lower case. -

      -

      In addition to literally matching some string with match you can also use regexmatch or notregexmatch to match a string @@ -2039,6 +2023,14 @@ declaration name directly can be preferable and can also be done using %rename("$ignore", regextarget=1) "Old$"; +Notice that the check is done only against the name of the declaration +itself, if you need to match the full name of a C++ declaration you +must use fullname attribute: +

      +
      +%rename("$ignore", regextarget=1, fullname=1) "NameSpace::ClassName::.*Old$";
+
      +

      As for notregexmatch, it restricts the match only to the strings not @@ -2244,7 +2236,8 @@ rest to lower case. And now, a final note about function pointer support. Although SWIG does not normally allow callback functions to be written in the target language, this can be accomplished with the use of typemaps and other advanced SWIG features. -This is described in a later chapter. +See the Typemaps chapter for more about typemaps +and individual target language chapters for more on callbacks and the 'director' feature.

      5.5 Structures and unions

      diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html index f9bfc8ec6..c8e5ee870 100644 --- a/Doc/Manual/SWIGPlus.html +++ b/Doc/Manual/SWIGPlus.html @@ -4192,8 +4192,9 @@ In the example below, the generic template type is used to rename to bbb 
      -%rename(bbb) Space::ABC::aaa(T t);                       // will match but with lower precedence than ccc
-%rename(ccc) Space::ABC<Space::XYZ>::aaa(Space::XYZ t);  // will match but with higher precedence than bbb
+%rename(bbb) Space::ABC::aaa(T t);                  // will match but with lower precedence than ccc
+%rename(ccc) Space::ABC<Space::XYZ>::aaa(Space::XYZ t);// will match but with higher precedence
+                                                             // than bbb
 
 namespace Space {
   class XYZ {};
@@ -4214,9 +4215,9 @@ Below shows how %rename can be placed inside a namespace.
 
      
 
       namespace Space {
-  %rename(bbb) ABC::aaa(T t);                       // will match but with lower precedence than ccc
-  %rename(ccc) ABC<Space::XYZ>::aaa(Space::XYZ t);  // will match but with higher precedence than bbb
-  %rename(ddd) ABC<Space::XYZ>::aaa(XYZ t);         // will not match
+  %rename(bbb) ABC::aaa(T t);                     // will match but with lower precedence than ccc
+  %rename(ccc) ABC<Space::XYZ>::aaa(Space::XYZ t);// will match but with higher precedence than bbb
+  %rename(ddd) ABC<Space::XYZ>::aaa(XYZ t);       // will not match
 }
 
 namespace Space {
@@ -4238,11 +4239,11 @@ The following example shows how %rename can be placed within %extend.
 
       namespace Space {
   %extend ABC {
-    %rename(bbb) aaa(T t);           // will match but with lower precedence than ccc
+    %rename(bbb) aaa(T t);         // will match but with lower precedence than ccc
   }
   %extend ABC<Space::XYZ> {
-    %rename(ccc) aaa(Space::XYZ t);  // will match but with higher precedence than bbb
-    %rename(ddd) aaa(XYZ t);         // will not match
+    %rename(ccc) aaa(Space::XYZ t);// will match but with higher precedence than bbb
+    %rename(ddd) aaa(XYZ t);       // will not match
   }
 }
 
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 855244790..62305b9ed 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 
 
      SWIG-2.0 Documentation
      
 
-Last update : SWIG-2.0.2 (in progress)
+Last update : SWIG-2.0.4 (in progress)
 
 
      Sections
      
 
@@ -36,13 +36,14 @@ Last update : SWIG-2.0.2 (in progress)
 
    • Allegro CL support
      • 
 
    • C# support
      • 
 
    • Chicken support
      • 
+
    • D support
      • 
 
    • Go support
      • 
 
    • Guile support
      • 
 
    • Java support
      • 
 
    • Common Lisp support
      • 
 
    • Lua support
      • 
 
    • Modula3 support
      • 
-
    • MzScheme support
      • 
+
    • MzScheme support
      • 
 
    • Ocaml support
      • 
 
    • Octave support
      • 
 
    • Perl5 support
      • 
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index 7a4a85de9..c677f6eed 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -6,7 +6,7 @@
 
 
 
-
      35 SWIG and Tcl
      
+
      36 SWIG and Tcl
      
 
 
      
 
        
@@ -83,7 +83,7 @@ Tcl 8.0 or a later release.   Earlier releases of SWIG supported Tcl 7.x, but
 this is no longer supported.
 
        
 
-
        35.1 Preliminaries
        
+
        36.1 Preliminaries
        
 
 
 
        
@@ -109,7 +109,7 @@ build a Tcl extension module.  To finish building the module, you
 need to compile this file and link it with the rest of your program.
 
        
 
-
        35.1.1 Getting the right header files
        
+
        36.1.1 Getting the right header files
        
 
 
 
        
@@ -127,7 +127,7 @@ this is the case, you should probably make a symbolic link so that tcl.h
 
-
        35.1.2 Compiling a dynamic module
        
+
        36.1.2 Compiling a dynamic module
        
 
 
 
        
@@ -162,7 +162,7 @@ The name of the module is specified using the %module directive or the
  -module command line option.
 
        
 
-
        35.1.3 Static linking
        
+
        36.1.3 Static linking
        
 
 
 
        
@@ -228,7 +228,7 @@ minimal in most situations (and quite frankly not worth the extra
 hassle in the opinion of this author). 
 
        
 
-
        35.1.4 Using your module
        
+
        36.1.4 Using your module
        
 
 
 
        
@@ -356,7 +356,7 @@ to the default system configuration (this requires root access and you will need
 the man pages). 
 
        
 
-
        35.1.5 Compilation of C++ extensions
        
+
        36.1.5 Compilation of C++ extensions
        
 
 
 
        
@@ -439,7 +439,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 
        
 
-
        35.1.6 Compiling for 64-bit platforms
        
+
        36.1.6 Compiling for 64-bit platforms
        
 
 
 
        
@@ -466,7 +466,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 
        
 
-
        35.1.7 Setting a package prefix
        
+
        36.1.7 Setting a package prefix
        
 
 
 
        
@@ -485,7 +485,7 @@ option will append the prefix to the name when creating a command and
 call it "Foo_bar".
 
        
 
-
        35.1.8 Using namespaces
        
+
        36.1.8 Using namespaces
        
 
 
 
        
@@ -507,7 +507,7 @@ When the -namespace option is used, objects in the module
 are always accessed with the namespace name such as Foo::bar.
 
        
 
-
        35.2 Building Tcl/Tk Extensions under Windows 95/NT
        
+
        36.2 Building Tcl/Tk Extensions under Windows 95/NT
        
 
 
 
        
@@ -518,7 +518,7 @@ covers the process of using SWIG with Microsoft Visual C++.
 although the procedure may be similar with other compilers.
 
        
 
-
        35.2.1 Running SWIG from Developer Studio
        
+
        36.2.1 Running SWIG from Developer Studio
        
 
 
 
        
@@ -576,7 +576,7 @@ MSDOS > tclsh80
 %
 
      
 
-
      35.2.2 Using NMAKE
      
+
      36.2.2 Using NMAKE
      
 
 
 
      
@@ -639,7 +639,7 @@ to get you started.  With a little practice, you'll be making lots of
 Tcl extensions.
 
      
 
-
      35.3 A tour of basic C/C++ wrapping
      
+
      36.3 A tour of basic C/C++ wrapping
      
 
 
 
      
@@ -650,7 +650,7 @@ classes.  This section briefly covers the essential aspects of this
 wrapping.
 
      
 
-
      35.3.1 Modules
      
+
      36.3.1 Modules
      
 
 
 
      
@@ -684,7 +684,7 @@ To fix this, supply an extra argument to load like this:
      -

      35.3.2 Functions

      +

      36.3.2 Functions

      @@ -709,7 +709,7 @@ like you think it does: % -

      35.3.3 Global variables

      +

      36.3.3 Global variables

      @@ -789,7 +789,7 @@ extern char *path; // Read-only (due to %immutable) -

      35.3.4 Constants and enums

      +

      36.3.4 Constants and enums

      @@ -873,7 +873,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l conversion. This allows the global statement to be omitted.

      -

      35.3.5 Pointers

      +

      36.3.5 Pointers

      @@ -969,7 +969,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return None if the conversion can't be performed.

      -

      35.3.6 Structures

      +

      36.3.6 Structures

      @@ -1251,7 +1251,7 @@ Note: Tcl only destroys the underlying object if it has ownership. See the memory management section that appears shortly.

      -

      35.3.7 C++ classes

      +

      36.3.7 C++ classes

      @@ -1318,7 +1318,7 @@ In Tcl, the static member is accessed as follows: -

      35.3.8 C++ inheritance

      +

      36.3.8 C++ inheritance

      @@ -1367,7 +1367,7 @@ For instance: It is safe to use multiple inheritance with SWIG.

      -

      35.3.9 Pointers, references, values, and arrays

      +

      36.3.9 Pointers, references, values, and arrays

      @@ -1421,7 +1421,7 @@ to hold the result and a pointer is returned (Tcl will release this memory when the return value is garbage collected).

      -

      35.3.10 C++ overloaded functions

      +

      36.3.10 C++ overloaded functions

      @@ -1544,7 +1544,7 @@ first declaration takes precedence. Please refer to the "SWIG and C++" chapter for more information about overloading.

      -

      35.3.11 C++ operators

      +

      36.3.11 C++ operators

      @@ -1646,7 +1646,7 @@ There are ways to make this operator appear as part of the class using the % Keep reading.

      -

      35.3.12 C++ namespaces

      +

      36.3.12 C++ namespaces

      @@ -1710,7 +1710,7 @@ utilizes thousands of small deeply nested namespaces each with identical symbol names, well, then you get what you deserve.

      -

      35.3.13 C++ templates

      +

      36.3.13 C++ templates

      @@ -1762,7 +1762,7 @@ More details can be found in the SWIG and C++ -

      35.3.14 C++ Smart Pointers

      +

      36.3.14 C++ Smart Pointers

      @@ -1846,7 +1846,7 @@ simply use the __deref__() method. For example: -

      35.4 Further details on the Tcl class interface

      +

      36.4 Further details on the Tcl class interface

      @@ -1859,7 +1859,7 @@ of low-level details were omitted. This section provides a brief overview of how the proxy classes work.

      -

      35.4.1 Proxy classes

      +

      36.4.1 Proxy classes

      @@ -1924,7 +1924,7 @@ function. This allows objects to be encapsulated objects that look a lot like as shown in the last section.

      -

      35.4.2 Memory management

      +

      36.4.2 Memory management

      @@ -2112,7 +2112,7 @@ typemaps--an advanced topic discussed later.

      -

      35.5 Input and output parameters

      +

      36.5 Input and output parameters

      @@ -2300,7 +2300,7 @@ set c [lindex $dim 1] -

      35.6 Exception handling

      +

      36.6 Exception handling

      @@ -2434,7 +2434,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex See the chapter on "Customization Features" for more examples.

      -

      35.7 Typemaps

      +

      36.7 Typemaps

      @@ -2451,7 +2451,7 @@ Typemaps are only used if you want to change some aspect of the primitive C-Tcl interface.

      -

      35.7.1 What is a typemap?

      +

      36.7.1 What is a typemap?

      @@ -2568,7 +2568,7 @@ parameter is omitted): -

      35.7.2 Tcl typemaps

      +

      36.7.2 Tcl typemaps

      @@ -2706,7 +2706,7 @@ Initialize an argument to a value before any conversions occur. Examples of these methods will appear shortly.

      -

      35.7.3 Typemap variables

      +

      36.7.3 Typemap variables

      @@ -2777,7 +2777,7 @@ properly assigned. The Tcl name of the wrapper function being created. -

      35.7.4 Converting a Tcl list to a char **

      +

      36.7.4 Converting a Tcl list to a char **

      @@ -2839,7 +2839,7 @@ argv[2] = Larry 3 -

      35.7.5 Returning values in arguments

      +

      36.7.5 Returning values in arguments

      @@ -2881,7 +2881,7 @@ result, a Tcl function using these typemaps will work like this : % -

      35.7.6 Useful functions

      +

      36.7.6 Useful functions

      @@ -2958,7 +2958,7 @@ int Tcl_IsShared(Tcl_Obj *obj); -

      35.7.7 Standard typemaps

      +

      36.7.7 Standard typemaps

      @@ -3042,7 +3042,7 @@ work) -

      35.7.8 Pointer handling

      +

      36.7.8 Pointer handling

      @@ -3118,7 +3118,7 @@ For example: -

      35.8 Turning a SWIG module into a Tcl Package.

      +

      36.8 Turning a SWIG module into a Tcl Package.

      @@ -3190,7 +3190,7 @@ As a final note, most SWIG examples do not yet use the to use the load command instead.

      -

      35.9 Building new kinds of Tcl interfaces (in Tcl)

      +

      36.9 Building new kinds of Tcl interfaces (in Tcl)

      @@ -3289,7 +3289,7 @@ danger of blowing something up (although it is easily accomplished with an out of bounds array access).

      -

      35.9.1 Proxy classes

      +

      36.9.1 Proxy classes

      @@ -3410,7 +3410,7 @@ short, but clever Tcl script can be combined with SWIG to do many interesting things.

      -

      35.10 Tcl/Tk Stubs

      +

      36.10 Tcl/Tk Stubs

      diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html index 1568c082e..6331aa1ac 100644 --- a/Doc/Manual/Typemaps.html +++ b/Doc/Manual/Typemaps.html @@ -1711,7 +1711,8 @@ you'll find the full typemap contents (example shown below for Python): %typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0, int res = 0) { res = SWIG_ConvertPtr($input, &argp,$descriptor, $disown | 0 ); if (!SWIG_IsOK(res)) { - SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); + SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " + "$argnum"" of type '" "$type""'"); } $1 = ($ltype)(argp); } @@ -1732,7 +1733,8 @@ SWIGINTERN PyObject *_wrap_foo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { ... res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_a_4__int, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "foo" "', argument " "1"" of type '" "int [10][4]""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "foo" "', argument " + "1"" of type '" "int [10][4]""'"); } arg1 = (int (*)[4])(argp1); ... @@ -1791,7 +1793,8 @@ void set_value(const char* val) {} } } -%apply SWIGTYPE * { const char* val, const char* another_value } // use default pointer handling instead of strings +// use default pointer handling instead of strings +%apply SWIGTYPE * { const char* val, const char* another_value } %typemap(check) const char* val = char* NON_NULL; @@ -3296,7 +3299,8 @@ SWIG can detect when the "optimal" attribute cannot be used and will ignore it a 

       example.i:28: Warning 474: Method XX::create() usage of the optimal attribute ignored
-example.i:14: Warning 474: in the out typemap as the following cannot be used to generate optimal code: 
+example.i:14: Warning 474: in the out typemap as the following cannot be used to generate
+optimal code: 
 try {
   result = XX::create();
 } catch(const std::exception &e) {
@@ -3317,8 +3321,8 @@ In fact SWIG attempts to detect this and will issue a warning something like:
 
 
      
 
      -example.i:21: Warning 475: Multiple calls to XX::create() might be generated due to optimal attribute usage in
-example.i:7: Warning 475: the out typemap.
+example.i:21: Warning 475: Multiple calls to XX::create() might be generated due to
+example.i:7: Warning 475: optimal attribute usage in the out typemap.
 
      
 
      
 
diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 2c71b6a31..60552b97a 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -381,8 +381,12 @@ example.i(4) : Syntax error in input.
 
 
 
        
-
      • 201. Unable to find 'filename'.
-
      • 202. Could not evaluate 'expr'.
+
      • 201. Unable to find filename.
+
      • 202. Could not evaluate expression expr.
+
      • 203. Both includeall and importall are defined: using includeall.
+
      • 204. CPP #warning, "warning".
+
      • 205. CPP #error, "error".
+
      • 206. Unexpected tokens after #directive directive.
 
      
 
 
      14.9.3 C/C++ Parser (300-399)
      
@@ -513,6 +517,7 @@ example.i(4) : Syntax error in input.
 
    • 517. 
 
    • 518. Portability warning: File file1 will be overwritten by file2 on case insensitive filesystems such as Windows' FAT32 and NTFS unless the class/module name is renamed.
 
    • 519. %template() contains no name. Template method ignored: declaration
+
    • 520. Base/Derived class 'classname1' of 'classname2' is not similarly marked as a smart pointer.
 
 
 
      14.9.6 Language module specific (700-899) 
      
diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters
index e918e234a..924c8cfde 100644
--- a/Doc/Manual/chapters
+++ b/Doc/Manual/chapters
@@ -17,6 +17,7 @@ CCache.html
 Allegrocl.html
 CSharp.html
 Chicken.html
+D.html
 Go.html
 Guile.html
 Java.html
diff --git a/Doc/Manual/linkchecker.config b/Doc/Manual/linkchecker.config
new file mode 100644
index 000000000..a947b278a
--- /dev/null
+++ b/Doc/Manual/linkchecker.config
@@ -0,0 +1,5 @@
+[checking]
+anchors=1
+
+[filtering]
+ignorewarnings=http-robots-denied
diff --git a/Doc/Manual/makechap.py b/Doc/Manual/makechap.py
index 4dd048c36..8225bfc79 100644
--- a/Doc/Manual/makechap.py
+++ b/Doc/Manual/makechap.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python
 
 ###############################################################################
 # Takes a chapter as input and adds internal links and numbering to all
diff --git a/Doc/Manual/maketoc.py b/Doc/Manual/maketoc.py
index c78bcfd13..d8c4aa759 100644
--- a/Doc/Manual/maketoc.py
+++ b/Doc/Manual/maketoc.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python
 
 import sys
 import os
@@ -12,7 +12,7 @@ print >>f, """
 SWIG Users Manual
 
 
-
      SWIG Users Manual
      
+
      SWIG Users Manual
      
 
 
      
 """
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 83bf34a46..62ed3cbb9 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -69,7 +69,7 @@ IOBJS      = $(IWRAP:.i=.@OBJEXT@)
 CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
              -L/usr/local/lib -lg++ -lstdc++ -lgcc
 
-# Solaris workshop 5.0 
+# Solaris workshop 5.0
 # CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun
 
 # Symbols used for using shared libraries
@@ -159,7 +159,7 @@ tcl_cpp: $(SRCS)
 # -----------------------------------------------------------------
 
 tcl_clean:
-	rm -f *_wrap* *~ .~* mytclsh@EXEEXT@ 
+	rm -f *_wrap* *~ .~* mytclsh@EXEEXT@
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 
@@ -296,9 +296,9 @@ python_static_cpp: $(SRCS)
 	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
 	$(PYTHON_INCLUDE) $(LIBS)  -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET)
 
-# ----------------------------------------------------------------- 
+# -----------------------------------------------------------------
 # Running a Python example
-# ----------------------------------------------------------------- 
+# -----------------------------------------------------------------
 
 ifeq (,$(PY3))
   PYSCRIPT = runme.py
@@ -313,7 +313,7 @@ python_run: $(PYSCRIPT)
 
 runme3.py: runme.py
 	cp $< $@
-	$(PY2TO3) -w $@ >/dev/null 2>&1 
+	$(PY2TO3) -w $@ >/dev/null 2>&1
 
 # -----------------------------------------------------------------
 # Cleaning the python examples
@@ -332,7 +332,7 @@ python_clean:
 
 # Make sure these locate your Octave installation
 OCTAVE_INCLUDE= $(DEFS) @OCTAVEEXT@
-OCTAVE_LIB    = 
+OCTAVE_LIB    =
 
 # Extra Octave specific dynamic linking options
 OCTAVE_DLNK   = @OCTAVEDYNAMICLINKING@
@@ -548,14 +548,14 @@ mzscheme: $(SRCS)
 mzscheme_cpp: $(SRCS)
 	$(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACEPATH)
 	$(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) 
+	$(CXXSHARED) $(CFLAGS) -o $(LIBPREFIX)$(TARGET)$(MZSCHEME_SO) $(OBJS) $(IOBJS) $(MZDYNOBJ) $(CPP_DLLIBS)
 
 # -----------------------------------------------------------------
 # Cleaning the mzscheme examples
 # -----------------------------------------------------------------
 
 mzscheme_clean:
-	rm -f *_wrap* *~ .~* 
+	rm -f *_wrap* *~ .~*
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 
@@ -632,7 +632,7 @@ ocaml_static_cpp: $(SRCS)
 	$(OCAMLCORE)
 	$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
 	cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
-	$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
+	$(OCC) -cc '$(CXX) -Wno-write-strings' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
 		$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -g -c $(INTERFACE:%.i=%.ml)
@@ -643,13 +643,13 @@ ocaml_static_cpp: $(SRCS)
 		$(INTERFACE:%.i=%.cmo) \
 		$(PROGFILE:%.ml=%.cmo) \
 		$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
-		-cclib "$(LIBS)" -cc '$(CXX)' 
+		-cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
 
 ocaml_static_cpp_toplevel: $(SRCS)
 	$(OCAMLCORE)
 	$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
 	cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
-	$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
+	$(OCC) -cc '$(CXX) -Wno-write-strings' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
 		$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS)
 	$(OCC) -g -c $(INTERFACE:%.i=%.mli)
 	$(OCC) -g -c $(INTERFACE:%.i=%.ml)
@@ -657,17 +657,17 @@ ocaml_static_cpp_toplevel: $(SRCS)
 		$(OCC) $(OCAMLPP) -c $(PROGFILE)
 	$(NOLINK) || $(OCAMLMKTOP) \
 		swig.cmo \
-		-I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo \
+		-I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo \
 		-g -ccopt -g -cclib -g -custom -o $(TARGET)_top \
 		$(INTERFACE:%.i=%.cmo) \
 		$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
-		-cclib "$(LIBS)" -cc '$(CXX)' 
+		-cclib "$(LIBS)" -cc '$(CXX) -Wno-write-strings'
 
 ocaml_dynamic_cpp: $(SRCS)
 	$(OCAMLCORE)
 	$(SWIG) -ocaml -c++ $(SWIGOPT) $(INTERFACEPATH)
 	cp $(ICXXSRCS) $(ICXXSRCS:%.cxx=%.c)
-	$(OCC) -cc '$(CXX)' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
+	$(OCC) -cc '$(CXX) -Wno-write-strings' -g -c -ccopt -g -ccopt "-xc++ $(INCLUDES)" \
 		$(ICXXSRCS:%.cxx=%.c) $(SRCS) $(CXXSRCS) -ccopt -fPIC
 	$(CXXSHARED) $(CFLAGS) -o $(INTERFACE:%.i=%@SO@) \
 		$(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) \
@@ -684,7 +684,7 @@ ocaml_dynamic_cpp: $(SRCS)
 		$(OCC) -cclib -export-dynamic -g -ccopt -g -cclib -g -custom \
 		-o $(TARGET) \
 		-package dl -linkpkg \
-		$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX)'
+		$(INTERFACE:%.i=%.cmo) $(PROGFILE:%.ml=%.cmo) -cc '$(CXX) -Wno-write-strings'
 
 ocaml_clean:
 	rm -f *_wrap* *~ .~* *.cmo *.cmi $(MLFILE) $(MLFILE)i swig.mli swig.cmi swig.ml swig.cmo swigp4.ml swigp4.cmo
@@ -781,7 +781,7 @@ PHP=@PHP@
 PHPSCRIPT ?= runme.php
 
 php_run:
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT)
+	$(RUNTOOL) $(PHP) -n -q -d extension_dir=. -d safe_mode=Off $(PHPSCRIPT)
 
 # -----------------------------------------------------------------
 # Cleaning the PHP examples
@@ -844,7 +844,7 @@ pike_cpp_static: $(SRCS)
 # -----------------------------------------------------------------
 
 pike_clean:
-	rm -f *_wrap* *~ .~* mypike@EXEEXT@ 
+	rm -f *_wrap* *~ .~* mypike@EXEEXT@
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
 
@@ -861,7 +861,7 @@ CHICKEN_CFLAGS = @CHICKENOPTS@
 CHICKENOPTS = -quiet
 CHICKEN_MAIN =
 
-# SWIG produces $(ISRCS) (the C wrapper file) 
+# SWIG produces $(ISRCS) (the C wrapper file)
 # and $(CHICKEN_GENERATED_SCHEME) (the Scheme wrapper file):
 CHICKEN_GENERATED_SCHEME = $(INTERFACE:.i=.scm)
 CHICKEN_COMPILED_SCHEME = $(INTERFACE:.i=_chicken.c)
@@ -1053,12 +1053,12 @@ lua_clean:
 
 allegrocl: $(SRCS)
 	$(SWIG) -allegrocl -cwrap $(SWIGOPT) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) 
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
 	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 allegrocl_cpp: $(SRCS)
 	$(SWIG) -c++ -allegrocl $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) 
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
 	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 allegrocl_clean:
@@ -1087,12 +1087,12 @@ clisp_clean:
 
 cffi: $(SRCS)
 	$(SWIG) -cffi $(SWIGOPT) $(INTERFACEPATH)
-#	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) 
+#	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
 #	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 cffi_cpp: $(SRCS)
 	$(SWIG) -c++ -cffi $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) 
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
 	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 cffi_clean:
@@ -1106,12 +1106,12 @@ cffi_clean:
 
 uffi: $(SRCS)
 	$(SWIG) -uffi $(SWIGOPT) $(INTERFACEPATH)
-#	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS) 
+#	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(INCLUDES) $(SRCS)
 #	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 uffi_cpp: $(SRCS)
 	$(SWIG) -c++ -uffi $(SWIGOPT) $(INTERFACEPATH)
-#	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) 
+#	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES)
 #	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
 
 uffi_clean:
@@ -1255,3 +1255,69 @@ go_clean:
 	rm -f *_wrap* *_gc* .~* runme
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *.[568] *.a *@SO@
+
+##################################################################
+#####                         D                             ######
+##################################################################
+
+DLIBPREFIX = @DLIBPREFIX@
+
+ifeq (,$(D_VERSION))
+  D_VERSION = @DDEFAULTVERSION@
+endif
+
+ifeq (2,$(D_VERSION))
+  SWIGD = $(SWIG) -d -d2
+  DCOMPILER = @D2COMPILER@
+else
+  SWIGD = $(SWIG) -d
+  DCOMPILER = @D1COMPILER@
+endif
+
+ifeq (dmd,$(DCOMPILER))
+  # DMD is 32bit only by now
+  DCFLAGS = -m32
+endif
+
+# ----------------------------------------------------------------
+# Build a dynamically loadable D wrapper for a C module
+# ----------------------------------------------------------------
+
+d: $(SRCS)
+	$(SWIGD) $(SWIGOPT) $(INTERFACEPATH)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(DCFLAGS) $(EXTRA_CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
+	$(LDSHARED) $(CFLAGS) $(DCFLAGS) $(EXTRA_LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(DLIBPREFIX)$(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a dynamically loadable D wrapper for a C++ module
+# ----------------------------------------------------------------
+
+d_cpp: $(SRCS)
+	$(SWIGD) -c++ $(SWIGOPT) $(INTERFACEPATH)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(DCFLAGS) $(EXTRA_CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
+	$(CXXSHARED) $(CFLAGS) $(DCFLAGS) $(EXTRA_LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(DLIBPREFIX)$(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Compile D files
+# ----------------------------------------------------------------
+
+# Clear the DFLAGS environment variable for the compiler call itself
+# to work around a discrepancy in argument handling between DMD and LDC.
+d_compile: $(SRCS)
+	DFLAGS="" $(COMPILETOOL) $(DCOMPILER) $(DFLAGS) $(DSRCS)
+
+# -----------------------------------------------------------------
+# Run D example
+# -----------------------------------------------------------------
+
+d_run:
+	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./runme
+
+# -----------------------------------------------------------------
+# Clean the D examples
+# -----------------------------------------------------------------
+
+d_clean:
+	rm -f *_wrap* *~ .~* runme runme.exe `find . -name \*.d | grep -v runme.d`
+	rm -f core @EXTRA_CLEAN@
+	rm -f *.@OBJEXT@ *@SO@
diff --git a/Examples/d/callback/Makefile b/Examples/d/callback/Makefile
new file mode 100644
index 000000000..b5808cf0d
--- /dev/null
+++ b/Examples/d/callback/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.cxx example_wrap.cxx
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/callback/d1/runme.d b/Examples/d/callback/d1/runme.d
new file mode 100644
index 000000000..e34e09603
--- /dev/null
+++ b/Examples/d/callback/d1/runme.d
@@ -0,0 +1,36 @@
+module runme;
+
+import tango.io.Stdout;
+import example;
+
+public class DCallback : Callback {
+  public override void run() {
+    Stdout( "DCallback.run()" ).newline;
+  }
+}
+
+void main() {
+  auto caller = new Caller();
+
+  Stdout( "Adding and calling a normal C++ callback" ).newline;
+  Stdout( "----------------------------------------" ).newline;
+  {
+    scope auto callback = new Callback();
+    caller.setCallback(callback);
+    caller.call();
+    caller.resetCallback();
+  }
+
+  Stdout.newline;
+  Stdout( "Adding and calling a D callback" ).newline;
+  Stdout( "-------------------------------" ).newline;
+  {
+    scope auto callback = new DCallback();
+    caller.setCallback(callback);
+    caller.call();
+    caller.resetCallback();
+  }
+
+  Stdout.newline;
+  Stdout( "D exit" ).newline;
+}
diff --git a/Examples/d/callback/d2/runme.d b/Examples/d/callback/d2/runme.d
new file mode 100644
index 000000000..88ffcdefd
--- /dev/null
+++ b/Examples/d/callback/d2/runme.d
@@ -0,0 +1,36 @@
+module runme;
+
+import std.stdio;
+import example;
+
+public class DCallback : Callback {
+  public override void run() {
+    writeln( "DCallback.run()" );
+  }
+}
+
+void main() {
+  auto caller = new Caller();
+
+  writeln( "Adding and calling a normal C++ callback" );
+  writeln( "----------------------------------------" );
+  {
+    scope auto callback = new Callback();
+    caller.setCallback(callback);
+    caller.call();
+    caller.resetCallback();
+  }
+
+  writeln();
+  writeln( "Adding and calling a D callback" );
+  writeln( "-------------------------------" );
+  {
+    scope auto callback = new DCallback();
+    caller.setCallback(callback);
+    caller.call();
+    caller.resetCallback();
+  }
+
+  writeln();
+  writeln( "D exit" );
+}
diff --git a/Examples/d/callback/example.cxx b/Examples/d/callback/example.cxx
new file mode 100644
index 000000000..450d75608
--- /dev/null
+++ b/Examples/d/callback/example.cxx
@@ -0,0 +1,4 @@
+/* File : example.cxx */
+
+#include "example.h"
+
diff --git a/Examples/d/callback/example.h b/Examples/d/callback/example.h
new file mode 100644
index 000000000..38d25a043
--- /dev/null
+++ b/Examples/d/callback/example.h
@@ -0,0 +1,24 @@
+/* File : example.h */
+
+#include 
+#include 
+
+class Callback {
+public:
+	virtual ~Callback() { std::cout << "Callback::~Callback()" << std:: endl; }
+	virtual void run() { std::cout << "Callback::run()" << std::endl; }
+};
+
+
+class Caller {
+private:
+	Callback *_callback;
+public:
+	Caller(): _callback(0) {}
+	~Caller() { delCallback(); }
+	void delCallback() { delete _callback; _callback = 0; }
+	void setCallback(Callback *cb) { delCallback(); _callback = cb; }
+	void resetCallback() { _callback = 0; }
+	void call() { if (_callback) _callback->run(); }
+};
+
diff --git a/Examples/d/callback/example.i b/Examples/d/callback/example.i
new file mode 100644
index 000000000..90beda01a
--- /dev/null
+++ b/Examples/d/callback/example.i
@@ -0,0 +1,13 @@
+/* File : example.i */
+%module(directors="1") example
+%{
+#include "example.h"
+%}
+
+%include "std_string.i"
+
+/* turn on director wrapping Callback */
+%feature("director") Callback;
+
+%include "example.h"
+
diff --git a/Examples/d/check.list b/Examples/d/check.list
new file mode 100644
index 000000000..010e7bbfc
--- /dev/null
+++ b/Examples/d/check.list
@@ -0,0 +1,9 @@
+# See top-level Makefile.in.
+callback
+class
+constants
+enum
+extend
+funcptr
+simple
+variables
diff --git a/Examples/d/class/Makefile b/Examples/d/class/Makefile
new file mode 100644
index 000000000..b5808cf0d
--- /dev/null
+++ b/Examples/d/class/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.cxx example_wrap.cxx
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/class/d1/runme.d
new file mode 100644
index 000000000..b0c4263a2
--- /dev/null
+++ b/Examples/d/class/d1/runme.d
@@ -0,0 +1,58 @@
+// This example illustrates how C++ classes can be used from D using SWIG.
+// The D class gets mapped onto the C++ class and behaves as if it is a D class.
+module runme;
+
+import tango.io.Stdout;
+import example;
+
+void main() {
+  // ----- Object creation -----
+
+  Stdout( "Creating some objects:" ).newline;
+
+  {
+    scope Square s = new Square(10);
+    scope Circle c = new Circle(10);
+
+    // ----- Access a static member -----
+    Stdout.format( "{} shapes were created.", Shape.nshapes ).newline;
+
+    // ----- Member data access -----
+
+    // Notice how we can do this using functions specific to
+    // the 'Circle' class.
+    c.x = 20;
+    c.y = 30;
+
+    // Now use the same functions in the base class
+    Shape shape = s;
+    shape.x = -10;
+    shape.y = 5;
+
+    Stdout( "\nHere is their current position:" ).newline;
+    Stdout.format( "    Circle = ( {}, {} )", c.x, c.y ).newline;
+    Stdout.format( "    Square = ( {}, {} )", s.x, s.y ).newline;
+
+    // ----- Call some methods -----
+
+    Stdout( "\nHere are some properties of the shapes:" ).newline;
+    Shape[] shapes = [ cast(Shape) c, cast(Shape) s ];
+    foreach ( currentShape; shapes )
+    {
+      Stdout.format( "    {}", currentShape.classinfo.name ).newline;
+      Stdout.format( "        area      = {}", currentShape.area() ).newline;
+      Stdout.format( "        perimeter = {}", currentShape.perimeter() ).newline;
+    }
+
+    // Notice how the area() and perimeter() functions really
+    // invoke the appropriate virtual method on each object.
+
+    // ----- Delete everything -----
+    Stdout( "\nGuess I'll clean up now:" ).newline;
+    // Note: when this using scope is exited the D destructors are called which
+    // in turn call the C++ destructors.
+  }
+
+  Stdout.format( "{} shapes remain", Shape.nshapes ).newline;
+  Stdout( "\nGoodbye!" ).newline;
+}
diff --git a/Examples/d/class/d2/runme.d b/Examples/d/class/d2/runme.d
new file mode 100644
index 000000000..2e86c5fc7
--- /dev/null
+++ b/Examples/d/class/d2/runme.d
@@ -0,0 +1,58 @@
+// This example illustrates how C++ classes can be used from D using SWIG.
+// The D class gets mapped onto the C++ class and behaves as if it is a D class.
+module runme;
+
+import std.stdio;
+import example;
+
+void main() {
+  // ----- Object creation -----
+
+  writeln( "Creating some objects:" );
+
+  {
+    scope Square s = new Square(10);
+    scope Circle c = new Circle(10);
+
+    // ----- Access a static member -----
+    writefln( "%s shapes were created.", Shape.nshapes );
+
+    // ----- Member data access -----
+
+    // Notice how we can do this using functions specific to
+    // the 'Circle' class.
+    c.x = 20;
+    c.y = 30;
+
+    // Now use the same functions in the base class
+    Shape shape = s;
+    shape.x = -10;
+    shape.y = 5;
+
+    writeln( "\nHere is their current position:" );
+    writefln( "    Circle = ( %s, %s )", c.x, c.y );
+    writefln( "    Square = ( %s, %s )", s.x, s.y );
+
+    // ----- Call some methods -----
+
+    writeln( "\nHere are some properties of the shapes:" );
+    Shape[] shapes = [ cast(Shape) c, cast(Shape) s ];
+    foreach ( currentShape; shapes )
+    {
+      writefln( "    %s", currentShape.classinfo.name );
+      writefln( "        area      = %s", currentShape.area() );
+      writefln( "        perimeter = %s", currentShape.perimeter() );
+    }
+
+    // Notice how the area() and perimeter() functions really
+    // invoke the appropriate virtual method on each object.
+
+    // ----- Delete everything -----
+    writeln( "\nGuess I'll clean up now:" );
+    // Note: when this using scope is exited the D destructors are called which
+    // in turn call the C++ destructors.
+  }
+
+  writefln( "%s shapes remain", Shape.nshapes );
+  writeln( "\nGoodbye!" );
+}
diff --git a/Examples/d/class/example.cxx b/Examples/d/class/example.cxx
new file mode 100644
index 000000000..1e8e203dd
--- /dev/null
+++ b/Examples/d/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/d/class/example.h b/Examples/d/class/example.h
new file mode 100644
index 000000000..0d4527e92
--- /dev/null
+++ b/Examples/d/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/d/class/example.i b/Examples/d/class/example.i
new file mode 100644
index 000000000..75700b305
--- /dev/null
+++ b/Examples/d/class/example.i
@@ -0,0 +1,10 @@
+/* File : example.i */
+%module example
+
+%{
+#include "example.h"
+%}
+
+/* Let's just grab the original header file here */
+%include "example.h"
+
diff --git a/Examples/d/constants/Makefile b/Examples/d/constants/Makefile
new file mode 100644
index 000000000..412055243
--- /dev/null
+++ b/Examples/d/constants/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ example_wrap.c
+EXTRA_LDFLAGS = example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/constants/d1/runme.d
new file mode 100644
index 000000000..47362cbf3
--- /dev/null
+++ b/Examples/d/constants/d1/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import tango.io.Stdout;
+static import example;
+
+void main() {
+  Stdout.formatln("ICONST  = {} (should be 42)", example.ICONST);
+  Stdout.formatln("FCONST  = {} (should be 2.18)", example.FCONST);
+  Stdout.formatln("CCONST  = {} (should be 'x')", example.CCONST);
+  Stdout.formatln("CCONST2 = {} (this should be on a new line)", example.CCONST2);
+  Stdout.formatln("SCONST  = {} (should be 'Hello World')", example.SCONST);
+  Stdout.formatln("SCONST2 = {} (should be '\"Hello World\"')", example.SCONST2);
+  Stdout.formatln("EXPR    = {} (should be 48.55)", example.EXPR);
+  Stdout.formatln("iconst  = {} (should be 37)", example.iconst);
+  Stdout.formatln("fconst  = {} (should be 3.14)", example.fconst);
+
+  static if (is(typeof(example.EXTERN))) {
+    Stdout.formatln("EXTERN should not be defined, but is: {}.", example.EXTERN );
+  } else {
+    Stdout.formatln("EXTERN isn't defined (good)");
+  }
+
+  static if (is(typeof(example.FOO))) {
+    Stdout.formatln("FOO should not be defined, but is: {}.", example.FOO);
+  } else {
+    Stdout.formatln("FOO isn't defined (good)");
+  }
+}
diff --git a/Examples/d/constants/d2/runme.d b/Examples/d/constants/d2/runme.d
new file mode 100644
index 000000000..4be510d16
--- /dev/null
+++ b/Examples/d/constants/d2/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import std.stdio;
+static import example;
+
+void main() {
+  writefln("ICONST  = %s (should be 42)", example.ICONST);
+  writefln("FCONST  = %s (should be 2.1828)", example.FCONST);
+  writefln("CCONST  = %s (should be 'x')", example.CCONST);
+  writefln("CCONST2 = %s (this should be on a new line)", example.CCONST2);
+  writefln("SCONST  = %s (should be 'Hello World')", example.SCONST);
+  writefln("SCONST2 = %s (should be '\"Hello World\"')", example.SCONST2);
+  writefln("EXPR    = %s (should be 48.5484)", example.EXPR);
+  writefln("iconst  = %s (should be 37)", example.iconst);
+  writefln("fconst  = %s (should be 3.14)", example.fconst);
+
+  static if (is(typeof(example.EXTERN))) {
+    writefln("EXTERN should not be defined, but is: %s.", example.EXTERN );
+  } else {
+    writeln("EXTERN isn't defined (good)");
+  }
+
+  static if (is(typeof(example.FOO))) {
+    writefln("FOO should not be defined, but is: %s.", example.FOO);
+  } else {
+    writeln("FOO isn't defined (good)");
+  }
+}
diff --git a/Examples/d/constants/example.d b/Examples/d/constants/example.d
new file mode 100644
index 000000000..7448d0ad9
--- /dev/null
+++ b/Examples/d/constants/example.d
@@ -0,0 +1,23 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.41
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+module example;
+
+static import example_wrap;
+
+static import tango.stdc.stringz;
+
+public const int ICONST = 42;
+public const double FCONST = 2.1828;
+public const char CCONST = 'x';
+public const char CCONST2 = '\n';
+public const char[] SCONST = "Hello World";
+public const char[] SCONST2 = "\"Hello World\"";
+public const double EXPR = 42+3*(2.1828);
+public const int iconst = 37;
+public const double fconst = 3.14;
diff --git a/Examples/d/constants/example.i b/Examples/d/constants/example.i
new file mode 100644
index 000000000..edeb258cd
--- /dev/null
+++ b/Examples/d/constants/example.i
@@ -0,0 +1,32 @@
+/* File : example.i */
+%module example
+
+/* Force the generated D code to use the C constant values rather than
+   retrieving them at runtime. You can also try disabling the feature and
+   compare the generated code. */
+%dmanifestconst;
+
+
+/* A few preprocessor macros */
+
+#define    ICONST      42
+#define    FCONST      2.1828
+#define    CCONST      'x'
+#define    CCONST2     '\n'
+#define    SCONST      "Hello World"
+#define    SCONST2     "\"Hello World\""
+
+/* This should work just fine */
+#define    EXPR        ICONST + 3*(FCONST)
+
+/* This shouldn't do anything */
+#define    EXTERN      extern
+
+/* Neither should this (BAR isn't defined) */
+#define    FOO         (ICONST + BAR)
+
+
+/* The following directives also produce constants */
+
+%constant int iconst = 37;
+%constant double fconst = 3.14;
diff --git a/Examples/d/enum/Makefile b/Examples/d/enum/Makefile
new file mode 100644
index 000000000..b5808cf0d
--- /dev/null
+++ b/Examples/d/enum/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.cxx example_wrap.cxx
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/enum/d1/runme.d
new file mode 100644
index 000000000..d986986d1
--- /dev/null
+++ b/Examples/d/enum/d1/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import tango.io.Stdout;
+import example;
+
+void main() {
+  Stdout( "Printing out some enum values:" ).newline;
+  Stdout("  color:").newline;
+  Stdout.formatln("    {} = {}", color.RED, cast(int)color.RED);
+  Stdout.formatln("    {} = {}", color.BLUE, cast(int)color.BLUE);
+  Stdout.formatln("    {} = {}", color.GREEN, cast(int)color.GREEN);
+
+  Stdout("\n  Foo.speed:").newline;
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.IMPULSE, cast(int)Foo.speed.IMPULSE);
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.WARP, cast(int)Foo.speed.WARP);
+  Stdout.formatln("    Foo.{} = {}", Foo.speed.LUDICROUS , cast(int)Foo.speed.LUDICROUS);
+
+  Stdout("\nTesting use of enums with functions:").newline;
+  example.enum_test(color.RED, Foo.speed.IMPULSE);
+  example.enum_test(color.BLUE, Foo.speed.WARP);
+  example.enum_test(color.GREEN, Foo.speed.LUDICROUS);
+
+  Stdout( "\nTesting use of enum with class method:" ).newline;
+  scope f = new Foo();
+  f.enum_test(Foo.speed.IMPULSE);
+  f.enum_test(Foo.speed.WARP);
+  f.enum_test(Foo.speed.LUDICROUS);
+}
diff --git a/Examples/d/enum/d2/runme.d b/Examples/d/enum/d2/runme.d
new file mode 100644
index 000000000..acaec8ae8
--- /dev/null
+++ b/Examples/d/enum/d2/runme.d
@@ -0,0 +1,28 @@
+module runme;
+
+import std.stdio;
+import example;
+
+void main() {
+  writeln( "Printing out some enum values:" );
+  writeln("  color:");
+  writefln("    %s = %s", color.RED, cast(int)color.RED);
+  writefln("    %s = %s", color.BLUE, cast(int)color.BLUE);
+  writefln("    %s = %s", color.GREEN, cast(int)color.GREEN);
+
+  writeln("\n  Foo.speed:");
+  writefln("    Foo.%s = %s", Foo.speed.IMPULSE, cast(int)Foo.speed.IMPULSE);
+  writefln("    Foo.%s = %s", Foo.speed.WARP, cast(int)Foo.speed.WARP);
+  writefln("    Foo.%s = %s", Foo.speed.LUDICROUS , cast(int)Foo.speed.LUDICROUS);
+
+  writeln("\nTesting use of enums with functions:");
+  example.enum_test(color.RED, Foo.speed.IMPULSE);
+  example.enum_test(color.BLUE, Foo.speed.WARP);
+  example.enum_test(color.GREEN, Foo.speed.LUDICROUS);
+
+  writeln( "\nTesting use of enum with class method:" );
+  scope f = new Foo();
+  f.enum_test(Foo.speed.IMPULSE);
+  f.enum_test(Foo.speed.WARP);
+  f.enum_test(Foo.speed.LUDICROUS);
+}
diff --git a/Examples/d/enum/example.cxx b/Examples/d/enum/example.cxx
new file mode 100644
index 000000000..df7bb6328
--- /dev/null
+++ b/Examples/d/enum/example.cxx
@@ -0,0 +1,37 @@
+/* File : example.cxx */
+
+#include "example.h"
+#include 
+
+void Foo::enum_test(speed s) {
+  if (s == IMPULSE) {
+    printf("IMPULSE speed\n");
+  } else if (s == WARP) {
+    printf("WARP speed\n");
+  } else if (s == LUDICROUS) {
+    printf("LUDICROUS speed\n");
+  } else {
+    printf("Unknown speed\n");
+  }
+}
+
+void enum_test(color c, Foo::speed s) {
+  if (c == RED) {
+    printf("color = RED, ");
+  } else if (c == BLUE) {
+    printf("color = BLUE, ");
+  } else if (c == GREEN) {
+    printf("color = GREEN, ");
+  } else {
+    printf("color = Unknown color!, ");
+  }
+  if (s == Foo::IMPULSE) {
+    printf("speed = IMPULSE speed\n");
+  } else if (s == Foo::WARP) {
+    printf("speed = WARP speed\n");
+  } else if (s == Foo::LUDICROUS) {
+    printf("speed = LUDICROUS speed\n");
+  } else {
+    printf("speed = Unknown speed!\n");
+  }
+}
diff --git a/Examples/d/enum/example.h b/Examples/d/enum/example.h
new file mode 100644
index 000000000..9119cd9fc
--- /dev/null
+++ b/Examples/d/enum/example.h
@@ -0,0 +1,13 @@
+/* File : example.h */
+
+enum color { RED, BLUE, GREEN };
+
+class Foo {
+ public:
+  Foo() { }
+  enum speed { IMPULSE=10, WARP=20, LUDICROUS=30 };
+  void enum_test(speed s);
+};
+
+void enum_test(color c, Foo::speed s);
+
diff --git a/Examples/d/enum/example.i b/Examples/d/enum/example.i
new file mode 100644
index 000000000..23ee8a822
--- /dev/null
+++ b/Examples/d/enum/example.i
@@ -0,0 +1,11 @@
+/* File : example.i */
+%module example
+
+%{
+#include "example.h"
+%}
+
+/* Let's just grab the original header file here */
+
+%include "example.h"
+
diff --git a/Examples/d/extend/Makefile b/Examples/d/extend/Makefile
new file mode 100644
index 000000000..b5808cf0d
--- /dev/null
+++ b/Examples/d/extend/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.cxx example_wrap.cxx
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/extend/d1/runme.d
new file mode 100644
index 000000000..96501d1a4
--- /dev/null
+++ b/Examples/d/extend/d1/runme.d
@@ -0,0 +1,75 @@
+/// This file illustrates the cross language polymorphism using directors.
+module runme;
+
+import example;
+import tango.io.Stdout;
+
+// CEO class, which overrides Employee.getPosition().
+class CEO : Manager {
+public:
+  this( char[] name ) {
+    super( name );
+  }
+
+  override char[] getPosition() {
+    return "CEO";
+  }
+
+  // Public method to stop the SWIG proxy base class from thinking it owns the underlying C++ memory.
+  void disownMemory() {
+    swigCMemOwn = false;
+  }
+}
+
+void main() {
+  // Create an instance of CEO, a class derived from the D proxy of the
+  // underlying C++ class. The calls to getName() and getPosition() are standard,
+  // the call to getTitle() uses the director wrappers to call CEO.getPosition().
+
+  auto e = new CEO( "Alice" );
+  Stdout.formatln( "{} is a {}.", e.getName(), e.getPosition() );
+  Stdout.formatln( "Just call her '{}'.", e.getTitle() );
+  Stdout( "----------------------" ).newline;
+
+  {
+    // Create a new EmployeeList instance.  This class does not have a C++
+    // director wrapper, but can be used freely with other classes that do.
+    scope auto list = new EmployeeList();
+
+    // EmployeeList owns its items, so we must surrender ownership of objects we add.
+    e.disownMemory();
+    list.addEmployee(e);
+    Stdout( "----------------------" ).newline;
+
+    // Now we access the first four items in list (three are C++ objects that
+    // EmployeeList's constructor adds, the last is our CEO). The virtual
+    // methods of all these instances are treated the same. For items 0, 1, and
+    // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls
+    // getPosition which resolves in D. The call to getPosition is
+    // slightly different, however, because of the overidden getPosition() call, since
+    // now the object reference has been "laundered" by passing through
+    // EmployeeList as an Employee*. Previously, D resolved the call
+    // immediately in CEO, but now D thinks the object is an instance of
+    // class Employee. So the call passes through the
+    // Employee proxy class and on to the C wrappers and C++ director,
+    // eventually ending up back at the D CEO implementation of getPosition().
+    // The call to getTitle() for item 3 runs the C++ Employee::getTitle()
+    // method, which in turn calls getPosition(). This virtual method call
+    // passes down through the C++ director class to the D implementation
+    // in CEO. All this routing takes place transparently.
+
+    Stdout( "(position, title) for items 0-3:" ).newline;
+    Stdout.formatln( "  {}, '{}'", list.getItem(0).getPosition(), list.getItem(0).getTitle() );
+    Stdout.formatln( "  {}, '{}'", list.getItem(1).getPosition(), list.getItem(1).getTitle() );
+    Stdout.formatln( "  {}, '{}'", list.getItem(2).getPosition(), list.getItem(2).getTitle() );
+    Stdout.formatln( "  {}, '{}'", list.getItem(3).getPosition(), list.getItem(3).getTitle() );
+    Stdout( "----------------------" ).newline;
+
+    // All Employees will be destroyed when the EmployeeList goes out of scope,
+    // including the CEO instance.
+  }
+  Stdout( "----------------------" ).newline;
+
+  // All done.
+  Stdout( "Exiting cleanly from D code." ).newline;
+}
diff --git a/Examples/d/extend/d2/runme.d b/Examples/d/extend/d2/runme.d
new file mode 100644
index 000000000..1ea6dfd21
--- /dev/null
+++ b/Examples/d/extend/d2/runme.d
@@ -0,0 +1,75 @@
+/// This file illustrates the cross language polymorphism using directors.
+module runme;
+
+import std.stdio;
+import example;
+
+// CEO class, which overrides Employee.getPosition().
+class CEO : Manager {
+public:
+  this( string name ) {
+    super( name );
+  }
+
+  override string getPosition() const {
+    return "CEO";
+  }
+
+  // Public method to stop the SWIG proxy base class from thinking it owns the underlying C++ memory.
+  void disownMemory() {
+    swigCMemOwn = false;
+  }
+}
+
+void main() {
+  // Create an instance of CEO, a class derived from the D proxy of the
+  // underlying C++ class. The calls to getName() and getPosition() are standard,
+  // the call to getTitle() uses the director wrappers to call CEO.getPosition().
+
+  auto e = new CEO( "Alice" );
+  writefln( "%s is a %s.", e.getName(), e.getPosition() );
+  writefln( "Just call her '%s'.", e.getTitle() );
+  writeln( "----------------------" );
+
+  {
+    // Create a new EmployeeList instance.  This class does not have a C++
+    // director wrapper, but can be used freely with other classes that do.
+    scope auto list = new EmployeeList();
+
+    // EmployeeList owns its items, so we must surrender ownership of objects we add.
+    e.disownMemory();
+    list.addEmployee(e);
+    writeln( "----------------------" );
+
+    // Now we access the first four items in list (three are C++ objects that
+    // EmployeeList's constructor adds, the last is our CEO). The virtual
+    // methods of all these instances are treated the same. For items 0, 1, and
+    // 2, all methods resolve in C++. For item 3, our CEO, getTitle calls
+    // getPosition which resolves in D. The call to getPosition is
+    // slightly different, however, because of the overidden getPosition() call, since
+    // now the object reference has been "laundered" by passing through
+    // EmployeeList as an Employee*. Previously, D resolved the call
+    // immediately in CEO, but now D thinks the object is an instance of
+    // class Employee. So the call passes through the
+    // Employee proxy class and on to the C wrappers and C++ director,
+    // eventually ending up back at the D CEO implementation of getPosition().
+    // The call to getTitle() for item 3 runs the C++ Employee::getTitle()
+    // method, which in turn calls getPosition(). This virtual method call
+    // passes down through the C++ director class to the D implementation
+    // in CEO. All this routing takes place transparently.
+
+    writeln( "(position, title) for items 0-3:" );
+    writefln( "  %s, '%s'", list.getItem(0).getPosition(), list.getItem(0).getTitle() );
+    writefln( "  %s, '%s'", list.getItem(1).getPosition(), list.getItem(1).getTitle() );
+    writefln( "  %s, '%s'", list.getItem(2).getPosition(), list.getItem(2).getTitle() );
+    writefln( "  %s, '%s'", list.getItem(3).getPosition(), list.getItem(3).getTitle() );
+    writeln( "----------------------" );
+
+    // All Employees will be destroyed when the EmployeeList goes out of scope,
+    // including the CEO instance.
+  }
+  writeln( "----------------------" );
+
+  // All done.
+  writeln( "Exiting cleanly from D code." );
+}
diff --git a/Examples/d/extend/example.cxx b/Examples/d/extend/example.cxx
new file mode 100644
index 000000000..450d75608
--- /dev/null
+++ b/Examples/d/extend/example.cxx
@@ -0,0 +1,4 @@
+/* File : example.cxx */
+
+#include "example.h"
+
diff --git a/Examples/d/extend/example.h b/Examples/d/extend/example.h
new file mode 100644
index 000000000..7ad93fbc1
--- /dev/null
+++ b/Examples/d/extend/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 *getItem(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/d/extend/example.i b/Examples/d/extend/example.i
new file mode 100644
index 000000000..0647e1319
--- /dev/null
+++ b/Examples/d/extend/example.i
@@ -0,0 +1,14 @@
+/* File : example.i */
+%module(directors="1") example
+%{
+#include "example.h"
+%}
+
+%include "std_string.i"
+
+/* turn on director wrapping for Manager */
+%feature("director") Employee;
+%feature("director") Manager;
+
+%include "example.h"
+
diff --git a/Examples/d/funcptr/Makefile b/Examples/d/funcptr/Makefile
new file mode 100644
index 000000000..09efa8d88
--- /dev/null
+++ b/Examples/d/funcptr/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.c example_wrap.c
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/funcptr/d1/runme.d
new file mode 100644
index 000000000..1461c1546
--- /dev/null
+++ b/Examples/d/funcptr/d1/runme.d
@@ -0,0 +1,42 @@
+module runme;
+
+import tango.io.Stdout;
+static import example;
+
+extern(C) int add(int a, int b) {
+  return a + b;
+}
+
+extern(C) int sub(int a, int b) {
+  return a - b;
+}
+
+extern(C) int mul(int a, int b) {
+  return a * b;
+}
+
+void main() {
+  int a = 37;
+  int b = 42;
+
+  Stdout( "a = " )( a ).newline;
+  Stdout( "b = " )( b ).newline;
+
+  Stdout( "Trying some C callback functions:" ).newline;
+  Stdout( "    ADD(a,b) = " )( example.do_op( a, b, example.ADD ) ).newline;
+  Stdout( "    SUB(a,b) = " )( example.do_op( a, b, example.SUB ) ).newline;
+  Stdout( "    MUL(a,b) = " )( example.do_op( a, b, example.MUL ) ).newline;
+
+  version (LDC) {
+    // Currently, there is no way to specify the calling convention for
+    // function pointer parameters in D, but LDC does strict typechecking for
+    // them (which is reasonable, but not covered by the language spec yet).
+    // As a result, there is no way to make the code below compile with LDC at
+    // the moment, so just skip it.
+  } else {
+    Stdout( "Now the same with callback functions defined in D:" ).newline;
+    Stdout( "    add(a,b) = " )( example.do_op( a, b, &add ) ).newline;
+    Stdout( "    sub(a,b) = " )( example.do_op( a, b, &sub ) ).newline;
+    Stdout( "    mul(a,b) = " )( example.do_op( a, b, &mul ) ).newline;
+  }
+}
diff --git a/Examples/d/funcptr/d2/runme.d b/Examples/d/funcptr/d2/runme.d
new file mode 100644
index 000000000..929911d6c
--- /dev/null
+++ b/Examples/d/funcptr/d2/runme.d
@@ -0,0 +1,34 @@
+module runme;
+
+import std.stdio;
+static import example;
+
+extern(C) int add(int a, int b) {
+  return a + b;
+}
+
+extern(C) int sub(int a, int b) {
+  return a - b;
+}
+
+extern(C) int mul(int a, int b) {
+  return a * b;
+}
+
+void main() {
+  int a = 37;
+  int b = 42;
+
+  writefln( "a = %s", a );
+  writefln( "b = %s", b );
+
+  writeln( "Trying some C callback functions:" );
+  writefln( "    ADD(a,b) = %s", example.do_op( a, b, example.ADD ) );
+  writefln( "    SUB(a,b) = %s", example.do_op( a, b, example.SUB ) );
+  writefln( "    MUL(a,b) = %s", example.do_op( a, b, example.MUL ) );
+
+  writeln( "Now the same with callback functions defined in D:" );
+  writefln( "    add(a,b) = %s", example.do_op( a, b, &add ) );
+  writefln( "    sub(a,b) = %s", example.do_op( a, b, &sub ) );
+  writefln( "    mul(a,b) = %s", example.do_op( a, b, &mul ) );
+}
diff --git a/Examples/d/funcptr/example.c b/Examples/d/funcptr/example.c
new file mode 100644
index 000000000..5c4a3dabf
--- /dev/null
+++ b/Examples/d/funcptr/example.c
@@ -0,0 +1,19 @@
+/* File : example.c */
+
+int do_op(int a, int b, int (*op)(int,int)) {
+  return (*op)(a,b);
+}
+
+int add(int a, int b) {
+  return a+b;
+}
+
+int sub(int a, int b) {
+  return a-b;
+}
+
+int mul(int a, int b) {
+  return a*b;
+}
+
+int (*funcvar)(int,int) = add;
diff --git a/Examples/d/funcptr/example.h b/Examples/d/funcptr/example.h
new file mode 100644
index 000000000..9936e24fc
--- /dev/null
+++ b/Examples/d/funcptr/example.h
@@ -0,0 +1,9 @@
+/* file: example.h */
+
+extern int do_op(int,int, int (*op)(int,int));
+extern int add(int,int);
+extern int sub(int,int);
+extern int mul(int,int);
+
+extern int (*funcvar)(int,int);
+
diff --git a/Examples/d/funcptr/example.i b/Examples/d/funcptr/example.i
new file mode 100644
index 000000000..8b3bef678
--- /dev/null
+++ b/Examples/d/funcptr/example.i
@@ -0,0 +1,16 @@
+/* File : example.i */
+%module example
+%{
+#include "example.h"
+%}
+
+/* Wrap a function taking a pointer to a function */
+extern int  do_op(int a, int b, int (*op)(int, int));
+
+/* Now install a bunch of "ops" as constants */
+%constant int (*ADD)(int,int) = add;
+%constant int (*SUB)(int,int) = sub;
+%constant int (*MUL)(int,int) = mul;
+
+extern int (*funcvar)(int,int);
+
diff --git a/Examples/d/simple/Makefile b/Examples/d/simple/Makefile
new file mode 100644
index 000000000..ae173a566
--- /dev/null
+++ b/Examples/d/simple/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.c example_wrap.c
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/simple/d1/runme.d
new file mode 100644
index 000000000..1293f1839
--- /dev/null
+++ b/Examples/d/simple/d1/runme.d
@@ -0,0 +1,27 @@
+module runme;
+
+import tango.io.Stdout;
+static import example;
+
+void main() {
+  /*
+   * Call our gcd() function.
+   */
+  int x = 42;
+  int y = 105;
+  int g = example.gcd( x, y );
+  Stdout.format( "The gcd of {} and {} is {}.", x, y, g ).newline;
+
+  /*
+   * Manipulate the Foo global variable.
+   */
+
+  // Output its current value
+  Stdout.format( "Foo = {}", example.Foo ).newline;
+
+  // Change its value
+  example.Foo = 3.1415926;
+
+  // See if the change took effect
+  Stdout.format( "Foo = {}", example.Foo ).newline;
+}
diff --git a/Examples/d/simple/d2/runme.d b/Examples/d/simple/d2/runme.d
new file mode 100644
index 000000000..7f278923b
--- /dev/null
+++ b/Examples/d/simple/d2/runme.d
@@ -0,0 +1,27 @@
+module runme;
+
+import std.stdio;
+static import example;
+
+void main() {
+  /*
+   * Call our gcd() function.
+   */
+  int x = 42;
+  int y = 105;
+  int g = example.gcd(x, y);
+  writefln("The gcd of %s and %s is %s.", x, y, g);
+
+  /*
+   * Manipulate the Foo global variable.
+   */
+
+  // Output its current value
+  writefln("Foo = %s", example.Foo);
+
+  // Change its value
+  example.Foo = 3.1415926;
+
+  // See if the change took effect
+  writefln("Foo = %s", example.Foo);
+}
diff --git a/Examples/d/simple/example.c b/Examples/d/simple/example.c
new file mode 100644
index 000000000..1c2af789c
--- /dev/null
+++ b/Examples/d/simple/example.c
@@ -0,0 +1,18 @@
+/* File : example.c */
+
+/* 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;
+}
+
+
diff --git a/Examples/d/simple/example.i b/Examples/d/simple/example.i
new file mode 100644
index 000000000..24093b9bf
--- /dev/null
+++ b/Examples/d/simple/example.i
@@ -0,0 +1,7 @@
+/* File : example.i */
+%module example
+
+%inline %{
+extern int    gcd(int x, int y);
+extern double Foo;
+%}
diff --git a/Examples/d/variables/Makefile b/Examples/d/variables/Makefile
new file mode 100644
index 000000000..ae173a566
--- /dev/null
+++ b/Examples/d/variables/Makefile
@@ -0,0 +1,30 @@
+ifeq (2,$(D_VERSION))
+  WORKING_DIR = d2/
+else
+  WORKING_DIR = d1/
+endif
+
+TOP           = ../../..
+SWIG          = $(TOP)/../preinst-swig
+EXTRA_CFLAGS  = -I../ ../example.c example_wrap.c
+EXTRA_LDFLAGS = example.o example_wrap.o
+TARGET        = example_wrap
+SWIGOPT       =
+DSRCS         = *.d
+DFLAGS        = -ofrunme
+
+
+all::	d
+
+d::
+	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::
+	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/d1/runme.d b/Examples/d/variables/d1/runme.d
new file mode 100644
index 000000000..35c896bdc
--- /dev/null
+++ b/Examples/d/variables/d1/runme.d
@@ -0,0 +1,71 @@
+// This example illustrates global variable access from C#.
+module runme;
+
+import tango.io.Stdout;
+static import example;
+
+void main() {
+  // Try to set the values of some global variables
+  example.ivar    =  42;
+  example.svar    = -31000;
+  example.lvar    =  65537;
+  example.uivar   =  123456;
+  example.usvar   =  61000;
+  example.ulvar   =  654321;
+  example.scvar   =  -13;
+  example.ucvar   =  251;
+  example.cvar    =  'S';
+  example.fvar    =  3.14159f;
+  example.dvar    =  2.1828;
+  example.strvar  =  "Hello World";
+  example.iptrvar = example.new_int(37);
+  example.ptptr   = example.new_Point(37,42);
+  example.name    = "Bill";
+
+  // Now print out the values of the variables
+  Stdout.formatln( "Variables (printed from D):" );
+  Stdout.formatln( "ivar      = {}", example.ivar );
+  Stdout.formatln( "svar      = {}", example.svar );
+  Stdout.formatln( "lvar      = {}", example.lvar );
+  Stdout.formatln( "uivar     = {}", example.uivar );
+  Stdout.formatln( "usvar     = {}", example.usvar );
+  Stdout.formatln( "ulvar     = {}", example.ulvar );
+  Stdout.formatln( "scvar     = {}", example.scvar );
+  Stdout.formatln( "ucvar     = {}", example.ucvar );
+  Stdout.formatln( "fvar      = {}", example.fvar );
+  Stdout.formatln( "dvar      = {}", example.dvar );
+  Stdout.formatln( "cvar      = {}", example.cvar );
+  Stdout.formatln( "strvar    = {}", example.strvar );
+  Stdout.formatln( "cstrvar   = {}", example.cstrvar );
+  Stdout.formatln( "iptrvar   = {}", example.iptrvar );
+  Stdout.formatln( "name      = {}", example.name );
+  Stdout.formatln( "ptptr     = {} {}", example.ptptr, example.Point_print(example.ptptr) );
+  Stdout.formatln( "pt        = {} {}", example.pt, example.Point_print(example.pt) );
+  Stdout.formatln( "status    = {}", example.status );
+
+  Stdout.formatln( "\nVariables (printed from the C library):" );
+  example.print_vars();
+
+  Stdout.formatln( "\nNow I'm going to try and modify some read only variables:" );
+  Stdout.formatln( "Checking that the read only variables are readonly..." );
+
+  Stdout( "     'path'..." );
+  static if ( is( typeof( example.path = "a" ) ) )
+    Stdout.formatln("Oh dear, this variable is not read only!");
+  else
+    Stdout.formatln("Good.");
+
+  Stdout( "     'status'..." );
+  static if ( is( typeof( example.status = 2 ) ) )
+    Stdout.formatln("Oh dear, this variable is not read only!");
+  else
+    Stdout.formatln("Good.");
+
+  Stdout.formatln( "\nI'm going to try and update a structure variable:" );
+
+  example.pt = example.ptptr;
+
+  Stdout( "The new value is " ).flush;
+  example.pt_print();
+  Stdout.formatln( "You should see the value {}", example.Point_print(example.ptptr) );
+}
diff --git a/Examples/d/variables/d2/runme.d b/Examples/d/variables/d2/runme.d
new file mode 100644
index 000000000..f80b81819
--- /dev/null
+++ b/Examples/d/variables/d2/runme.d
@@ -0,0 +1,71 @@
+// This example illustrates global variable access from C#.
+module runme;
+
+import std.stdio;
+static import example;
+
+void main() {
+  // Try to set the values of some global variables
+  example.ivar    =  42;
+  example.svar    = -31000;
+  example.lvar    =  65537;
+  example.uivar   =  123456;
+  example.usvar   =  61000;
+  example.ulvar   =  654321;
+  example.scvar   =  -13;
+  example.ucvar   =  251;
+  example.cvar    =  'S';
+  example.fvar    =  3.14159f;
+  example.dvar    =  2.1828;
+  example.strvar  =  "Hello World";
+  example.iptrvar = example.new_int(37);
+  example.ptptr   = example.new_Point(37,42);
+  example.name    = "Bill";
+
+  // Now print out the values of the variables
+  writefln( "Variables (printed from D):" );
+  writefln( "ivar      = %s", example.ivar );
+  writefln( "svar      = %s", example.svar );
+  writefln( "lvar      = %s", example.lvar );
+  writefln( "uivar     = %s", example.uivar );
+  writefln( "usvar     = %s", example.usvar );
+  writefln( "ulvar     = %s", example.ulvar );
+  writefln( "scvar     = %s", example.scvar );
+  writefln( "ucvar     = %s", example.ucvar );
+  writefln( "fvar      = %s", example.fvar );
+  writefln( "dvar      = %s", example.dvar );
+  writefln( "cvar      = %s", example.cvar );
+  writefln( "strvar    = %s", example.strvar );
+  writefln( "cstrvar   = %s", example.cstrvar );
+  writefln( "iptrvar   = %s", example.iptrvar );
+  writefln( "name      = %s", example.name );
+  writefln( "ptptr     = %s %s", example.ptptr, example.Point_print(example.ptptr) );
+  writefln( "pt        = %s %s", example.pt, example.Point_print(example.pt) );
+  writefln( "status    = %s", example.status );
+
+  writefln( "\nVariables (printed from the C library):" );
+  example.print_vars();
+
+  writefln( "\nNow I'm going to try and modify some read only variables:" );
+  writefln( "Checking that the read only variables are readonly..." );
+
+  writeln( "     'path'..." );
+  static if ( is( typeof( example.path = "a" ) ) )
+    writefln("Oh dear, this variable is not read only!");
+  else
+    writefln("Good.");
+
+  writeln( "     'status'..." );
+  static if ( is( typeof( example.status = 2 ) ) )
+    writefln("Oh dear, this variable is not read only!");
+  else
+    writefln("Good.");
+
+  writefln( "\nI'm going to try and update a structure variable:" );
+
+  example.pt = example.ptptr;
+
+  write( "The new value is " );
+  example.pt_print();
+  writefln( "You should see the value %s", example.Point_print(example.ptptr) );
+}
diff --git a/Examples/d/variables/example.c b/Examples/d/variables/example.c
new file mode 100644
index 000000000..1bf9c120f
--- /dev/null
+++ b/Examples/d/variables/example.c
@@ -0,0 +1,91 @@
+/* File : example.c */
+
+/* I'm a file containing some C global variables */
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#include 
+#include 
+#include "example.h"
+
+int              ivar = 0;
+short            svar = 0;
+long             lvar = 0;
+unsigned int     uivar = 0;
+unsigned short   usvar = 0;
+unsigned long    ulvar = 0;
+signed char      scvar = 0;
+unsigned char    ucvar = 0;
+char             cvar = 0;
+float            fvar = 0;
+double           dvar = 0;
+char            *strvar = 0;
+const char       cstrvar[] = "Goodbye";
+int             *iptrvar = 0;
+char             name[256] = "Dave";
+char             path[256] = "/home/beazley";
+
+
+/* Global variables involving a structure */
+Point           *ptptr = 0;
+Point            pt = { 10, 20 };
+
+/* A variable that we will make read-only in the interface */
+int              status = 1;
+
+/* A debugging function to print out their values */
+
+void print_vars() {
+  printf("ivar      = %d\n", ivar);
+  printf("svar      = %d\n", svar);
+  printf("lvar      = %ld\n", lvar);
+  printf("uivar     = %u\n", uivar);
+  printf("usvar     = %u\n", usvar);
+  printf("ulvar     = %lu\n", ulvar);
+  printf("scvar     = %d\n", scvar);
+  printf("ucvar     = %u\n", ucvar);
+  printf("fvar      = %g\n", fvar);
+  printf("dvar      = %g\n", dvar);
+  printf("cvar      = %c\n", cvar);
+  printf("strvar    = %s\n", strvar ? strvar : "(null)");
+  printf("cstrvar   = %s\n", cstrvar ? cstrvar : "(null)");
+  printf("iptrvar   = %p\n", iptrvar);
+  printf("name      = %s\n", name);
+  printf("ptptr     = %p (%d, %d)\n", ptptr, ptptr ? ptptr->x : 0, ptptr ? ptptr->y : 0);
+  printf("pt        = (%d, %d)\n", pt.x, pt.y);
+  printf("status    = %d\n", status);
+}
+
+/* A function to create an integer (to test iptrvar) */
+
+int *new_int(int value) {
+  int *ip = (int *) malloc(sizeof(int));
+  *ip = value;
+  return ip;
+}
+
+/* A function to create a point */
+
+Point *new_Point(int x, int y) {
+  Point *p = (Point *) malloc(sizeof(Point));
+  p->x = x;
+  p->y = y;
+  return p;
+}
+
+char * Point_print(Point *p) {
+  static char buffer[256];
+  if (p) {
+    sprintf(buffer,"(%d, %d)", p->x,p->y);
+  } else {
+    sprintf(buffer,"null");
+  }
+  return buffer;
+}
+
+void pt_print() {
+  printf("(%d, %d)\n", pt.x, pt.y);
+}
diff --git a/Examples/d/variables/example.h b/Examples/d/variables/example.h
new file mode 100644
index 000000000..0f7e89594
--- /dev/null
+++ b/Examples/d/variables/example.h
@@ -0,0 +1,6 @@
+/* File: example.h */
+
+typedef struct {
+  int x,y;
+} Point;
+
diff --git a/Examples/d/variables/example.i b/Examples/d/variables/example.i
new file mode 100644
index 000000000..591b871ed
--- /dev/null
+++ b/Examples/d/variables/example.i
@@ -0,0 +1,49 @@
+/* File : example.i */
+%module example
+%{
+#include "example.h"
+%}
+
+/* Some global variable declarations */
+%inline %{
+extern int              ivar;
+extern short            svar;
+extern long             lvar;
+extern unsigned int     uivar;
+extern unsigned short   usvar;
+extern unsigned long    ulvar;
+extern signed char      scvar;
+extern unsigned char    ucvar;
+extern char             cvar;
+extern float            fvar;
+extern double           dvar;
+extern char            *strvar;
+extern const char       cstrvar[];
+extern int             *iptrvar;
+extern char             name[256];
+
+extern Point           *ptptr;
+extern Point            pt;
+%}
+
+
+/* Some read-only variables */
+
+%immutable;
+
+%inline %{
+extern int  status;
+extern char path[256];
+%}
+
+%mutable;
+
+/* Some helper functions to make it easier to test */
+%inline %{
+extern void  print_vars();
+extern int  *new_int(int value);
+extern Point *new_Point(int x, int y);
+extern char  *Point_print(Point *p);
+extern void  pt_print();
+%}
+
diff --git a/Examples/go/callback/example.go b/Examples/go/callback/example.go
deleted file mode 100644
index 5c0cfb051..000000000
--- a/Examples/go/callback/example.go
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-type _swig_DirectorCallback struct {
-	SwigcptrCallback
-	v interface{}
-}
-
-func (p *_swig_DirectorCallback) Swigcptr() uintptr {
-	return p.SwigcptrCallback.Swigcptr()
-}
-
-func (p *_swig_DirectorCallback) SwigIsCallback() {
-}
-
-func (p *_swig_DirectorCallback) DirectorInterface() interface{} {
-	return p.v
-}
-
-func _swig_NewDirectorCallbackCallback(*_swig_DirectorCallback) SwigcptrCallback
-
-func NewDirectorCallback(v interface{}) Callback {
-	p := &_swig_DirectorCallback{0, v}
-	p.SwigcptrCallback = _swig_NewDirectorCallbackCallback(p)
-	return p
-}
-
-func _swig_wrap_DeleteDirectorCallback(uintptr)
-
-func DeleteDirectorCallback(arg1 Callback) {
-	_swig_wrap_DeleteDirectorCallback(arg1.Swigcptr())
-}
-
-func Swiggo_DeleteDirector_Callback(p *_swig_DirectorCallback) {
-	p.SwigcptrCallback = 0
-}
-
-type _swig_DirectorInterfaceCallbackRun interface {
-	Run()
-}
-
-func _swig_wrap__swig_DirectorCallback_upcall_Run(SwigcptrCallback)
-func (swig_p *_swig_DirectorCallback) Run() {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceCallbackRun); swig_ok {
-		swig_g.Run()
-		return
-	}
-	_swig_wrap__swig_DirectorCallback_upcall_Run(swig_p.SwigcptrCallback)
-}
-
-func DirectorCallbackRun(p Callback) {
-	_swig_wrap__swig_DirectorCallback_upcall_Run(p.(*_swig_DirectorCallback).SwigcptrCallback)
-}
-
-func Swig_DirectorCallback_callback_run(p *_swig_DirectorCallback) {
-	p.Run()
-}
-
-type SwigcptrCallback uintptr
-
-func (p SwigcptrCallback) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrCallback) SwigIsCallback() {
-}
-
-func (p SwigcptrCallback) DirectorInterface() interface{} {
-	return nil
-}
-
-func _swig_wrap_delete_Callback(uintptr)
-
-func DeleteCallback(arg1 Callback) {
-	_swig_wrap_delete_Callback(arg1.Swigcptr())
-}
-
-func _swig_wrap_Callback_run(SwigcptrCallback)
-
-func (arg1 SwigcptrCallback) Run() {
-	_swig_wrap_Callback_run(arg1)
-}
-
-func _swig_wrap_new_Callback() SwigcptrCallback
-
-func NewCallback() Callback {
-	return _swig_wrap_new_Callback()
-}
-
-type Callback interface {
-	Swigcptr() uintptr
-	SwigIsCallback()
-	DirectorInterface() interface{}
-	Run()
-}
-
-type SwigcptrCaller uintptr
-
-func (p SwigcptrCaller) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrCaller) SwigIsCaller() {
-}
-
-func _swig_wrap_new_Caller() SwigcptrCaller
-
-func NewCaller() Caller {
-	return _swig_wrap_new_Caller()
-}
-
-func _swig_wrap_delete_Caller(uintptr)
-
-func DeleteCaller(arg1 Caller) {
-	_swig_wrap_delete_Caller(arg1.Swigcptr())
-}
-
-func _swig_wrap_Caller_delCallback(SwigcptrCaller)
-
-func (arg1 SwigcptrCaller) DelCallback() {
-	_swig_wrap_Caller_delCallback(arg1)
-}
-
-func _swig_wrap_Caller_setCallback(SwigcptrCaller, uintptr)
-
-func (arg1 SwigcptrCaller) SetCallback(arg2 Callback) {
-	_swig_wrap_Caller_setCallback(arg1, arg2.Swigcptr())
-}
-
-func _swig_wrap_Caller_call(SwigcptrCaller)
-
-func (arg1 SwigcptrCaller) Call() {
-	_swig_wrap_Caller_call(arg1)
-}
-
-type Caller interface {
-	Swigcptr() uintptr
-	SwigIsCaller()
-	DelCallback()
-	SetCallback(arg2 Callback)
-	Call()
-}
-
-
-type SwigcptrSwigDirector_Callback uintptr
-type SwigDirector_Callback interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrSwigDirector_Callback) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/class/example.go b/Examples/go/class/example.go
deleted file mode 100644
index ec8113ad4..000000000
--- a/Examples/go/class/example.go
+++ /dev/null
@@ -1,284 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-type SwigcptrShape uintptr
-
-func (p SwigcptrShape) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrShape) SwigIsShape() {
-}
-
-func _swig_wrap_delete_Shape(uintptr)
-
-func DeleteShape(arg1 Shape) {
-	_swig_wrap_delete_Shape(arg1.Swigcptr())
-}
-
-func _swig_wrap_Shape_x_set(SwigcptrShape, float64)
-
-func (arg1 SwigcptrShape) SetX(arg2 float64) {
-	_swig_wrap_Shape_x_set(arg1, arg2)
-}
-
-func _swig_wrap_Shape_x_get(SwigcptrShape) float64
-
-func (arg1 SwigcptrShape) GetX() float64 {
-	return _swig_wrap_Shape_x_get(arg1)
-}
-
-func _swig_wrap_Shape_y_set(SwigcptrShape, float64)
-
-func (arg1 SwigcptrShape) SetY(arg2 float64) {
-	_swig_wrap_Shape_y_set(arg1, arg2)
-}
-
-func _swig_wrap_Shape_y_get(SwigcptrShape) float64
-
-func (arg1 SwigcptrShape) GetY() float64 {
-	return _swig_wrap_Shape_y_get(arg1)
-}
-
-func _swig_wrap_Shape_move(SwigcptrShape, float64, float64)
-
-func (arg1 SwigcptrShape) Move(arg2 float64, arg3 float64) {
-	_swig_wrap_Shape_move(arg1, arg2, arg3)
-}
-
-func _swig_wrap_Shape_area(SwigcptrShape) float64
-
-func (arg1 SwigcptrShape) Area() float64 {
-	return _swig_wrap_Shape_area(arg1)
-}
-
-func _swig_wrap_Shape_perimeter(SwigcptrShape) float64
-
-func (arg1 SwigcptrShape) Perimeter() float64 {
-	return _swig_wrap_Shape_perimeter(arg1)
-}
-
-func _swig_wrap_Shape_nshapes_set(int)
-
-func SetShapeNshapes(arg1 int) {
-	_swig_wrap_Shape_nshapes_set(arg1)
-}
-
-func GetShapeNshapes() int
-type Shape interface {
-	Swigcptr() uintptr
-	SwigIsShape()
-	SetX(arg2 float64)
-	GetX() float64
-	SetY(arg2 float64)
-	GetY() float64
-	Move(arg2 float64, arg3 float64)
-	Area() float64
-	Perimeter() float64
-}
-
-type SwigcptrCircle uintptr
-
-func (p SwigcptrCircle) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrCircle) SwigIsCircle() {
-}
-
-func _swig_wrap_new_Circle(float64) SwigcptrCircle
-
-func NewCircle(arg1 float64) Circle {
-	return _swig_wrap_new_Circle(arg1)
-}
-
-func _swig_wrap_Circle_area(SwigcptrCircle) float64
-
-func (arg1 SwigcptrCircle) Area() float64 {
-	return _swig_wrap_Circle_area(arg1)
-}
-
-func _swig_wrap_Circle_perimeter(SwigcptrCircle) float64
-
-func (arg1 SwigcptrCircle) Perimeter() float64 {
-	return _swig_wrap_Circle_perimeter(arg1)
-}
-
-func _swig_wrap_delete_Circle(uintptr)
-
-func DeleteCircle(arg1 Circle) {
-	_swig_wrap_delete_Circle(arg1.Swigcptr())
-}
-
-func _swig_wrap_SetCircle_X(SwigcptrCircle, float64)
-
-func (_swig_base SwigcptrCircle) SetX(arg1 float64) {
-	_swig_wrap_SetCircle_X(_swig_base, arg1)
-}
-
-func _swig_wrap_GetCircle_X(SwigcptrCircle) float64
-
-func (_swig_base SwigcptrCircle) GetX() float64 {
-	return _swig_wrap_GetCircle_X(_swig_base)
-}
-
-func _swig_wrap_SetCircle_Y(SwigcptrCircle, float64)
-
-func (_swig_base SwigcptrCircle) SetY(arg1 float64) {
-	_swig_wrap_SetCircle_Y(_swig_base, arg1)
-}
-
-func _swig_wrap_GetCircle_Y(SwigcptrCircle) float64
-
-func (_swig_base SwigcptrCircle) GetY() float64 {
-	return _swig_wrap_GetCircle_Y(_swig_base)
-}
-
-func _swig_wrap_Circle_move(SwigcptrCircle, float64, float64)
-
-func (_swig_base SwigcptrCircle) Move(arg1 float64, arg2 float64) {
-	_swig_wrap_Circle_move(_swig_base, arg1, arg2)
-}
-
-func (p SwigcptrCircle) SwigIsShape() {
-}
-
-func (p SwigcptrCircle) SwigGetShape() Shape {
-	return SwigcptrShape(p.Swigcptr())
-}
-
-type Circle interface {
-	Swigcptr() uintptr
-	SwigIsCircle()
-	Area() float64
-	Perimeter() float64
-	SetX(arg1 float64)
-	GetX() float64
-	SetY(arg1 float64)
-	GetY() float64
-	Move(arg1 float64, arg2 float64)
-	SwigIsShape()
-	SwigGetShape() Shape
-}
-
-type SwigcptrSquare uintptr
-
-func (p SwigcptrSquare) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrSquare) SwigIsSquare() {
-}
-
-func _swig_wrap_new_Square(float64) SwigcptrSquare
-
-func NewSquare(arg1 float64) Square {
-	return _swig_wrap_new_Square(arg1)
-}
-
-func _swig_wrap_Square_area(SwigcptrSquare) float64
-
-func (arg1 SwigcptrSquare) Area() float64 {
-	return _swig_wrap_Square_area(arg1)
-}
-
-func _swig_wrap_Square_perimeter(SwigcptrSquare) float64
-
-func (arg1 SwigcptrSquare) Perimeter() float64 {
-	return _swig_wrap_Square_perimeter(arg1)
-}
-
-func _swig_wrap_delete_Square(uintptr)
-
-func DeleteSquare(arg1 Square) {
-	_swig_wrap_delete_Square(arg1.Swigcptr())
-}
-
-func _swig_wrap_SetSquare_X(SwigcptrSquare, float64)
-
-func (_swig_base SwigcptrSquare) SetX(arg1 float64) {
-	_swig_wrap_SetSquare_X(_swig_base, arg1)
-}
-
-func _swig_wrap_GetSquare_X(SwigcptrSquare) float64
-
-func (_swig_base SwigcptrSquare) GetX() float64 {
-	return _swig_wrap_GetSquare_X(_swig_base)
-}
-
-func _swig_wrap_SetSquare_Y(SwigcptrSquare, float64)
-
-func (_swig_base SwigcptrSquare) SetY(arg1 float64) {
-	_swig_wrap_SetSquare_Y(_swig_base, arg1)
-}
-
-func _swig_wrap_GetSquare_Y(SwigcptrSquare) float64
-
-func (_swig_base SwigcptrSquare) GetY() float64 {
-	return _swig_wrap_GetSquare_Y(_swig_base)
-}
-
-func _swig_wrap_Square_move(SwigcptrSquare, float64, float64)
-
-func (_swig_base SwigcptrSquare) Move(arg1 float64, arg2 float64) {
-	_swig_wrap_Square_move(_swig_base, arg1, arg2)
-}
-
-func (p SwigcptrSquare) SwigIsShape() {
-}
-
-func (p SwigcptrSquare) SwigGetShape() Shape {
-	return SwigcptrShape(p.Swigcptr())
-}
-
-type Square interface {
-	Swigcptr() uintptr
-	SwigIsSquare()
-	Area() float64
-	Perimeter() float64
-	SetX(arg1 float64)
-	GetX() float64
-	SetY(arg1 float64)
-	GetY() float64
-	Move(arg1 float64, arg2 float64)
-	SwigIsShape()
-	SwigGetShape() Shape
-}
-
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/constants/example.go b/Examples/go/constants/example.go
deleted file mode 100644
index 0e5e66418..000000000
--- a/Examples/go/constants/example.go
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-const ICONST int = 42
-const FCONST float64 = 2.1828
-const CCONST byte = 'x'
-func _swig_getCCONST2() byte
-var CCONST2 byte = _swig_getCCONST2()
-const SCONST string = "Hello World"
-func _swig_getSCONST2() string
-var SCONST2 string = _swig_getSCONST2()
-func _swig_getEXPR() float64
-var EXPR float64 = _swig_getEXPR()
-const Iconst int = 37
-const Fconst float64 = 3.14
-
diff --git a/Examples/go/enum/example.go b/Examples/go/enum/example.go
deleted file mode 100644
index 4653ab57a..000000000
--- a/Examples/go/enum/example.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-type Color int
-func _swig_getRED() Color
-var RED Color = _swig_getRED()
-func _swig_getBLUE() Color
-var BLUE Color = _swig_getBLUE()
-func _swig_getGREEN() Color
-var GREEN Color = _swig_getGREEN()
-type SwigcptrFoo uintptr
-
-func (p SwigcptrFoo) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrFoo) SwigIsFoo() {
-}
-
-func _swig_wrap_new_Foo() SwigcptrFoo
-
-func NewFoo() Foo {
-	return _swig_wrap_new_Foo()
-}
-
-type FooSpeed int
-func _swig_getFoo_IMPULSE_Foo() FooSpeed
-var FooIMPULSE FooSpeed = _swig_getFoo_IMPULSE_Foo()
-func _swig_getFoo_WARP_Foo() FooSpeed
-var FooWARP FooSpeed = _swig_getFoo_WARP_Foo()
-func _swig_getFoo_LUDICROUS_Foo() FooSpeed
-var FooLUDICROUS FooSpeed = _swig_getFoo_LUDICROUS_Foo()
-func _swig_wrap_Foo_enum_test(SwigcptrFoo, FooSpeed)
-
-func (arg1 SwigcptrFoo) Enum_test(arg2 FooSpeed) {
-	_swig_wrap_Foo_enum_test(arg1, arg2)
-}
-
-func _swig_wrap_delete_Foo(uintptr)
-
-func DeleteFoo(arg1 Foo) {
-	_swig_wrap_delete_Foo(arg1.Swigcptr())
-}
-
-type Foo interface {
-	Swigcptr() uintptr
-	SwigIsFoo()
-	Enum_test(arg2 FooSpeed)
-}
-
-func _swig_wrap_enum_test(Color, FooSpeed)
-
-func Enum_test(arg1 Color, arg2 FooSpeed) {
-	_swig_wrap_enum_test(arg1, arg2)
-}
-
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/extend/example.go b/Examples/go/extend/example.go
deleted file mode 100644
index 08f21e6ab..000000000
--- a/Examples/go/extend/example.go
+++ /dev/null
@@ -1,397 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-type _swig_DirectorEmployee struct {
-	SwigcptrEmployee
-	v interface{}
-}
-
-func (p *_swig_DirectorEmployee) Swigcptr() uintptr {
-	return p.SwigcptrEmployee.Swigcptr()
-}
-
-func (p *_swig_DirectorEmployee) SwigIsEmployee() {
-}
-
-func (p *_swig_DirectorEmployee) DirectorInterface() interface{} {
-	return p.v
-}
-
-func _swig_NewDirectorEmployeeEmployee(*_swig_DirectorEmployee, string) SwigcptrEmployee
-
-func NewDirectorEmployee(v interface{}, arg1 string) Employee {
-	p := &_swig_DirectorEmployee{0, v}
-	p.SwigcptrEmployee = _swig_NewDirectorEmployeeEmployee(p, arg1)
-	return p
-}
-
-type _swig_DirectorInterfaceEmployeeGetTitle interface {
-	GetTitle() string
-}
-
-func _swig_wrap__swig_DirectorEmployee_upcall_GetTitle(SwigcptrEmployee) string
-func (swig_p *_swig_DirectorEmployee) GetTitle() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceEmployeeGetTitle); swig_ok {
-		return swig_g.GetTitle()
-	}
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetTitle(swig_p.SwigcptrEmployee)
-}
-
-func DirectorEmployeeGetTitle(p Employee) string {
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetTitle(p.(*_swig_DirectorEmployee).SwigcptrEmployee)
-}
-
-func Swig_DirectorEmployee_callback_getTitle(p *_swig_DirectorEmployee) (swig_result string) {
-	return p.GetTitle()
-}
-
-type _swig_DirectorInterfaceEmployeeGetName interface {
-	GetName() string
-}
-
-func _swig_wrap__swig_DirectorEmployee_upcall_GetName(SwigcptrEmployee) string
-func (swig_p *_swig_DirectorEmployee) GetName() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceEmployeeGetName); swig_ok {
-		return swig_g.GetName()
-	}
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetName(swig_p.SwigcptrEmployee)
-}
-
-func DirectorEmployeeGetName(p Employee) string {
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetName(p.(*_swig_DirectorEmployee).SwigcptrEmployee)
-}
-
-func Swig_DirectorEmployee_callback_getName(p *_swig_DirectorEmployee) (swig_result string) {
-	return p.GetName()
-}
-
-type _swig_DirectorInterfaceEmployeeGetPosition interface {
-	GetPosition() string
-}
-
-func _swig_wrap__swig_DirectorEmployee_upcall_GetPosition(SwigcptrEmployee) string
-func (swig_p *_swig_DirectorEmployee) GetPosition() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceEmployeeGetPosition); swig_ok {
-		return swig_g.GetPosition()
-	}
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetPosition(swig_p.SwigcptrEmployee)
-}
-
-func DirectorEmployeeGetPosition(p Employee) string {
-	return _swig_wrap__swig_DirectorEmployee_upcall_GetPosition(p.(*_swig_DirectorEmployee).SwigcptrEmployee)
-}
-
-func Swig_DirectorEmployee_callback_getPosition(p *_swig_DirectorEmployee) (swig_result string) {
-	return p.GetPosition()
-}
-
-func _swig_wrap_DeleteDirectorEmployee(uintptr)
-
-func DeleteDirectorEmployee(arg1 Employee) {
-	_swig_wrap_DeleteDirectorEmployee(arg1.Swigcptr())
-}
-
-func Swiggo_DeleteDirector_Employee(p *_swig_DirectorEmployee) {
-	p.SwigcptrEmployee = 0
-}
-
-type SwigcptrEmployee uintptr
-
-func (p SwigcptrEmployee) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrEmployee) SwigIsEmployee() {
-}
-
-func (p SwigcptrEmployee) DirectorInterface() interface{} {
-	return nil
-}
-
-func _swig_wrap_new_Employee(string) SwigcptrEmployee
-
-func NewEmployee(arg1 string) Employee {
-	return _swig_wrap_new_Employee(arg1)
-}
-
-func _swig_wrap_Employee_getTitle(SwigcptrEmployee) string
-
-func (arg1 SwigcptrEmployee) GetTitle() string {
-	return _swig_wrap_Employee_getTitle(arg1)
-}
-
-func _swig_wrap_Employee_getName(SwigcptrEmployee) string
-
-func (arg1 SwigcptrEmployee) GetName() string {
-	return _swig_wrap_Employee_getName(arg1)
-}
-
-func _swig_wrap_Employee_getPosition(SwigcptrEmployee) string
-
-func (arg1 SwigcptrEmployee) GetPosition() string {
-	return _swig_wrap_Employee_getPosition(arg1)
-}
-
-func _swig_wrap_delete_Employee(uintptr)
-
-func DeleteEmployee(arg1 Employee) {
-	_swig_wrap_delete_Employee(arg1.Swigcptr())
-}
-
-type Employee interface {
-	Swigcptr() uintptr
-	SwigIsEmployee()
-	DirectorInterface() interface{}
-	GetTitle() string
-	GetName() string
-	GetPosition() string
-}
-
-type _swig_DirectorManager struct {
-	SwigcptrManager
-	v interface{}
-}
-
-func (p *_swig_DirectorManager) Swigcptr() uintptr {
-	return p.SwigcptrManager.Swigcptr()
-}
-
-func (p *_swig_DirectorManager) SwigIsManager() {
-}
-
-func (p *_swig_DirectorManager) DirectorInterface() interface{} {
-	return p.v
-}
-
-func _swig_NewDirectorManagerManager(*_swig_DirectorManager, string) SwigcptrManager
-
-func NewDirectorManager(v interface{}, arg1 string) Manager {
-	p := &_swig_DirectorManager{0, v}
-	p.SwigcptrManager = _swig_NewDirectorManagerManager(p, arg1)
-	return p
-}
-
-type _swig_DirectorInterfaceManagerGetTitle interface {
-	GetTitle() string
-}
-
-func _swig_wrap__swig_DirectorManager_upcall_GetTitle(SwigcptrManager) string
-func (swig_p *_swig_DirectorManager) GetTitle() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceManagerGetTitle); swig_ok {
-		return swig_g.GetTitle()
-	}
-	return _swig_wrap__swig_DirectorManager_upcall_GetTitle(swig_p.SwigcptrManager)
-}
-
-func DirectorManagerGetTitle(p Manager) string {
-	return _swig_wrap__swig_DirectorManager_upcall_GetTitle(p.(*_swig_DirectorManager).SwigcptrManager)
-}
-
-func Swig_DirectorManager_callback_getTitle(p *_swig_DirectorManager) (swig_result string) {
-	return p.GetTitle()
-}
-
-type _swig_DirectorInterfaceManagerGetName interface {
-	GetName() string
-}
-
-func _swig_wrap__swig_DirectorManager_upcall_GetName(SwigcptrManager) string
-func (swig_p *_swig_DirectorManager) GetName() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceManagerGetName); swig_ok {
-		return swig_g.GetName()
-	}
-	return _swig_wrap__swig_DirectorManager_upcall_GetName(swig_p.SwigcptrManager)
-}
-
-func DirectorManagerGetName(p Manager) string {
-	return _swig_wrap__swig_DirectorManager_upcall_GetName(p.(*_swig_DirectorManager).SwigcptrManager)
-}
-
-func Swig_DirectorManager_callback_getName(p *_swig_DirectorManager) (swig_result string) {
-	return p.GetName()
-}
-
-type _swig_DirectorInterfaceManagerGetPosition interface {
-	GetPosition() string
-}
-
-func _swig_wrap__swig_DirectorManager_upcall_GetPosition(SwigcptrManager) string
-func (swig_p *_swig_DirectorManager) GetPosition() string {
-	if swig_g, swig_ok := swig_p.v.(_swig_DirectorInterfaceManagerGetPosition); swig_ok {
-		return swig_g.GetPosition()
-	}
-	return _swig_wrap__swig_DirectorManager_upcall_GetPosition(swig_p.SwigcptrManager)
-}
-
-func DirectorManagerGetPosition(p Manager) string {
-	return _swig_wrap__swig_DirectorManager_upcall_GetPosition(p.(*_swig_DirectorManager).SwigcptrManager)
-}
-
-func Swig_DirectorManager_callback_getPosition(p *_swig_DirectorManager) (swig_result string) {
-	return p.GetPosition()
-}
-
-func _swig_wrap_DeleteDirectorManager(uintptr)
-
-func DeleteDirectorManager(arg1 Manager) {
-	_swig_wrap_DeleteDirectorManager(arg1.Swigcptr())
-}
-
-func Swiggo_DeleteDirector_Manager(p *_swig_DirectorManager) {
-	p.SwigcptrManager = 0
-}
-
-type SwigcptrManager uintptr
-
-func (p SwigcptrManager) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrManager) SwigIsManager() {
-}
-
-func (p SwigcptrManager) DirectorInterface() interface{} {
-	return nil
-}
-
-func _swig_wrap_new_Manager(string) SwigcptrManager
-
-func NewManager(arg1 string) Manager {
-	return _swig_wrap_new_Manager(arg1)
-}
-
-func _swig_wrap_Manager_getPosition(SwigcptrManager) string
-
-func (arg1 SwigcptrManager) GetPosition() string {
-	return _swig_wrap_Manager_getPosition(arg1)
-}
-
-func _swig_wrap_delete_Manager(uintptr)
-
-func DeleteManager(arg1 Manager) {
-	_swig_wrap_delete_Manager(arg1.Swigcptr())
-}
-
-func _swig_wrap_Manager_getTitle(SwigcptrManager) string
-
-func (_swig_base SwigcptrManager) GetTitle() string {
-	return _swig_wrap_Manager_getTitle(_swig_base)
-}
-
-func _swig_wrap_Manager_getName(SwigcptrManager) string
-
-func (_swig_base SwigcptrManager) GetName() string {
-	return _swig_wrap_Manager_getName(_swig_base)
-}
-
-func (p SwigcptrManager) SwigIsEmployee() {
-}
-
-func (p SwigcptrManager) SwigGetEmployee() Employee {
-	return SwigcptrEmployee(p.Swigcptr())
-}
-
-type Manager interface {
-	Swigcptr() uintptr
-	SwigIsManager()
-	DirectorInterface() interface{}
-	GetPosition() string
-	GetTitle() string
-	GetName() string
-	SwigIsEmployee()
-	SwigGetEmployee() Employee
-}
-
-type SwigcptrEmployeeList uintptr
-
-func (p SwigcptrEmployeeList) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrEmployeeList) SwigIsEmployeeList() {
-}
-
-func _swig_wrap_new_EmployeeList() SwigcptrEmployeeList
-
-func NewEmployeeList() EmployeeList {
-	return _swig_wrap_new_EmployeeList()
-}
-
-func _swig_wrap_EmployeeList_addEmployee(SwigcptrEmployeeList, uintptr)
-
-func (arg1 SwigcptrEmployeeList) AddEmployee(arg2 Employee) {
-	_swig_wrap_EmployeeList_addEmployee(arg1, arg2.Swigcptr())
-}
-
-func _swig_wrap_EmployeeList_get_item(SwigcptrEmployeeList, int) SwigcptrEmployee
-
-func (arg1 SwigcptrEmployeeList) Get_item(arg2 int) Employee {
-	return _swig_wrap_EmployeeList_get_item(arg1, arg2)
-}
-
-func _swig_wrap_delete_EmployeeList(uintptr)
-
-func DeleteEmployeeList(arg1 EmployeeList) {
-	_swig_wrap_delete_EmployeeList(arg1.Swigcptr())
-}
-
-type EmployeeList interface {
-	Swigcptr() uintptr
-	SwigIsEmployeeList()
-	AddEmployee(arg2 Employee)
-	Get_item(arg2 int) Employee
-}
-
-
-type SwigcptrSwigDirector_Manager uintptr
-type SwigDirector_Manager interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrSwigDirector_Manager) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
-type SwigcptrSwigDirector_Employee uintptr
-type SwigDirector_Employee interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrSwigDirector_Employee) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/funcptr/example.go b/Examples/go/funcptr/example.go
deleted file mode 100644
index b059bae8d..000000000
--- a/Examples/go/funcptr/example.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func Do_op(int, int, _swig_fnptr) int
-func _swig_getADD() _swig_fnptr
-var ADD _swig_fnptr = _swig_getADD()
-func _swig_getSUB() _swig_fnptr
-var SUB _swig_fnptr = _swig_getSUB()
-func _swig_getMUL() _swig_fnptr
-var MUL _swig_fnptr = _swig_getMUL()
-func _swig_wrap_funcvar_set(_swig_fnptr)
-
-func SetFuncvar(arg1 _swig_fnptr) {
-	_swig_wrap_funcvar_set(arg1)
-}
-
-func GetFuncvar() _swig_fnptr
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/multimap/example.go b/Examples/go/multimap/example.go
deleted file mode 100644
index 59ed9eaad..000000000
--- a/Examples/go/multimap/example.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func Gcd(int, int) int
-func Gcdmain([]string) int
-func Count(string, byte) int
-func _swig_wrap_capitalize([]string)
-
-func Capitalize(arg1 []string) {
-	_swig_wrap_capitalize(arg1)
-}
-
-func _swig_wrap_circle(float64, float64)
-
-func Circle(arg1 float64, arg2 float64) {
-	_swig_wrap_circle(arg1, arg2)
-}
-
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/pointer/example.go b/Examples/go/pointer/example.go
deleted file mode 100644
index 567c41c32..000000000
--- a/Examples/go/pointer/example.go
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func _swig_wrap_add(*int, *int, *int)
-
-func Add(arg1 *int, arg2 *int, arg3 *int) {
-	_swig_wrap_add(arg1, arg2, arg3)
-}
-
-func New_intp() *int
-func Copy_intp(int) *int
-func _swig_wrap_delete_intp(*int)
-
-func Delete_intp(arg1 *int) {
-	_swig_wrap_delete_intp(arg1)
-}
-
-func _swig_wrap_intp_assign(*int, int)
-
-func Intp_assign(arg1 *int, arg2 int) {
-	_swig_wrap_intp_assign(arg1, arg2)
-}
-
-func Intp_value(*int) int
-func _swig_wrap_sub(int, int, []int)
-
-func Sub(arg1 int, arg2 int, arg3 []int) {
-	_swig_wrap_sub(arg1, arg2, arg3)
-}
-
-func Divide(int, int, []int) int
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/pointer/runme.go b/Examples/go/pointer/runme.go
index 9cbcda489..63deb11b7 100644
--- a/Examples/go/pointer/runme.go
+++ b/Examples/go/pointer/runme.go
@@ -32,7 +32,7 @@ func main() {
 
 	// Now try the typemap library
 	// Now it is no longer necessary to manufacture pointers.
-	// Instead we use a single element array which in Java is modifiable.
+	// Instead we use a single element slice which in Go is modifiable.
 
 	fmt.Println("Trying the typemap library")
 	r := []int{0}
diff --git a/Examples/go/reference/example.go b/Examples/go/reference/example.go
deleted file mode 100644
index fb98f8a18..000000000
--- a/Examples/go/reference/example.go
+++ /dev/null
@@ -1,126 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-type SwigcptrVector uintptr
-
-func (p SwigcptrVector) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrVector) SwigIsVector() {
-}
-
-func _swig_wrap_new_Vector(float64, float64, float64) SwigcptrVector
-
-func NewVector(arg1 float64, arg2 float64, arg3 float64) Vector {
-	return _swig_wrap_new_Vector(arg1, arg2, arg3)
-}
-
-func _swig_wrap_delete_Vector(uintptr)
-
-func DeleteVector(arg1 Vector) {
-	_swig_wrap_delete_Vector(arg1.Swigcptr())
-}
-
-func _swig_wrap_Vector_print(SwigcptrVector) string
-
-func (arg1 SwigcptrVector) Print() string {
-	return _swig_wrap_Vector_print(arg1)
-}
-
-type Vector interface {
-	Swigcptr() uintptr
-	SwigIsVector()
-	Print() string
-}
-
-func _swig_wrap_addv(uintptr, uintptr) SwigcptrVector
-
-func Addv(arg1 Vector, arg2 Vector) Vector {
-	return _swig_wrap_addv(arg1.Swigcptr(), arg2.Swigcptr())
-}
-
-type SwigcptrVectorArray uintptr
-
-func (p SwigcptrVectorArray) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrVectorArray) SwigIsVectorArray() {
-}
-
-func _swig_wrap_new_VectorArray(int) SwigcptrVectorArray
-
-func NewVectorArray(arg1 int) VectorArray {
-	return _swig_wrap_new_VectorArray(arg1)
-}
-
-func _swig_wrap_delete_VectorArray(uintptr)
-
-func DeleteVectorArray(arg1 VectorArray) {
-	_swig_wrap_delete_VectorArray(arg1.Swigcptr())
-}
-
-func _swig_wrap_VectorArray_size(SwigcptrVectorArray) int
-
-func (arg1 SwigcptrVectorArray) Size() int {
-	return _swig_wrap_VectorArray_size(arg1)
-}
-
-func _swig_wrap_VectorArray_get(SwigcptrVectorArray, int) SwigcptrVector
-
-func (arg1 SwigcptrVectorArray) Get(arg2 int) Vector {
-	return _swig_wrap_VectorArray_get(arg1, arg2)
-}
-
-func _swig_wrap_VectorArray_set(SwigcptrVectorArray, int, uintptr)
-
-func (arg1 SwigcptrVectorArray) Set(arg2 int, arg3 Vector) {
-	_swig_wrap_VectorArray_set(arg1, arg2, arg3.Swigcptr())
-}
-
-type VectorArray interface {
-	Swigcptr() uintptr
-	SwigIsVectorArray()
-	Size() int
-	Get(arg2 int) Vector
-	Set(arg2 int, arg3 Vector)
-}
-
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/simple/example.go b/Examples/go/simple/example.go
deleted file mode 100644
index df0e70564..000000000
--- a/Examples/go/simple/example.go
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func Gcd(int, int) int
-func _swig_wrap_Foo_set(float64)
-
-func SetFoo(arg1 float64) {
-	_swig_wrap_Foo_set(arg1)
-}
-
-func GetFoo() float64
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/template/example.go b/Examples/go/template/example.go
deleted file mode 100644
index 671b5c2ba..000000000
--- a/Examples/go/template/example.go
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func Maxint(int, int) int
-func Maxdouble(float64, float64) float64
-type SwigcptrVecint uintptr
-
-func (p SwigcptrVecint) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrVecint) SwigIsVecint() {
-}
-
-func _swig_wrap_new_vecint(int) SwigcptrVecint
-
-func NewVecint(arg1 int) Vecint {
-	return _swig_wrap_new_vecint(arg1)
-}
-
-func _swig_wrap_vecint_get(SwigcptrVecint, int) *int
-
-func (arg1 SwigcptrVecint) Get(arg2 int) *int {
-	return _swig_wrap_vecint_get(arg1, arg2)
-}
-
-func _swig_wrap_vecint_set(SwigcptrVecint, int, *int)
-
-func (arg1 SwigcptrVecint) Set(arg2 int, arg3 *int) {
-	_swig_wrap_vecint_set(arg1, arg2, arg3)
-}
-
-func _swig_wrap_vecint_getitem(SwigcptrVecint, int) int
-
-func (arg1 SwigcptrVecint) Getitem(arg2 int) int {
-	return _swig_wrap_vecint_getitem(arg1, arg2)
-}
-
-func _swig_wrap_vecint_setitem(SwigcptrVecint, int, int)
-
-func (arg1 SwigcptrVecint) Setitem(arg2 int, arg3 int) {
-	_swig_wrap_vecint_setitem(arg1, arg2, arg3)
-}
-
-func _swig_wrap_delete_vecint(uintptr)
-
-func DeleteVecint(arg1 Vecint) {
-	_swig_wrap_delete_vecint(arg1.Swigcptr())
-}
-
-type Vecint interface {
-	Swigcptr() uintptr
-	SwigIsVecint()
-	Get(arg2 int) *int
-	Set(arg2 int, arg3 *int)
-	Getitem(arg2 int) int
-	Setitem(arg2 int, arg3 int)
-}
-
-type SwigcptrVecdouble uintptr
-
-func (p SwigcptrVecdouble) Swigcptr() uintptr {
-	return (uintptr)(p)
-}
-
-func (p SwigcptrVecdouble) SwigIsVecdouble() {
-}
-
-func _swig_wrap_new_vecdouble(int) SwigcptrVecdouble
-
-func NewVecdouble(arg1 int) Vecdouble {
-	return _swig_wrap_new_vecdouble(arg1)
-}
-
-func _swig_wrap_vecdouble_get(SwigcptrVecdouble, int) *float64
-
-func (arg1 SwigcptrVecdouble) Get(arg2 int) *float64 {
-	return _swig_wrap_vecdouble_get(arg1, arg2)
-}
-
-func _swig_wrap_vecdouble_set(SwigcptrVecdouble, int, *float64)
-
-func (arg1 SwigcptrVecdouble) Set(arg2 int, arg3 *float64) {
-	_swig_wrap_vecdouble_set(arg1, arg2, arg3)
-}
-
-func _swig_wrap_vecdouble_getitem(SwigcptrVecdouble, int) float64
-
-func (arg1 SwigcptrVecdouble) Getitem(arg2 int) float64 {
-	return _swig_wrap_vecdouble_getitem(arg1, arg2)
-}
-
-func _swig_wrap_vecdouble_setitem(SwigcptrVecdouble, int, float64)
-
-func (arg1 SwigcptrVecdouble) Setitem(arg2 int, arg3 float64) {
-	_swig_wrap_vecdouble_setitem(arg1, arg2, arg3)
-}
-
-func _swig_wrap_delete_vecdouble(uintptr)
-
-func DeleteVecdouble(arg1 Vecdouble) {
-	_swig_wrap_delete_vecdouble(arg1.Swigcptr())
-}
-
-type Vecdouble interface {
-	Swigcptr() uintptr
-	SwigIsVecdouble()
-	Get(arg2 int) *float64
-	Set(arg2 int, arg3 *float64)
-	Getitem(arg2 int) float64
-	Setitem(arg2 int, arg3 float64)
-}
-
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/go/variables/example.go b/Examples/go/variables/example.go
deleted file mode 100644
index f4f299b73..000000000
--- a/Examples/go/variables/example.go
+++ /dev/null
@@ -1,198 +0,0 @@
-/* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.1
- * 
- * This file is not intended to be easily readable and contains a number of 
- * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
- * ----------------------------------------------------------------------------- */
-
-package example
-
-
-type _swig_fnptr *byte
-type _swig_memberptr *byte
-
-
-func _swig_allocatememory(int) *byte
-func _swig_internal_allocate(len int) *byte {
-	return _swig_allocatememory(len)
-}
-
-func _swig_allocatestring(*byte, int) string
-func _swig_internal_makegostring(p *byte, l int) string {
-	return _swig_allocatestring(p, l)
-}
-
-func _swig_internal_gopanic(p *byte, l int) {
-	panic(_swig_allocatestring(p, l))
-}
-
-func _swig_wrap_ivar_set(int)
-
-func SetIvar(arg1 int) {
-	_swig_wrap_ivar_set(arg1)
-}
-
-func GetIvar() int
-func _swig_wrap_svar_set(int16)
-
-func SetSvar(arg1 int16) {
-	_swig_wrap_svar_set(arg1)
-}
-
-func GetSvar() int16
-func _swig_wrap_lvar_set(int32)
-
-func SetLvar(arg1 int32) {
-	_swig_wrap_lvar_set(arg1)
-}
-
-func GetLvar() int32
-func _swig_wrap_uivar_set(uint)
-
-func SetUivar(arg1 uint) {
-	_swig_wrap_uivar_set(arg1)
-}
-
-func GetUivar() uint
-func _swig_wrap_usvar_set(uint16)
-
-func SetUsvar(arg1 uint16) {
-	_swig_wrap_usvar_set(arg1)
-}
-
-func GetUsvar() uint16
-func _swig_wrap_ulvar_set(uint32)
-
-func SetUlvar(arg1 uint32) {
-	_swig_wrap_ulvar_set(arg1)
-}
-
-func GetUlvar() uint32
-func _swig_wrap_scvar_set(int8)
-
-func SetScvar(arg1 int8) {
-	_swig_wrap_scvar_set(arg1)
-}
-
-func GetScvar() int8
-func _swig_wrap_ucvar_set(byte)
-
-func SetUcvar(arg1 byte) {
-	_swig_wrap_ucvar_set(arg1)
-}
-
-func GetUcvar() byte
-func _swig_wrap_cvar_set(byte)
-
-func SetCvar(arg1 byte) {
-	_swig_wrap_cvar_set(arg1)
-}
-
-func GetCvar() byte
-func _swig_wrap_fvar_set(float32)
-
-func SetFvar(arg1 float32) {
-	_swig_wrap_fvar_set(arg1)
-}
-
-func GetFvar() float32
-func _swig_wrap_dvar_set(float64)
-
-func SetDvar(arg1 float64) {
-	_swig_wrap_dvar_set(arg1)
-}
-
-func GetDvar() float64
-func _swig_wrap_strvar_set(string)
-
-func SetStrvar(arg1 string) {
-	_swig_wrap_strvar_set(arg1)
-}
-
-func GetStrvar() string
-func GetCstrvar() string
-func _swig_wrap_iptrvar_set(*int)
-
-func SetIptrvar(arg1 *int) {
-	_swig_wrap_iptrvar_set(arg1)
-}
-
-func GetIptrvar() *int
-func _swig_wrap_name_set(string)
-
-func SetName(arg1 string) {
-	_swig_wrap_name_set(arg1)
-}
-
-func GetName() string
-func _swig_wrap_ptptr_set(uintptr)
-
-func SetPtptr(arg1 Point) {
-	_swig_wrap_ptptr_set(arg1.Swigcptr())
-}
-
-func _swig_wrap_ptptr_get() SwigcptrPoint
-
-func GetPtptr() Point {
-	return _swig_wrap_ptptr_get()
-}
-
-func _swig_wrap_pt_set(uintptr)
-
-func SetPt(arg1 Point) {
-	_swig_wrap_pt_set(arg1.Swigcptr())
-}
-
-func _swig_wrap_pt_get() SwigcptrPoint
-
-func GetPt() Point {
-	return _swig_wrap_pt_get()
-}
-
-func GetStatus() int
-func GetPath() string
-func _swig_wrap_print_vars()
-
-func Print_vars() {
-	_swig_wrap_print_vars()
-}
-
-func New_int(int) *int
-func _swig_wrap_new_Point(int, int) SwigcptrPoint
-
-func New_Point(arg1 int, arg2 int) Point {
-	return _swig_wrap_new_Point(arg1, arg2)
-}
-
-func _swig_wrap_Point_print(uintptr) string
-
-func Point_print(arg1 Point) string {
-	return _swig_wrap_Point_print(arg1.Swigcptr())
-}
-
-func _swig_wrap_pt_print()
-
-func Pt_print() {
-	_swig_wrap_pt_print()
-}
-
-
-type SwigcptrPoint uintptr
-type Point interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrPoint) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
-type SwigcptrVoid uintptr
-type Void interface {
-	Swigcptr() uintptr;
-}
-func (p SwigcptrVoid) Swigcptr() uintptr {
-	return uintptr(p)
-}
-
diff --git a/Examples/ocaml/argout_ref/example.i b/Examples/ocaml/argout_ref/example.i
index a0be05f24..5ea6777fb 100644
--- a/Examples/ocaml/argout_ref/example.i
+++ b/Examples/ocaml/argout_ref/example.i
@@ -1,4 +1,8 @@
 /* File : example.i */
 %module example
 
+%{
+extern "C" void   factor(int &x, int &y);
+%}
+
 extern "C" void   factor(int &x, int &y);
diff --git a/Examples/ocaml/shapes/example.c b/Examples/ocaml/shapes/example.c
index bf0fff937..26c1b8098 100644
--- a/Examples/ocaml/shapes/example.c
+++ b/Examples/ocaml/shapes/example.c
@@ -46,3 +46,5 @@ void draw_depth_map( volume *v, int div_x, int div_y ) {
 }
 
 double volume::depth( double x, double y ) { return 0.0; }
+
+volume::~volume() { }
diff --git a/Examples/ocaml/shapes/example.h b/Examples/ocaml/shapes/example.h
index 4b1644494..68cb6ee3e 100644
--- a/Examples/ocaml/shapes/example.h
+++ b/Examples/ocaml/shapes/example.h
@@ -9,7 +9,8 @@ public:
 
 class volume {
 public:
-    virtual double depth( double x, double y );
+  virtual double depth( double x, double y );
+  virtual ~volume();
 };
 
 extern void draw_shape_coverage( shape *s, int div_x, int div_y );
diff --git a/Examples/ocaml/std_string/README b/Examples/ocaml/std_string/README
index 566553083..ccebecbaf 100644
--- a/Examples/ocaml/std_string/README
+++ b/Examples/ocaml/std_string/README
@@ -1,3 +1,9 @@
+--- New --- 
+
+It's not possible to access std::(w)string at the moment as it breaks other string examples. 
+
+--- Old ---
+
 This example shows how to use both std::string and std::wstring in Ocaml,
 and also demonstrates that one might use this to make a locale-obedient
 Ocaml program.
diff --git a/Examples/ocaml/strings_test/example.h b/Examples/ocaml/strings_test/example.h
index 3417981f0..959404b5d 100644
--- a/Examples/ocaml/strings_test/example.h
+++ b/Examples/ocaml/strings_test/example.h
@@ -1,14 +1,18 @@
 /* -*- mode: c++ -*- */
 /* File : example.h -- Tests all string typemaps */
 
+#include 
+#include 
+
 void takes_std_string( std::string in ) {
     cout << "takes_std_string( \"" << in << "\" );" << endl;
 }
 
 std::string gives_std_string() {
-    time_t t;
-    
-    return std::string( asctime( localtime( &t ) ) );
+    struct timeval tv;
+
+    gettimeofday(&tv, NULL);
+    return std::string( asctime( localtime( &tv.tv_sec ) ) );
 }
 
 void takes_char_ptr( char *p ) {
@@ -24,10 +28,10 @@ void takes_and_gives_std_string( std::string &inout ) {
     inout.insert( inout.end(), ']' );
 }
 
-void takes_and_gives_char_ptr( char *&ptr ) {
-    char *pout = strchr( ptr, '.' );
-    if( pout ) ptr = pout + 1;
-    else ptr = "foo";
+void takes_and_gives_char_ptr( char *&inout ) {
+    char *pout = strchr( inout, '.' );
+    if( pout ) inout = pout + 1;
+    else inout = "foo";
 }
 
 /*
diff --git a/Examples/php/overloading/runme.php b/Examples/php/overloading/runme.php
index 01044445f..56d515138 100644
--- a/Examples/php/overloading/runme.php
+++ b/Examples/php/overloading/runme.php
@@ -35,11 +35,10 @@ print "    Square = (" . $s->x . "," . $s->y . ")\n";
 
 # ----- Call some methods -----
 
-print "\nHere are some properties of the shapes:\n";
+print "\nCall some overloaded methods:\n";
 foreach (array(1, 2.1, "quick brown fox", $c, $s) as $o) {
-      print "    ".get_class($o)." \$o\n";
-      print "        overloaded = " .  overloaded($o) . "\n";
-  }
+  print "        overloaded = " .  overloaded($o) . "\n";
+}
 
 # Need to unset($o) or else we hang on to a reference to the Square object.
 unset($o);
diff --git a/Examples/python/performance/Makefile b/Examples/python/performance/Makefile
new file mode 100644
index 000000000..c580801b4
--- /dev/null
+++ b/Examples/python/performance/Makefile
@@ -0,0 +1,37 @@
+ifeq (,$(PY3))
+  PYSCRIPT = runme.py
+else
+  PYSCRIPT = runme3.py
+endif
+
+default : all
+
+include ../../Makefile
+
+SUBDIRS := constructor func hierarchy operator hierarchy_operator
+
+.PHONY : all $(SUBDIRS)
+
+all : $(SUBDIRS:%=%-build)
+	@for subdir in $(SUBDIRS); do \
+		echo Running $$subdir test... ; \
+		echo -------------------------------------------------------------------------------- ; \
+		cd $$subdir; \
+		env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT); \
+		cd ..; \
+	done
+
+$(SUBDIRS) :
+	$(MAKE) -C $@
+	@echo Running $$subdir test...
+	@echo --------------------------------------------------------------------------------
+	cd $@ && env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=$(srcdir):$$PYTHONPATH $(PYTHON) $(PYSCRIPT)
+
+%-build :
+	$(MAKE) -C $*
+
+%-clean :
+	$(MAKE) -s -C $* clean
+
+clean : $(SUBDIRS:%=%-clean)
+	rm -f *.pyc
diff --git a/Examples/python/performance/constructor/Makefile b/Examples/python/performance/constructor/Makefile
new file mode 100644
index 000000000..48449875c
--- /dev/null
+++ b/Examples/python/performance/constructor/Makefile
@@ -0,0 +1,21 @@
+TOP        = ../../..
+SWIG       = $(TOP)/../preinst-swig
+CXXSRCS       =
+TARGET     = Simple
+INTERFACE  = Simple.i
+
+all :
+	$(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' \
+	TARGET='$(TARGET)_optimized' INTERFACE='$(INTERFACE)' python_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
+	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
+
+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
diff --git a/Examples/python/performance/constructor/Simple.i b/Examples/python/performance/constructor/Simple.i
new file mode 100644
index 000000000..d642d15bf
--- /dev/null
+++ b/Examples/python/performance/constructor/Simple.i
@@ -0,0 +1,8 @@
+%inline %{
+class MyClass {
+public:
+    MyClass () {}
+    ~MyClass () {}
+    void func () {}
+};
+%}
diff --git a/Examples/python/performance/constructor/runme.py b/Examples/python/performance/constructor/runme.py
new file mode 100644
index 000000000..23577a14d
--- /dev/null
+++ b/Examples/python/performance/constructor/runme.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env
+
+import sys
+sys.path.append('..')
+import harness
+
+def proc (mod) :
+    for i in range(1000000) :
+        x = mod.MyClass()
+
+harness.run(proc)
diff --git a/Examples/python/performance/func/Makefile b/Examples/python/performance/func/Makefile
new file mode 100644
index 000000000..0df09d908
--- /dev/null
+++ b/Examples/python/performance/func/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../..
+SWIG       = $(TOP)/../preinst-swig
+CXXSRCS       =
+TARGET     = Simple
+INTERFACE  = Simple.i
+
+default : all
+
+all :
+	$(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' \
+	TARGET='$(TARGET)_optimized' INTERFACE='$(INTERFACE)' python_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
+	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
+
+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
diff --git a/Examples/python/performance/func/Simple.i b/Examples/python/performance/func/Simple.i
new file mode 100644
index 000000000..d642d15bf
--- /dev/null
+++ b/Examples/python/performance/func/Simple.i
@@ -0,0 +1,8 @@
+%inline %{
+class MyClass {
+public:
+    MyClass () {}
+    ~MyClass () {}
+    void func () {}
+};
+%}
diff --git a/Examples/python/performance/func/runme.py b/Examples/python/performance/func/runme.py
new file mode 100644
index 000000000..fd2fb175b
--- /dev/null
+++ b/Examples/python/performance/func/runme.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env
+
+import sys
+sys.path.append('..')
+import harness
+
+def proc (mod) :
+    x = mod.MyClass()
+    for i in range(10000000) :
+        x.func()
+
+harness.run(proc)
diff --git a/Examples/python/performance/harness.py b/Examples/python/performance/harness.py
new file mode 100644
index 000000000..8e9b6041b
--- /dev/null
+++ b/Examples/python/performance/harness.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env
+
+import sys
+import time
+import imp
+from subprocess import *
+
+def run (proc) :
+
+    try :
+        mod = imp.find_module(sys.argv[1])
+        mod = imp.load_module(sys.argv[1], *mod)
+
+        t1 = time.clock()
+        proc(mod)
+        t2 = time.clock()
+        print "%s took %f seconds" % (mod.__name__, t2 - t1)
+
+    except IndexError :
+        proc = Popen([sys.executable, 'runme.py', 'Simple_baseline'], stdout=PIPE)
+        (stdout, stderr) = proc.communicate()
+        print stdout
+
+        proc = Popen([sys.executable, 'runme.py', 'Simple_optimized'], stdout=PIPE)
+        (stdout, stderr) = proc.communicate()
+        print stdout
+
+        proc = Popen([sys.executable, 'runme.py', 'Simple_builtin'], stdout=PIPE)
+        (stdout, stderr) = proc.communicate()
+        print stdout
diff --git a/Examples/python/performance/hierarchy/Makefile b/Examples/python/performance/hierarchy/Makefile
new file mode 100644
index 000000000..0df09d908
--- /dev/null
+++ b/Examples/python/performance/hierarchy/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../..
+SWIG       = $(TOP)/../preinst-swig
+CXXSRCS       =
+TARGET     = Simple
+INTERFACE  = Simple.i
+
+default : all
+
+all :
+	$(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' \
+	TARGET='$(TARGET)_optimized' INTERFACE='$(INTERFACE)' python_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
+	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
+
+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
diff --git a/Examples/python/performance/hierarchy/Simple.i b/Examples/python/performance/hierarchy/Simple.i
new file mode 100644
index 000000000..b4f43ec3e
--- /dev/null
+++ b/Examples/python/performance/hierarchy/Simple.i
@@ -0,0 +1,52 @@
+%inline %{
+
+class A {
+public:
+    A () {}
+    ~A () {}
+    void func () {}
+};
+
+class B : public A {
+public:
+    B () {}
+    ~B () {}
+};
+
+class C : public B {
+public:
+    C () {}
+    ~C () {}
+};
+
+class D : public C {
+public:
+    D () {}
+    ~D () {}
+};
+
+class E : public D {
+public:
+    E () {}
+    ~E () {}
+};
+
+class F : public E {
+public:
+    F () {}
+    ~F () {}
+};
+
+class G : public F {
+public:
+    G () {}
+    ~G () {}
+};
+
+class H : public G {
+public:
+    H () {}
+    ~H () {}
+};
+
+%}
diff --git a/Examples/python/performance/hierarchy/runme.py b/Examples/python/performance/hierarchy/runme.py
new file mode 100644
index 000000000..8a57da05e
--- /dev/null
+++ b/Examples/python/performance/hierarchy/runme.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env
+
+import sys
+sys.path.append('..')
+import harness
+
+def proc (mod) :
+    x = mod.H()
+    for i in range(10000000) :
+        x.func()
+
+harness.run(proc)
diff --git a/Examples/python/performance/hierarchy_operator/Makefile b/Examples/python/performance/hierarchy_operator/Makefile
new file mode 100644
index 000000000..0df09d908
--- /dev/null
+++ b/Examples/python/performance/hierarchy_operator/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../..
+SWIG       = $(TOP)/../preinst-swig
+CXXSRCS       =
+TARGET     = Simple
+INTERFACE  = Simple.i
+
+default : all
+
+all :
+	$(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' \
+	TARGET='$(TARGET)_optimized' INTERFACE='$(INTERFACE)' python_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
+	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
+
+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
diff --git a/Examples/python/performance/hierarchy_operator/Simple.i b/Examples/python/performance/hierarchy_operator/Simple.i
new file mode 100644
index 000000000..b26bcf31d
--- /dev/null
+++ b/Examples/python/performance/hierarchy_operator/Simple.i
@@ -0,0 +1,53 @@
+%inline %{
+
+class A {
+public:
+    A () {}
+    ~A () {}
+    void func () {}
+    A& operator+= (int i) { return *this; }
+};
+
+class B : public A {
+public:
+    B () {}
+    ~B () {}
+};
+
+class C : public B {
+public:
+    C () {}
+    ~C () {}
+};
+
+class D : public C {
+public:
+    D () {}
+    ~D () {}
+};
+
+class E : public D {
+public:
+    E () {}
+    ~E () {}
+};
+
+class F : public E {
+public:
+    F () {}
+    ~F () {}
+};
+
+class G : public F {
+public:
+    G () {}
+    ~G () {}
+};
+
+class H : public G {
+public:
+    H () {}
+    ~H () {}
+};
+
+%}
diff --git a/Examples/python/performance/hierarchy_operator/runme.py b/Examples/python/performance/hierarchy_operator/runme.py
new file mode 100644
index 000000000..cf200362f
--- /dev/null
+++ b/Examples/python/performance/hierarchy_operator/runme.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env
+
+import sys
+sys.path.append('..')
+import harness
+
+def proc (mod) :
+    x = mod.H()
+    for i in range(10000000) :
+        x += i
+
+harness.run(proc)
diff --git a/Examples/python/performance/operator/Makefile b/Examples/python/performance/operator/Makefile
new file mode 100644
index 000000000..0df09d908
--- /dev/null
+++ b/Examples/python/performance/operator/Makefile
@@ -0,0 +1,23 @@
+TOP        = ../../..
+SWIG       = $(TOP)/../preinst-swig
+CXXSRCS       =
+TARGET     = Simple
+INTERFACE  = Simple.i
+
+default : all
+
+all :
+	$(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' \
+	TARGET='$(TARGET)_optimized' INTERFACE='$(INTERFACE)' python_cpp
+	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG) -builtin -O -module Simple_builtin' \
+	TARGET='$(TARGET)_builtin' INTERFACE='$(INTERFACE)' python_cpp
+
+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
diff --git a/Examples/python/performance/operator/Simple.i b/Examples/python/performance/operator/Simple.i
new file mode 100644
index 000000000..fb0dd992c
--- /dev/null
+++ b/Examples/python/performance/operator/Simple.i
@@ -0,0 +1,8 @@
+%inline %{
+class MyClass {
+public:
+    MyClass () {}
+    ~MyClass () {}
+    MyClass& operator+ (int i) { return *this; }
+};
+%}
diff --git a/Examples/python/performance/operator/runme.py b/Examples/python/performance/operator/runme.py
new file mode 100644
index 000000000..61a0e8edc
--- /dev/null
+++ b/Examples/python/performance/operator/runme.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env
+
+import sys
+sys.path.append('..')
+import harness
+
+def proc (mod) :
+    x = mod.MyClass()
+    for i in range(10000000) :
+        x = x + i
+
+harness.run(proc)
diff --git a/Examples/test-suite/abstract_virtual.i b/Examples/test-suite/abstract_virtual.i
index 2e4d105b1..d8372c936 100644
--- a/Examples/test-suite/abstract_virtual.i
+++ b/Examples/test-suite/abstract_virtual.i
@@ -2,10 +2,12 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, D, Java, PHP multiple inheritance */
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, D, Java, PHP multiple inheritance */
 
 %inline %{
 #if defined(_MSC_VER)
diff --git a/Examples/test-suite/array_typedef_memberin.i b/Examples/test-suite/array_typedef_memberin.i
index 3a0cf2522..ed49543a3 100644
--- a/Examples/test-suite/array_typedef_memberin.i
+++ b/Examples/test-suite/array_typedef_memberin.i
@@ -1,12 +1,43 @@
 %module array_typedef_memberin
 %inline %{ 
-typedef short arr_short8[8]; 
+typedef short Eight[8]; 
+typedef const short ConstEight[8]; 
 namespace ArrayExample 
 { 
     class ExampleDetail 
     { 
     public: 
-        arr_short8 node_list; 
-     }; 
+        Eight node_list; 
+#ifndef _MSC_VER
+        const Eight node_list2; 
+        ConstEight node_list3; 
+#else
+        Eight node_list2; 
+        Eight node_list3; 
+#endif
+
+        void fn1(Eight a) {}
+        void fn2(const Eight a) {}
+        void fn3(ConstEight a) {}
+
+        void fn4(Eight* a) {}
+        void fn5(ConstEight* a) {}
+        void fn6(const ConstEight* a) {}
+
+        void fn7(Eight*& a) {}
+        void fn8(ConstEight*& a) {}
+        void fn9(const ConstEight*& a) {}
+    };
 } 
+
+typedef int Four[4];
+typedef const int ConstFour[4];
+
+void test_1(int (*v)[4]) {}
+void test_2(Four *v) {}
+void test_3(const Four *v) {}
+void test_4(ConstFour *v) {}
+void test_5(const int (*v)[4]) {}
+void test_3r(const Four *&v) {}
+void test_4r(ConstFour *&v) {}
 %} 
diff --git a/Examples/test-suite/char_binary.i b/Examples/test-suite/char_binary.i
new file mode 100644
index 000000000..778792946
--- /dev/null
+++ b/Examples/test-suite/char_binary.i
@@ -0,0 +1,29 @@
+/*
+A test case for testing non null terminated char pointers.
+*/
+
+%module char_binary
+
+%apply (char *STRING, size_t LENGTH) { (const char *str, size_t len) }
+
+%inline %{
+struct Test {
+  size_t strlen(const char *str, size_t len) {
+    return len;
+  }
+};
+
+typedef char namet[5];
+namet var_namet;
+
+typedef char* pchar;
+pchar var_pchar;
+%}
+
+// Remove string handling typemaps and treat as pointer
+%typemap(freearg) SWIGTYPE * ""
+%apply SWIGTYPE * { char * }
+
+%include "carrays.i"
+%array_functions(char, pchar);
+
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 02548747c..107d99dfb 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -148,12 +148,14 @@ CPP_TEST_CASES += \
 	cpp_static \
 	cpp_typedef \
 	default_args \
+	default_arg_values \
 	default_constructor \
 	defvalue_constructor \
 	derived_byvalue \
 	derived_nested \
 	destructor_reprotected \
 	director_abstract \
+	director_alternating \
 	director_basic \
 	director_classes \
 	director_classic \
@@ -166,6 +168,7 @@ CPP_TEST_CASES += \
 	director_finalizer \
 	director_frob \
 	director_ignore \
+	director_keywords \
 	director_namespace_clash \
 	director_nested \
 	director_overload \
@@ -228,9 +231,11 @@ CPP_TEST_CASES += \
 	li_cpointer \
 	li_stdint \
 	li_typemaps \
+	li_typemaps_apply \
 	li_windows \
 	long_long_apply \
 	memberin_extend \
+	member_funcptr_galore \
 	member_pointer \
 	member_template \
 	minherit \
@@ -259,11 +264,13 @@ CPP_TEST_CASES += \
 	null_pointer \
 	operator_overload \
 	operator_overload_break \
+	operator_pointer_ref \
         operbool \
 	ordering \
 	overload_copy \
 	overload_extend \
 	overload_rename \
+	overload_return_type \
 	overload_simple \
 	overload_subtype \
 	overload_template \
@@ -283,6 +290,7 @@ CPP_TEST_CASES += \
 	rename3 \
 	rename4 \
 	rename_scope \
+	rename_simple \
 	rename_strip_encoder \
 	rename_pcre_encoder \
 	rename_pcre_enum \
@@ -307,6 +315,7 @@ CPP_TEST_CASES += \
 	smart_pointer_rename \
 	smart_pointer_simple \
 	smart_pointer_static \
+	smart_pointer_template_const_overload \
 	smart_pointer_templatemethods \
 	smart_pointer_templatevariables \
 	smart_pointer_typedef \
@@ -318,11 +327,11 @@ CPP_TEST_CASES += \
 	struct_initialization_cpp \
 	struct_value \
 	symbol_clash \
-	template \
 	template_arg_replace \
 	template_arg_scope \
 	template_arg_typename \
 	template_array_numeric \
+	template_basic \
 	template_base_template \
 	template_classes \
 	template_const_ref \
@@ -396,6 +405,7 @@ CPP_TEST_CASES += \
 	typedef_scope \
 	typedef_sizet \
 	typedef_struct \
+	typemap_arrays \
 	typemap_delete \
 	typemap_global_scope \
 	typemap_namespace \
@@ -415,6 +425,7 @@ CPP_TEST_CASES += \
 	using_extend \
 	using_inherit \
 	using_namespace \
+	using_namespace_loop \
 	using_pointers \
 	using_private \
 	using_protected \
@@ -423,6 +434,7 @@ CPP_TEST_CASES += \
 	valuewrapper_const \
 	valuewrapper_opaque \
 	varargs \
+	varargs_overload \
 	virtual_destructor \
 	virtual_poly \
 	voidtest \
@@ -466,7 +478,7 @@ C_TEST_CASES += \
 	extern_declaration \
 	funcptr \
 	function_typedef \
-	immutable \
+	immutable_values \
 	inctest \
 	integers \
         keyword_rename \
@@ -487,6 +499,8 @@ C_TEST_CASES += \
 	overload_extendc \
 	preproc \
 	preproc_constants_c \
+	preproc_defined \
+	preproc_include \
 	preproc_line_file \
 	ret_by_value \
 	simple_array \
@@ -504,6 +518,7 @@ C_TEST_CASES += \
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
 	imports \
+	import_stl \
 	packageoption \
 	mod \
 	template_typedef_import \
@@ -511,6 +526,7 @@ MULTI_CPP_TEST_CASES += \
 
 # Custom tests - tests with additional commandline options
 wallkw.cpptest: SWIGOPT += -Wallkw
+preproc_include.ctest: SWIGOPT += -includeall
 
 
 NOT_BROKEN_TEST_CASES =	$(CPP_TEST_CASES:=.cpptest) \
diff --git a/Examples/test-suite/contract.i b/Examples/test-suite/contract.i
index b979ef19e..0ad7e8e7c 100644
--- a/Examples/test-suite/contract.i
+++ b/Examples/test-suite/contract.i
@@ -3,12 +3,17 @@
 %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, D, Java, PHP multiple inheritance */
 
 #ifdef SWIGCSHARP
 %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override
 #endif
 
+#ifdef SWIGD
+%ignore B::bar; // Prevents getting an error that C.bar does not override any function because multiple inheritance is not supported.
+#endif
+
 %contract test_preassert(int a, int b) {
 require:
 	a > 0;
diff --git a/Examples/test-suite/cpp_basic.i b/Examples/test-suite/cpp_basic.i
index a247dd268..bd1ec453a 100644
--- a/Examples/test-suite/cpp_basic.i
+++ b/Examples/test-suite/cpp_basic.i
@@ -8,6 +8,12 @@
 
 %newobject Bar::testFoo;
 
+%{
+#if defined(__SUNPRO_CC)
+#pragma error_messages (off, wbadasg) /* Assigning extern "C" ... */
+#endif
+%}
+
 %inline %{
 
 class Foo {
diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index 48731f82b..f9a4bd76f 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -5,6 +5,7 @@
 LANGUAGE     = csharp
 SCRIPTSUFFIX = _runme.cs
 INTERPRETER  = @CSHARPCILINTERPRETER@
+INTERPRETER_FLAGS   = @CSHARPCILINTERPRETER_FLAGS@
 CSHARPPATHSEPARATOR = "@CSHARPPATHSEPARATOR@"
 CSHARPCYGPATH_W     = @CSHARPCYGPATH_W@
 srcdir       = @srcdir@
@@ -64,16 +65,17 @@ setup = \
 # Compiles C# files then runs the testcase. A testcase is only run if
 # a file is found which has _runme.cs appended after the testcase name.
 # Note C# uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows and SHLIB_PATH on HPUX.
+# DYLD_FALLBACK_LIBRARY_PATH is cleared for MacOSX.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
-	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
+	  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" $(RUNTOOL) $(INTERPRETER) $*_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 \
-	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \
+	  CSHARPFLAGS='-nologo -debug+ $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \
 	  CSHARPSRCS='`find . -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile; \
 	fi
 
diff --git a/Examples/test-suite/csharp/csharp_prepost_runme.cs b/Examples/test-suite/csharp/csharp_prepost_runme.cs
index d0bacdaba..f76dae38e 100644
--- a/Examples/test-suite/csharp/csharp_prepost_runme.cs
+++ b/Examples/test-suite/csharp/csharp_prepost_runme.cs
@@ -55,6 +55,43 @@ public class csharp_prepost_runme {
           throw new Exception("Expecting CustomInt attribute");
       }
     }
+    // Dates
+    {
+      // pre post typemap attributes example
+      System.DateTime dateIn = new System.DateTime(2011, 4, 13);
+      System.DateTime dateOut = new System.DateTime();
+
+      // Note in calls below, dateIn remains unchanged and dateOut 
+      // is set to a new value by the C++ call
+      csharp_prepostNamespace.Action action = new csharp_prepostNamespace.Action(dateIn, out dateOut);
+      if (dateOut != dateIn)
+        throw new Exception("dates wrong");
+
+      dateIn = new System.DateTime(2012, 7, 14);
+      action.doSomething(dateIn, out dateOut);
+      if (dateOut != dateIn)
+        throw new Exception("dates wrong");
+
+      System.DateTime refDate = new System.DateTime(1999, 12, 31);
+      if (csharp_prepost.ImportantDate != refDate)
+        throw new Exception("dates wrong");
+
+      refDate = new System.DateTime(1999, 12, 31);
+      csharp_prepost.ImportantDate = refDate;
+      System.DateTime importantDate = csharp_prepost.ImportantDate;
+      if (importantDate != refDate)
+        throw new Exception("dates wrong");
+
+      System.DateTime christmasEve = new System.DateTime(2000, 12, 24);
+      csharp_prepost.addYears(ref christmasEve, 10);
+      if (christmasEve != new System.DateTime(2010, 12, 24))
+        throw new Exception("dates wrong");
+
+      Person person = new Person();
+      person.Birthday = christmasEve;
+      if (person.Birthday != christmasEve)
+        throw new Exception("dates wrong");
+    }
   }
   private static void Assert(double d1, double d2) {
     if (d1 != d2)
diff --git a/Examples/test-suite/csharp/director_alternating_runme.cs b/Examples/test-suite/csharp/director_alternating_runme.cs
new file mode 100644
index 000000000..19365217a
--- /dev/null
+++ b/Examples/test-suite/csharp/director_alternating_runme.cs
@@ -0,0 +1,11 @@
+
+using System;
+using director_alternatingNamespace;
+
+public class director_alternating_runme {
+  public static void Main() {
+   if (director_alternating.getBar().id() != director_alternating.idFromGetBar())
+     throw new Exception("idFromGetBar failed");
+  }
+}
+
diff --git a/Examples/test-suite/csharp/director_protected_runme.cs b/Examples/test-suite/csharp/director_protected_runme.cs
index ee4697b0e..b44c3b7e9 100644
--- a/Examples/test-suite/csharp/director_protected_runme.cs
+++ b/Examples/test-suite/csharp/director_protected_runme.cs
@@ -16,6 +16,7 @@ public class runme
     Foo f = b.create();
     FooBar fb = new FooBar();
     FooBar2 fb2 = new FooBar2();
+    FooBar3 fb3 = new FooBar3();
 
     String s;
     s = fb.used();
@@ -37,6 +38,21 @@ public class runme
     s = fb.pong();
     if ( s != ("Bar::pong();Foo::pong();FooBar::ping();"))
       throw new Exception("bad FooBar::pong");
+
+//    if (fb3.cheer() != "FooBar3::cheer();")
+//      throw new Exception("bad fb3::cheer");
+
+    if (fb2.callping() != "FooBar2::ping();")
+      throw new Exception("bad fb2.callping");
+
+    if (fb2.callcheer() != "FooBar2::pang();Bar::pong();Foo::pong();FooBar2::ping();")
+      throw new Exception("bad fb2.callcheer");
+
+    if (fb3.callping() != "Bar::ping();")
+      throw new Exception("bad fb3.callping");
+
+    if (fb3.callcheer() != "FooBar3::cheer();")
+      throw new Exception("bad fb3.callcheer");
   }
 }
 
@@ -69,4 +85,16 @@ class FooBar2 : Bar
   }
 }
 
+class FooBar3 : Bar
+{
+  public FooBar3() : base()
+  {
+  }
+
+  protected override String cheer()
+  {
+    return "FooBar3::cheer();";
+  }
+}
+
 }
diff --git a/Examples/test-suite/csharp/enum_thorough_runme.cs b/Examples/test-suite/csharp/enum_thorough_runme.cs
index 144736f2b..854c8dbb5 100644
--- a/Examples/test-suite/csharp/enum_thorough_runme.cs
+++ b/Examples/test-suite/csharp/enum_thorough_runme.cs
@@ -405,6 +405,28 @@ public class runme {
       if ((int)enum_thorough.repeatTest(repeat.llast) != 3) throw new Exception("repeatTest 5 failed");
       if ((int)enum_thorough.repeatTest(repeat.end) != 3) throw new Exception("repeatTest 6 failed");
     }
+    // different types
+    {
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typeint) != 10) throw new Exception("differentTypes 1 failed");
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typeboolfalse) != 0) throw new Exception("differentTypes 2 failed");
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typebooltrue) != 1) throw new Exception("differentTypes 3 failed");
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typebooltwo) != 2) throw new Exception("differentTypes 4 failed");
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typechar) != 'C') throw new Exception("differentTypes 5 failed");
+      if ((int)enum_thorough.differentTypesTest(DifferentTypes.typedefaultint) != 'D') throw new Exception("differentTypes 6 failed");
+
+      int global_enum = enum_thorough.global_typeint;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 10) throw new Exception("global differentTypes 1 failed");
+      global_enum = enum_thorough.global_typeboolfalse;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 0) throw new Exception("global differentTypes 2 failed");
+      global_enum = enum_thorough.global_typebooltrue;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 1) throw new Exception("global differentTypes 3 failed");
+      global_enum = enum_thorough.global_typebooltwo;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 2) throw new Exception("global differentTypes 4 failed");
+      global_enum = enum_thorough.global_typechar;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 'C') throw new Exception("global differentTypes 5 failed");
+      global_enum = enum_thorough.global_typedefaultint;
+      if ((int)enum_thorough.globalDifferentTypesTest(global_enum) != 'D') throw new Exception("global differentTypes 6 failed");
+    }
   }
 }
 
diff --git a/Examples/test-suite/csharp/enum_thorough_simple_runme.cs b/Examples/test-suite/csharp/enum_thorough_simple_runme.cs
index d5bba1b7d..0c22d8e3f 100644
--- a/Examples/test-suite/csharp/enum_thorough_simple_runme.cs
+++ b/Examples/test-suite/csharp/enum_thorough_simple_runme.cs
@@ -405,6 +405,28 @@ public class runme {
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.llast) != 3) throw new Exception("repeatTest 5 failed");
       if (enum_thorough_simple.repeatTest(enum_thorough_simple.end) != 3) throw new Exception("repeatTest 6 failed");
     }
+    // different types
+    {
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typeint) != 10) throw new Exception("differentTypes 1 failed");
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typeboolfalse) != 0) throw new Exception("differentTypes 2 failed");
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typebooltrue) != 1) throw new Exception("differentTypes 3 failed");
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typebooltwo) != 2) throw new Exception("differentTypes 4 failed");
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typechar) != 'C') throw new Exception("differentTypes 5 failed");
+      if (enum_thorough_simple.differentTypesTest(enum_thorough_simple.typedefaultint) != 'D') throw new Exception("differentTypes 6 failed");
+
+      int global_enum = enum_thorough_simple.global_typeint;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 10) throw new Exception("global differentTypes 1 failed");
+      global_enum = enum_thorough_simple.global_typeboolfalse;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 0) throw new Exception("global differentTypes 2 failed");
+      global_enum = enum_thorough_simple.global_typebooltrue;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 1) throw new Exception("global differentTypes 3 failed");
+      global_enum = enum_thorough_simple.global_typebooltwo;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 2) throw new Exception("global differentTypes 4 failed");
+      global_enum = enum_thorough_simple.global_typechar;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 'C') throw new Exception("global differentTypes 5 failed");
+      global_enum = enum_thorough_simple.global_typedefaultint;
+      if (enum_thorough_simple.globalDifferentTypesTest(global_enum) != 'D') throw new Exception("global differentTypes 6 failed");
+    }
   }
 }
 
diff --git a/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs b/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs
index 3606d1137..86179dcf4 100644
--- a/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs
+++ b/Examples/test-suite/csharp/enum_thorough_typesafe_runme.cs
@@ -405,6 +405,28 @@ public class runme {
       if (enum_thorough_typesafe.repeatTest(repeat.llast).swigValue != 3) throw new Exception("repeatTest 5 failed");
       if (enum_thorough_typesafe.repeatTest(repeat.end).swigValue != 3) throw new Exception("repeatTest 6 failed");
     }
+    // different types
+    {
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typeint).swigValue != 10) throw new Exception("differentTypes 1 failed");
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typebooltrue).swigValue != 1) throw new Exception("differentTypes 2 failed");
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typebooltwo).swigValue != 2) throw new Exception("differentTypes 3 failed");
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typeboolfalse).swigValue != 0) throw new Exception("differentTypes 4 failed");
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typechar).swigValue != (int)'C') throw new Exception("differentTypes 5 failed");
+      if (enum_thorough_typesafe.differentTypesTest(DifferentTypes.typedefaultint).swigValue != (int)'D') throw new Exception("differentTypes 6 failed");
+
+      int global_enum = enum_thorough_typesafe.global_typeint;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 10) throw new Exception("global differentTypes 1 failed");
+      global_enum = enum_thorough_typesafe.global_typeboolfalse;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 0) throw new Exception("global differentTypes 2 failed");
+      global_enum = enum_thorough_typesafe.global_typebooltrue;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 1) throw new Exception("global differentTypes 3 failed");
+      global_enum = enum_thorough_typesafe.global_typebooltwo;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 2) throw new Exception("global differentTypes 4 failed");
+      global_enum = enum_thorough_typesafe.global_typechar;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 'C') throw new Exception("global differentTypes 5 failed");
+      global_enum = enum_thorough_typesafe.global_typedefaultint;
+      if (enum_thorough_typesafe.globalDifferentTypesTest(global_enum) != 'D') throw new Exception("global differentTypes 6 failed");
+    }
   }
 }
 
diff --git a/Examples/test-suite/csharp/friends_runme.cs b/Examples/test-suite/csharp/friends_runme.cs
new file mode 100644
index 000000000..ae3ffb64f
--- /dev/null
+++ b/Examples/test-suite/csharp/friends_runme.cs
@@ -0,0 +1,43 @@
+using System;
+using friendsNamespace;
+
+public class friends_runme {
+  public static void Main() {
+    A a = new A(2);
+
+    if (friends.get_val1(a) != 2)
+      throw new Exception("failed");
+    if (friends.get_val2(a) != 4)
+      throw new Exception("failed");
+    if (friends.get_val3(a) != 6)
+      throw new Exception("failed");
+
+    // nice overload working fine
+    if (friends.get_val1(1,2,3) != 1)
+      throw new Exception("failed");
+
+    B b = new B(3);
+
+    // David's case
+    if (friends.mix(a,b) != 5)
+      throw new Exception("failed");
+
+    D_d di = new D_d(2);
+    D_d dd = new D_d(3.3);
+
+    // incredible template overloading working just fine
+    if (friends.get_val1(di) != 2)
+      throw new Exception("failed");
+    if (friends.get_val1(dd) != 3.3)
+      throw new Exception("failed");
+
+    friends.set(di, 4);
+    friends.set(dd, 1.3);
+
+    if (friends.get_val1(di) != 4)
+      throw new Exception("failed");
+    if (friends.get_val1(dd) != 1.3)
+      throw new Exception("failed");
+  }
+}
+
diff --git a/Examples/test-suite/csharp/li_std_map_runme.cs b/Examples/test-suite/csharp/li_std_map_runme.cs
index b0a5a78e4..551cf2dc1 100644
--- a/Examples/test-suite/csharp/li_std_map_runme.cs
+++ b/Examples/test-suite/csharp/li_std_map_runme.cs
@@ -68,6 +68,7 @@ public class li_std_map_runme {
         {
             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");
 
@@ -78,6 +79,13 @@ public class li_std_map_runme {
             {
                 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");
             }
         }
 
diff --git a/Examples/test-suite/csharp/nspace_runme.cs b/Examples/test-suite/csharp/nspace_runme.cs
index 9cf593857..fb6462541 100644
--- a/Examples/test-suite/csharp/nspace_runme.cs
+++ b/Examples/test-suite/csharp/nspace_runme.cs
@@ -2,7 +2,7 @@ using System;
 
 public class runme
 {
-    static void Main() 
+    static void Main()
     {
       // constructors and destructors
       nspaceNamespace.Outer.Inner1.Color color1 = new nspaceNamespace.Outer.Inner1.Color();
@@ -62,7 +62,7 @@ public class runme
         throw new ApplicationException("Transmission2 wrong");
 
       // turn feature off / ignoring
-      nspaceNamespace.Outer.nspace ns = new nspaceNamespace.Outer.nspace();
+      nspaceNamespace.Outer.namespce ns = new nspaceNamespace.Outer.namespce();
       ns.Dispose();
       nspaceNamespace.NoNSpacePlease nons = new nspaceNamespace.NoNSpacePlease();
       nons.Dispose();
diff --git a/Examples/test-suite/csharp/pointer_reference_runme.cs b/Examples/test-suite/csharp/pointer_reference_runme.cs
index d00555199..2b9f526af 100644
--- a/Examples/test-suite/csharp/pointer_reference_runme.cs
+++ b/Examples/test-suite/csharp/pointer_reference_runme.cs
@@ -12,6 +12,9 @@ public class pointer_reference_runme {
     Struct ss = new Struct(20);
     pointer_reference.set(ss);
     if (Struct.instance.value != 20) throw new Exception("set test failed");
+
+    if (pointer_reference.overloading(1) != 111) throw new Exception("overload test 1 failed");
+    if (pointer_reference.overloading(ss) != 222) throw new Exception("overload test 2 failed");
   }
 
 }
diff --git a/Examples/test-suite/csharp/rename_pcre_encoder_runme.cs b/Examples/test-suite/csharp/rename_pcre_encoder_runme.cs
new file mode 100644
index 000000000..f6289e7e2
--- /dev/null
+++ b/Examples/test-suite/csharp/rename_pcre_encoder_runme.cs
@@ -0,0 +1,12 @@
+using System;
+using rename_pcre_encoderNamespace;
+
+public class runme {
+  static void Main() {
+    SomeWidget w = new SomeWidget();
+    w.putBorderWidth(17);
+    if ( w.getBorderWidth() != 17 )
+      throw new Exception(String.Format("Border with should be 17, not {0}",
+                                        w.getBorderWidth()));
+  }
+}
diff --git a/Examples/test-suite/csharp/rename_simple_runme.cs b/Examples/test-suite/csharp/rename_simple_runme.cs
new file mode 100644
index 000000000..edf05ad24
--- /dev/null
+++ b/Examples/test-suite/csharp/rename_simple_runme.cs
@@ -0,0 +1,30 @@
+
+using System;
+using rename_simpleNamespace;
+
+public class rename_simple_runme {
+
+  public static void Main() {
+    NewStruct s = new NewStruct();
+    check(111, s.NewInstanceVariable, "NewInstanceVariable");
+    check(222, s.NewInstanceMethod(), "NewInstanceMethod");
+    check(333, NewStruct.NewStaticMethod(), "NewStaticMethod");
+    check(444, NewStruct.NewStaticVariable, "NewStaticVariable");
+    check(555, rename_simple.NewFunction(), "NewFunction");
+    check(666, rename_simple.NewGlobalVariable, "NewGlobalVariable");
+
+    s.NewInstanceVariable = 1111;
+    NewStruct.NewStaticVariable = 4444;
+    rename_simple.NewGlobalVariable = 6666;
+
+    check(1111, s.NewInstanceVariable, "NewInstanceVariable");
+    check(4444, NewStruct.NewStaticVariable, "NewStaticVariable");
+    check(6666, rename_simple.NewGlobalVariable, "NewGlobalVariable");
+  }
+
+  public static void check(int expected, int actual, string msg) {
+    if (expected != actual)
+      throw new Exception("Failed: Expected: " + expected + " actual: " + actual + " " + msg);
+  }
+}
+
diff --git a/Examples/test-suite/csharp_prepost.i b/Examples/test-suite/csharp_prepost.i
index 817f5b9b9..31e6ec753 100644
--- a/Examples/test-suite/csharp_prepost.i
+++ b/Examples/test-suite/csharp_prepost.i
@@ -79,7 +79,7 @@ struct PrePost2 {
 
 // Check attributes in the typemaps
 %typemap(cstype, inattributes="[CustomInt]") int val "int"
-%typemap(csin, pre="    int tmp_$csinput = $csinput * 100;") int "tmp_$csinput"
+%typemap(csin, pre="    int tmp_$csinput = $csinput * 100;") int val "tmp_$csinput"
 %typemap(imtype, out="IntPtr/*overridden*/", outattributes="[CustomIntPtr]") CsinAttributes * "HandleRef/*overridden*/"
 
 %inline %{
@@ -188,5 +188,8 @@ void subtractYears(CDate *pDate, int years) {
 
 %inline %{
 CDate ImportantDate = CDate(1999, 12, 31);
+struct Person {
+  CDate Birthday;
+};
 %}
 
diff --git a/Examples/test-suite/d/Makefile.in b/Examples/test-suite/d/Makefile.in
new file mode 100644
index 000000000..53b9f2859
--- /dev/null
+++ b/Examples/test-suite/d/Makefile.in
@@ -0,0 +1,81 @@
+#######################################################################
+# Makefile for D test-suite
+#######################################################################
+
+LANGUAGE     = d
+srcdir       = @srcdir@
+top_srcdir   = ../@top_srcdir@
+top_builddir = ../@top_builddir@
+
+ifeq (2,$(D_VERSION))
+  VERSIONSUFFIX = .2
+else
+  VERSIONSUFFIX = .1
+endif
+
+TESTSUFFIX = _runme$(VERSIONSUFFIX).d
+
+CPP_TEST_CASES = \
+	d_exception_name \
+	d_nativepointers \
+	exception_partial_info
+
+include $(srcdir)/../common.mk
+
+# Override some variables from common.mk:
+
+TARGETSUFFIX = _wrap
+
+SWIGOPT+=-splitproxy -package $*
+
+# Rules for the different types of tests
+%.cpptest:
+	$(setup)
+	+(cd $*$(VERSIONSUFFIX) && $(swig_and_compile_cpp))
+	+$(run_testcase)
+
+%.ctest:
+	$(setup)
+	+(cd $*$(VERSIONSUFFIX) && $(swig_and_compile_c))
+	+$(run_testcase)
+
+%.multicpptest:
+	$(setup)
+	+(cd $*$(VERSIONSUFFIX) && $(swig_and_compile_multi_cpp))
+	+$(run_testcase)
+
+# Makes a directory for the testcase if it does not exist
+setup = \
+	if [ -f $(srcdir)/$(TESTPREFIX)$*$(TESTSUFFIX) ]; then			\
+	  echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ;	\
+	else									\
+	  echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ;			\
+	fi;									\
+	if [ ! -d $*$(VERSIONSUFFIX) ]; then					\
+	  mkdir $*$(VERSIONSUFFIX);						\
+	fi;									\
+	if [ ! -d $*$(VERSIONSUFFIX)/$* ]; then					\
+	  mkdir $*$(VERSIONSUFFIX)/$*;						\
+	fi
+
+# Compiles D files then runs the testcase. A testcase is only run if
+# a file is found which has _runme.d appended after the testcase name.
+run_testcase = \
+	if [ -f $(srcdir)/$(TESTPREFIX)$*$(TESTSUFFIX) ]; then \
+	  cd $*$(VERSIONSUFFIX) && \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	  DFLAGS='-of$*_runme' \
+	  DSRCS='../$(srcdir)/$(TESTPREFIX)$*$(TESTSUFFIX) `find $* -name *.d`' d_compile && \
+	  env LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" $(RUNTOOL) ./$*_runme; \
+	else \
+	  cd $*$(VERSIONSUFFIX) && \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
+	  DFLAGS='-c' \
+	  DSRCS='`find $* -name *.d`' d_compile && cd .. ; \
+	fi
+
+# Clean: remove testcase directories
+%.clean:
+	@if [ -d $*$(VERSIONSUFFIX) ]; then \
+	  rm -rf $*$(VERSIONSUFFIX); \
+	fi
diff --git a/Examples/test-suite/d/README b/Examples/test-suite/d/README
new file mode 100644
index 000000000..bb5372882
--- /dev/null
+++ b/Examples/test-suite/d/README
@@ -0,0 +1,7 @@
+D language module testsuite
+---------------------------
+
+Please see ../README for the common readme file.
+
+By default the D1 version is built, set D_VERSION=2 (in the environment or at
+the make command line) to run it for D2 instead.
diff --git a/Examples/test-suite/d/aggregate_runme.1.d b/Examples/test-suite/d/aggregate_runme.1.d
new file mode 100644
index 000000000..a00d34c25
--- /dev/null
+++ b/Examples/test-suite/d/aggregate_runme.1.d
@@ -0,0 +1,25 @@
+module aggregate_runme;
+
+import aggregate.aggregate;
+
+void main() {
+  // Confirm that move() returns correct results under normal use.
+  int result = move(UP);
+  if (result != UP) throw new Exception("UP failed");
+
+  result = move(DOWN);
+  if (result != DOWN) throw new Exception("DOWN failed");
+
+  result = move(LEFT);
+  if (result != LEFT) throw new Exception("LEFT failed");
+
+  result = move(RIGHT);
+  if (result != RIGHT) throw new Exception("RIGHT failed");
+
+  // Confirm that move() raises an exception when the contract is violated.
+  try {
+    move(0);
+    throw new Exception("0 test failed");
+  }
+  catch (Exception e) {}
+}
diff --git a/Examples/test-suite/d/aggregate_runme.2.d b/Examples/test-suite/d/aggregate_runme.2.d
new file mode 100644
index 000000000..a00d34c25
--- /dev/null
+++ b/Examples/test-suite/d/aggregate_runme.2.d
@@ -0,0 +1,25 @@
+module aggregate_runme;
+
+import aggregate.aggregate;
+
+void main() {
+  // Confirm that move() returns correct results under normal use.
+  int result = move(UP);
+  if (result != UP) throw new Exception("UP failed");
+
+  result = move(DOWN);
+  if (result != DOWN) throw new Exception("DOWN failed");
+
+  result = move(LEFT);
+  if (result != LEFT) throw new Exception("LEFT failed");
+
+  result = move(RIGHT);
+  if (result != RIGHT) throw new Exception("RIGHT failed");
+
+  // Confirm that move() raises an exception when the contract is violated.
+  try {
+    move(0);
+    throw new Exception("0 test failed");
+  }
+  catch (Exception e) {}
+}
diff --git a/Examples/test-suite/d/allprotected_runme.1.d b/Examples/test-suite/d/allprotected_runme.1.d
new file mode 100644
index 000000000..82a180e66
--- /dev/null
+++ b/Examples/test-suite/d/allprotected_runme.1.d
@@ -0,0 +1,65 @@
+module allprotected_runme;
+
+import allprotected.Klass;
+import allprotected.ProtectedBase;
+
+void main() {
+  auto mpb = new MyProtectedBase("MyProtectedBase");
+  mpb.accessProtected();
+}
+
+class MyProtectedBase : ProtectedBase {
+public:
+  this(char[] name) {
+    super(name);
+  }
+
+  void accessProtected() {
+    char[] s = virtualMethod();
+    if (s != "ProtectedBase")
+      throw new Exception("Failed");
+
+    Klass k = instanceMethod(new Klass("xyz"));
+    if (k.getName() != "xyz") 
+      throw new Exception("Failed");
+
+    k = instanceOverloaded(new Klass("xyz"));
+    if (k.getName() != "xyz") 
+      throw new Exception("Failed");
+
+    k = instanceOverloaded(new Klass("xyz"), "abc");
+    if (k.getName() != "abc") 
+      throw new Exception("Failed");
+
+    k = staticMethod(new Klass("abc"));
+    if (k.getName() != "abc") 
+      throw new Exception("Failed");
+
+    k = staticOverloaded(new Klass("xyz"));
+    if (k.getName() != "xyz") 
+      throw new Exception("Failed");
+
+    k = staticOverloaded(new Klass("xyz"), "abc");
+    if (k.getName() != "abc") 
+      throw new Exception("Failed");
+
+    instanceMemberVariable = 30;
+    int i = instanceMemberVariable;
+    if (i != 30)
+      throw new Exception("Failed");
+
+    staticMemberVariable = 40;
+    i = staticMemberVariable;
+    if (i != 40)
+      throw new Exception("Failed");
+
+    i = staticConstMemberVariable;
+    if (i != 20)
+      throw new Exception("Failed");
+
+    anEnum = ProtectedBase.AnEnum.EnumVal1;
+    ProtectedBase.AnEnum ae = anEnum;
+    if (ae != ProtectedBase.AnEnum.EnumVal1)
+      throw new Exception("Failed");
+  }
+}
diff --git a/Examples/test-suite/d/allprotected_runme.2.d b/Examples/test-suite/d/allprotected_runme.2.d
new file mode 100644
index 000000000..799230291
--- /dev/null
+++ b/Examples/test-suite/d/allprotected_runme.2.d
@@ -0,0 +1,65 @@
+module allprotected_runme;
+
+import allprotected.Klass;
+import allprotected.ProtectedBase;
+
+void main() {
+  auto mpb = new MyProtectedBase("MyProtectedBase");
+  mpb.accessProtected();
+}
+
+class MyProtectedBase : ProtectedBase {
+public:
+  this(string name) {
+    super(name);
+  }
+
+  void accessProtected() {
+    string s = virtualMethod();
+    if (s != "ProtectedBase")
+      throw new Exception("Failed");
+
+    Klass k = instanceMethod(new Klass("xyz"));
+    if (k.getName() != "xyz")
+      throw new Exception("Failed");
+
+    k = instanceOverloaded(new Klass("xyz"));
+    if (k.getName() != "xyz")
+      throw new Exception("Failed");
+
+    k = instanceOverloaded(new Klass("xyz"), "abc");
+    if (k.getName() != "abc")
+      throw new Exception("Failed");
+
+    k = staticMethod(new Klass("abc"));
+    if (k.getName() != "abc")
+      throw new Exception("Failed");
+
+    k = staticOverloaded(new Klass("xyz"));
+    if (k.getName() != "xyz")
+      throw new Exception("Failed");
+
+    k = staticOverloaded(new Klass("xyz"), "abc");
+    if (k.getName() != "abc")
+      throw new Exception("Failed");
+
+    instanceMemberVariable = 30;
+    int i = instanceMemberVariable;
+    if (i != 30)
+      throw new Exception("Failed");
+
+    staticMemberVariable = 40;
+    i = staticMemberVariable;
+    if (i != 40)
+      throw new Exception("Failed");
+
+    i = staticConstMemberVariable;
+    if (i != 20)
+      throw new Exception("Failed");
+
+    anEnum = ProtectedBase.AnEnum.EnumVal1;
+    ProtectedBase.AnEnum ae = anEnum;
+    if (ae != ProtectedBase.AnEnum.EnumVal1)
+      throw new Exception("Failed");
+  }
+}
diff --git a/Examples/test-suite/d/apply_strings_runme.1.d b/Examples/test-suite/d/apply_strings_runme.1.d
new file mode 100644
index 000000000..960caa4ca
--- /dev/null
+++ b/Examples/test-suite/d/apply_strings_runme.1.d
@@ -0,0 +1,12 @@
+module apply_strings_runme;
+
+import apply_strings.apply_strings;
+
+const char[] TEST_MESSAGE = "A message from target language to the C++ world and back again.";
+
+void main() {
+  if (UCharFunction(TEST_MESSAGE) != TEST_MESSAGE) throw new Exception("UCharFunction failed");
+  if (SCharFunction(TEST_MESSAGE) != TEST_MESSAGE) throw new Exception("SCharFunction failed");
+  auto pChar = CharFunction(null);
+  if (pChar !is null) throw new Exception("CharFunction failed");
+}
diff --git a/Examples/test-suite/d/apply_strings_runme.2.d b/Examples/test-suite/d/apply_strings_runme.2.d
new file mode 100644
index 000000000..86183f8a3
--- /dev/null
+++ b/Examples/test-suite/d/apply_strings_runme.2.d
@@ -0,0 +1,12 @@
+module apply_strings_runme;
+
+import apply_strings.apply_strings;
+
+enum string TEST_MESSAGE = "A message from target language to the C++ world and back again.";
+
+void main() {
+  if (UCharFunction(TEST_MESSAGE) != TEST_MESSAGE) throw new Exception("UCharFunction failed");
+  if (SCharFunction(TEST_MESSAGE) != TEST_MESSAGE) throw new Exception("SCharFunction failed");
+  auto pChar = CharFunction(null);
+  if (pChar !is null) throw new Exception("CharFunction failed");
+}
diff --git a/Examples/test-suite/d/bools_runme.1.d b/Examples/test-suite/d/bools_runme.1.d
new file mode 100644
index 000000000..f501b0762
--- /dev/null
+++ b/Examples/test-suite/d/bools_runme.1.d
@@ -0,0 +1,20 @@
+/// This is the bool runtime testcase. It checks that the C++ bool type works.
+module bools_runme;
+
+import bools.bools;
+
+void main() {
+  bool t = true;
+  bool f = false;
+
+  check_bo(f);
+  check_bo(t);
+}
+
+void check_bo(bool input) {
+  for (int i = 0; i < 1000; ++i) {
+    if (bo(input) != input) {
+      throw new Exception("Runtime test check_bo failed.");
+    }
+  }
+}
diff --git a/Examples/test-suite/d/bools_runme.2.d b/Examples/test-suite/d/bools_runme.2.d
new file mode 100644
index 000000000..f501b0762
--- /dev/null
+++ b/Examples/test-suite/d/bools_runme.2.d
@@ -0,0 +1,20 @@
+/// This is the bool runtime testcase. It checks that the C++ bool type works.
+module bools_runme;
+
+import bools.bools;
+
+void main() {
+  bool t = true;
+  bool f = false;
+
+  check_bo(f);
+  check_bo(t);
+}
+
+void check_bo(bool input) {
+  for (int i = 0; i < 1000; ++i) {
+    if (bo(input) != input) {
+      throw new Exception("Runtime test check_bo failed.");
+    }
+  }
+}
diff --git a/Examples/test-suite/d/catches_runme.1.d b/Examples/test-suite/d/catches_runme.1.d
new file mode 100644
index 000000000..55b18132d
--- /dev/null
+++ b/Examples/test-suite/d/catches_runme.1.d
@@ -0,0 +1,33 @@
+module catches_runme;
+
+import catches.catches;
+
+void main() {
+  test({ test_catches(1); }, "C++ int exception thrown, value: 1");
+  test({ test_catches(2); }, "two");
+  test({ test_catches(3); }, "C++ ThreeException const & exception thrown");
+
+  test({ test_exception_specification(1); }, "C++ int exception thrown, value: 1");
+  test({ test_exception_specification(2); }, "unknown exception");
+  test({ test_exception_specification(3); }, "unknown exception");
+
+  test({ test_catches_all(1); }, "unknown exception");
+}
+
+void test(void delegate() command, char[] expectedMessage) {
+  bool didntThrow;
+  try {
+    command();
+    didntThrow = true;
+  } catch (Exception e) {
+    if (e.msg != expectedMessage) {
+      throw new Exception("Failed to propagate C++ exception. Expected '" ~
+	expectedMessage ~ "', but received '" ~ e.msg ~ "'.");
+    }
+  }
+
+  if (didntThrow) {
+    throw new Exception("Failed to propagate C++ exception. Expected '" ~
+      expectedMessage ~ "', but no exception was thrown.");
+  }
+}
diff --git a/Examples/test-suite/d/catches_runme.2.d b/Examples/test-suite/d/catches_runme.2.d
new file mode 100644
index 000000000..508558485
--- /dev/null
+++ b/Examples/test-suite/d/catches_runme.2.d
@@ -0,0 +1,33 @@
+module catches_runme;
+
+import catches.catches;
+
+void main() {
+  test({ test_catches(1); }, "C++ int exception thrown, value: 1");
+  test({ test_catches(2); }, "two");
+  test({ test_catches(3); }, "C++ ThreeException const & exception thrown");
+
+  test({ test_exception_specification(1); }, "C++ int exception thrown, value: 1");
+  test({ test_exception_specification(2); }, "unknown exception");
+  test({ test_exception_specification(3); }, "unknown exception");
+
+  test({ test_catches_all(1); }, "unknown exception");
+}
+
+void test(void delegate() command, string expectedMessage) {
+  bool didntThrow;
+  try {
+    command();
+    didntThrow = true;
+  } catch (Exception e) {
+    if (e.msg != expectedMessage) {
+      throw new Exception("Failed to propagate C++ exception. Expected '" ~
+	expectedMessage ~ "', but received '" ~ e.msg ~ "'.");
+    }
+  }
+
+  if (didntThrow) {
+    throw new Exception("Failed to propagate C++ exception. Expected '" ~
+      expectedMessage ~ "', but no exception was thrown.");
+  }
+}
diff --git a/Examples/test-suite/d/char_strings_runme.1.d b/Examples/test-suite/d/char_strings_runme.1.d
new file mode 100644
index 000000000..cde6fe0f7
--- /dev/null
+++ b/Examples/test-suite/d/char_strings_runme.1.d
@@ -0,0 +1,151 @@
+module char_strings_runme;
+
+import tango.text.convert.Integer;
+import char_strings.char_strings;
+
+const char[] CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
+const char[] OTHERLAND_MSG = "Little message from the safe world.";
+
+void main() {
+  const uint count = 10000;
+  uint i = 0;
+
+  // get functions
+  for (i=0; i