From 21ef7bc243f5738d4a081959e57b4de4b9032d0c Mon Sep 17 00:00:00 2001
From: Ivan Shvedunov <ivan4th@gmail.com>
Date: Sat, 20 Dec 2014 17:12:39 +0300
Subject: [PATCH 001/220] CFFI: handle array struct/union members.

---
 Source/Modules/cffi.cxx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/cffi.cxx b/Source/Modules/cffi.cxx
index a1be00100..8f718e653 100644
--- a/Source/Modules/cffi.cxx
+++ b/Source/Modules/cffi.cxx
@@ -831,7 +831,12 @@ void CFFI::emit_struct_union(Node *n, bool un = false) {
       if (slot_name && (Strcmp(slot_name, "t") == 0 || Strcmp(slot_name, "T") == 0))
 	slot_name = NewStringf("t_var");
 
-      Printf(f_cl, "\n\t(%s %s)", slot_name, typespec);
+      if (SwigType_isarray(childType) && SwigType_array_ndim(childType) == 1) {
+          String *dim = SwigType_array_getdim(childType, 0);
+          Printf(f_cl, "\n\t(%s %s :count %s)", slot_name, typespec, dim);
+          Delete(dim);
+      } else
+          Printf(f_cl, "\n\t(%s %s)", slot_name, typespec);
 
       Delete(node);
       Delete(childType);

From fb2cf1189185dc317bbcd068ba52394335250e54 Mon Sep 17 00:00:00 2001
From: Tyler Jones <tjj5036@gmail.com>
Date: Wed, 11 Feb 2015 10:09:53 -0800
Subject: [PATCH 002/220] Corrected the link for documentation relating to
 NodeJS, and added one clarification regarding building modules.

---
 Doc/Manual/Javascript.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index cae199048..5e6540c7d 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -197,10 +197,10 @@ $ sudo npm install -g node-gyp</pre>
 <pre>
 $ swig -javascript -node -c++ example.i</pre>
 </div>
-<p>Then run <code>node-gyp</code></p>
+<p>Then run <code>node-gyp build</code> to actually create the module:</p>
 <div class="shell">
 <pre>
-$ node-gyp</pre>
+$ node-gyp build</pre>
 </div>
 <p>This will create a <code>build</code> folder containing the native module. To use the extension you need to 'require' it in your Javascript source file:</p>
 <div class="code">
@@ -410,7 +410,7 @@ open new windows, and many more things.
 };</pre>
 </div>
 
-<H2><a name="Javascript_nn14"></a>26.4 Examples</H2>
+<H2><a id="Javascript_examples" name="Javascript_nn14"></a>26.4 Examples</H2>
 
 
 <p>Some basic examples are shown here in more detail.</p>

From ece9854e8f54b88962ae9285e390b0c206b176a1 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 17 Feb 2015 16:00:22 +1300
Subject: [PATCH 003/220] Give more helpful message for "make dist"

---
 Makefile.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 964c48a07..daec0b08d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -570,8 +570,9 @@ dd = @PACKAGE_NAME@-@PACKAGE_VERSION@
 srpm = @PACKAGE_NAME@-@PACKAGE_VERSION@
 
 dist:
-	@echo "not implemented - use Tools/mkdist.py instead."
-	false
+	@echo "'make dist' not implemented - use Tools/mkdist.py instead - e.g.:"
+	@echo "Tools/mkdist.py @VERSION@ master"
+	@false
 
 srcrpm:
 	rm -fr $(srpm) $(srpm).src.rpm

From 8da4d20308c015e679eaba6b1d312af45cccbe48 Mon Sep 17 00:00:00 2001
From: Misha Seltzer <misha@seltzer.com>
Date: Mon, 9 Feb 2015 18:34:04 +0200
Subject: [PATCH 004/220] Fixed SWIG go for cases when SWIG %import-s another
 package which is located in a subdirectory.

---
 CHANGES.current                               |  3 ++
 Examples/Makefile.in                          | 13 +++++--
 Examples/test-suite/go/Makefile.in            | 23 ++++++++++++
 .../test-suite/go/go_subdir_import_runme.go   | 16 ++++++++
 Examples/test-suite/go_subdir_import.list     |  3 ++
 Examples/test-suite/go_subdir_import_a.i      | 37 +++++++++++++++++++
 Examples/test-suite/go_subdir_import_b.i      | 12 ++++++
 .../go_subdir_import/go_subdir_import_c.i     | 12 ++++++
 Source/Modules/go.cxx                         | 23 ++++++++++--
 9 files changed, 135 insertions(+), 7 deletions(-)
 create mode 100644 Examples/test-suite/go/go_subdir_import_runme.go
 create mode 100644 Examples/test-suite/go_subdir_import.list
 create mode 100644 Examples/test-suite/go_subdir_import_a.i
 create mode 100644 Examples/test-suite/go_subdir_import_b.i
 create mode 100644 Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i

diff --git a/CHANGES.current b/CHANGES.current
index 4679e8d63..a8fa0ca46 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -9,6 +9,9 @@ Version 3.0.6 (in progress)
             [Guile] Fix generated code for static const char member variables when
             defined and declared inline.
 
+2015-02-09: mishas
+            [Go] Fix %import of files in sub directories.
+
 2015-02-05: ianlancetaylor
             [Go] Ignore Go specific type maps (goin, goout, etc.) if they are empty.
 
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 6fccda22e..9a414af08 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1818,14 +1818,21 @@ go: $(SRCDIR_SRCS)
 go_cpp: $(SRCDIR_SRCS)
 	$(SWIG) -go -c++ $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
 	if $(GO12) || $(GO13) || $(GOGCC); then \
-	  $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \
+	  ${foreach f,$(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(ICXXSRCS), \
+	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o ${addsuffix .o,${basename $f}} $f $(INCLUDES); \
+	  } \
 	else \
 	  $(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \
 	  $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \
 	fi
-	$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS)
+	${foreach f,$(GOSRCS), \
+	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o ${addsuffix .$(GOOBJEXT),${basename $f}} $f \
+	}
 	if ! $(GOGCC) ; then \
-	  $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} $(GOCSRCS); \
+	  ${foreach f,$(GOCSRCS), \
+	    $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \
+	    -o ${addsuffix .$(GOOBJEXT),${basename $f}} $f; \
+	  } \
 	  rm -f $(GOPACKAGE); \
 	  if $(GO13); then \
 	    cp $(GOGCOBJS) $(GOPACKAGE); \
diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index 4480ecf1f..7eb12d2f8 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -28,6 +28,9 @@ CPP_TEST_CASES = \
 	go_inout \
 	go_director_inout
 
+MULTI_CPP_TEST_CASES = \
+	go_subdir_import
+
 include $(srcdir)/../common.mk
 
 .SUFFIXES: .cpptest .ctest .multicpptest
@@ -59,6 +62,25 @@ multi_import.multicpptest:
 	done
 	$(run_multi_testcase)
 
+go_subdir_import.multicpptest:
+	$(setup)
+	mkdir -p testdir/go_subdir_import/
+	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
+	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
+	INTERFACEPATH="go_subdir_import_b.i" \
+	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) -outdir ." NOLINK=true \
+	TARGET="$(TARGETPREFIX)go_subdir_import_b$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" \
+	INTERFACE="testdir/go_subdir_import/go_subdir_import_b.i" \
+	$(LANGUAGE)$(VARIANT)_cpp;
+	for f in testdir/go_subdir_import/go_subdir_import_c go_subdir_import_a ; do \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
+	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
+	  $(LANGUAGE)$(VARIANT)_cpp; \
+	done
+	$(run_multi_testcase)
+
 # Runs the testcase.
 run_testcase = \
 	if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \
@@ -108,6 +130,7 @@ clean:
 	rm -f mod_a.go mod_b.go imports_a.go imports_b.go
 	rm -f clientdata_prop_a.go clientdata_prop_b.go
 	rm -f multi_import_a.go multi_import_b.go
+	rm -rf go_subdir_import_a.go testdir
 	rm -f packageoption_a.go packageoption_b.go packageoption_c.go
 	rm -f import_stl_a.go import_stl_b.go
 
diff --git a/Examples/test-suite/go/go_subdir_import_runme.go b/Examples/test-suite/go/go_subdir_import_runme.go
new file mode 100644
index 000000000..f90a6eb54
--- /dev/null
+++ b/Examples/test-suite/go/go_subdir_import_runme.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"go_subdir_import_a"
+	"testdir/go_subdir_import/go_subdir_import_b"
+	"testdir/go_subdir_import/go_subdir_import_c"
+)
+
+func main() {
+	b := go_subdir_import_b.NewObjB();
+	c := go_subdir_import_c.NewObjC();
+	v := go_subdir_import_a.AddFive(b, c)
+	if v != 50 {
+		panic(0)
+	}
+}
diff --git a/Examples/test-suite/go_subdir_import.list b/Examples/test-suite/go_subdir_import.list
new file mode 100644
index 000000000..e117d32fa
--- /dev/null
+++ b/Examples/test-suite/go_subdir_import.list
@@ -0,0 +1,3 @@
+testdir/go_subdir_import/go_subdir_import_c
+go_subdir_import_b
+go_subdir_import_a
diff --git a/Examples/test-suite/go_subdir_import_a.i b/Examples/test-suite/go_subdir_import_a.i
new file mode 100644
index 000000000..72b28786e
--- /dev/null
+++ b/Examples/test-suite/go_subdir_import_a.i
@@ -0,0 +1,37 @@
+/* File : go_subdir_import_a.i */
+
+/*
+ * This files helps check the case where the SWIG-generated .go file needs to
+ * import another, SWIG-generated, module that is in a relative subdirectory.
+ * This case might happen for two different reasons:
+ * 1) Importing a module for which the .i file is in a subdirectory relatively
+ *    to this file (this is tested here with go_subdir_import_c).
+ * 2) Importing a module whos module name is a path (this is tested here with
+ *    go_subdir_import_b).
+ *
+ * This file is the "root" file that imports the two modules which will be
+ * generated (by swig) in a relative subdirectory.
+ */
+%module go_subdir_import_a
+
+%import(module="testdir/go_subdir_import/go_subdir_import_c") "testdir/go_subdir_import/go_subdir_import_c.i"
+%import "go_subdir_import_b.i"
+
+%{
+class ObjC {
+ public:
+  int getInt() const;
+};
+
+class ObjB {
+ public:
+  int getInt() const;
+};
+%}
+
+%inline %{
+int AddFive(const ObjB& b, const ObjC& c) {
+  return b.getInt() + c.getInt() + 5;
+}
+%}
+
diff --git a/Examples/test-suite/go_subdir_import_b.i b/Examples/test-suite/go_subdir_import_b.i
new file mode 100644
index 000000000..b87f7cf3c
--- /dev/null
+++ b/Examples/test-suite/go_subdir_import_b.i
@@ -0,0 +1,12 @@
+/* File : go_subdir_import_b.i */
+%module "testdir/go_subdir_import/go_subdir_import_b"
+
+%inline %{
+class ObjB {
+ public:
+  int getInt() const {
+    return 27;
+  }
+};
+%}
+
diff --git a/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i b/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i
new file mode 100644
index 000000000..2c2c2e1fe
--- /dev/null
+++ b/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i
@@ -0,0 +1,12 @@
+/* File : go_subdir_import_c.i */
+%module go_subdir_import_c
+
+%inline %{
+class ObjC {
+ public:
+  int getInt() const {
+    return 18;
+  }
+};
+%}
+
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 9a3960ce0..f910da629 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -554,7 +554,7 @@ private:
 
     // Output module initialization code.
 
-    Printf(f_go_begin, "\npackage %s\n\n", package);
+    Printf(f_go_begin, "\npackage %s\n\n", getModuleName(package));
 
     if (gccgo_flag) {
       Printf(f_go_runtime, "func SwigCgocall()\n");
@@ -2058,7 +2058,7 @@ private:
 	Printv(f_go_wrappers, "type ", name, " int\n", NULL);
       } else {
 	String *nw = NewString("");
-	Printv(nw, imported_package, ".", name, NULL);
+	Printv(nw, getModuleName(imported_package), ".", name, NULL);
 	Setattr(n, "go:enumname", nw);
       }
     }
@@ -5096,7 +5096,7 @@ private:
 	  Setattr(undefined_types, t, t);
 	} else {
 	  String *nw = NewString("");
-	  Printv(nw, Getattr(cnmod, "name"), ".", ret, NULL);
+	  Printv(nw, getModuleName(Getattr(cnmod, "name")), ".", ret, NULL);
 	  Delete(ret);
 	  ret = nw;
 	}
@@ -5282,7 +5282,7 @@ private:
 	Append(ret, ex);
       } else {
 	ret = NewString("");
-	Printv(ret, Getattr(cnmod, "name"), ".Swigcptr", ex, NULL);
+	Printv(ret, getModuleName(Getattr(cnmod, "name")), ".Swigcptr", ex, NULL);
       }
     }
     Delete(ty);
@@ -5603,6 +5603,21 @@ private:
     return ret;
   }
 
+  /* ----------------------------------------------------------------------
+   * getModuleName
+   *
+   * Return the name of a module. This is different from module path:
+   * "some/path/to/module" -> "module".
+   * ---------------------------------------------------------------------- */
+
+  String *getModuleName(String *module_path) {
+    char *suffix = strrchr(Char(module_path), '/');
+    if (suffix == NULL) {
+      return module_path;
+    }
+    return Str(suffix + 1);
+  }
+
 };				/* class GO */
 
 /* -----------------------------------------------------------------------------

From fcf2b68e841d3055379b4c10ebc00cc7e6e53c86 Mon Sep 17 00:00:00 2001
From: Misha Seltzer <mishas@google.com>
Date: Tue, 10 Feb 2015 11:02:59 +0200
Subject: [PATCH 005/220] Fixed errors due to last sync.

---
 Examples/test-suite/go/Makefile.in | 2 +-
 Source/Modules/go.cxx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index 7eb12d2f8..294f4c335 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -67,7 +67,7 @@ go_subdir_import.multicpptest:
 	mkdir -p testdir/go_subdir_import/
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
-	INTERFACEPATH="go_subdir_import_b.i" \
+	INTERFACEPATH="$(SRCDIR)$(INTERFACEDIR)go_subdir_import_b.i" \
 	INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT) -outdir ." NOLINK=true \
 	TARGET="$(TARGETPREFIX)go_subdir_import_b$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" \
 	INTERFACE="testdir/go_subdir_import/go_subdir_import_b.i" \
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index f910da629..f0b1d5ac2 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -444,7 +444,7 @@ private:
     Delete(swig_input_content);
     fclose(swig_input);
     unique_id = NewString("");
-    Printf(unique_id, "_%s_%08x%08x", package, hash.hi, hash.lo);
+    Printf(unique_id, "_%s_%08x%08x", getModuleName(package), hash.hi, hash.lo);
 
     // Open files.
 

From 9e2c75c2a88df0feef55f8abe803923cd47139cf Mon Sep 17 00:00:00 2001
From: Misha Seltzer <mishas@google.com>
Date: Tue, 10 Feb 2015 14:31:27 +0200
Subject: [PATCH 006/220] Fix running tests when the test build outputs are
 generated in a different folder. (Fixes Travis' test runs).

---
 Examples/Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 9a414af08..6bc391cf1 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1818,7 +1818,10 @@ go: $(SRCDIR_SRCS)
 go_cpp: $(SRCDIR_SRCS)
 	$(SWIG) -go -c++ $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
 	if $(GO12) || $(GO13) || $(GOGCC); then \
-	  ${foreach f,$(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(ICXXSRCS), \
+	  if test -n "$(SRCDIR_CXXSRCS)$(SRCDIR_SRCS)"; then \
+	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \
+	  fi; \
+	  ${foreach f,$(ICXXSRCS), \
 	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o ${addsuffix .o,${basename $f}} $f $(INCLUDES); \
 	  } \
 	else \

From beed5f3479182987e90069fea4b17b2d7cc31f4a Mon Sep 17 00:00:00 2001
From: Misha Seltzer <mishas@google.com>
Date: Sat, 14 Feb 2015 12:02:57 +0200
Subject: [PATCH 007/220] Changed to using $() instead of ${} in the makefile
 for consistancy

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

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 6bc391cf1..6fa45e3ec 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1821,21 +1821,21 @@ go_cpp: $(SRCDIR_SRCS)
 	  if test -n "$(SRCDIR_CXXSRCS)$(SRCDIR_SRCS)"; then \
 	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \
 	  fi; \
-	  ${foreach f,$(ICXXSRCS), \
-	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o ${addsuffix .o,${basename $f}} $f $(INCLUDES); \
-	  } \
+	  $(foreach f,$(ICXXSRCS), \
+	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .o,$(basename $f)) $f $(INCLUDES); \
+	  ) \
 	else \
 	  $(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \
 	  $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \
 	fi
-	${foreach f,$(GOSRCS), \
-	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o ${addsuffix .$(GOOBJEXT),${basename $f}} $f \
-	}
+	$(foreach f,$(GOSRCS), \
+	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \
+	)
 	if ! $(GOGCC) ; then \
-	  ${foreach f,$(GOCSRCS), \
+	  $(foreach f,$(GOCSRCS), \
 	    $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \
-	    -o ${addsuffix .$(GOOBJEXT),${basename $f}} $f; \
-	  } \
+	    -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \
+	  ) \
 	  rm -f $(GOPACKAGE); \
 	  if $(GO13); then \
 	    cp $(GOGCOBJS) $(GOPACKAGE); \

From 40f5b1ecc684d092bbceff319c62fda84fab1bc6 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Sun, 22 Feb 2015 11:01:24 -0800
Subject: [PATCH 008/220] [Go] Fixes so that the  go_subdir_import test will
 work with gccgo.

---
 Examples/Makefile.in               | 16 ++++++++++------
 Examples/test-suite/go/Makefile.in |  3 +++
 Source/Modules/go.cxx              |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 6fa45e3ec..8aa1ecedf 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1760,7 +1760,7 @@ GOOPT = @GOOPT@
 GOVERSIONOPTION = @GOVERSIONOPTION@
 
 GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
-GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) ; then echo -pack ; fi`
+GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) && ! $(GOGCC); then echo -pack ; fi`
 
 GOSRCS = $(INTERFACE:.i=.go)
 GOCSRCS = $(INTERFACE:.i=_gc.c)
@@ -1822,16 +1822,16 @@ go_cpp: $(SRCDIR_SRCS)
 	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \
 	  fi; \
 	  $(foreach f,$(ICXXSRCS), \
-	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .o,$(basename $f)) $f $(INCLUDES); \
+	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) -o $(addsuffix .@OBJEXT@,$(basename $f)) $f $(INCLUDES); \
 	  ) \
 	else \
 	  $(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS) $(ICXXSRCS) $(INCLUDES); \
 	  $(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \
 	fi
-	$(foreach f,$(GOSRCS), \
-	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \
-	)
 	if ! $(GOGCC) ; then \
+	  $(foreach f,$(GOSRCS), \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f \
+	  ); \
 	  $(foreach f,$(GOCSRCS), \
 	    $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} \
 	    -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \
@@ -1845,6 +1845,10 @@ go_cpp: $(SRCDIR_SRCS)
 	  else \
 	    $(COMPILETOOL) $(GOPACK) grc $(GOPACKAGE) $(GOGCOBJS) $(GOCSRCS:.c=.$(GOOBJEXT)); \
 	  fi; \
+	else \
+	  $(foreach f,$(GOSRCS), \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .@OBJEXT@,$(basename $f)) $f \
+	  ); \
 	fi
 	if test -f $(SRCDIR)$(RUNME).go; then \
 	  $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
@@ -1862,7 +1866,7 @@ go_cpp: $(SRCDIR_SRCS)
 # -----------------------------------------------------------------
 
 go_run:
-	env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) ./$(RUNME) $(RUNPIPE)
+	env $(RUNTOOL) ./$(RUNME) $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Version display
diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index 294f4c335..b4747601c 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -79,6 +79,9 @@ go_subdir_import.multicpptest:
 	  TARGET="$(TARGETPREFIX)$${f}$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$$f.i" \
 	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
+	if $(GOGCC); then \
+	  cp testdir/go_subdir_import/*.@OBJEXT@ .; \
+	fi
 	$(run_multi_testcase)
 
 # Runs the testcase.
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index f0b1d5ac2..cc47e625d 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -413,7 +413,7 @@ private:
       }
       if (!pkgpath_option) {
 	Append(go_prefix, ".");
-	Append(go_prefix, package);
+	Append(go_prefix, getModuleName(package));
       }
     }
 

From 1dd401899fc230073295cf86db4a5d66eefdba85 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Sun, 22 Feb 2015 11:09:58 -0800
Subject: [PATCH 009/220] [Go] Change SWIG directors to use a handle instead of
 a Go pointer. In future releases of Go it will not be possible to pass Go
 pointers into C/C++ code.  The handle is automatically translated back to the
 Go value using a Go map.  Since directors must be explicitly deleted, we can
 reliably use that call to remove the handle from the map.

---
 Lib/go/goruntime.swg  | 55 +++++++++++++++++++++++++++++++++++++++++++
 Source/Modules/go.cxx | 39 ++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index 19ccf5ae9..f76da9c78 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -317,3 +317,58 @@ static void swig_acquire_pointer(Swig_memory** pmem, Type* ptr) {
   (*pmem)->swig_acquire_pointer(ptr);
 }
 %}
+
+/* For directors we need C++ to track a Go pointer.  Since we can't
+   pass a Go pointer into C++, we use a map to track the pointers on
+   the Go side.  */
+
+%go_import("sync")
+
+%insert(go_header) %{
+type _ sync.Mutex
+%}
+
+%insert(go_director) %{
+
+var swigDirectorTrack struct {
+	sync.Mutex
+	m map[int]interface{}
+	c int
+}
+
+func swigDirectorAdd(v interface{}) int {
+	swigDirectorTrack.Lock()
+	defer swigDirectorTrack.Unlock()
+	if swigDirectorTrack.m == nil {
+		swigDirectorTrack.m = make(map[int]interface{})
+	}
+	swigDirectorTrack.c++
+	ret := swigDirectorTrack.c
+	swigDirectorTrack.m[ret] = v
+	return ret
+}
+
+func swigDirectorLookup(c int) interface{} {
+	swigDirectorTrack.Lock()
+	defer swigDirectorTrack.Unlock()
+	ret := swigDirectorTrack.m[c]
+	if ret == nil {
+		panic("C++ director pointer not found (possible	use-after-free)")
+	}
+	return ret
+}
+
+func swigDirectorDelete(c int) {
+	swigDirectorTrack.Lock()
+	defer swigDirectorTrack.Unlock()
+	if swigDirectorTrack.m[c] == nil {
+		if c > swigDirectorTrack.c {
+			panic("C++ director pointer invalid (possible memory corruption")
+		} else {
+			panic("C++ director pointer not found (possible use-after-free)")
+		}
+	}
+	delete(swigDirectorTrack.m, c)
+}
+
+%}
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index cc47e625d..92d857c56 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -146,6 +146,7 @@ class GO:public Language {
   File *f_go_runtime;
   File *f_go_header;
   File *f_go_wrappers;
+  File *f_go_directors;
   File *f_gc_runtime;
   File *f_gc_header;
   File *f_gc_wrappers;
@@ -214,6 +215,7 @@ public:
      f_go_runtime(NULL),
      f_go_header(NULL),
      f_go_wrappers(NULL),
+     f_go_directors(NULL),
      f_gc_runtime(NULL),
      f_gc_header(NULL),
      f_gc_wrappers(NULL),
@@ -489,6 +491,7 @@ private:
     f_go_runtime = NewString("");
     f_go_header = NewString("");
     f_go_wrappers = NewString("");
+    f_go_directors = NewString("");
     if (!gccgo_flag) {
       f_gc_runtime = NewString("");
       f_gc_header = NewString("");
@@ -507,6 +510,7 @@ private:
     Swig_register_filebyname("go_runtime", f_go_runtime);
     Swig_register_filebyname("go_header", f_go_header);
     Swig_register_filebyname("go_wrapper", f_go_wrappers);
+    Swig_register_filebyname("go_director", f_go_directors);
     if (!gccgo_flag) {
       Swig_register_filebyname("gc_begin", f_gc_begin);
       Swig_register_filebyname("gc_runtime", f_gc_runtime);
@@ -635,6 +639,9 @@ private:
     Dump(f_go_header, f_go_begin);
     Dump(f_go_runtime, f_go_begin);
     Dump(f_go_wrappers, f_go_begin);
+    if (directorsEnabled()) {
+      Dump(f_go_directors, f_go_begin);
+    }
     if (!gccgo_flag) {
       Dump(f_gc_header, f_gc_begin);
       Dump(f_gc_runtime, f_gc_begin);
@@ -649,6 +656,7 @@ private:
     Delete(f_go_runtime);
     Delete(f_go_header);
     Delete(f_go_wrappers);
+    Delete(f_go_directors);
     if (!gccgo_flag) {
       Delete(f_gc_runtime);
       Delete(f_gc_header);
@@ -2914,8 +2922,7 @@ private:
       Append(func_with_over_name, overname);
     }
 
-    SwigType *first_type = NewString("void");
-    SwigType_add_pointer(first_type);
+    SwigType *first_type = NewString("int");
     Parm *first_parm = NewParm(first_type, "swig_p", n);
     set_nextSibling(first_parm, parms);
     Setattr(first_parm, "lname", "p");
@@ -2940,7 +2947,7 @@ private:
       if (overname) {
 	Printv(f_go_wrappers, overname, NULL);
       }
-      Printv(f_go_wrappers, "(_swig_director *", director_struct_name, NULL);
+      Printv(f_go_wrappers, "(_swig_director int", NULL);
 
       p = parms;
       for (int i = 0; i < parm_count; ++i) {
@@ -2989,7 +2996,7 @@ private:
       if (overname) {
 	Printv(f_go_wrappers, overname, NULL);
       }
-      Printv(f_go_wrappers, "(p", NULL);
+      Printv(f_go_wrappers, "(swigDirectorAdd(p)", NULL);
 
       p = parms;
       for (int i = 0; i < parm_count; ++i) {
@@ -3181,8 +3188,13 @@ private:
 
       Printv(f_c_directors, "  delete swig_mem;\n", NULL);
 
-      Printv(f_go_wrappers, "func ", go_name, "(p *", director_struct_name, ") {\n", NULL);
-      Printv(f_go_wrappers, "\tp.", class_receiver, " = 0\n", NULL);
+      Printv(f_go_wrappers, "func ", go_name, "(c int) {\n", NULL);
+      if (gccgo_flag) {
+	Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
+	Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
+      }
+      Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
+      Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
       Printv(f_go_wrappers, "}\n\n", NULL);
     }
 
@@ -3211,13 +3223,13 @@ private:
     if (!gccgo_flag) {
       Printv(f_c_directors, "extern \"C\" void ", wname, "(void*, int);\n", NULL);
     } else {
-      Printv(f_c_directors, "extern \"C\" void ", wname, "(void*) __asm__(\"", go_prefix, ".", go_name, "\");\n", NULL);
+      Printv(f_c_directors, "extern \"C\" void ", wname, "(intgo) __asm__(\"", go_prefix, ".", go_name, "\");\n", NULL);
     }
 
     Printv(f_c_directors, director_sig, NULL);
 
     if (!gccgo_flag) {
-      Printv(f_c_directors, "  struct { void *p; } a;\n", NULL);
+      Printv(f_c_directors, "  struct { intgo p; } a;\n", NULL);
       Printv(f_c_directors, "  a.p = go_val;\n", NULL);
       Printv(f_c_directors, "  crosscall2(", wname, ", &a, (int) sizeof a);\n", NULL);
 
@@ -3852,7 +3864,7 @@ private:
       // The Go function which invokes the method.  This is called
       // from by the C++ method on the director class.
 
-      Printv(f_go_wrappers, "func ", callback_name, "(p *", director_struct_name, NULL);
+      Printv(f_go_wrappers, "func ", callback_name, "(swig_c int", NULL);
 
       p = parms;
       for (int i = 0; i < parm_count; ++i) {
@@ -3897,7 +3909,7 @@ private:
 	    Printv(call, result_wrapper, "(", NULL);
 	  }
 	}
-	Printv(call, "p.", go_with_over_name, "(", NULL);
+	Printv(call, "swig_p.", go_with_over_name, "(", NULL);
 
 	String *goincode = NewString("");
 
@@ -3966,6 +3978,7 @@ private:
 	  Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
 	}
 
+	Printv(f_go_wrappers, "\tswig_p := swigDirectorLookup(swig_c).(*", director_struct_name, ")\n", NULL);
 	Printv(f_go_wrappers, goincode, NULL);
 	Printv(f_go_wrappers, call, NULL);
 	Delete(call);
@@ -4074,7 +4087,7 @@ private:
       Printv(f_c_directors, "extern \"C\" ", NULL);
 
       String *fnname = NewString("");
-      Printv(fnname, callback_wname, "(void*", NULL);
+      Printv(fnname, callback_wname, "(int", NULL);
 
       Parm *p = parms;
       while (p) {
@@ -4105,7 +4118,7 @@ private:
 
     if (!gccgo_flag) {
       Printv(w->code, "  struct {\n", NULL);
-      Printv(w->code, "    void *go_val;\n", NULL);
+      Printv(w->code, "    intgo go_val;\n", NULL);
 
       Parm *p = parms;
       while (p) {
@@ -4295,7 +4308,7 @@ private:
     (void) n;
 
     Printv(f_c_directors_h, " private:\n", NULL);
-    Printv(f_c_directors_h, "  void *go_val;\n", NULL);
+    Printv(f_c_directors_h, "  intgo go_val;\n", NULL);
     Printv(f_c_directors_h, "  Swig_memory *swig_mem;\n", NULL);
     Printv(f_c_directors_h, "};\n\n", NULL);
 

From de1cae9319f0e1282a77435bddb681a446ef5f8b Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 26 Feb 2015 14:56:29 +1300
Subject: [PATCH 010/220] Fix segmentation fault when top==NULL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduced by nested class handling (reported in issue#346 by Paweł Tomulik).
---
 CHANGES.current           | 4 ++++
 Source/Modules/nested.cxx | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index a8fa0ca46..21f75ecf8 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-02-26: olly
+	    Fix segmentation fault when top==NULL, introduced by nested class
+	    handling (reported in issue#346 by Paweł Tomulik).
+
 2015-02-09: wsfulton
             [Guile] Fix generated code for static const char member variables when
             defined and declared inline.
diff --git a/Source/Modules/nested.cxx b/Source/Modules/nested.cxx
index c4ab6a8ea..0fcd5ad18 100644
--- a/Source/Modules/nested.cxx
+++ b/Source/Modules/nested.cxx
@@ -340,6 +340,8 @@ static void insertNodeAfter(Node *n, Node *c) {
 }
 
 void Swig_nested_name_unnamed_c_structs(Node *n) {
+  if (!n)
+    return;
   if (!classhash)
     classhash = Getattr(n, "classes");
   Node *c = firstChild(n);
@@ -427,6 +429,8 @@ static void remove_outer_class_reference(Node *n) {
 }
 
 void Swig_nested_process_classes(Node *n) {
+  if (!n)
+    return;
   Node *c = firstChild(n);
   while (c) {
     Node *next = nextSibling(c);

From df36d84f1b43cdb9c5aba2277942871d874deecf Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 26 Feb 2015 14:59:49 +1300
Subject: [PATCH 011/220] Avoid debug code segfaults when top==NULL

---
 Source/Modules/main.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
index aa0d7d589..f0f9962dd 100644
--- a/Source/Modules/main.cxx
+++ b/Source/Modules/main.cxx
@@ -1221,7 +1221,7 @@ int SWIG_main(int argc, char *argv[], Language *l) {
       Printf(stdout, "debug-top stage 3\n");
       Swig_print_tree(top);
     }
-    if (dump_module & STAGE3) {
+    if (top && (dump_module & STAGE3)) {
       Printf(stdout, "debug-module stage 3\n");
       Swig_print_tree(Getattr(top, "module"));
     }
@@ -1230,7 +1230,7 @@ int SWIG_main(int argc, char *argv[], Language *l) {
       Printf(stdout, "Generating wrappers...\n");
     }
 
-    if (dump_classes) {
+    if (top && dump_classes) {
       Hash *classes = Getattr(top, "classes");
       if (classes) {
 	Printf(stdout, "Classes\n");

From 9ad497c08e012b9fc5431486d982ea4053c53478 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 2 Mar 2015 14:03:33 -0800
Subject: [PATCH 012/220] [Go] Add -cgo option, required for Go version 1.5 and
 later.

---
 CHANGES.current                               |    4 +
 Doc/Manual/Go.html                            |   70 +-
 Examples/Makefile.in                          |  133 +-
 Examples/test-suite/go/Makefile.in            |   84 +-
 Examples/test-suite/go_subdir_import_a.i      |    4 +-
 Examples/test-suite/go_subdir_import_b.i      |    2 +-
 .../go_subdir_import/go_subdir_import_c.i     |    2 +-
 Lib/go/go.swg                                 |    2 +-
 Lib/go/goruntime.swg                          |   65 +-
 Source/Modules/go.cxx                         | 1490 +++++++++++++++--
 configure.ac                                  |  141 +-
 11 files changed, 1697 insertions(+), 300 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 21f75ecf8..93e5fb943 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-03-02: ianlancetaylor
+	    [Go] Add -cgo option, required for Go versions 1.5 and
+	    later.
+
 2015-02-26: olly
 	    Fix segmentation fault when top==NULL, introduced by nested class
 	    handling (reported in issue#346 by Paweł Tomulik).
diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 895e6c581..175f22f26 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -111,6 +111,14 @@ swig -go -help
 <th>Go specific options</th>
 </tr>
 
+<tr>
+<td>-cgo</td>
+<td>Generate files to be used as input for the Go cgo tool.  This
+  option is required for Go 1.5 and later, and works for Go 1.2 and
+  later.  In the future this option will likely become the
+  default.</td>
+</tr>
+
 <tr>
 <td>-intgosize &lt;s&gt;</td>
 <td>Set the size for the Go type <tt>int</tt>.  This controls the size
@@ -171,8 +179,13 @@ swig -go -help
 <H3><a name="Go_outputs"></a>23.3.2 Go Output Files</H3>
 
 
-<p> When generating Go code, SWIG will generate the following
-  files:</p>
+<p>There are two different approaches to generating output files,
+  controlled by SWIG's <tt>-cgo</tt> option.  The <tt>-cgo</tt> option
+  works with Go version 1.2 or later.  It is required when using Go
+  version 1.5 or later.</p>
+
+<p>With or without the <tt>-cgo</tt> option, SWIG will generate the
+  following files when generating Go code:</p>
 
 <ul>
 <li>
@@ -180,21 +193,30 @@ MODULE.go will contain the Go functions that your Go code will call.
 These functions will be wrappers for the C++ functions defined by your
 module.  This file should, of course, be compiled with the Go
 compiler.
+</li>
 <li>
 MODULE_wrap.c or MODULE_wrap.cxx will contain C/C++ functions will be
 invoked by the Go wrapper code.  This file should be compiled with the
-usual C or C++ compiler and linked into a shared library.
+usual C or C++ compiler.
+</li>
 <li>
 MODULE_wrap.h will be generated if you use the directors feature.  It
 provides a definition of the generated C++ director classes.  It is
 generally not necessary to use this file, but in some special cases it
 may be helpful to include it in your code, compiled with the usual C
 or C++ compiler.
+</li>
+</ul>
+
+<p>When neither the <tt>-cgo</tt> nor the <tt>-gccgo</tt> option is
+  used, SWIG will also generate an additional file:</p>
+
+<ul>
 <li>
-If using the gc compiler, MODULE_gc.c will contain C code which should
-be compiled with the C compiler distributed as part of the gc
-compiler.  It should then be combined with the compiled MODULE.go
-using gopack.  This file will not be generated when using gccgo.
+MODULE_gc.c will contain C code which should be compiled with the C
+compiler distributed as part of the gc compiler.  It should then be
+combined with the compiled MODULE.go using go tool pack.
+</li>
 </ul>
 
 <p>
@@ -203,14 +225,33 @@ support for SWIG.  To use it, put your SWIG interface into a file with
 the extension .swig, or, if you are wrapping C++ code, .swigcxx.  Put
 that file in a GOPATH/src directory as usual for Go sources.  Put
 other interface code in the same directory with extensions of .c and
-.cxx.  The go build command and go install commands will automatically
-run SWIG for you and will build the interface code.
+.cxx.  The <tt>go build</tt> and <tt>go install</tt> commands will
+automatically run SWIG for you and will build the interface code.
 </p>
 
 <p>
-You can also use SWIG directly yourself.  When using the gc compiler
-version 1.2 or later, or when using gccgo, the code generated by SWIG
-can be linked directly into the Go program.  A typical command
+You can also use SWIG directly yourself.  When using
+the <tt>-cgo</tt> option, SWIG will generate files that can be used
+directly by <tt>go build</tt>.  Put your SWIG input file in a
+directory under GOPATH/src, and give it a name that does not end in
+.swig or .swigcxx.
+</p>
+
+<div class="code"><pre>
+% swig -go -cgo example.i
+% go install
+</pre></div>
+
+<p>
+You will now have a Go package that you can import from other Go
+packages as usual.
+</p>
+
+<p>
+To use SWIG without the <tt>-cgo</tt> option, more steps are required.
+Recall that this only works with Go versions before 1.5.  When using
+Go version 1.2 or later, or when using gccgo, the code generated by
+SWIG can be linked directly into the Go program.  A typical command
 sequence when using the gc compiler would look like this:
 </p>
 
@@ -227,9 +268,8 @@ sequence when using the gc compiler would look like this:
 
 <p>
 You can also put the wrapped code into a shared library, and when
-using the gc compiler before version 1.2 this is the only supported
-option.  A typical command sequence for this approach would look like
-this:
+using the Go versions before 1.2 this is the only supported option.  A
+typical command sequence for this approach would look like this:
 </p>
 
 <div class="code"><pre>
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 8aa1ecedf..47e2d7ca7 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1752,15 +1752,18 @@ scilab_clean:
 
 GO = @GO@
 GOGCC = @GOGCC@
+GCCGO = @GCCGO@
 GO1 = @GO1@
 GO12 = @GO12@
 GO13 = @GO13@
+GO15 = @GO15@
 GOC = @GOC@
 GOOPT = @GOOPT@
+GCCGOOPT = @GCCGOOPT@
 GOVERSIONOPTION = @GOVERSIONOPTION@
 
 GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
-GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) && ! $(GOGCC); then echo -pack ; fi`
+GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi`
 
 GOSRCS = $(INTERFACE:.i=.go)
 GOCSRCS = $(INTERFACE:.i=_gc.c)
@@ -1769,7 +1772,9 @@ GOLD = $(GOC:c=l)
 GOTOOL = `if $(GO1) ; then echo go tool; fi`
 GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
 
-GOPACKAGE = $(INTERFACE:.i=.a)
+GOPACKAGE = $(notdir $(INTERFACE:.i=.a))
+
+GOPATHDIR = gopath/src/$(INTERFACE:.i=)
 
 GOOBJEXT = $(GOC:c=)
 GOGCOBJS = $(GOSRCS:.go=.$(GOOBJEXT))
@@ -1779,19 +1784,21 @@ GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@)
 # Build a Go module (C)
 # ----------------------------------------------------------------
 
-go: $(SRCDIR_SRCS)
+go_nocgo: $(SRCDIR_SRCS)
 	$(SWIG) -go $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
-	if $(GO12) || $(GO13) || $(GOGCC); then \
+	if $(GO12) || $(GO13) || $(GO15) || $(GOGCC); then \
 	  $(CC) -g -c $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES); \
 	else \
 	  $(CC) -g -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SRCDIR_SRCS) $(ISRCS) $(INCLUDES); \
 	  $(LDSHARED) $(CFLAGS) $(LDFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO); \
 	fi
-	$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS)
-	if ! $(GOGCC) ; then \
+	if $(GOGCC) ; then \
+	  $(COMPILETOOL) $(GCCGO) -g -c -I . $(GOSRCS); \
+	else \
+	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS); \
 	  $(COMPILETOOL) $(GOTOOL) $(GOC) -I $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`} $(GOCSRCS); \
 	  rm -f $(GOPACKAGE); \
-	  if $(GO13); then \
+	  if $(GO13) || $(GO15); then \
 	    cp $(GOGCOBJS) $(GOPACKAGE); \
 	    $(COMPILETOOL) $(GOPACK) r $(GOPACKAGE) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \
 	  elif $(GO12); then \
@@ -1801,12 +1808,54 @@ go: $(SRCDIR_SRCS)
 	  fi; \
 	fi
 	if test -f $(SRCDIR)$(RUNME).go; then \
-	  $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	  if $(GOGCC) ; then \
-	    $(COMPILETOOL) $(GO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS); \
-	  elif $(GO12) || $(GO13); then \
+	    $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS); \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  else \
+	    $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \
+	  fi; \
+	fi
+
+go: $(SRCDIR_SRCS)
+	$(SWIG) -go -cgo $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
+	@mkdir gopath 2>/dev/null || true
+	@mkdir gopath/src 2>/dev/null || true
+	@mkdir gopath/src/$(INTERFACE:.i=) 2>/dev/null || true
+	rm -f $(GOPATHDIR)/*
+	cp $(ISRCS) $(GOPATHDIR)/
+	if test -f $(IWRAP:.i=.h); then \
+	  cp $(IWRAP:.i=.h) $(GOPATHDIR)/; \
+	fi
+	if test -n "$(SRCDIR_SRCS)"; then \
+	  cp $(SRCDIR_SRCS) $(GOPATHDIR)/; \
+	fi
+	cp $(GOSRCS) $(GOPATHDIR)/
+	GOPATH=`pwd`/gopath; \
+	export GOPATH; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `pwd`"; \
+	export CGO_CPPFLAGS; \
+	CGO_CFLAGS="$(CFLAGS)"; \
+	export CGO_CFLAGS; \
+	CGO_LDFLAGS="$(LDFLAGS) -lm"; \
+	export CGO_LDFLAGS; \
+	(cd $(GOPATHDIR)/ && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE))
+	cp $(GOPATHDIR)/$(GOPACKAGE) $(dir $(INTERFACE))/$(GOPACKAGE)
+	if $(GOGCC); then \
+	  cp $(dir $(INTERFACE))/$(GOPACKAGE) $(dir $(INTERFACE))/$(GOPACKAGE:.a=.gox); \
+	fi
+	if test -f $(SRCDIR)$(RUNME).go; then \
+	  if $(GOGCC) ; then \
+	    $(COMPILETOOL) $(GCCGO) -c -g $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE); \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
+	  else \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  fi; \
 	fi
@@ -1815,9 +1864,9 @@ go: $(SRCDIR_SRCS)
 # Build a Go module (C++)
 # ----------------------------------------------------------------
 
-go_cpp: $(SRCDIR_SRCS)
+go_cpp_nocgo: $(SRCDIR_SRCS)
 	$(SWIG) -go -c++ $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
-	if $(GO12) || $(GO13) || $(GOGCC); then \
+	if $(GO12) || $(GO13) || $(GO15) || $(GOGCC); then \
 	  if test -n "$(SRCDIR_CXXSRCS)$(SRCDIR_SRCS)"; then \
 	    $(CXX) -g -c $(CPPFLAGS) $(CXXFLAGS) $(SRCDIR_CXXSRCS) $(SRCDIR_SRCS) $(INCLUDES); \
 	  fi; \
@@ -1837,7 +1886,7 @@ go_cpp: $(SRCDIR_SRCS)
 	    -o $(addsuffix .$(GOOBJEXT),$(basename $f)) $f; \
 	  ) \
 	  rm -f $(GOPACKAGE); \
-	  if $(GO13); then \
+	  if $(GO13) || $(GO15); then \
 	    cp $(GOGCOBJS) $(GOPACKAGE); \
 	    $(COMPILETOOL) $(GOPACK) r $(GOPACKAGE) $(GOCSRCS:.c=.$(GOOBJEXT)) $(OBJS) $(IOBJS); \
 	  elif $(GO12); then \
@@ -1847,16 +1896,63 @@ go_cpp: $(SRCDIR_SRCS)
 	  fi; \
 	else \
 	  $(foreach f,$(GOSRCS), \
-	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . -o $(addsuffix .@OBJEXT@,$(basename $f)) $f \
+	    $(COMPILETOOL) $(GCCGO) -g -c -I . -o $(addsuffix .@OBJEXT@,$(basename $f)) $f \
 	  ); \
 	fi
 	if test -f $(SRCDIR)$(RUNME).go; then \
-	  $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	  if $(GOGCC) ; then \
-	    $(COMPILETOOL) $(GO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS) -lstdc++; \
-	  elif $(GO12) || $(GO13); then \
+	    $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(GOGCCOBJS) $(OBJS) $(IOBJS) -lstdc++; \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  else \
+	    $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \
+	  fi; \
+	fi
+
+go_cpp: $(SRCDIR_SRCS)
+	$(SWIG) -go -c++ -cgo $(GOOPT) $(GOSWIGARG) $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
+	@mkdir gopath 2>/dev/null || true
+	@mkdir gopath/src 2>/dev/null || true
+	@mkdir gopath/src/$(INTERFACE:.i=) 2>/dev/null || true
+	rm -f $(GOPATHDIR)/*
+	cp $(ICXXSRCS) $(GOPATHDIR)/
+	if test -f $(IWRAP:.i=.h); then \
+	  cp $(IWRAP:.i=.h) $(GOPATHDIR)/; \
+	fi
+	if test -n "$(SRCDIR_CXXSRCS)"; then \
+	  cp $(SRCDIR_CXXSRCS) $(GOPATHDIR)/; \
+	fi
+	if test -n "$(SRCDIR_SRCS)"; then \
+	  cp $(SRCDIR_SRCS) $(GOPATHDIR)/; \
+	fi
+	cp $(GOSRCS) $(GOPATHDIR)/
+	GOPATH=`pwd`/gopath; \
+	export GOPATH; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `pwd`"; \
+	export CGO_CPPFLAGS; \
+	CGO_CFLAGS="$(CFLAGS)"; \
+	export CGO_CFLAGS; \
+	CGO_CXXFLAGS="$(CXXFLAGS)"; \
+	export CGO_CXXFLAGS; \
+	CGO_LDFLAGS="$(LDFLAGS) -lm"; \
+	export CGO_LDFLAGS; \
+	(cd $(GOPATHDIR) && $(COMPILETOOL) $(GO) build `if $(GOGCC); then echo -compiler=gccgo; fi` -o $(GOPACKAGE))
+	cp $(GOPATHDIR)/$(GOPACKAGE) $(dir $(INTERFACE))/$(GOPACKAGE)
+	if $(GOGCC); then \
+	  cp $(dir $(INTERFACE))/$(GOPACKAGE) $(dir $(INTERFACE))/$(GOPACKAGE:.a=.gox); \
+	fi
+	if test -f $(SRCDIR)$(RUNME).go; then \
+	  if $(GOGCC) ; then \
+	    $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE) -lstdc++; \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
+	  else \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  fi; \
 	fi
@@ -1880,7 +1976,8 @@ go_version:
 # -----------------------------------------------------------------
 
 go_clean:
-	rm -f *_wrap* *_gc* .~* $(RUNME) $(GOSRCS)
+	rm -f *_wrap* *_gc* *.gox .~* $(RUNME) $(GOSRCS)
+	rm -rf gopath
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *.[568] *.a *@SO@
 
diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index b4747601c..3c99a0879 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -5,13 +5,15 @@
 LANGUAGE	= go
 GO		= @GO@
 GOGCC		= @GOGCC@
+GCCGO		= @GCCGO@
 GO1		= @GO1@
 GO12		= @GO12@
 GO13		= @GO13@
+GO15		= @GO15@
 GOC		= @GOC@
 SCRIPTSUFFIX	= _runme.go
 
-GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi`
+GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi`
 GOLD = $(GOC:c=l)
 GOTOOL = `if $(GO1) ; then echo go tool; fi`
 GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
@@ -20,9 +22,10 @@ GOOBJEXT = $(GOC:c=)
 
 SO = @SO@
 
-srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@
-top_builddir = @top_builddir@
+srcdir         = @srcdir@
+top_srcdir     = @top_srcdir@
+top_builddir   = @top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 
 CPP_TEST_CASES = \
 	go_inout \
@@ -33,6 +36,8 @@ MULTI_CPP_TEST_CASES = \
 
 include $(srcdir)/../common.mk
 
+INCLUDES = -I$(abs_top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)
+
 .SUFFIXES: .cpptest .ctest .multicpptest
 
 # Rules for the different types of tests
@@ -40,17 +45,37 @@ include $(srcdir)/../common.mk
 	$(setup)
 	+$(swig_and_compile_cpp)
 	$(run_testcase_cpp)
+	if ! $(GO15); then \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
+	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	  TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
+	  $(LANGUAGE)$(VARIANT)_cpp_nocgo; \
+	  $(run_testcase_cpp); \
+	fi
 
 %.ctest:
 	$(setup)
 	+$(swig_and_compile_c)
 	$(run_testcase)
+	if ! $(GO15); then \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CSRCS="$(CSRCS)" \
+	  SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" \
+	  INCLUDES="$(INCLUDES)" SWIGOPT="$(SWIGOPT)" NOLINK=true \
+	  TARGET="$(TARGETPREFIX)$*$(TARGETSUFFIX)" INTERFACEDIR="$(INTERFACEDIR)" INTERFACE="$*.i" \
+	  $(LANGUAGE)$(VARIANT)_nocgo; \
+	  $(run_testcase); \
+	fi
 
 %.multicpptest:
 	$(setup)
 	+$(swig_and_compile_multi_cpp)
 	$(run_multi_testcase)
 
+li_windows.cpptest:
+	# Does not work because go build won't build li_windows.go,
+	# because file names with "windows" are only built on Windows.
+
 multi_import.multicpptest:
 	$(setup)
 	for f in multi_import_b multi_import_a; do \
@@ -65,6 +90,7 @@ multi_import.multicpptest:
 go_subdir_import.multicpptest:
 	$(setup)
 	mkdir -p testdir/go_subdir_import/
+	mkdir -p gopath/src/testdir/go_subdir_import/
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" CXXSRCS="$(CXXSRCS)" \
 	SWIG_LIB="$(SWIG_LIB)" SWIG="$(SWIG)" LIBS='$(LIBS)' \
 	INTERFACEPATH="$(SRCDIR)$(INTERFACEDIR)go_subdir_import_b.i" \
@@ -80,19 +106,24 @@ go_subdir_import.multicpptest:
 	  $(LANGUAGE)$(VARIANT)_cpp; \
 	done
 	if $(GOGCC); then \
-	  cp testdir/go_subdir_import/*.@OBJEXT@ .; \
+	  cp gopath/src/testdir/go_subdir_import/go_subdir_import_b/go_subdir_import_b.a gopath/src/testdir/go_subdir_import/go_subdir_import_b.gox; \
+	  cp gopath/src/testdir/go_subdir_import/go_subdir_import_b/go_subdir_import_b.a .; \
+	  cp gopath/src/testdir/go_subdir_import/go_subdir_import_c/go_subdir_import_c.a gopath/src/testdir/go_subdir_import/go_subdir_import_c.gox; \
+	  cp gopath/src/testdir/go_subdir_import/go_subdir_import_c/go_subdir_import_c.a testdir/go_subdir_import/; \
 	fi
 	$(run_multi_testcase)
 
 # Runs the testcase.
 run_testcase = \
 	if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \
-	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	  if $(GOGCC) ; then \
-	    $(COMPILETOOL) $(GO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $*.@OBJEXT@ $*_wrap.@OBJEXT@; \
-	  elif $(GO12) || $(GO13); then \
+	    $(COMPILETOOL) $(GCCGO) -c -g -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
+	    $(COMPILETOOL) $(GCCGO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $*.a; \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld $(CC) -extldflags "$(CFLAGS)" -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  else \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  fi && \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \
@@ -100,12 +131,14 @@ run_testcase = \
 
 run_testcase_cpp = \
 	if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \
-	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	  if $(GOGCC) ; then \
-	    $(COMPILETOOL) $(GO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $*.@OBJEXT@ $*_wrap.@OBJEXT@ -lstdc++; \
-	  elif $(GO12) || $(GO13); then \
+	    $(COMPILETOOL) $(GCCGO) -c -g -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
+	    $(COMPILETOOL) $(GCCGO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ $*.a -lstdc++; \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld $(CXX) -extldflags "$(CXXFLAGS)" -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  else \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  fi && \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \
@@ -113,29 +146,38 @@ run_testcase_cpp = \
 
 run_multi_testcase = \
 	if test -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); then \
-	  $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	  if $(GOGCC) ; then \
+	    $(COMPILETOOL) $(GCCGO) -c -g -I . -I gopath/src $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    files=`cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list`; \
-	    $(COMPILETOOL) $(GO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ `for f in $$files; do echo $$f.@OBJEXT@ $${f}_wrap.@OBJEXT@; done` -lstdc++; \
-	  elif $(GO12) || $(GO13); then \
+	    $(COMPILETOOL) $(GCCGO) -o $*_runme $(SCRIPTPREFIX)$*_runme.@OBJEXT@ `for f in $$files; do echo $$f.a; done` -lstdc++; \
+	  elif $(GO12) || $(GO13) || $(GO15); then \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -linkmode external -extld $(CXX) -extldflags "$(CXXFLAGS)" -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  else \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) && \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -L . -r $${GOROOT:-`go env GOROOT`}/pkg/$${GOOS:-`go env GOOS`}_$${GOARCH:-`go env GOARCH`}:. -o $*_runme $(SCRIPTPREFIX)$*_runme.$(GOOBJEXT); \
 	  fi && \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) ./$*_runme; \
 	fi
 
 %.clean:
-	@rm -f $*.go $*_gc.c $*_wrap.* $*_runme
+	@rm -rf $*.go $*_gc.c $*_wrap.* $*_runme $*.gox $*.a
 
 clean:
 	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile SRCDIR="$(SRCDIR)" go_clean
-	rm -f mod_a.go mod_b.go imports_a.go imports_b.go
-	rm -f clientdata_prop_a.go clientdata_prop_b.go
-	rm -f multi_import_a.go multi_import_b.go
-	rm -rf go_subdir_import_a.go testdir
-	rm -f packageoption_a.go packageoption_b.go packageoption_c.go
-	rm -f import_stl_a.go import_stl_b.go
+	rm -f mod_a.go mod_a.gox mod_b.go mod_b.gox
+	rm -f imports_a.go imports_a.gox imports_b.go imports_b.gox
+	rm -f clientdata_prop_a.go clientdata_prop_a.gox
+	rm -f clientdata_prop_b.go clientdata_prop_b.gox
+	rm -f multi_import_a.go multi_import_a.gox
+	rm -f multi_import_b.go multi_import_b.gox
+	rm -rf go_subdir_import_a.go go_subdir_import_a.gox testdir
+	rm -f packageoption_a.go packageoption_a.gox
+	rm -f packageoption_b.go packageoption_b.gox
+	rm -f packageoption_c.go packageoption_c.gox
+	rm -f import_stl_a.go import_stl_a.gox
+	rm -f import_stl_b.go import_stl_b.gox
+	rm -rf gopath
 
 cvsignore:
 	@echo '*_gc.c *_wrap.* *.so *.dll *.exp *.lib'
diff --git a/Examples/test-suite/go_subdir_import_a.i b/Examples/test-suite/go_subdir_import_a.i
index 72b28786e..3fc36e6f9 100644
--- a/Examples/test-suite/go_subdir_import_a.i
+++ b/Examples/test-suite/go_subdir_import_a.i
@@ -20,12 +20,12 @@
 %{
 class ObjC {
  public:
-  int getInt() const;
+  virtual int getInt() const;
 };
 
 class ObjB {
  public:
-  int getInt() const;
+  virtual int getInt() const;
 };
 %}
 
diff --git a/Examples/test-suite/go_subdir_import_b.i b/Examples/test-suite/go_subdir_import_b.i
index b87f7cf3c..42544822e 100644
--- a/Examples/test-suite/go_subdir_import_b.i
+++ b/Examples/test-suite/go_subdir_import_b.i
@@ -4,7 +4,7 @@
 %inline %{
 class ObjB {
  public:
-  int getInt() const {
+  virtual int getInt() const {
     return 27;
   }
 };
diff --git a/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i b/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i
index 2c2c2e1fe..dff269c3f 100644
--- a/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i
+++ b/Examples/test-suite/testdir/go_subdir_import/go_subdir_import_c.i
@@ -4,7 +4,7 @@
 %inline %{
 class ObjC {
  public:
-  int getInt() const {
+  virtual int getInt() const {
     return 18;
   }
 };
diff --git a/Lib/go/go.swg b/Lib/go/go.swg
index d38623b4a..35f914c5b 100644
--- a/Lib/go/go.swg
+++ b/Lib/go/go.swg
@@ -533,7 +533,7 @@
 %typemap(directorin) enum SWIGTYPE & (intgo e)
 %{
   e = (intgo)$1;
-  $input = &e;
+  $input = ($1_ltype)&e;
 %}
 
 %typemap(godirectorin) enum SWIGTYPE & ""
diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index f76da9c78..d776e414a 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -19,21 +19,45 @@ static void Swig_free(void* p) {
 
 %}
 
+#if SWIGGO_CGO
+%insert(cgo_comment_typedefs) %{
+#include <stdint.h>
+%}
+#endif
+
 #if SWIGGO_INTGO_SIZE == 32
 %insert(runtime) %{
 typedef int intgo;
 typedef unsigned int uintgo;
 %}
+#if SWIGGO_CGO
+%insert(cgo_comment_typedefs) %{
+typedef int intgo;
+typedef unsigned int uintgo;
+%}
+#endif
 #elif SWIGGO_INTGO_SIZE == 64
 %insert(runtime) %{
 typedef long long intgo;
 typedef unsigned long long uintgo;
 %}
+#if SWIGGO_CGO
+%insert(cgo_comment_typedefs) %{
+typedef long long intgo;
+typedef unsigned long long uintgo;
+%}
+#endif
 #else
 %insert(runtime) %{
 typedef ptrdiff_t intgo;
 typedef size_t uintgo;
 %}
+#if SWIGGO_CGO
+%insert(cgo_comment_typedefs) %{
+typedef ptrdiff_t intgo;
+typedef size_t uintgo;
+%}
+#endif
 #endif
 
 %insert(runtime) %{
@@ -43,6 +67,17 @@ typedef struct { void* array; intgo len; intgo cap; } _goslice_;
 
 %}
 
+#ifdef SWIGGO_CGO
+
+%insert(cgo_comment_typedefs) %{
+
+typedef struct { char *p; intgo n; } _gostring_;
+typedef struct { void* array; intgo len; intgo cap; } _goslice_;
+
+%}
+
+#endif
+
 #ifndef SWIGGO_GCCGO
 /* Boilerplate for C/C++ code when using 6g/8g.  This code is compiled
    with gcc.  */
@@ -98,6 +133,8 @@ static void _swig_gopanic(const char *p) {
 
 %}
 
+#if !SWIGGO_CGO
+
 /* Boilerplate for C code when using 6g/8g.  This code is compiled
    with 6c/8c.  */
 %insert(gc_header) %{
@@ -111,6 +148,8 @@ void *·_cgo_runtime_cgocall = &cgocall;
 
 %}
 
+#endif
+
 #else
 
 /* Boilerplate for C/C++ code when using gccgo.  */
@@ -122,6 +161,17 @@ extern "C" {
 #endif
 extern void *_cgo_allocate(size_t);
 extern void _cgo_panic(const char *);
+#ifdef __cplusplus
+}
+#endif
+
+#define _swig_goallocate _cgo_allocate
+#define _swig_gopanic _cgo_panic
+%}
+
+#if !SWIGGO_CGO
+
+%insert(runtime) %{
 
 /* Implementations of SwigCgocall and friends for different versions
    of gccgo.  The Go code will call these functions using C names with
@@ -130,6 +180,10 @@ extern void _cgo_panic(const char *);
    version.  We assume that the version of gcc used to compile this
    file is the same as the version of gccgo.  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SWIG_GCC_VERSION \
   (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 
@@ -184,13 +238,12 @@ void SwigCgocallBackDone() {
 }
 #endif
 
-#define _swig_goallocate _cgo_allocate
-#define _swig_gopanic _cgo_panic
-
 %}
 
 #endif
 
+#endif
+
 %insert(runtime) %{
 
 static _gostring_ _swig_makegostring(const char *p, size_t l) {
@@ -209,9 +262,11 @@ static _gostring_ _swig_makegostring(const char *p, size_t l) {
 
 %go_import("unsafe", _ "runtime/cgo")
 
+#if !SWIGGO_CGO
 %insert(go_header) %{
 var _cgo_runtime_cgocall func(unsafe.Pointer, uintptr)
 %}
+#endif
 
 #else
 
@@ -231,6 +286,8 @@ type _ unsafe.Pointer
 
 %}
 
+#if !SWIGGO_CGO
+
 /* Swig_always_false is used to conditionally assign parameters to
    Swig_escape_val so that the compiler thinks that they escape.  We
    only assign them if Swig_always_false is true, which it never is.
@@ -241,6 +298,8 @@ var Swig_escape_always_false bool
 var Swig_escape_val interface{}
 %}
 
+#endif
+
 /* Function pointers are translated by the code in go.cxx into
    _swig_fnptr.  Member pointers are translated to _swig_memberptr.  */
 
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 92d857c56..0d349bd22 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -115,6 +115,8 @@ class GO:public Language {
   String *package;
   // SWIG module name.
   String *module;
+  // Flag for generating cgo input files.
+  bool cgo_flag;
   // Flag for generating gccgo output.
   bool gccgo_flag;
   // Prefix to use with gccgo.
@@ -150,6 +152,8 @@ class GO:public Language {
   File *f_gc_runtime;
   File *f_gc_header;
   File *f_gc_wrappers;
+  File *f_cgo_comment;
+  File *f_cgo_comment_typedefs;
 
   // True if we imported a module.
   bool saw_import;
@@ -195,6 +199,7 @@ class GO:public Language {
 public:
   GO():package(NULL),
      module(NULL),
+     cgo_flag(false),
      gccgo_flag(false),
      go_prefix(NULL),
      prefix_option(NULL),
@@ -219,6 +224,8 @@ public:
      f_gc_runtime(NULL),
      f_gc_header(NULL),
      f_gc_wrappers(NULL),
+     f_cgo_comment(NULL),
+     f_cgo_comment_typedefs(NULL),
      saw_import(false),
      imported_package(NULL),
      interfaces(NULL),
@@ -231,7 +238,8 @@ public:
      undefined_enum_types(NULL),
      undefined_types(NULL),
      defined_types(NULL),
-     go_imports(NULL) {
+     go_imports(NULL),
+     unique_id(NULL) {
     director_multiple_inheritance = 1;
     director_language = 1;
     director_prot_ctor_code = NewString("_swig_gopanic(\"accessing abstract class or protected constructor\");");
@@ -258,6 +266,9 @@ private:
 	  } else {
 	    Swig_arg_error();
 	  }
+	} else if (strcmp(argv[i], "-cgo") == 0) {
+	  Swig_mark_arg(i);
+	  cgo_flag = true;
 	} else if (strcmp(argv[i], "-gccgo") == 0) {
 	  Swig_mark_arg(i);
 	  gccgo_flag = true;
@@ -327,6 +338,10 @@ private:
     // Add preprocessor symbol to parser.
     Preprocessor_define("SWIGGO 1", 0);
 
+    if (cgo_flag) {
+      Preprocessor_define("SWIGGO_CGO 1", 0);
+    }
+
     if (gccgo_flag) {
       Preprocessor_define("SWIGGO_GCCGO 1", 0);
     }
@@ -474,7 +489,7 @@ private:
       SWIG_exit(EXIT_FAILURE);
     }
 
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       f_gc_begin = NewFile(gc_filename, "w", SWIG_output_files());
       if (!f_gc_begin) {
 	FileErrorDisplay(gc_filename);
@@ -492,11 +507,15 @@ private:
     f_go_header = NewString("");
     f_go_wrappers = NewString("");
     f_go_directors = NewString("");
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       f_gc_runtime = NewString("");
       f_gc_header = NewString("");
       f_gc_wrappers = NewString("");
     }
+    if (cgo_flag) {
+      f_cgo_comment = NewString("");
+      f_cgo_comment_typedefs = NewString("");
+    }
 
     Swig_register_filebyname("begin", f_c_begin);
     Swig_register_filebyname("runtime", f_c_runtime);
@@ -511,12 +530,16 @@ private:
     Swig_register_filebyname("go_header", f_go_header);
     Swig_register_filebyname("go_wrapper", f_go_wrappers);
     Swig_register_filebyname("go_director", f_go_directors);
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       Swig_register_filebyname("gc_begin", f_gc_begin);
       Swig_register_filebyname("gc_runtime", f_gc_runtime);
       Swig_register_filebyname("gc_header", f_gc_header);
       Swig_register_filebyname("gc_wrapper", f_gc_wrappers);
     }
+    if (cgo_flag) {
+      Swig_register_filebyname("cgo_comment", f_cgo_comment);
+      Swig_register_filebyname("cgo_comment_typedefs", f_cgo_comment_typedefs);
+    }
 
     Swig_banner(f_c_begin);
     if (CPlusPlus) {
@@ -549,18 +572,28 @@ private:
     Swig_banner(f_go_begin);
     Printf(f_go_begin, "\n// source: %s\n", swig_filename);
 
-    if (!gccgo_flag && soname) {
+    if (!gccgo_flag && !cgo_flag && soname) {
       Swig_banner(f_gc_begin);
       Printf(f_gc_begin, "\n/* source: %s */\n\n", swig_filename);
       Printf(f_gc_begin, "\n/* This file should be compiled with 6c/8c.  */\n");
       Printf(f_gc_begin, "#pragma dynimport _ _ \"%s\"\n", soname);
     }
 
+    if (cgo_flag) {
+      Printv(f_cgo_comment_typedefs, "/*\n", NULL);
+
+      // The cgo program defines the intgo type after our function
+      // definitions, but we want those definitions to be able to use
+      // intgo also.
+      Printv(f_cgo_comment_typedefs, "#define intgo swig_intgo\n", NULL);
+      Printv(f_cgo_comment_typedefs, "typedef void *swig_voidp;\n", NULL);
+    }
+
     // Output module initialization code.
 
     Printf(f_go_begin, "\npackage %s\n\n", getModuleName(package));
 
-    if (gccgo_flag) {
+    if (gccgo_flag && !cgo_flag) {
       Printf(f_go_runtime, "func SwigCgocall()\n");
       Printf(f_go_runtime, "func SwigCgocallDone()\n");
       Printf(f_go_runtime, "func SwigCgocallBack()\n");
@@ -632,9 +665,21 @@ private:
     // End the extern "C".
     Printv(f_c_wrappers, "#ifdef __cplusplus\n", "}\n", "#endif\n\n", NULL);
 
+    if (cgo_flag) {
+      // End the cgo comment.
+      Printv(f_cgo_comment, "#undef intgo\n", NULL);
+      Printv(f_cgo_comment, "*/\n", NULL);
+      Printv(f_cgo_comment, "import \"C\"\n", NULL);
+      Printv(f_cgo_comment, "\n", NULL);
+    }
+
     Dump(f_c_runtime, f_c_begin);
     Dump(f_c_wrappers, f_c_begin);
     Dump(f_c_init, f_c_begin);
+    if (cgo_flag) {
+      Dump(f_cgo_comment_typedefs, f_go_begin);
+      Dump(f_cgo_comment, f_go_begin);
+    }
     Dump(f_go_imports, f_go_begin);
     Dump(f_go_header, f_go_begin);
     Dump(f_go_runtime, f_go_begin);
@@ -642,7 +687,7 @@ private:
     if (directorsEnabled()) {
       Dump(f_go_directors, f_go_begin);
     }
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       Dump(f_gc_header, f_gc_begin);
       Dump(f_gc_runtime, f_gc_begin);
       Dump(f_gc_wrappers, f_gc_begin);
@@ -657,15 +702,19 @@ private:
     Delete(f_go_header);
     Delete(f_go_wrappers);
     Delete(f_go_directors);
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       Delete(f_gc_runtime);
       Delete(f_gc_header);
       Delete(f_gc_wrappers);
     }
+    if (cgo_flag) {
+      Delete(f_cgo_comment);
+      Delete(f_cgo_comment_typedefs);
+    }
 
     Delete(f_c_begin);
     Delete(f_go_begin);
-    if (!gccgo_flag) {
+    if (!gccgo_flag && !cgo_flag) {
       Delete(f_gc_begin);
     }
 
@@ -945,24 +994,33 @@ private:
 
     assert(result);
 
-    int r = goFunctionWrapper(n, name, go_name, overname, wname, base, parms, result, is_static);
-    if (r != SWIG_OK) {
-      return r;
-    }
+    int ret = SWIG_OK;
 
-    if (!gccgo_flag) {
-      r = gcFunctionWrapper(wname);
+    if (cgo_flag) {
+      int r = makeCgoWrappers(n, go_name, overname, wname, base, parms, result, is_static);
       if (r != SWIG_OK) {
-	return r;
-      }
-      r = gccFunctionWrapper(n, base, wname, parms, result);
-      if (r != SWIG_OK) {
-	return r;
+	ret = r;
       }
     } else {
-      r = gccgoFunctionWrapper(n, base, wname, parms, result);
+      int r = goFunctionWrapper(n, name, go_name, overname, wname, base, parms, result, is_static);
       if (r != SWIG_OK) {
-	return r;
+	ret = r;
+      }
+
+      if (!gccgo_flag) {
+	r = gcFunctionWrapper(wname);
+	if (r != SWIG_OK) {
+	  ret = r;
+	}
+	r = gccFunctionWrapper(n, base, wname, parms, result);
+	if (r != SWIG_OK) {
+	  ret = r;
+	}
+      } else {
+	r = gccgoFunctionWrapper(n, base, wname, parms, result);
+	if (r != SWIG_OK) {
+	  ret = r;
+	}
       }
     }
 
@@ -970,6 +1028,556 @@ private:
       Setattr(class_methods, Getattr(n, "name"), NewString(""));
     }
 
+    return ret;
+  }
+
+  /* ----------------------------------------------------------------------
+   * struct cgoWrapperInfo
+   *
+   * Information needed by the CGO wrapper functions.
+   * ---------------------------------------------------------------------- */
+
+  struct cgoWrapperInfo {
+    // The function we are generating code for.
+    Node *n;
+    // The name of the Go function.
+    String *go_name;
+    // The overload string for an overloaded function.
+    String *overname;
+    // The name of the C wrapper function.
+    String *wname;
+    // The base classes.
+    List *base;
+    // The parameters.
+    ParmList *parms;
+    // The result type.
+    SwigType *result;
+    // Whether this is a static function, not a class method.
+    bool is_static;
+    // The Go receiver type.
+    String *receiver;
+    // Whether this is a class constructor.
+    bool is_constructor;
+    // Whether this is a class destructor.
+    bool is_destructor;
+  };
+
+  /* ----------------------------------------------------------------------
+   * makeCgoWrappers()
+   *
+   * Write out the wrappers for a function when producing cgo input
+   * files.
+   * ---------------------------------------------------------------------- */
+
+  int makeCgoWrappers(Node *n, String *go_name, String *overname, String *wname, List *base, ParmList *parms, SwigType *result, bool is_static) {
+    Swig_save("makeCgoWrappers", n, "emit:cgotype", "emit:cgotypestruct", NULL);
+
+    cgoWrapperInfo info;
+
+    info.n = n;
+    info.go_name = go_name;
+    info.overname = overname;
+    info.wname = wname;
+    info.base = base;
+    info.parms = parms;
+    info.result = result;
+    info.is_static = is_static;
+
+    info.receiver = class_receiver;
+    if (is_static) {
+      info.receiver = NULL;
+    }
+
+    String *nodetype = Getattr(n, "nodeType");
+    info.is_constructor = Cmp(nodetype, "constructor") == 0;
+    info.is_destructor = Cmp(nodetype, "destructor") == 0;
+    if (info.is_constructor || info.is_destructor) {
+      assert(class_receiver);
+      assert(!base);
+      info.receiver = NULL;
+    }
+
+    int ret = SWIG_OK;
+
+    int r = cgoGoWrapper(&info);
+    if (r != SWIG_OK) {
+      ret = r;
+    }
+
+    r = cgoCommentWrapper(&info);
+    if (r != SWIG_OK) {
+      ret = r;
+    }
+
+    r = cgoGccWrapper(&info);
+    if (r != SWIG_OK) {
+      ret = r;
+    }
+
+    Swig_restore(n);
+
+    return ret;
+  }
+
+  /* ----------------------------------------------------------------------
+   * cgoGoWrapper()
+   *
+   * Write out Go code to call a cgo function.  This code will go into
+   * the generated Go output file.
+   * ---------------------------------------------------------------------- */
+  int cgoGoWrapper(const cgoWrapperInfo *info) {
+
+    Wrapper *dummy = initGoTypemaps(info->parms);
+
+    bool add_to_interface = interfaces && !info->is_constructor && !info->is_destructor && !info->is_static && !info->overname && checkFunctionVisibility(info->n, NULL);
+
+    Printv(f_go_wrappers, "func ", NULL);
+
+    Parm *p = info->parms;
+    int pi = 0;
+
+    // Add the receiver first if this is a method.
+    if (info->receiver) {
+      Printv(f_go_wrappers, "(", NULL);
+      if (info->base && info->receiver) {
+	Printv(f_go_wrappers, "_swig_base", NULL);
+      } else {
+	Printv(f_go_wrappers, Getattr(p, "lname"), NULL);
+	p = nextParm(p);
+	++pi;
+      }
+      Printv(f_go_wrappers, " ", info->receiver, ") ", NULL);
+    }
+
+    Printv(f_go_wrappers, info->go_name, NULL);
+    if (info->overname) {
+      Printv(f_go_wrappers, info->overname, NULL);
+    }
+    Printv(f_go_wrappers, "(", NULL);
+
+    // If we are doing methods, add this method to the interface.
+    if (add_to_interface) {
+      Printv(interfaces, "\t", info->go_name, "(", NULL);
+    }
+
+    // Write out the parameters to both the function definition and
+    // the interface.
+
+    String *parm_print = NewString("");
+
+    int parm_count = emit_num_arguments(info->parms);
+    int required_count = emit_num_required(info->parms);
+    int args = 0;
+
+    for (; pi < parm_count; ++pi) {
+      p = getParm(p);
+      if (pi == 0 && info->is_destructor) {
+	String *cl = exportedName(class_name);
+	Printv(parm_print, Getattr(p, "lname"), " ", cl, NULL);
+	Delete(cl);
+	++args;
+      } else {
+	if (args > 0) {
+	  Printv(parm_print, ", ", NULL);
+	}
+	++args;
+	if (pi >= required_count) {
+	  Printv(parm_print, "_swig_args ...interface{}", NULL);
+	  break;
+	}
+	Printv(parm_print, Getattr(p, "lname"), " ", NULL);
+	String *tm = goType(p, Getattr(p, "type"));
+	Printv(parm_print, tm, NULL);
+	Delete(tm);
+      }
+      p = nextParm(p);
+    }
+
+    Printv(parm_print, ")", NULL);
+
+    // Write out the result type.
+    if (info->is_constructor) {
+      String *cl = exportedName(class_name);
+      Printv(parm_print, " (_swig_ret ", cl, ")", NULL);
+      Delete(cl);
+    } else {
+      if (SwigType_type(info->result) != T_VOID) {
+	String *tm = goType(info->n, info->result);
+	Printv(parm_print, " (_swig_ret ", tm, ")", NULL);
+	Delete(tm);
+      }
+    }
+
+    Printv(f_go_wrappers, parm_print, NULL);
+    if (add_to_interface) {
+      Printv(interfaces, parm_print, "\n", NULL);
+    }
+
+    // Write out the function body.
+
+    Printv(f_go_wrappers, " {\n", NULL);
+
+    if (parm_count > required_count) {
+      Parm *p = info->parms;
+      int i;
+      for (i = 0; i < required_count; ++i) {
+	p = getParm(p);
+	p = nextParm(p);
+      }
+      for (; i < parm_count; ++i) {
+	p = getParm(p);
+	String *tm = goType(p, Getattr(p, "type"));
+	Printv(f_go_wrappers, "\tvar ", Getattr(p, "lname"), " ", tm, "\n", NULL);
+	Printf(f_go_wrappers, "\tif len(_swig_args) > %d {\n", i - required_count);
+	Printf(f_go_wrappers, "\t\t%s = _swig_args[%d].(%s)\n", Getattr(p, "lname"), i - required_count, tm);
+	Printv(f_go_wrappers, "\t}\n", NULL);
+	Delete(tm);
+	p = nextParm(p);
+      }
+    }
+
+    String *call = NewString("\t");
+
+    String *ret_type = NULL;
+    bool memcpy_ret = false;
+    String *wt = NULL;
+    if (SwigType_type(info->result) != T_VOID) {
+      if (info->is_constructor) {
+	ret_type = exportedName(class_name);
+      } else {
+	ret_type = goImType(info->n, info->result);
+      }
+      Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
+
+      bool c_struct_type;
+      Delete(cgoTypeForGoValue(info->n, info->result, &c_struct_type));
+      if (c_struct_type) {
+	memcpy_ret = true;
+      }
+
+      if (memcpy_ret) {
+	Printv(call, "swig_r_p := ", NULL);
+      } else {
+	Printv(call, "swig_r = (", ret_type, ")(", NULL);
+      }
+
+      if (info->is_constructor || goTypeIsInterface(info->n, info->result)) {
+	if (info->is_constructor) {
+	  wt = Copy(class_receiver);
+	} else {
+	  wt = goWrapperType(info->n, info->result, true);
+	}
+	Printv(call, wt, "(", NULL);
+      }
+    }
+
+    Printv(call, "C.", info->wname, "(", NULL);
+
+    args = 0;
+
+    if (parm_count > required_count) {
+      Printv(call, "C.swig_intgo(len(_swig_args))", NULL);
+      ++args;
+    }
+
+    if (info->base && info->receiver) {
+      if (args > 0) {
+	Printv(call, ", ", NULL);
+      }
+      ++args;
+      Printv(call, "C.uintptr_t(_swig_base)", NULL);
+    }
+
+    p = info->parms;
+    for (int i = 0; i < parm_count; ++i) {
+      p = getParm(p);
+      if (args > 0) {
+	Printv(call, ", ", NULL);
+      }
+      ++args;
+
+      SwigType *pt = Getattr(p, "type");
+      String *ln = Getattr(p, "lname");
+
+      String *ivar = NewStringf("_swig_i_%d", i);
+
+      String *goin = goGetattr(p, "tmap:goin");
+      if (goin == NULL) {
+	Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
+	if ((i == 0 && info->is_destructor) || ((i > 0 || !info->receiver || info->base || info->is_constructor) && goTypeIsInterface(p, pt))) {
+	  Printv(f_go_wrappers, ".Swigcptr()", NULL);
+	}
+	Printv(f_go_wrappers, "\n", NULL);
+	Setattr(p, "emit:goinput", ln);
+      } else {
+	String *itm = goImType(p, pt);
+	Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
+	goin = Copy(goin);
+	Replaceall(goin, "$input", ln);
+	Replaceall(goin, "$result", ivar);
+	Printv(f_go_wrappers, goin, "\n", NULL);
+	Delete(goin);
+	Setattr(p, "emit:goinput", ivar);
+      }
+
+      bool c_struct_type;
+      String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
+      if (c_struct_type) {
+	Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
+      } else {
+	Printv(call, "C.", ct, "(", ivar, ")", NULL);
+      }
+      Delete(ct);
+
+      p = nextParm(p);
+    }
+
+    Printv(f_go_wrappers, call, ")", NULL);
+    Delete(call);
+
+    if (wt) {
+      // Close the type conversion to the wrapper type.
+      Printv(f_go_wrappers, ")", NULL);
+    }
+    if (SwigType_type(info->result) != T_VOID && !memcpy_ret) {
+      // Close the type conversion of the return value.
+      Printv(f_go_wrappers, ")", NULL);
+    }
+
+    Printv(f_go_wrappers, "\n", NULL);
+
+    if (memcpy_ret) {
+      Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
+    }
+    if (ret_type) {
+      Delete(ret_type);
+    }
+
+    goargout(info->parms, parm_count);
+
+    if (SwigType_type(info->result) != T_VOID) {
+      String *goout = goTypemapLookup("goout", info->n, "swig_r");
+      if (goout == NULL) {
+	Printv(f_go_wrappers, "\treturn swig_r\n", NULL);
+      } else {
+	String *tm = goType(info->n, info->result);
+	Printv(f_go_wrappers, "\tvar swig_r_1 ", tm, "\n", NULL);
+	goout = Copy(goout);
+	Replaceall(goout, "$input", "swig_r");
+	Replaceall(goout, "$result", "swig_r_1");
+	Printv(f_go_wrappers, goout, "\n", NULL);
+	Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
+      }
+    }
+
+    Printv(f_go_wrappers, "}\n\n", NULL);
+
+    DelWrapper(dummy);
+
+    return SWIG_OK;
+  }
+
+  /* ----------------------------------------------------------------------
+   * cgoCommentWrapper()
+   *
+   * Write out a cgo function to call a C/C++ function.  This code
+   * will go into the cgo comment in the generated Go output file.
+   * ---------------------------------------------------------------------- */
+  int cgoCommentWrapper(const cgoWrapperInfo *info) {
+    String *ret_type;
+    if (SwigType_type(info->result) == T_VOID) {
+      ret_type = NewString("void");
+    } else {
+      bool c_struct_type;
+      ret_type = cgoTypeForGoValue(info->n, info->result, &c_struct_type);
+    }
+
+    Printv(f_cgo_comment, "extern ", ret_type, " ", info->wname, "(", NULL);
+
+    Delete(ret_type);
+
+    int parm_count = emit_num_arguments(info->parms);
+    int required_count = emit_num_required(info->parms);
+    int args = 0;
+
+    if (parm_count > required_count) {
+      Printv(f_cgo_comment, "intgo _swig_args", NULL);
+      ++args;
+    }
+
+    if (info->base && info->receiver) {
+      if (args > 0) {
+	Printv(f_cgo_comment, ", ", NULL);
+      }
+      ++args;
+      Printv(f_cgo_comment, "uintptr_t _swig_base", NULL);
+    }
+
+    Parm *p = info->parms;
+    for (int i = 0; i < parm_count; ++i) {
+      p = getParm(p);
+      if (args > 0) {
+	Printv(f_cgo_comment, ", ", NULL);
+      }
+      ++args;
+
+      SwigType *pt = Getattr(p, "type");
+      String *ln = Getattr(p, "lname");
+
+      bool c_struct_type;
+      String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
+      Printv(f_cgo_comment, ct, " ", ln, NULL);
+      Delete(ct);
+
+      p = nextParm(p);
+    }
+
+    if (args == 0) {
+      Printv(f_cgo_comment, "void", NULL);
+    }
+
+    Printv(f_cgo_comment, ");\n", NULL);
+
+    return SWIG_OK;
+  }
+
+  /* ----------------------------------------------------------------------
+   * cgoGccWrapper()
+   *
+   * Write out code to the C/C++ wrapper file.  This code will be
+   * called by the code generated by cgoCommentWrapper.
+   * ---------------------------------------------------------------------- */
+  int cgoGccWrapper(const cgoWrapperInfo *info) {
+    Wrapper *f = NewWrapper();
+
+    Swig_save("cgoGccWrapper", info->n, "parms", NULL);
+
+    ParmList *parms = info->parms;
+
+    Parm *base_parm = NULL;
+    if (info->base && !isStatic(info->n)) {
+      SwigType *base_type = Copy(getClassType());
+      SwigType_add_pointer(base_type);
+      base_parm = NewParm(base_type, NewString("arg1"), info->n);
+      set_nextSibling(base_parm, parms);
+      parms = base_parm;
+    }
+
+    emit_parameter_variables(parms, f);
+    emit_attach_parmmaps(parms, f);
+    int parm_count = emit_num_arguments(parms);
+    int required_count = emit_num_required(parms);
+
+    emit_return_variable(info->n, info->result, f);
+
+    // Start the function definition.
+
+    String *fnname = NewString("");
+    Printv(fnname, info->wname, "(", NULL);
+
+    int args = 0;
+
+    if (parm_count > required_count) {
+      Printv(fnname, "intgo _swig_optargc", NULL);
+      ++args;
+    }
+
+    Parm *p = parms;
+    for (int i = 0; i < parm_count; ++i) {
+      if (args > 0) {
+	Printv(fnname, ", ", NULL);
+      }
+      ++args;
+
+      p = getParm(p);
+
+      SwigType *pt = Copy(Getattr(p, "type"));
+      if (SwigType_isarray(pt)) {
+	SwigType_del_array(pt);
+	SwigType_add_pointer(pt);
+      }
+      String *pn = NewStringf("_swig_go_%d", i);
+      String *ct = gcCTypeForGoValue(p, pt, pn);
+      Printv(fnname, ct, NULL);
+      Delete(ct);
+      Delete(pn);
+      Delete(pt);
+
+      p = nextParm(p);
+    }
+      
+    Printv(fnname, ")", NULL);
+
+    if (SwigType_type(info->result) == T_VOID) {
+      Printv(f->def, "void ", fnname, NULL);
+    } else {
+      String *ct = gcCTypeForGoValue(info->n, info->result, fnname);
+      Printv(f->def, ct, NULL);
+      Delete(ct);
+
+      String *ln = NewString("_swig_go_result");
+      ct = gcCTypeForGoValue(info->n, info->result, ln);
+      Wrapper_add_local(f, "_swig_go_result", ct);
+      Delete(ct);
+      Delete(ln);
+    }
+
+    Delete(fnname);
+
+    Printv(f->def, " {\n", NULL);
+
+    // Apply the in typemaps.
+
+    p = parms;
+    for (int i = 0; i < parm_count; ++i) {
+      p = getParm(p);
+      String *tm = Getattr(p, "tmap:in");
+      if (!tm) {
+	Swig_warning(WARN_TYPEMAP_IN_UNDEF, input_file, line_number, "unable to use type %s as a function argument\n", SwigType_str(Getattr(p, "type"), 0));
+      } else {
+	tm = Copy(tm);
+	String *pn = NewStringf("_swig_go_%d", i);
+	Replaceall(tm, "$input", pn);
+	if (i < required_count) {
+	  Printv(f->code, "\t", tm, "\n", NULL);
+	} else {
+	  Printf(f->code, "\tif (_swig_optargc > %d) {\n", i - required_count);
+	  Printv(f->code, "\t\t", tm, "\n", NULL);
+	  Printv(f->code, "\t}\n", NULL);
+	}
+	Delete(tm);
+	Setattr(p, "emit:input", pn);
+      }
+      p = nextParm(p);
+    }
+
+    Printv(f->code, "\n", NULL);
+
+    // Do the real work of the function.
+
+    checkConstraints(parms, f);
+
+    emitGoAction(info->n, info->base, parms, info->result, f);
+
+    argout(parms, f);
+
+    cleanupFunction(info->n, f, parms);
+
+    if (SwigType_type(info->result) != T_VOID) {
+      Printv(f->code, "\treturn _swig_go_result;\n", NULL);
+    }
+
+    Printv(f->code, "}\n", NULL);
+
+    Wrapper_print(f, f_c_wrappers);
+
+    Swig_restore(info->n);
+
+    DelWrapper(f);
+    if (base_parm) {
+      Delete(base_parm);
+    }
+
     return SWIG_OK;
   }
 
@@ -985,23 +1593,9 @@ private:
    * ---------------------------------------------------------------------- */
 
   int goFunctionWrapper(Node *n, String *name, String *go_name, String *overname, String *wname, List *base, ParmList *parms, SwigType *result, bool is_static) {
-    Wrapper *dummy = NewWrapper();
-    emit_attach_parmmaps(parms, dummy);
+    Wrapper *dummy = initGoTypemaps(parms);
 
-    Parm *p = parms;
     int parm_count = emit_num_arguments(parms);
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      Swig_cparm_name(p, i);
-      p = nextParm(p);
-    }
-
-    Swig_typemap_attach_parms("default", parms, dummy);
-    Swig_typemap_attach_parms("gotype", parms, dummy);
-    Swig_typemap_attach_parms("goin", parms, dummy);
-    Swig_typemap_attach_parms("goargout", parms, dummy);
-    Swig_typemap_attach_parms("imtype", parms, dummy);
-
     int required_count = emit_num_required(parms);
 
     String *receiver = class_receiver;
@@ -1032,7 +1626,7 @@ private:
     // See whether any of the function parameters are represented by
     // interface values.  When calling the C++ code, we need to convert
     // back to a uintptr.
-    p = parms;
+    Parm *p = parms;
     for (int i = 0; i < parm_count; ++i) {
       p = getParm(p);
       String *ty = Getattr(p, "type");
@@ -1322,11 +1916,11 @@ private:
 	  String *ivar = NewString("");
 	  Printf(ivar, "_swig_i_%d", i);
 	  String *itm = goImType(p, pt);
-	  Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, NULL);
+	  Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
 	  goin = Copy(goin);
 	  Replaceall(goin, "$input", ln);
 	  Replaceall(goin, "$result", ivar);
-	  Printv(f_go_wrappers, goin, NULL);
+	  Printv(f_go_wrappers, goin, "\n", NULL);
 	  Delete(goin);
 	  Printv(call, ivar, NULL);
 	  Setattr(p, "emit:goinput", ivar);
@@ -1391,6 +1985,34 @@ private:
     return SWIG_OK;
   }
 
+  /* ----------------------------------------------------------------------
+   * initGoTypemaps()
+   *
+   * Initialize the typenames for a Go wrapper, returning a dummy
+   * Wrapper*.  Also set consistent names for the parameters.
+   * ---------------------------------------------------------------------- */
+
+  Wrapper* initGoTypemaps(ParmList *parms) {
+    Wrapper *dummy = NewWrapper();
+    emit_attach_parmmaps(parms, dummy);
+
+    Parm *p = parms;
+    int parm_count = emit_num_arguments(parms);
+    for (int i = 0; i < parm_count; ++i) {
+      p = getParm(p);
+      Swig_cparm_name(p, i);
+      p = nextParm(p);
+    }
+
+    Swig_typemap_attach_parms("default", parms, dummy);
+    Swig_typemap_attach_parms("gotype", parms, dummy);
+    Swig_typemap_attach_parms("goin", parms, dummy);
+    Swig_typemap_attach_parms("goargout", parms, dummy);
+    Swig_typemap_attach_parms("imtype", parms, dummy);
+
+    return dummy;
+  }
+
   /* ----------------------------------------------------------------------
    * argName()
    *
@@ -1771,7 +2393,7 @@ private:
    * ----------------------------------------------------------------------- */
 
   void emitGoAction(Node *n, List *base, ParmList *parms, SwigType *result, Wrapper *f) {
-    if (!gccgo_flag && SwigType_type(result) != T_VOID) {
+    if (!gccgo_flag && !cgo_flag && SwigType_type(result) != T_VOID) {
       Wrapper_add_local(f, "swig_stktop", "char *swig_stktop");
       Printv(f->code, "\tswig_stktop = _swig_topofstack();\n", NULL);
     }
@@ -1784,7 +2406,7 @@ private:
       actioncode = NewString("");
 
       String *current = NewString("");
-      if (!gccgo_flag) {
+      if (!gccgo_flag && !cgo_flag) {
 	Printv(current, "swig_a->", NULL);
       }
       Printv(current, Getattr(parms, "lname"), NULL);
@@ -1821,7 +2443,7 @@ private:
       Delete(tm);
     }
 
-    if (!gccgo_flag && SwigType_type(result) != T_VOID) {
+    if (!gccgo_flag && !cgo_flag && SwigType_type(result) != T_VOID) {
       // If the function called back into the Go code, the stack might
       // have been copied.  We need to adjust swig_a accordingly here.
       // This is what cgo does.
@@ -2896,6 +3518,11 @@ private:
       }
     }
 
+    String *fn_with_over_name = Copy(fn_name);
+    if (overname) {
+      Append(fn_with_over_name, overname);
+    }
+
     String *wname = Swig_name_wrapper(fn_name);
 
     if (overname) {
@@ -2935,47 +3562,58 @@ private:
     }
 
     if (!is_ignored) {
-      // Declare the C++ wrapper.
+      if (cgo_flag) {
+	Printv(f_cgo_comment, "extern uintptr_t ", wname, "(int", NULL);
 
-      if (!gccgo_flag) {
-	Printv(f_go_wrappers, "var ", wname, " unsafe.Pointer\n\n", NULL);
+	p = parms;
+	for (int i = 0; i < parm_count; ++i) {
+	  p = getParm(p);
+	  bool c_struct_type;
+	  String *ct = cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type);
+	  Printv(f_cgo_comment, ", ", ct, " ", Getattr(p, "lname"), NULL);
+	  p = nextParm(p);
+	}
+	Printv(f_cgo_comment, ");\n", NULL);
       } else {
-	Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL);
+	// Declare the C++ wrapper.
+
+	if (!gccgo_flag) {
+	  Printv(f_go_wrappers, "var ", wname, " unsafe.Pointer\n\n", NULL);
+	} else {
+	  Printv(f_go_wrappers, "//extern ", go_prefix, "_", wname, "\n", NULL);
+	}
+
+	Printv(f_go_wrappers, "func ", fn_with_over_name, "(_swig_director int", NULL);
+
+	p = parms;
+	for (int i = 0; i < parm_count; ++i) {
+	  p = getParm(p);
+	  String *tm = goWrapperType(p, Getattr(p, "type"), false);
+	  Printv(f_go_wrappers, ", _ ", tm, NULL);
+	  Delete(tm);
+	  p = nextParm(p);
+	}
+
+	Printv(f_go_wrappers, ") (_swig_ret ", go_type_name, ")", NULL);
+
+	if (!gccgo_flag) {
+	  Printv(f_go_wrappers, " {\n", NULL);
+	  Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_director))\n", NULL);
+	  Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", wname, ", _swig_p)\n", NULL);
+	  Printv(f_go_wrappers, "\treturn\n", NULL);
+	  Printv(f_go_wrappers, "}", NULL);
+	}
+
+	Printv(f_go_wrappers, "\n\n", NULL);
       }
 
-      Printv(f_go_wrappers, "func ", fn_name, NULL);
-      if (overname) {
-	Printv(f_go_wrappers, overname, NULL);
-      }
-      Printv(f_go_wrappers, "(_swig_director int", NULL);
-
-      p = parms;
-      for (int i = 0; i < parm_count; ++i) {
-	p = getParm(p);
-	String *tm = goType(p, Getattr(p, "type"));
-	Printv(f_go_wrappers, ", _ ", tm, NULL);
-	Delete(tm);
-	p = nextParm(p);
-      }
-
-      Printv(f_go_wrappers, ") (_swig_ret ", go_type_name, ")", NULL);
-
-      if (!gccgo_flag) {
-	Printv(f_go_wrappers, " {\n", NULL);
-	Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_director))\n", NULL);
-	Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", wname, ", _swig_p)\n", NULL);
-	Printv(f_go_wrappers, "\treturn\n", NULL);
-	Printv(f_go_wrappers, "}", NULL);
-      }
-
-      Printv(f_go_wrappers, "\n\n", NULL);
+      // Write out the Go function that calls the wrapper.
 
       Printv(f_go_wrappers, "func ", func_with_over_name, "(v interface{}", NULL);
 
       p = parms;
       for (int i = 0; i < parm_count; ++i) {
 	p = getParm(p);
-	// Set the lname parameter.
 	Printv(f_go_wrappers, ", ", Getattr(p, "lname"), " ", NULL);
 	String *tm = goType(p, Getattr(p, "type"));
 	Printv(f_go_wrappers, tm, NULL);
@@ -2987,25 +3625,71 @@ private:
 
       Printv(f_go_wrappers, "\tp := &", director_struct_name, "{0, v}\n", NULL);
 
-      if (gccgo_flag) {
+      if (gccgo_flag && !cgo_flag) {
 	Printv(f_go_wrappers, "\tdefer SwigCgocallDone()\n", NULL);
 	Printv(f_go_wrappers, "\tSwigCgocall()\n", NULL);
       }
 
-      Printv(f_go_wrappers, "\tp.", class_receiver, " = ", fn_name, NULL);
-      if (overname) {
-	Printv(f_go_wrappers, overname, NULL);
+      String *call = NewString("");
+
+      Printv(call, "\tp.", class_receiver, " = ", NULL);
+      if (cgo_flag) {
+	Printv(call, go_type_name, "(C.", wname, "(C.int(swigDirectorAdd(p))", NULL);
+      } else {
+	Printv(call, fn_with_over_name, "(swigDirectorAdd(p)", NULL);
       }
-      Printv(f_go_wrappers, "(swigDirectorAdd(p)", NULL);
 
       p = parms;
       for (int i = 0; i < parm_count; ++i) {
+	Printv(call, ", ", NULL);
+
 	p = getParm(p);
-	Printv(f_go_wrappers, ", ", Getattr(p, "lname"), NULL);
+	String *pt = Getattr(p, "type");
+	String *ln = Getattr(p, "lname");
+
+	String *ivar = NewStringf("_swig_i_%d", i);
+
+	String *goin = goGetattr(p, "tmap:goin");
+	if (goin == NULL) {
+	  Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
+	  if (goTypeIsInterface(p, pt)) {
+	    Printv(f_go_wrappers, ".Swigcptr()", NULL);
+	  }
+	  Printv(f_go_wrappers, "\n", NULL);
+	} else {
+	  String *itm = goImType(p, pt);
+	  Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
+	  goin = Copy(goin);
+	  Replaceall(goin, "$input", ln);
+	  Replaceall(goin, "$result", ivar);
+	  Printv(f_go_wrappers, goin, "\n", NULL);
+	  Delete(goin);
+	}
+
+	Setattr(p, "emit:goinput", ivar);
+
+	if (cgo_flag) {
+	  bool c_struct_type;
+	  String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
+	  if (c_struct_type) {
+	    Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
+	  } else {
+	    Printv(call, "C.", ct, "(", ivar, ")", NULL);
+	  }
+	  Delete(ct);
+	} else {
+	  Printv(call, ivar, NULL);
+	}
 	p = nextParm(p);
       }
 
-      Printv(f_go_wrappers, ")\n", NULL);
+      Printv(call, ")", NULL);
+      if (cgo_flag) {
+	Printv(call, ")", NULL);
+      }
+
+      Printv(f_go_wrappers, call, "\n", NULL);
+
       Printv(f_go_wrappers, "\treturn p\n", NULL);
       Printv(f_go_wrappers, "}\n\n", NULL);
 
@@ -3038,7 +3722,26 @@ private:
       Printv(action, ");", NULL);
       Setattr(n, "wrap:action", action);
 
-      if (!gccgo_flag) {
+      if (cgo_flag) {
+	cgoWrapperInfo info;
+
+	info.n = n;
+	info.go_name = func_name;
+	info.overname = overname;
+	info.wname = wname;
+	info.base = NULL;
+	info.parms = first_parm;
+	info.result = result;
+	info.is_static = false;
+	info.receiver = NULL;
+	info.is_constructor = true;
+	info.is_destructor = false;
+
+	int r = cgoGccWrapper(&info);
+	if (r != SWIG_OK) {
+	  return r;
+	}
+      } else if (!gccgo_flag) {
 	int r = gcFunctionWrapper(wname);
 	if (r != SWIG_OK) {
 	  return r;
@@ -3101,6 +3804,7 @@ private:
     Delete(go_type_name);
     Delete(director_struct_name);
     Delete(fn_name);
+    Delete(fn_with_over_name);
     Delete(func_name);
     Delete(func_with_over_name);
     Delete(wname);
@@ -3184,18 +3888,9 @@ private:
     Printv(director_sig, "{\n", NULL);
 
     if (!is_ignored) {
-      makeDirectorDestructorWrapper(go_name, director_sig);
+      makeDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
 
       Printv(f_c_directors, "  delete swig_mem;\n", NULL);
-
-      Printv(f_go_wrappers, "func ", go_name, "(c int) {\n", NULL);
-      if (gccgo_flag) {
-	Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
-	Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
-      }
-      Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
-      Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
-      Printv(f_go_wrappers, "}\n\n", NULL);
     }
 
     Printv(f_c_directors, "}\n\n", NULL);
@@ -3216,7 +3911,21 @@ private:
    * unfinished.
    * ------------------------------------------------------------ */
 
-  void makeDirectorDestructorWrapper(String *go_name, String *director_sig) {
+  void makeDirectorDestructorWrapper(String *go_name, String *director_struct_name, String *director_sig) {
+    if (cgo_flag) {
+      makeCgoDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
+      return;
+    }
+
+    Printv(f_go_wrappers, "func ", go_name, "(c int) {\n", NULL);
+    if (gccgo_flag) {
+      Printv(f_go_wrappers, "\tSwigCgocallBack()\n", NULL);
+      Printv(f_go_wrappers, "\tdefer SwigCgocallBackDone()\n", NULL);
+    }
+    Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
+    Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
+    Printv(f_go_wrappers, "}\n\n", NULL);
+
     String *wname = NewString("_swiggo_wrap_DeleteDirector_");
     Append(wname, class_name);
 
@@ -3249,6 +3958,28 @@ private:
     Delete(wname);
   }
 
+  /* ------------------------------------------------------------
+   * makeCgoDirectorDestructorWrapper
+   *
+   * When using cgo, emit the function wrapper for the destructor of a
+   * director class.
+   * ------------------------------------------------------------ */
+
+  void makeCgoDirectorDestructorWrapper(String *go_name, String *director_struct_name, String *director_sig) {
+    String *wname = Copy(go_name);
+    Append(wname, unique_id);
+
+    Printv(f_go_wrappers, "//export ", wname, "\n", NULL);
+    Printv(f_go_wrappers, "func ", wname, "(c int) {\n", NULL);
+    Printv(f_go_wrappers, "\tswigDirectorLookup(c).(*", director_struct_name, ").", class_receiver, " = 0\n", NULL);
+    Printv(f_go_wrappers, "\tswigDirectorDelete(c)\n", NULL);
+    Printv(f_go_wrappers, "}\n\n", NULL);
+
+    Printv(f_c_directors, "extern \"C\" void ", wname, "(intgo);\n", NULL);
+    Printv(f_c_directors, director_sig, NULL);
+    Printv(f_c_directors, "  ", wname, "(go_val);\n", NULL);
+  }
+
   /* ------------------------------------------------------------
    * classDirectorMethod
    *
@@ -3404,6 +4135,9 @@ private:
     if (overname) {
       Append(callback_name, overname);
     }
+    if (cgo_flag) {
+      Append(callback_name, unique_id);
+    }
 
     String *upcall_name = Copy(director_struct_name);
     Append(upcall_name, "_upcall_");
@@ -3462,43 +4196,68 @@ private:
       Printv(f_go_wrappers, "}\n\n", NULL);
 
       if (!GetFlag(n, "abstract")) {
-	// Declare the upcall function, which calls the method on the
-	// parent class.
+	if (cgo_flag) {
+	  Printv(f_cgo_comment, "extern ", NULL);
 
-	if (!gccgo_flag) {
-	  Printv(f_go_wrappers, "var ", upcall_wname, " unsafe.Pointer\n\n", NULL);
+	  if (SwigType_type(result) == T_VOID) {
+	    Printv(f_cgo_comment, "void", NULL);
+	  } else {
+	    bool c_struct_type;
+	    String *ret_type = cgoTypeForGoValue(n, result, &c_struct_type);
+	    Printv(f_cgo_comment, ret_type, NULL);
+	    Delete(ret_type);
+	  }
+
+	  Printv(f_cgo_comment, " ", upcall_wname, "(uintptr_t", NULL);
+
+	  p = parms;
+	  for (int i = 0; i < parm_count; ++i) {
+	    p = getParm(p);
+	    bool c_struct_type;
+	    String *ct = cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type);
+	    Printv(f_cgo_comment, ", ", ct, " ", Getattr(p, "lname"), NULL);
+	    p = nextParm(p);
+	  }
+	  Printv(f_cgo_comment, ");\n", NULL);
 	} else {
-	  Printv(f_go_wrappers, "//extern ", go_prefix, "_", upcall_wname, "\n", NULL);
+	  // Declare the upcall function, which calls the method on
+	  // the parent class.
+
+	  if (!gccgo_flag) {
+	    Printv(f_go_wrappers, "var ", upcall_wname, " unsafe.Pointer\n\n", NULL);
+	  } else {
+	    Printv(f_go_wrappers, "//extern ", go_prefix, "_", upcall_wname, "\n", NULL);
+	  }
+
+	  Printv(f_go_wrappers, "func ", upcall_gc_name, "(_swig_ptr ", go_type_name, NULL);
+
+	  p = parms;
+	  for (int i = 0; i < parm_count; ++i) {
+	    p = getParm(p);
+	    String *tm = goWrapperType(p, Getattr(p, "type"), false);
+	    Printv(f_go_wrappers, ", _ ", tm, NULL);
+	    Delete(tm);
+	    p = nextParm(p);
+	  }
+
+	  Printv(f_go_wrappers, ")", NULL);
+
+	  if (SwigType_type(result) != T_VOID) {
+	    String *tm = goWrapperType(n, result, true);
+	    Printv(f_go_wrappers, " (_swig_ret ", tm, ")", NULL);
+	    Delete(tm);
+	  }
+
+	  if (!gccgo_flag) {
+	    Printv(f_go_wrappers, " {\n", NULL);
+	    Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_ptr))\n", NULL);
+	    Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", upcall_wname, ", _swig_p)\n", NULL);
+	    Printv(f_go_wrappers, "\treturn\n", NULL);
+	    Printv(f_go_wrappers, "}", NULL);
+	  }
+
+	  Printv(f_go_wrappers, "\n\n", NULL);
 	}
-
-	Printv(f_go_wrappers, "func ", upcall_gc_name, "(_swig_ptr ", go_type_name, NULL);
-
-	p = parms;
-	for (int i = 0; i < parm_count; ++i) {
-	  p = getParm(p);
-	  String *tm = goWrapperType(p, Getattr(p, "type"), false);
-	  Printv(f_go_wrappers, ", _ ", tm, NULL);
-	  Delete(tm);
-	  p = nextParm(p);
-	}
-
-	Printv(f_go_wrappers, ")", NULL);
-
-	if (SwigType_type(result) != T_VOID) {
-	  String *tm = goWrapperType(n, result, true);
-	  Printv(f_go_wrappers, " (_swig_ret ", tm, ")", NULL);
-	  Delete(tm);
-	}
-
-	if (!gccgo_flag) {
-	  Printv(f_go_wrappers, " {\n", NULL);
-	  Printv(f_go_wrappers, "\t_swig_p := uintptr(unsafe.Pointer(&_swig_ptr))\n", NULL);
-	  Printv(f_go_wrappers, "\t_cgo_runtime_cgocall(", upcall_wname, ", _swig_p)\n", NULL);
-	  Printv(f_go_wrappers, "\treturn\n", NULL);
-	  Printv(f_go_wrappers, "}", NULL);
-	}
-
-	Printv(f_go_wrappers, "\n\n", NULL);
       }
 
       // Define the method on the director class in Go.
@@ -3554,14 +4313,26 @@ private:
       if (GetFlag(n, "abstract")) {
 	Printv(f_go_wrappers, "\tpanic(\"call to pure virtual method\")\n", NULL);
       } else {
+	String *ret_type = NULL;
+	bool memcpy_ret = false;
+	String *wt = NULL;
 	bool has_goout = false;
 	String *goout = NULL;
 	if (SwigType_type(result) != T_VOID) {
-	  Printv(f_go_wrappers, "\tvar swig_r ", goImType(n, result), "\n", NULL);
+	  ret_type = goImType(n, result);
+	  Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
 	  goout = goTypemapLookup("goout", n, "swig_r");
 	  if (goout) {
 	    has_goout = true;
 	  }
+
+	  if (cgo_flag) {
+	    bool c_struct_type;
+	    Delete(cgoTypeForGoValue(n, result, &c_struct_type));
+	    if (c_struct_type) {
+	      memcpy_ret = true;
+	    }
+	  }
 	}
 
 	p = parms;
@@ -3575,7 +4346,7 @@ private:
 
 	String *call = NewString("");
 
-	if (gccgo_flag) {
+	if (gccgo_flag && !cgo_flag) {
 	  if (has_goout) {
 	    Printv(call, "\tfunc() {\n", NULL);
 	  }
@@ -3585,9 +4356,33 @@ private:
 
 	Printv(call, "\t", NULL);
 	if (SwigType_type(result) != T_VOID) {
-	  Printv(call, "swig_r = ", NULL);
+	  if (memcpy_ret) {
+	    Printv(call, "swig_r_p := ", NULL);
+	  } else {
+	    Printv(call, "swig_r = ", NULL);
+	    if (cgo_flag) {
+	      Printv(call, "(", ret_type, ")(", NULL);
+	    }
+	  }
+	  if (cgo_flag && goTypeIsInterface(n, result)) {
+	    wt = goWrapperType(n, result, true);
+	    Printv(call, "(", wt, ")(", NULL);
+	  }
+	}
+
+	if (cgo_flag) {
+	  Printv(call, "C.", upcall_wname, NULL);
+	} else {
+	  Printv(call, upcall_gc_name, NULL);
+	}
+	Printv(call, "(", NULL);
+	if (cgo_flag) {
+	  Printv(call, "C.uintptr_t(", NULL);
+	}
+	Printv(call, "swig_p.", go_type_name, NULL);
+	if (cgo_flag) {
+	  Printv(call, ")", NULL);
 	}
-	Printv(call, upcall_gc_name, "(swig_p.", go_type_name, NULL);
 
 	p = parms;
 	for (int i = 0; i < parm_count; ++i) {
@@ -3597,41 +4392,70 @@ private:
 
 	  String *ln = Getattr(p, "lname");
 
+	  String *ivar = NewStringf("_swig_i_%d", i);
+
 	  // This is an ordinary call from Go to C++, so adjust using
 	  // the goin typemap.
 	  String *goin = goGetattr(p, "tmap:goin");
 	  if (goin == NULL) {
-	    Printv(call, ln, NULL);
+	    Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
 	    if (goTypeIsInterface(p, pt)) {
-	      Printv(call, ".Swigcptr()", NULL);
+	      Printv(f_go_wrappers, ".Swigcptr()", NULL);
 	    }
-	    Setattr(p, "emit:goinput", ln);
+	    Printv(f_go_wrappers, "\n", NULL);
 	  } else {
-	    String *ivar = NewString("");
-	    Printf(ivar, "_swig_i_%d", i);
 	    String *itm = goImType(p, pt);
-	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, NULL);
+	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
 	    goin = Copy(goin);
 	    Replaceall(goin, "$input", ln);
 	    Replaceall(goin, "$result", ivar);
 	    Printv(f_go_wrappers, goin, NULL);
 	    Delete(goin);
+	  }
+
+	  Setattr(p, "emit:goinput", ivar);
+
+	  if (cgo_flag) {
+	    bool c_struct_type;
+	    String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
+	    if (c_struct_type) {
+	      Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
+	    } else {
+	      Printv(call, "C.", ct, "(", ivar, ")", NULL);
+	    }
+	  } else {
 	    Printv(call, ivar, NULL);
-	    Setattr(p, "emit:goinput", ivar);
 	  }
 
 	  p = nextParm(p);
 	}
 
-	Printv(call, ")\n", NULL);
+	Printv(call, ")", NULL);
 
-	if (gccgo_flag && has_goout) {
-	  Printv(call, "\t}()\n", NULL);
+	if (gccgo_flag && !cgo_flag && has_goout) {
+	  Printv(call, "\n\t}()", NULL);
 	}
 
+	if (cgo_flag) {
+	  if (wt) {
+	    // Close the type conversion to the wrapper type.
+	    Printv(call, ")", NULL);
+	  }
+	  if (SwigType_type(result) != T_VOID && !memcpy_ret) {
+	    // Close the type conversion of the return value.
+	    Printv(call, ")", NULL);
+	  }
+	}
+
+	Printv(call, "\n", NULL);
+
 	Printv(f_go_wrappers, call, NULL);
 	Delete(call);
 
+	if (memcpy_ret) {
+	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
+	}
+
 	goargout(parms, parm_count);
 
 	if (SwigType_type(result) != T_VOID) {
@@ -3646,6 +4470,13 @@ private:
 	    Printv(f_go_wrappers, "\treturn swig_r_1\n", NULL);
 	  }
 	}
+
+	if (ret_type) {
+	  Delete(ret_type);
+	}
+	if (wt) {
+	  Delete(wt);
+	}
       }
 
       Printv(f_go_wrappers, "}\n\n", NULL);
@@ -3727,7 +4558,26 @@ private:
 	Printv(action, ");", NULL);
 	Setattr(n, "wrap:action", action);
 
-	if (!gccgo_flag) {
+	if (cgo_flag) {
+	  cgoWrapperInfo info;
+
+	  info.n = n;
+	  info.go_name = go_name;
+	  info.overname = overname;
+	  info.wname = upcall_wname;
+	  info.base = NULL;
+	  info.parms = first_parm;
+	  info.result = result;
+	  info.is_static = is_static;
+	  info.receiver = NULL;
+	  info.is_constructor = false;
+	  info.is_destructor = false;
+
+	  int r = cgoGccWrapper(&info);
+	  if (r != SWIG_OK) {
+	    return r;
+	  }
+	} else if (!gccgo_flag) {
 	  // Write the upcall wrapper function.  This is compiled by gc
 	  // and calls the C++ function.
 	  int r = gcFunctionWrapper(upcall_wname);
@@ -3778,15 +4628,27 @@ private:
 
 	Printv(f_go_wrappers, " {\n", NULL);
 
+	String *ret_type = NULL;
+	bool memcpy_ret = false;
+	String *wt = NULL;
 	String *goout = NULL;
 	if (SwigType_type(result) != T_VOID) {
-	  Printv(f_go_wrappers, "\tvar swig_r ", goImType(n, result), "\n", NULL);
+	  ret_type = goImType(n, result);
+	  Printv(f_go_wrappers, "\tvar swig_r ", ret_type, "\n", NULL);
 	  goout = goTypemapLookup("goout", n, "swig_r");
+
+	  if (cgo_flag) {
+	    bool c_struct_type;
+	    Delete(cgoTypeForGoValue(n, result, &c_struct_type));
+	    if (c_struct_type) {
+	      memcpy_ret = true;
+	    }
+	  }
 	}
 
 	String *call = NewString("");
 
-	if (gccgo_flag) {
+	if (gccgo_flag && !cgo_flag) {
 	  if (goout != NULL) {
 	    Printv(call, "\tfunc() {\n", NULL);
 	  }
@@ -3796,9 +4658,33 @@ private:
 
 	Printv(call, "\t", NULL);
 	if (SwigType_type(result) != T_VOID) {
-	  Printv(call, "swig_r = ", NULL);
+	  if (memcpy_ret) {
+	    Printv(call, "swig_r_p := ", NULL);
+	  } else {
+	    Printv(call, "swig_r = ", NULL);
+	    if (cgo_flag) {
+	      Printv(call, "(", ret_type, ")(", NULL);
+	    }
+	  }
+	  if (cgo_flag && goTypeIsInterface(n, result)) {
+	    wt = goWrapperType(n, result, true);
+	    Printv(call, "(", wt, ")(", NULL);
+	  }
+	}
+
+	if (cgo_flag) {
+	  Printv(call, "C.", upcall_wname, NULL);
+	} else {
+	  Printv(call, upcall_gc_name, NULL);
+	}
+	Printv(call, "(", NULL);
+	if (cgo_flag) {
+	  Printv(call, "C.uintptr_t(", NULL);
+	}
+	Printv(call, "p.(*", director_struct_name, ").", go_type_name, NULL);
+	if (cgo_flag) {
+	  Printv(call, ")", NULL);
 	}
-	Printv(call, upcall_gc_name, "(p.(*", director_struct_name, ").", go_type_name, NULL);
 
 	p = parms;
 	for (int i = 0; i < parm_count; ++i) {
@@ -3806,27 +4692,39 @@ private:
 	  p = getParm(p);
 	  SwigType *pt = Getattr(p, "type");
 
+	  String *ivar = NewStringf("_swig_i_%d", i);
+
 	  String *ln = Copy(Getattr(p, "lname"));
-	  if (goTypeIsInterface(p, pt)) {
-	    Printv(ln, ".Swigcptr()", NULL);
-	  }
 
 	  String *goin = goGetattr(p, "tmap:goin");
 	  if (goin == NULL) {
-	    Printv(call, ln, NULL);
-	    Setattr(p, "emit:goinput", ln);
+	    Printv(f_go_wrappers, "\t", ivar, " := ", ln, NULL);
+	    if (goTypeIsInterface(p, pt)) {
+	      Printv(f_go_wrappers, ".Swigcptr()", NULL);
+	    }
+	    Printv(f_go_wrappers, "\n", NULL);
 	  } else {
-	    String *ivar = NewString("");
-	    Printf(ivar, "_swig_i_%d", i);
 	    String *itm = goImType(p, pt);
-	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, NULL);
+	    Printv(f_go_wrappers, "\tvar ", ivar, " ", itm, "\n", NULL);
 	    goin = Copy(goin);
 	    Replaceall(goin, "$input", ln);
 	    Replaceall(goin, "$result", ivar);
 	    Printv(f_go_wrappers, goin, NULL);
 	    Delete(goin);
+	  }
+
+	  Setattr(p, "emit:goinput", ivar);
+
+	  if (cgo_flag) {
+	    bool c_struct_type;
+	    String *ct = cgoTypeForGoValue(p, pt, &c_struct_type);
+	    if (c_struct_type) {
+	      Printv(call, "*(*C.", ct, ")(unsafe.Pointer(&", ivar, "))", NULL);
+	    } else {
+	      Printv(call, "C.", ct, "(", ivar, ")", NULL);
+	    }
+	  } else {
 	    Printv(call, ivar, NULL);
-	    Setattr(p, "emit:goinput", ivar);
 	  }
 
 	  Delete(ln);
@@ -3834,15 +4732,32 @@ private:
 	  p = nextParm(p);
 	}
 
-	Printv(call, ")\n", NULL);
+	Printv(call, ")", NULL);
 
-	if (gccgo_flag && goout != NULL) {
-	  Printv(call, "\t}()\n", NULL);
+	if (gccgo_flag && !cgo_flag && goout != NULL) {
+	  Printv(call, "\n\t}()", NULL);
 	}
 
+	if (cgo_flag) {
+	  if (wt) {
+	    // Close the type conversion to the wrapper type.
+	    Printv(call, ")", NULL);
+	  }
+	  if (SwigType_type(result) != T_VOID && !memcpy_ret) {
+	    // Close the type conversion of the return value.
+	    Printv(call, ")", NULL);
+	  }
+	}
+
+	Printv(call, "\n", NULL);
+
 	Printv(f_go_wrappers, call, NULL);
 	Delete(call);
 
+	if (memcpy_ret) {
+	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
+	}
+
 	goargout(parms, parm_count);
 
 	if (SwigType_type(result) != T_VOID) {
@@ -3859,11 +4774,22 @@ private:
 	}
 
 	Printv(f_go_wrappers, "}\n\n", NULL);
+
+	if (ret_type) {
+	  Delete(ret_type);
+	}
+	if (wt) {
+	  Delete(wt);
+	}
       }
 
       // The Go function which invokes the method.  This is called
       // from by the C++ method on the director class.
 
+      if (cgo_flag) {
+	Printv(f_go_wrappers, "//export ", callback_name, "\n", NULL);
+      }
+
       Printv(f_go_wrappers, "func ", callback_name, "(swig_c int", NULL);
 
       p = parms;
@@ -3970,7 +4896,7 @@ private:
 	}
 	Printv(call, "\n", NULL);
 
-	if (gccgo_flag) {
+	if (gccgo_flag && !cgo_flag) {
 	  if (goout != NULL) {
 	    Printv(f_go_wrappers, "\tfunc() {\n", NULL);
 	  }
@@ -3983,7 +4909,7 @@ private:
 	Printv(f_go_wrappers, call, NULL);
 	Delete(call);
 
-	if (gccgo_flag && goout != NULL) {
+	if (gccgo_flag && !cgo_flag && goout != NULL) {
 	  Printv(f_go_wrappers, "\t}()\n", NULL);
 	}
 
@@ -4062,6 +4988,7 @@ private:
     Delete(go_type_name);
     Delete(director_struct_name);
     Delete(interface_name);
+    Delete(callback_name);
     Delete(upcall_name);
     Delete(go_name);
     DelWrapper(w);
@@ -4075,6 +5002,11 @@ private:
    * Emit the function wrapper for a director method.
    * ------------------------------------------------------------ */
   void makeDirectorMethodWrapper(Node *n, Wrapper *w, String *callback_name) {
+    if (cgo_flag) {
+      makeCgoDirectorMethodWrapper(n, w, callback_name);
+      return;
+    }
+
     ParmList *parms = Getattr(n, "wrap:parms");
     SwigType *result = Getattr(n, "type");
 
@@ -4298,6 +5230,129 @@ private:
     Delete(callback_wname);
   }
 
+  /* ------------------------------------------------------------
+   * makeDirectorMethodWrapper
+   *
+   * Emit the function wrapper for a director method for cgo.
+   * ------------------------------------------------------------ */
+
+  void makeCgoDirectorMethodWrapper(Node *n, Wrapper *w, String *callback_name) {
+    ParmList *parms = Getattr(n, "wrap:parms");
+    SwigType *result = Getattr(n, "type");
+
+    Printv(f_c_directors, "extern \"C\" ", NULL);
+
+    String *fnname = Copy(callback_name);
+    Append(fnname, "(int");
+
+    Parm *p = parms;
+    while (p) {
+      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
+	p = Getattr(p, "tmap:directorin:next");
+      }
+      String *cg = gcCTypeForGoValue(p, Getattr(p, "type"), Getattr(p, "lname"));
+      Printv(fnname, ", ", cg, NULL);
+      Delete(cg);
+      p = Getattr(p, "tmap:directorin:next");
+    }
+
+    Printv(fnname, ")", NULL);
+
+    if (SwigType_type(result) == T_VOID) {
+      Printv(f_c_directors, "void ", fnname, NULL);
+    } else {
+      String *tm = gcCTypeForGoValue(n, result, fnname);
+      Printv(f_c_directors, tm, NULL);
+      Delete(tm);
+    }
+
+    Delete(fnname);
+
+    Printv(f_c_directors, ";\n", NULL);
+
+    if (SwigType_type(result) != T_VOID) {
+      String *r = NewString(Swig_cresult_name());
+      String *tm = gcCTypeForGoValue(n, result, r);
+      Wrapper_add_local(w, r, tm);
+      Delete(tm);
+      Delete(r);
+    }
+
+    String *args = NewString("");
+
+    p = parms;
+    while (p) {
+      while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {
+	p = Getattr(p, "tmap:directorin:next");
+      }
+
+      String *pn = NewString("swig_");
+      Append(pn, Getattr(p, "lname"));
+      Setattr(p, "emit:directorinput", pn);
+
+      String *tm = gcCTypeForGoValue(p, Getattr(p, "type"), pn);
+      Wrapper_add_local(w, pn, tm);
+      Delete(tm);
+
+      tm = Getattr(p, "tmap:directorin");
+      if (!tm) {
+	Swig_warning(WARN_TYPEMAP_DIRECTORIN_UNDEF, input_file,
+		     line_number, "Unable to use type %s as director method argument\n", SwigType_str(Getattr(p, "type"), 0));
+      } else {
+	tm = Copy(tm);
+	Replaceall(tm, "$input", pn);
+	Replaceall(tm, "$owner", 0);
+	Printv(w->code, "  ", tm, "\n", NULL);
+	Delete(tm);
+
+	Printv(args, ", ", pn, NULL);
+      }
+
+      p = Getattr(p, "tmap:directorin:next");
+    }
+
+    Printv(w->code, "  ", NULL);
+    if (SwigType_type(result) != T_VOID) {
+      Printv(w->code, Swig_cresult_name(), " = ", NULL);
+    }
+    Printv(w->code, callback_name, "(go_val", args, ");\n", NULL);
+
+    /* Marshal outputs */
+    for (p = parms; p; ) {
+      String *tm;
+      if ((tm = Getattr(p, "tmap:directorargout"))) {
+	tm = Copy(tm);
+	Replaceall(tm, "$result", "jresult");
+	Replaceall(tm, "$input", Getattr(p, "emit:directorinput"));
+	Printv(w->code, tm, "\n", NULL);
+	Delete(tm);
+	p = Getattr(p, "tmap:directorargout:next");
+      } else {
+	p = nextSibling(p);
+      }
+    }
+
+    if (SwigType_type(result) != T_VOID) {
+      String *result_str = NewString("c_result");
+      String *tm = Swig_typemap_lookup("directorout", n, result_str, NULL);
+      if (!tm) {
+	Swig_warning(WARN_TYPEMAP_DIRECTOROUT_UNDEF, input_file, line_number,
+		     "Unable to use type %s as director method result\n", SwigType_str(result, 0));
+      } else {
+	tm = Copy(tm);
+	Replaceall(tm, "$input", Swig_cresult_name());
+	Replaceall(tm, "$result", "c_result");
+	Printv(w->code, "  ", tm, "\n", NULL);
+	String *retstr = SwigType_rcaststr(result, "c_result");
+	Printv(w->code, "  return ", retstr, ";\n", NULL);
+	Delete(retstr);
+	Delete(tm);
+      }
+      Delete(result_str);
+    }
+  }
+
+
   /* ------------------------------------------------------------
    * classDirectorEnd
    *
@@ -5218,6 +6273,106 @@ private:
     return ret;
   }
 
+  /* ----------------------------------------------------------------------
+   * cgoTypeForGoValue()
+   *
+   * Given a SWIG type, return a string for the C type to use for the
+   * cgo wrapper code.  This always returns a simple identifier, since
+   * it is used in Go code as C.name.
+   *
+   * This sets *c_struct_type if the C type uses a struct where the Go
+   * type uses a simple type.  This is true for strings and slices.
+   * When this is true the Go code has to jump through unsafe hoops to
+   * pass the type checker.
+   * ---------------------------------------------------------------------- */
+
+  String *cgoTypeForGoValue(Node *n, SwigType *type, bool *c_struct_type) {
+    *c_struct_type = false;
+
+    bool is_interface;
+    String *go_type = goTypeWithInfo(n, type, false, &is_interface);
+    if (is_interface) {
+      Delete(go_type);
+      return NewString("uintptr_t");
+    }
+    if (Strcmp(go_type, "uintptr") == 0) {
+      Delete(go_type);
+      return NewString("uintptr_t");
+    }
+    if (((char*)Char(go_type))[0] == '*') {
+      // Treat all pointers as void*.  There is no meaningful type
+      // checking going on here anyhow, and that lets us avoid
+      // worrying about defining the base type of the pointer.
+      Delete(go_type);
+      return NewString("swig_voidp");
+    }
+    Delete(go_type);
+
+    String *ct = Getattr(n, "emit:cgotype");
+    if (ct) {
+      *c_struct_type = (bool)Getattr(n, "emit:cgotypestruct");
+      return Copy(ct);
+    }
+
+    String *t = Copy(type);
+    if (SwigType_isarray(t)) {
+      SwigType_del_array(t);
+      SwigType_add_pointer(t);
+    }
+
+    bool add_typedef = true;
+
+    static int count;
+    ++count;
+    ct = NewStringf("swig_type_%d", count);
+
+    String *gct = gcCTypeForGoValue(n, t, ct);
+    Delete(t);
+
+    if (Strncmp(gct, "_gostring_", 10) == 0 || Strncmp(gct, "_goslice_", 9) == 0) {
+      *c_struct_type = true;
+      Setattr(n, "emit:cgotypestruct", type);
+    } else {
+      char *p = Strstr(gct, ct);
+      if (p != NULL && p > (char*)Char(gct) && p[-1] == '*' && p[Len(ct)] == '\0') {
+	// Treat all pointers as void*.  See above.
+	Delete(ct);
+	--count;
+	ct = NewString("swig_voidp");
+	add_typedef = false;
+      }
+
+      if (Strncmp(gct, "bool ", 5) == 0) {
+	// Change the C++ type bool to the C type _Bool.
+	Replace(gct, "bool", "_Bool", DOH_REPLACE_FIRST);
+      }
+      if (Strncmp(gct, "intgo ", 6) == 0) {
+	// We #define intgo to swig_intgo for the cgo comment.
+	Replace(gct, "intgo", "swig_intgo", DOH_REPLACE_FIRST);
+      }
+      p = Strstr(gct, ct);
+      if (p != NULL && p > (char*)Char(gct) && p[-1] == ' ' && p[Len(ct)] == '\0') {
+	String *q = NewStringWithSize(gct, Len(gct) - Len(ct) - 1);
+	if (validIdentifier(q)) {
+	  // This is a simple type name, and we can use it directly.
+	  Delete(ct);
+	  --count;
+	  ct = q;
+	  add_typedef = false;
+	}
+      }
+    }
+    if (add_typedef) {
+      Printv(f_cgo_comment_typedefs, "typedef ", gct, ";\n", NULL);
+    }
+
+    Setattr(n, "emit:cgotype", ct);
+
+    Delete(gct);
+
+    return Copy(ct);
+  }
+
   /* ----------------------------------------------------------------------
    * goWrapperType()
    *
@@ -5330,6 +6485,7 @@ private:
     bool is_member = Strcmp(gt, "_swig_memberptr") == 0;
     bool is_complex64 = Strcmp(gt, "complex64") == 0;
     bool is_complex128 = Strcmp(gt, "complex128") == 0;
+    bool is_bool = false;
     bool is_int8 = false;
     bool is_int16 = false;
     bool is_int = Strcmp(gt, "int") == 0 || Strcmp(gt, "uint") == 0;
@@ -5337,7 +6493,10 @@ private:
     bool is_int64 = false;
     bool is_float32 = false;
     bool is_float64 = false;
-    if ((n != NULL && Getattr(n, "tmap:gotype") != NULL) || hasGoTypemap(n, type)) {
+
+    bool has_typemap = (n != NULL && Getattr(n, "tmap:gotype") != NULL) || hasGoTypemap(n, type);
+    if (has_typemap) {
+      is_bool = Strcmp(gt, "bool") == 0;
       is_int8 = Strcmp(gt, "int8") == 0 || Strcmp(gt, "uint8") == 0 || Strcmp(gt, "byte") == 0;
       is_int16 = Strcmp(gt, "int16") == 0 || Strcmp(gt, "uint16") == 0;
       is_int32 = Strcmp(gt, "int32") == 0 || Strcmp(gt, "uint32") == 0;
@@ -5386,7 +6545,7 @@ private:
       return ret;
     } else {
       SwigType *t = SwigType_typedef_resolve_all(type);
-      if (SwigType_isreference(t)) {
+      if (!has_typemap && SwigType_isreference(t)) {
 	// A const reference to a known type, or to a pointer, is not
 	// mapped to a pointer.
 	SwigType_del_reference(t);
@@ -5424,7 +6583,9 @@ private:
       }
 
       Delete(t);
-      if (is_int8) {
+      if (is_bool) {
+	ret = NewString("bool ");
+      } else if (is_int8) {
 	ret = NewString("char ");
       } else if (is_int16) {
 	ret = NewString("short ");
@@ -5445,7 +6606,7 @@ private:
     }
 
     Append(ret, tail);
-    if (SwigType_isreference(type)) {
+    if (!has_typemap && SwigType_isreference(type)) {
       Append(ret, "* ");
     }
     Append(ret, name);
@@ -5651,6 +6812,7 @@ extern "C" Language *swig_go(void) {
 // Usage message.
 const char * const GO::usage = "\
 Go Options (available with -go)\n\
+     -cgo                - Generate cgo input files\n\
      -gccgo              - Generate code for gccgo rather than 6g/8g\n\
      -go-pkgpath <p>     - Like gccgo -fgo-pkgpath option\n\
      -go-prefix <p>      - Like gccgo -fgo-prefix option\n\
diff --git a/configure.ac b/configure.ac
index c2a36fc95..b595de08e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2319,109 +2319,102 @@ if test x"${GOBIN}" = xno -o x"${with_alllang}" = xno ; then
   GO1=false
   GO12=false
   GO13=false
+  GO15=false
   GOGCC=false
+  GCCGO=
   GOOPT=
+  GCCGOOPT=
   GOVERSIONOPTION=
 else
 
   if test "x$GOBIN" = xyes; then
-    AC_CHECK_PROGS(GO, go 6g 8g gccgo)
+    AC_CHECK_PROGS(GO, go)
   else
     GO="$GOBIN"
   fi
 
+  AC_CHECK_PROGS(GCCGO, gccgo)
+
   GOGCC=false
+  GCCGO=
   GO1=false
   GO12=false
   GO13=false
+  GO15=false
   GOOPT=
+  GCCGOOPT=
   GOVERSIONOPTION=
-  if test -n "$GO" ; then
-    if $GO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
-      GOGCC=true
-      GOVERSIONOPTION=--version
-      AC_MSG_CHECKING([whether gccgo version is too old])
-      go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
-      if test "x$go_version" = x; then
-        AC_MSG_RESULT([could not determine gccgo version - disabling Go])
-        GO=
-      elif test "$go_version" -lt 470; then
-        AC_MSG_RESULT([yes - minimum version is 4.7.0])
-        GO=
-      else
-	AC_MSG_RESULT([no])
-        if test "$go_version" -lt 480; then
-          GOOPT="-intgosize 32"
-	else
-	  AC_CHECK_SIZEOF([void *], [4])
-	  if test "$ac_cv_sizeof_void_p" = "8"; then
-	    GOOPT="-intgosize 64"
-	  else
-	    GOOPT="-intgosize 32"
-	  fi
-        fi
-      fi
-    elif test "`echo $GO | sed -e 's|.*/||'`" = "go"; then
-      GO1=true
-      GOVERSIONOPTION=version
-      GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
-      go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
-      AC_MSG_CHECKING([whether go version is too old])
-      case $go_version in
-      go1.0* | go1 )
-	AC_MSG_RESULT([yes - minimum version is 1.1])
-	GO=
-	GOOPT="-intgosize 32"
-	;;
-      *)
-	AC_MSG_RESULT([no])
-	if test "$GOC" = "6c"; then
-          GOOPT="-intgosize 64"
-        else
-          GOOPT="-intgosize 32"
-	fi
-	;;
-      esac
-      case $go_version in
-      go1.0* | go1 | go1.1*)
-	GOOPT="$GOOPT -use-shlib"
-	;;
-      go1.2*)
-        GO12=true
-	;;
-      *)
-	GO13=true
-	;;
-      esac
+
+  GO1=true
+  GOVERSIONOPTION=version
+  GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
+  go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
+  AC_MSG_CHECKING([whether go version is too old])
+  case $go_version in
+  go1.0* | go1 )
+    AC_MSG_RESULT([yes - minimum version is 1.1])
+    GO=
+    GOOPT="-intgosize 32"
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    if test "$GOC" = "6c"; then
+      GOOPT="-intgosize 64"
     else
-      GOC=`echo $GO | sed -e 's/g/c/'`
-      GOVERSIONOPTION=-V
-      AC_MSG_CHECKING([whether Go ($GO) version is too old])
-      AC_MSG_RESULT([yes - minimum version is 1.1])
-      GO=
-      dnl Old code retained for now in case we implement an option for it.
-      dnl go_version=`$GO $GOVERSIONOPTION 2>/dev/null | sed -e 's/.*version.* \([[0-9]]*\).*/\1/'`
-      dnl go_min_version=7077
-      dnl if test "$go_version" != "" -a "$go_version" -lt $go_min_version; then
-      dnl   AC_MSG_RESULT([yes - minimum version is $go_min_version])
-      dnl   GO=
-      dnl else
-      dnl   AC_MSG_RESULT([no])
-      dnl fi
       GOOPT="-intgosize 32"
-      GO12=false
-      GO13=false
+    fi
+    ;;
+  esac
+  case $go_version in
+  go1.0* | go1 | go1.1*)
+    GOOPT="$GOOPT -use-shlib"
+    ;;
+  go1.2*)
+    GO12=true
+    ;;
+  go1.3* | go1.4*)
+    GO13=true
+    ;;
+  *)
+    GO15=true
+    ;;
+  esac
+
+  if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
+    AC_MSG_CHECKING([whether gccgo version is too old])
+    go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
+    if test "x$go_version" = x; then
+      AC_MSG_RESULT([could not determine gccgo version])
+      GCCGO=
+    elif test "$go_version" -lt 470; then
+      AC_MSG_RESULT([yes - minimum version is 4.7.0])
+      GCCGO=
+    else
+      AC_MSG_RESULT([no])
+      if test "$go_version" -lt 480; then
+        GCCGOOPT="-intgosize 32"
+      else
+	AC_CHECK_SIZEOF([void *], [4])
+	if test "$ac_cv_sizeof_void_p" = "8"; then
+	  GCCGOOPT="-intgosize 64"
+	else
+	  GCCGOOPT="-intgosize 32"
+	fi
+      fi
     fi
   fi
 fi
 
 AC_SUBST(GOGCC)
+AC_SUBST(GCCGO)
 AC_SUBST(GO)
 AC_SUBST(GOC)
 AC_SUBST(GO1)
 AC_SUBST(GO12)
 AC_SUBST(GO13)
+AC_SUBST(GO15)
 AC_SUBST(GOOPT)
+AC_SUBST(GCCGOOPT)
 AC_SUBST(GOVERSIONOPTION)
 
 #----------------------------------------------------------------

From b15a66f2ab2a02becd7e5c64f1365acce01e29eb Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 4 Mar 2015 14:25:10 -0800
Subject: [PATCH 013/220] [Go] Use imtype when checking for pointer in cgo
 type.  Permit func, map, chan values to be converted to pointers when using
 cgo.

---
 Source/Modules/go.cxx | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 0d349bd22..185d19552 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -4783,8 +4783,8 @@ private:
 	}
       }
 
-      // The Go function which invokes the method.  This is called
-      // from by the C++ method on the director class.
+      // The Go function which invokes the method.  This is called by
+      // the C++ method on the director class.
 
       if (cgo_flag) {
 	Printv(f_go_wrappers, "//export ", callback_name, "\n", NULL);
@@ -6290,7 +6290,7 @@ private:
     *c_struct_type = false;
 
     bool is_interface;
-    String *go_type = goTypeWithInfo(n, type, false, &is_interface);
+    String *go_type = goTypeWithInfo(n, type, true, &is_interface);
     if (is_interface) {
       Delete(go_type);
       return NewString("uintptr_t");
@@ -6306,6 +6306,10 @@ private:
       Delete(go_type);
       return NewString("swig_voidp");
     }
+
+    // Check for some Go types that are really pointers under the covers.
+    bool is_hidden_pointer = Strncmp(go_type, "func(", 5) == 0 || Strncmp(go_type, "map[", 4) == 0 || Strncmp(go_type, "chan ", 5) == 0;
+
     Delete(go_type);
 
     String *ct = Getattr(n, "emit:cgotype");
@@ -6340,6 +6344,14 @@ private:
 	--count;
 	ct = NewString("swig_voidp");
 	add_typedef = false;
+	if (is_hidden_pointer) {
+	  // A Go type that is really a pointer, like func, map, chan,
+	  // is being represented in C by a pointer.  This is fine,
+	  // but we have to memcpy the type rather than simply
+	  // converting it.
+	  *c_struct_type = true;
+	  Setattr(n, "emit:cgotypestruct", type);
+	}
       }
 
       if (Strncmp(gct, "bool ", 5) == 0) {

From a6a9a89524c11dca96ffed2d074adb63925d81f4 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 6 Mar 2015 17:51:30 -0800
Subject: [PATCH 014/220] [Go] Fix overloading on an undefined type.

---
 .../go/overload_polymorphic_runme.go          |  6 ++-
 Examples/test-suite/overload_polymorphic.i    |  4 ++
 Source/Modules/go.cxx                         | 37 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/go/overload_polymorphic_runme.go b/Examples/test-suite/go/overload_polymorphic_runme.go
index 1720e1a4d..46f837f49 100644
--- a/Examples/test-suite/go/overload_polymorphic_runme.go
+++ b/Examples/test-suite/go/overload_polymorphic_runme.go
@@ -6,6 +6,10 @@ func main(){
 	t := overload_polymorphic.NewDerived()
 	
 	if overload_polymorphic.Test(t) != 0 {
-		panic("failed")
+		panic("failed 1")
+	}
+
+	if overload_polymorphic.Test2(t) != 1 {
+		panic("failed 2")
 	}
 }
diff --git a/Examples/test-suite/overload_polymorphic.i b/Examples/test-suite/overload_polymorphic.i
index a1f123b9d..ac004f948 100644
--- a/Examples/test-suite/overload_polymorphic.i
+++ b/Examples/test-suite/overload_polymorphic.i
@@ -19,4 +19,8 @@ public:
 int test(Base* base){ return 0;}
 int test(int hello){ return 1; }
 
+class Unknown;
+int test2(Unknown* unknown) { return 0; }
+int test2(Base* base) { return 1; }
+
 %}
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 185d19552..d4a0c0caf 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -5652,8 +5652,43 @@ private:
 	      ++num_braces;
 	    }
 
+	    Delete(tm);
+
+	    tm = goType(pj, Getattr(pj, "type"));
+
+	    // Now for a C++ class, tm is the interface type.  If this
+	    // is based on an undefined type, then require matching on
+	    // the underlying integer type.  This is because the
+	    // interface type we generate for an undefined type will
+	    // match the interface generated for any C++ class type.
+	    // It has to work that way so that we can handle a derived
+	    // type of an ignored type.  It's unlikely that anybody
+	    // will have a value of an undefined type, but we support
+	    // it because it worked in the past.
+	    SwigType *ty = SwigType_typedef_resolve_all(Getattr(pj, "type"));
+	    while (true) {
+	      if (SwigType_ispointer(ty)) {
+		SwigType_del_pointer(ty);
+	      } else if (SwigType_isarray(ty)) {
+		SwigType_del_array(ty);
+	      } else if (SwigType_isreference(ty)) {
+		SwigType_del_reference(ty);
+	      } else if (SwigType_isqualifier(ty)) {
+		SwigType_del_qualifier(ty);
+	      } else {
+		break;
+	      }
+	    }
+
+	    if (Getattr(undefined_types, ty) && !Getattr(defined_types, ty)) {
+	      Delete(tm);
+	      tm = goWrapperType(pj, Getattr(pj, "type"), true);
+	    }
+
+	    Delete(ty);
+
 	    fn = i + 1;
-	    Printf(f_go_wrappers, "\t\tif _, ok := a[%d].(%s); !ok {\n", j, goType(pj, Getattr(pj, "type")));
+	    Printf(f_go_wrappers, "\t\tif _, ok := a[%d].(%s); !ok {\n", j, tm);
 	    Printf(f_go_wrappers, "\t\t\tgoto check_%d\n", fn);
 	    Printv(f_go_wrappers, "\t\t}\n", NULL);
 	  }

From b1311b0d88a3cf8c3534703e633f64d97e2c91fd Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Sun, 8 Mar 2015 20:30:47 -0700
Subject: [PATCH 015/220] [Go] Use -I ../../.. instead of -I $(pwd) to see if
 this helps with Travis.  (Travis is reporting failures that I can not
 recreate.)

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

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 47e2d7ca7..e0d8cf025 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1836,7 +1836,7 @@ go: $(SRCDIR_SRCS)
 	cp $(GOSRCS) $(GOPATHDIR)/
 	GOPATH=`pwd`/gopath; \
 	export GOPATH; \
-	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `pwd`"; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I ../../.."; \
 	export CGO_CPPFLAGS; \
 	CGO_CFLAGS="$(CFLAGS)"; \
 	export CGO_CFLAGS; \
@@ -1931,7 +1931,7 @@ go_cpp: $(SRCDIR_SRCS)
 	cp $(GOSRCS) $(GOPATHDIR)/
 	GOPATH=`pwd`/gopath; \
 	export GOPATH; \
-	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `pwd`"; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I ../../.."; \
 	export CGO_CPPFLAGS; \
 	CGO_CFLAGS="$(CFLAGS)"; \
 	export CGO_CFLAGS; \

From 4c399718d0a3fdc1c07dbd2601c4b09f16d8a6b4 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 9 Mar 2015 10:06:04 -0700
Subject: [PATCH 016/220] [Go] Add -I $(SRCDIR) to CGO_CPPFLAGS.

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

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index e0d8cf025..a7d00929b 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1836,7 +1836,7 @@ go: $(SRCDIR_SRCS)
 	cp $(GOSRCS) $(GOPATHDIR)/
 	GOPATH=`pwd`/gopath; \
 	export GOPATH; \
-	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I ../../.."; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \
 	export CGO_CPPFLAGS; \
 	CGO_CFLAGS="$(CFLAGS)"; \
 	export CGO_CFLAGS; \
@@ -1931,7 +1931,7 @@ go_cpp: $(SRCDIR_SRCS)
 	cp $(GOSRCS) $(GOPATHDIR)/
 	GOPATH=`pwd`/gopath; \
 	export GOPATH; \
-	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I ../../.."; \
+	CGO_CPPFLAGS="$(CPPFLAGS) $(INCLUDES) -I `cd $(SRCDIR) && pwd` -I `pwd`"; \
 	export CGO_CPPFLAGS; \
 	CGO_CFLAGS="$(CFLAGS)"; \
 	export CGO_CFLAGS; \

From 95cc6c95619a30bef883e5ae3bb5db114cd176a2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 13 Feb 2015 07:48:43 +0000
Subject: [PATCH 017/220] .travis.yml branch builds correction

[skip ci]
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8d814e7f8..1a79187d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,4 +113,3 @@ script:
 branches:
   only:
     - master
-    - error-declaration-after-statement

From a2513b083a04a11187a26f9f752094c988775f95 Mon Sep 17 00:00:00 2001
From: Ian Bell <ian.h.bell@gmail.com>
Date: Tue, 10 Mar 2015 10:07:05 -0600
Subject: [PATCH 018/220] Added some information on manually compiling for R

This was the root of my problem, and it would have been good to have this clearly explained before.
---
 Doc/Manual/R.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html
index 5de390eab..50e861b22 100644
--- a/Doc/Manual/R.html
+++ b/Doc/Manual/R.html
@@ -119,6 +119,23 @@ Without it, inheritance of wrapped objects may fail.
 These two files can be loaded in any order
 </p>
 
+<p>
+  If you are compiling code yourself (not using R itself), there are a few things to watch out for:
+</p>
+
+<ul>
+<li>The output shared library name (to the left of the file extension) MUST match the module name, or alternatively, you can also set the -package NAME command line argument.  See swig -r -help for more information
+<li>If you do not set the output file name appropriately, you might see errors like 
+<div class="shell">
+<pre>
+> fact(4)
+Error in .Call("R_swig_fact", s_arg1, as.logical(.copy), PACKAGE = "example") :
+  "R_swig_fact" not available for .Call() for package "example"
+</pre>
+</div>
+<li>Make sure the architecture of the shared library(x64 for instance), matches the architecture of the R program you want to load your shared library into
+</ul>
+
 <H2><a name="R_nn4"></a>37.3 Precompiling large R files</H2>
 
 

From c4268c369b7890fa518b5040098a552c04580d86 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 12 Mar 2015 17:50:52 +1300
Subject: [PATCH 019/220] Fix cut-and-paste typo

---
 Lib/octave/director.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/octave/director.swg b/Lib/octave/director.swg
index c399a6a89..e80877ef6 100644
--- a/Lib/octave/director.swg
+++ b/Lib/octave/director.swg
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
  * director.swg
  *
- * This file contains support for director classes so that D proxy
+ * This file contains support for director classes so that Octave proxy
  * methods can be called from C++.
  * ----------------------------------------------------------------------------- */
 

From 7ba06526776274d779fb12636e1ab7e4063c0f72 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 12 Mar 2015 19:51:11 +1300
Subject: [PATCH 020/220] Create director_common.swg for language-indep code

Move -DSWIG_DIRECTOR_STATIC handling there, so this is now supported for
all languages with director support, not just Python and PHP.
---
 CHANGES.current           |  4 ++++
 Lib/director_common.swg   | 15 +++++++++++++++
 Lib/php/director.swg      |  9 ---------
 Lib/python/director.swg   | 10 ----------
 Source/Modules/csharp.cxx |  1 +
 Source/Modules/d.cxx      |  1 +
 Source/Modules/java.cxx   |  1 +
 Source/Modules/ocaml.cxx  |  1 +
 Source/Modules/octave.cxx |  4 +++-
 Source/Modules/perl5.cxx  |  1 +
 Source/Modules/php.cxx    |  1 +
 Source/Modules/python.cxx |  1 +
 Source/Modules/ruby.cxx   |  1 +
 13 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 Lib/director_common.swg

diff --git a/CHANGES.current b/CHANGES.current
index 93e5fb943..c8a376e0a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-03-12: olly
+	    -DSWIG_DIRECTOR_STATIC is now supported for all languages with
+	    director support, not only Python and PHP.
+
 2015-03-02: ianlancetaylor
 	    [Go] Add -cgo option, required for Go versions 1.5 and
 	    later.
diff --git a/Lib/director_common.swg b/Lib/director_common.swg
new file mode 100644
index 000000000..9ce93c7e7
--- /dev/null
+++ b/Lib/director_common.swg
@@ -0,0 +1,15 @@
+/* -----------------------------------------------------------------------------
+ * director_common.swg
+ *
+ * This file contains support for director classes which is common between
+ * languages.
+ * ----------------------------------------------------------------------------- */
+
+/*
+  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
+  'Swig' namespace. This could be useful for multi-modules projects.
+*/
+#ifdef SWIG_DIRECTOR_STATIC
+/* Force anonymous (static) namespace */
+#define Swig
+#endif
diff --git a/Lib/php/director.swg b/Lib/php/director.swg
index 92c149999..638a1697d 100644
--- a/Lib/php/director.swg
+++ b/Lib/php/director.swg
@@ -12,15 +12,6 @@
 #include <exception>
 #include <map>
 
-/*
-  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
-  'Swig' namespace. This could be useful for multi-modules projects.
-*/
-#ifdef SWIG_DIRECTOR_STATIC
-/* Force anonymous (static) namespace */
-#define Swig
-#endif
-
 namespace Swig {
 
   /* memory handler */
diff --git a/Lib/python/director.swg b/Lib/python/director.swg
index 90c58c107..6e69e544c 100644
--- a/Lib/python/director.swg
+++ b/Lib/python/director.swg
@@ -40,16 +40,6 @@
 #endif
 
 
-/*
-  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
-  'Swig' namespace. This could be useful for multi-modules projects.
-*/
-#ifdef SWIG_DIRECTOR_STATIC
-/* Force anonymous (static) namespace */
-#define Swig
-#endif
-
-
 /*
   Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the
   native C++ RTTI and dynamic_cast<>. But be aware that directors
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 3b1e03560..52d230d99 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -418,6 +418,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
     // Generate the intermediary class
diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index 8546372ea..8b0bdded1 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -508,6 +508,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (before %header section).
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
 
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 82ecb41a4..b010d10d5 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -481,6 +481,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
     // Generate the intermediary class
diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx
index ac73c1f0c..72f0d98d3 100644
--- a/Source/Modules/ocaml.cxx
+++ b/Source/Modules/ocaml.cxx
@@ -325,6 +325,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
 
diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx
index 236598c1f..6d225575d 100644
--- a/Source/Modules/octave.cxx
+++ b/Source/Modules/octave.cxx
@@ -228,8 +228,10 @@ public:
     if (Len(docs))
       emit_doc_texinfo();
 
-    if (directorsEnabled())
+    if (directorsEnabled()) {
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
+    }
 
     Printf(f_init, "return true;\n}\n");
     Printf(s_global_tab, "{0,0,0,0,0}\n};\n");
diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
index e1b0e69c6..3963abf5d 100644
--- a/Source/Modules/perl5.cxx
+++ b/Source/Modules/perl5.cxx
@@ -470,6 +470,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
 
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index e6105eb3e..b50470ede 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -473,6 +473,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime
+      Swig_insert_file("director_common.swg", s_header);
       Swig_insert_file("director.swg", s_header);
     }
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index c71a0f364..0e4a40229 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -967,6 +967,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
 
diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx
index 310e89b82..5aadf86df 100644
--- a/Source/Modules/ruby.cxx
+++ b/Source/Modules/ruby.cxx
@@ -1171,6 +1171,7 @@ public:
 
     if (directorsEnabled()) {
       // Insert director runtime into the f_runtime file (make it occur before %header section)
+      Swig_insert_file("director_common.swg", f_runtime);
       Swig_insert_file("director.swg", f_runtime);
     }
 

From eccfa288b89229ed37daee129c65c8399dfe912d Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Thu, 12 Mar 2015 08:13:16 -0700
Subject: [PATCH 021/220] [Go] Consistently use the same type when dispatching
 to an overloaded function.

---
 Source/Modules/go.cxx | 81 +++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index d4a0c0caf..c7c32cde5 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -5611,9 +5611,9 @@ private:
 	    break;
 	  }
 
-	  // If all the wrappers have the same type in this position,
+	  // If all the overloads have the same type in this position,
 	  // we can omit the check.
-	  SwigType *tm = goWrapperType(pj, Getattr(pj, "type"), true);
+	  SwigType *tm = goOverloadType(pj, Getattr(pj, "type"));
 	  bool emitcheck = false;
 	  for (int k = 0; k < Len(coll) && !emitcheck; ++k) {
 	    Node *nk = Getitem(coll, k);
@@ -5635,7 +5635,7 @@ private:
 		break;
 	      }
 	      if (l == j) {
-		SwigType *tml = goWrapperType(pl, Getattr(pl, "type"), true);
+		SwigType *tml = goOverloadType(pl, Getattr(pl, "type"));
 		if (Cmp(tm, tml) != 0) {
 		  emitcheck = true;
 		}
@@ -5652,41 +5652,6 @@ private:
 	      ++num_braces;
 	    }
 
-	    Delete(tm);
-
-	    tm = goType(pj, Getattr(pj, "type"));
-
-	    // Now for a C++ class, tm is the interface type.  If this
-	    // is based on an undefined type, then require matching on
-	    // the underlying integer type.  This is because the
-	    // interface type we generate for an undefined type will
-	    // match the interface generated for any C++ class type.
-	    // It has to work that way so that we can handle a derived
-	    // type of an ignored type.  It's unlikely that anybody
-	    // will have a value of an undefined type, but we support
-	    // it because it worked in the past.
-	    SwigType *ty = SwigType_typedef_resolve_all(Getattr(pj, "type"));
-	    while (true) {
-	      if (SwigType_ispointer(ty)) {
-		SwigType_del_pointer(ty);
-	      } else if (SwigType_isarray(ty)) {
-		SwigType_del_array(ty);
-	      } else if (SwigType_isreference(ty)) {
-		SwigType_del_reference(ty);
-	      } else if (SwigType_isqualifier(ty)) {
-		SwigType_del_qualifier(ty);
-	      } else {
-		break;
-	      }
-	    }
-
-	    if (Getattr(undefined_types, ty) && !Getattr(defined_types, ty)) {
-	      Delete(tm);
-	      tm = goWrapperType(pj, Getattr(pj, "type"), true);
-	    }
-
-	    Delete(ty);
-
 	    fn = i + 1;
 	    Printf(f_go_wrappers, "\t\tif _, ok := a[%d].(%s); !ok {\n", j, tm);
 	    Printf(f_go_wrappers, "\t\t\tgoto check_%d\n", fn);
@@ -6462,6 +6427,46 @@ private:
     return ret;
   }
 
+  /* ----------------------------------------------------------------------
+   * goOverloadType()
+   *
+   * Given a type, return the Go type to use when dispatching of
+   * overloaded functions.  This is normally just the usual Go type.
+   * However, for a C++ class, the usual Go type is an interface type.
+   * And if that interface type represents a C++ type that SWIG does
+   * not know about, then the interface type generated for any C++
+   * class will match that interface.  So for that case, we match on
+   * the underlying integer type.
+   *
+   * It has to work this way so that we can handle a derived type of a
+   * %ignore'd type.  It's unlikely that anybody will have a value of
+   * an undefined type, but we support it because it worked in the
+   * past.
+   * ---------------------------------------------------------------------- */
+
+  String *goOverloadType(Node *n, SwigType *type) {
+    SwigType *ty = SwigType_typedef_resolve_all(type);
+    while (true) {
+      if (SwigType_ispointer(ty)) {
+	SwigType_del_pointer(ty);
+      } else if (SwigType_isarray(ty)) {
+	SwigType_del_array(ty);
+      } else if (SwigType_isreference(ty)) {
+	SwigType_del_reference(ty);
+      } else if (SwigType_isqualifier(ty)) {
+	SwigType_del_qualifier(ty);
+      } else {
+	break;
+      }
+    }
+
+    if (Getattr(undefined_types, ty) && !Getattr(defined_types, ty)) {
+      return goWrapperType(n, type, true);
+    }
+
+    return goType(n, type);
+  }
+
   /* ----------------------------------------------------------------------
    * goCPointerType()
    *

From 7fa1058a8a0bbfcb9eaa944e9b6da4e2d74252cd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 14 Mar 2015 23:40:30 +0000
Subject: [PATCH 022/220] Configure fix and warning fix for Go

---
 Source/Modules/go.cxx |   2 +-
 configure.ac          | 112 ++++++++++++++++++++++--------------------
 2 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index c7c32cde5..4ec5dae62 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -6314,7 +6314,7 @@ private:
 
     String *ct = Getattr(n, "emit:cgotype");
     if (ct) {
-      *c_struct_type = (bool)Getattr(n, "emit:cgotypestruct");
+      *c_struct_type = Getattr(n, "emit:cgotypestruct") ? true : false;
       return Copy(ct);
     }
 
diff --git a/configure.ac b/configure.ac
index b595de08e..f6c21de98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2333,8 +2333,6 @@ else
     GO="$GOBIN"
   fi
 
-  AC_CHECK_PROGS(GCCGO, gccgo)
-
   GOGCC=false
   GCCGO=
   GO1=false
@@ -2345,61 +2343,67 @@ else
   GCCGOOPT=
   GOVERSIONOPTION=
 
-  GO1=true
-  GOVERSIONOPTION=version
-  GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
-  go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
-  AC_MSG_CHECKING([whether go version is too old])
-  case $go_version in
-  go1.0* | go1 )
-    AC_MSG_RESULT([yes - minimum version is 1.1])
-    GO=
-    GOOPT="-intgosize 32"
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    if test "$GOC" = "6c"; then
-      GOOPT="-intgosize 64"
-    else
+  if test -n "$GO" ; then
+    GO1=true
+    GOVERSIONOPTION=version
+    GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
+    go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
+    AC_MSG_CHECKING([whether go version is too old])
+    case $go_version in
+    go1.0* | go1 )
+      AC_MSG_RESULT([yes - minimum version is 1.1])
+      GO=
       GOOPT="-intgosize 32"
-    fi
-    ;;
-  esac
-  case $go_version in
-  go1.0* | go1 | go1.1*)
-    GOOPT="$GOOPT -use-shlib"
-    ;;
-  go1.2*)
-    GO12=true
-    ;;
-  go1.3* | go1.4*)
-    GO13=true
-    ;;
-  *)
-    GO15=true
-    ;;
-  esac
-
-  if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
-    AC_MSG_CHECKING([whether gccgo version is too old])
-    go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
-    if test "x$go_version" = x; then
-      AC_MSG_RESULT([could not determine gccgo version])
-      GCCGO=
-    elif test "$go_version" -lt 470; then
-      AC_MSG_RESULT([yes - minimum version is 4.7.0])
-      GCCGO=
-    else
+      ;;
+    *)
       AC_MSG_RESULT([no])
-      if test "$go_version" -lt 480; then
-        GCCGOOPT="-intgosize 32"
+      if test "$GOC" = "6c"; then
+        GOOPT="-intgosize 64"
       else
-	AC_CHECK_SIZEOF([void *], [4])
-	if test "$ac_cv_sizeof_void_p" = "8"; then
-	  GCCGOOPT="-intgosize 64"
-	else
-	  GCCGOOPT="-intgosize 32"
-	fi
+        GOOPT="-intgosize 32"
+      fi
+      ;;
+    esac
+    case $go_version in
+    go1.0* | go1 | go1.1*)
+      GOOPT="$GOOPT -use-shlib"
+      ;;
+    go1.2*)
+      GO12=true
+      ;;
+    go1.3* | go1.4*)
+      GO13=true
+      ;;
+    *)
+      GO15=true
+      ;;
+    esac
+  fi
+
+  AC_CHECK_PROGS(GCCGO, gccgo)
+
+  if test -n "$GCCGO" ; then
+    if $GCCGO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
+      AC_MSG_CHECKING([whether gccgo version is too old])
+      go_version=[`$GO $GOVERSIONOPTION | sed -n '1p' | sed -e 's/^.* \([0-9.]*\) *$/\1/' -e 's/[.]//g'`]
+      if test "x$go_version" = x; then
+        AC_MSG_RESULT([could not determine gccgo version])
+        GCCGO=
+      elif test "$go_version" -lt 470; then
+        AC_MSG_RESULT([yes - minimum version is 4.7.0])
+        GCCGO=
+      else
+        AC_MSG_RESULT([no])
+        if test "$go_version" -lt 480; then
+          GCCGOOPT="-intgosize 32"
+        else
+          AC_CHECK_SIZEOF([void *], [4])
+          if test "$ac_cv_sizeof_void_p" = "8"; then
+            GCCGOOPT="-intgosize 64"
+          else
+            GCCGOOPT="-intgosize 32"
+          fi
+        fi
       fi
     fi
   fi

From eba41f4f56fdf42e91df5be022970145f4695709 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 16 Mar 2015 14:36:44 +1300
Subject: [PATCH 023/220] Note vadz as contributing to Python

Taken from doxygen branch
---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 4a26f5947..c3fbbdebd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -62,7 +62,7 @@ Past SWIG developers and major contributors include:
  John Lenz                                                (Guile, MzScheme updates, Chicken module, runtime system)
  Baozeng Ding  <sploving1@163.com>                        (Scilab)
  Ian Lance Taylor                                         (Go)
- Vadim Zeitlin                                            (PCRE)
+ Vadim Zeitlin                                            (PCRE, Python)
  Stefan Zager (szager@gmail.com)                          (Python)
  Vincent Couvert                                          (Scilab)
  Sylvestre Ledru                                          (Scilab)

From 87a189271922d7c77df32bc873368669d081afe3 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 16 Mar 2015 14:41:15 +1300
Subject: [PATCH 024/220] Trim trailing blank lines

---
 Examples/java/pointer/example.i | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Examples/java/pointer/example.i b/Examples/java/pointer/example.i
index a8ac79499..ed1c2fcc3 100644
--- a/Examples/java/pointer/example.i
+++ b/Examples/java/pointer/example.i
@@ -24,7 +24,3 @@ extern void sub(int *INPUT, int *INPUT, int *OUTPUT);
 
 %apply int *OUTPUT { int *r };
 extern int divide(int n, int d, int *r);
-
-
-
-

From 0193c98608ff30ef94dd797977128a89f4c2d349 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 16 Mar 2015 18:02:03 +1300
Subject: [PATCH 025/220] Fix random case flipping of an HTML source line

Introduced in a586874
---
 Doc/Manual/Lua.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html
index 61f19be68..2e1515c43 100644
--- a/Doc/Manual/Lua.html
+++ b/Doc/Manual/Lua.html
@@ -891,7 +891,7 @@ void spam(short);
 <p>
 or
 </p>
-<DIV CLASS="CODE"><PRE>VOID FOO(bAR *B);
+<div class="code"><pre>void foo(Bar *b);
 void foo(Bar &amp;b);
 </pre></div>
 <p>

From ab677205d87aa39a1506a543e595cd848382c6b6 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 16 Mar 2015 18:12:38 +1300
Subject: [PATCH 026/220] Suppress warning from Intel compiler

Fixes issue #192, reported by kesmit13
---
 Lib/swiglabels.swg | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Lib/swiglabels.swg b/Lib/swiglabels.swg
index baa21a756..e73e63a57 100644
--- a/Lib/swiglabels.swg
+++ b/Lib/swiglabels.swg
@@ -110,3 +110,12 @@
 #if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
 # define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
 #endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif

From baf1fe036a56e6a9637406763b75a280330d1061 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 16 Mar 2015 11:45:15 -0700
Subject: [PATCH 027/220] [Go] Correct goargout typemap when matching multiple
 parameters.

---
 Source/Modules/go.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 4ec5dae62..087a71999 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -1353,7 +1353,7 @@ private:
       Delete(ret_type);
     }
 
-    goargout(info->parms, parm_count);
+    goargout(info->parms);
 
     if (SwigType_type(info->result) != T_VOID) {
       String *goout = goTypemapLookup("goout", info->n, "swig_r");
@@ -1945,7 +1945,7 @@ private:
       Printv(f_go_wrappers, call, NULL);
       Delete(call);
 
-      goargout(parms, parm_count);
+      goargout(parms);
 
       if (need_return_var) {
 	if (goout == NULL) {
@@ -2487,18 +2487,17 @@ private:
    * property with the name to use to refer to that parameter.
    * ----------------------------------------------------------------------- */
 
-  void goargout(ParmList *parms, int parm_count) {
+  void goargout(ParmList *parms) {
     Parm *p = parms;
-    for (int i = 0; i < parm_count; ++i) {
-      p = getParm(p);
-      String *tm = goGetattr(p, "tmap:goargout");
+    while (p) {
+      String *tm = Getattr(p, "tmap:goargout");
       if (!tm) {
 	p = nextSibling(p);
       } else {
 	tm = Copy(tm);
 	Replaceall(tm, "$result", "swig_r");
 	Replaceall(tm, "$input", Getattr(p, "emit:goinput"));
-	Printv(f_go_wrappers, tm, NULL);
+	Printv(f_go_wrappers, tm, "\n", NULL);
 	Delete(tm);
 	p = Getattr(p, "tmap:goargout:next");
       }
@@ -4456,7 +4455,7 @@ private:
 	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
 	}
 
-	goargout(parms, parm_count);
+	goargout(parms);
 
 	if (SwigType_type(result) != T_VOID) {
 	  if (goout == NULL) {
@@ -4758,7 +4757,7 @@ private:
 	  Printv(f_go_wrappers, "\tswig_r = *(*", ret_type, ")(unsafe.Pointer(&swig_r_p))\n", NULL);
 	}
 
-	goargout(parms, parm_count);
+	goargout(parms);
 
 	if (SwigType_type(result) != T_VOID) {
 	  if (goout == NULL) {

From e6ed961711d623630f1a24ca7e12d85be843294b Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 12:33:20 +1300
Subject: [PATCH 028/220] Fix configure message about ocaml version check

The test is actually > 3.08.2, not >= 3.08.2 as the message previously
implied.  The change in question happened after 3.08.2, so ">" is the
correct test:

http://caml.inria.fr/pub/ml-archives/caml-list/2005/07/ad882d2c46496ad44e6ea6c31a989860.en.html
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f6c21de98..6a1c8129e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1803,7 +1803,7 @@ else
 		AC_MSG_RESULT(not found)
 	fi
 
-	AC_MSG_CHECKING(for Ocaml version 3.08.2 or higher)
+	AC_MSG_CHECKING(if Ocaml version is greater than 3.08.2)
 	OCAMLVER=`$OCAMLC -version | sed -e 's/.*version //g'`
 	AC_COMPARE_VERSION([$OCAMLVER],[3.08.2],[:],[:],[OCAMLLOC=_loc])
 	AC_MSG_RESULT($OCAMLVER)

From c7c6f2381eff3d1a474392181d17236ceb0c0fd9 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 12:39:57 +1300
Subject: [PATCH 029/220] Eliminate AC_COMPARE_VERSION

We also have AX_COMPARE_VERSION which does essentially the same job.
---
 Tools/config/ac_compare_version.m4 | 40 ------------------------------
 configure.ac                       |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 Tools/config/ac_compare_version.m4

diff --git a/Tools/config/ac_compare_version.m4 b/Tools/config/ac_compare_version.m4
deleted file mode 100644
index 0828f4789..000000000
--- a/Tools/config/ac_compare_version.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl @synopsis AC_COMPARE_VERSION\
-dnl  (version-a, version-b, action-if-greater, action-if-equal, action-if-less)
-dnl 
-dnl This macro compares two version numbers and executes the indicated action
-dnl based on whether they're equal or one is greater than the other.
-dnl It's needed to determine whether ocaml is new enough that the incompatible
-dnl change 'loc' -> '_loc' is present in this version of camlp4.
-dnl 
-dnl It's implemented from scratch just for SWIG by arty.
-dnl
-dnl @category Misc
-dnl @author arty
-dnl @version 2006-11-02
-dnl @license GPLWithACException
-
-AC_DEFUN([AC_COMPARE_VERSION], [
-	# Split the version into units.
-	ver_a="[$1]"
-	ver_b="[$2]"
-	nodots_a=`echo $ver_a | sed -e 's/\./ /g'`
-	condition="equal"
-	isolate_b_regex='\([[0-9]]\+\).*'
-	for ver_part in $nodots_a ; do
-		b_ver_part=`echo "$ver_b" | sed -e 's/'"$isolate_b_regex"'/\1/'`
-		if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then
-			condition=less
-		elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then
-			condition=greater
-		fi
-		isolate_b_regex='[[0-9]]\+\.'"$isolate_b_regex"
-	done
-
-	if test "x$condition" = "xequal" ; then
-		[$4]
-	elif test "x$condition" = "xless" ; then
-		[$3]
-	elif test "x$condition" = "xgreater" ; then
-		[$5]
-	fi
-])
diff --git a/configure.ac b/configure.ac
index 6a1c8129e..06f037a53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1805,7 +1805,7 @@ else
 
 	AC_MSG_CHECKING(if Ocaml version is greater than 3.08.2)
 	OCAMLVER=`$OCAMLC -version | sed -e 's/.*version //g'`
-	AC_COMPARE_VERSION([$OCAMLVER],[3.08.2],[:],[:],[OCAMLLOC=_loc])
+	AX_COMPARE_VERSION([$OCAMLVER], [ge], [3.08.2], [OCAMLLOC=_loc])
 	AC_MSG_RESULT($OCAMLVER)
     fi
 fi # Disabling ocaml

From 6d80e406999c2074d307d51e612daab683c6efea Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:10:59 +1300
Subject: [PATCH 030/220] Remove dead Ocaml configure probes

A number of the probed for values are no longer actually used anywhere.
---
 Doc/Manual/Ocaml.html |  2 +-
 configure.ac          | 49 ++++---------------------------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index aa6679f9a..4f61d0179 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -84,7 +84,7 @@ If you're not familiar with the Objective Caml language, you can visit
 
 
 <p>
-                  SWIG 1.3 works with Ocaml 3.04 and above.  Given the choice,
+                  SWIG 3.0 works with Ocaml 3.08.3 and above.  Given the choice,
    you  should  use the latest stable release.  The SWIG Ocaml module has
 been   tested  on Linux (x86,PPC,Sparc) and Cygwin on Windows.  The
 best  way to determine    whether your system will work is to compile the
diff --git a/configure.ac b/configure.ac
index 06f037a53..9d9aed6c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1745,19 +1745,17 @@ AC_SUBST(PHPINC)
 # Look for ocaml
 #----------------------------------------------------------------
 
-AC_ARG_WITH(ocaml, AS_HELP_STRING([--without-ocaml], [Disable OCaml])
-AS_HELP_STRING([--with-ocaml=path], [Set location of ocaml executable]),[ OCAMLBIN="$withval"], [OCAMLBIN=yes])
+AC_ARG_WITH(ocaml, AS_HELP_STRING([--without-ocaml], [Disable OCaml]), [with_ocaml="$withval"], [with_ocaml=yes])
 AC_ARG_WITH(ocamlc,[  --with-ocamlc=path      Set location of ocamlc executable],[ OCAMLC="$withval"], [OCAMLC=])
 AC_ARG_WITH(ocamldlgen,[  --with-ocamldlgen=path  Set location of ocamldlgen],[ OCAMLDLGEN="$withval" ], [OCAMLDLGEN=])
 AC_ARG_WITH(ocamlfind,[  --with-ocamlfind=path   Set location of ocamlfind],[OCAMLFIND="$withval"],[OCAMLFIND=])
 AC_ARG_WITH(ocamlmktop,[  --with-ocamlmktop=path  Set location of ocamlmktop executable],[ OCAMLMKTOP="$withval"], [OCAMLMKTOP=])
 
 # First, check for "--without-ocaml" or "--with-ocaml=no".
-if test x"${OCAMLBIN}" = xno -o x"${with_alllang}" = xno ; then
+if test x"${with_ocaml}" = xno -o x"${with_alllang}" = xno ; then
     AC_MSG_NOTICE([Disabling OCaml])
-    OCAMLBIN=
+    OCAMLC=
 else
-
     AC_MSG_CHECKING(for Ocaml DL load generator)
     if test -z "$OCAMLDLGEN"; then
 	AC_CHECK_PROGS(OCAMLDLGEN, ocamldlgen, :)
@@ -1773,56 +1771,17 @@ else
 	AC_CHECK_PROGS(OCAMLC, ocamlc, :)
     fi
 
-    AC_MSG_CHECKING(for Ocaml interpreter)
-	if test "x$OCAMLBIN" = xyes; then
-	AC_CHECK_PROGS(OCAMLBIN, ocaml, :)
-    fi
-
     AC_MSG_CHECKING(for Ocaml toplevel creator)
     if test -z "$OCAMLMKTOP"; then
 	AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :)
     fi
-
-    OCAMLLOC=loc
-    if test "$OCAMLC" != ":" ; then
-	AC_MSG_CHECKING(for Ocaml header files)
-	dirs="/usr/lib/ocaml/caml /usr/local/lib/ocaml/caml"
-	dir="`$OCAMLC -where 2>/dev/null`"
-	if test "$dir"; then
-		dirs="$dir/caml $dirs"
-	fi
-	for i in $dirs; do
-		if test -r $i/mlvalues.h; then
-			AC_MSG_RESULT($i)
-			OCAMLEXT="$i"
-			OCAMLINC="-I$OCAMLEXT"
-			break
-		fi
-	done
-	if test -z "$OCAMLINC"; then
-		AC_MSG_RESULT(not found)
-	fi
-
-	AC_MSG_CHECKING(if Ocaml version is greater than 3.08.2)
-	OCAMLVER=`$OCAMLC -version | sed -e 's/.*version //g'`
-	AX_COMPARE_VERSION([$OCAMLVER], [ge], [3.08.2], [OCAMLLOC=_loc])
-	AC_MSG_RESULT($OCAMLVER)
-    fi
 fi # Disabling ocaml
 
-export OCAMLLOC
-export OCAMLVER
-export OCAMLINC
-export OCAMLBIN
 export OCAMLC
 export OCAMLDLGEN
 export OCAMLFIND
 export OCAMLMKTOP
 
-AC_SUBST(OCAMLLOC)
-AC_SUBST(OCAMLVER)
-AC_SUBST(OCAMLINC)
-AC_SUBST(OCAMLBIN)
 AC_SUBST(OCAMLC)
 AC_SUBST(OCAMLDLGEN)
 AC_SUBST(OCAMLFIND)
@@ -2584,7 +2543,7 @@ AC_SUBST(SKIP_PHP)
 
 
 SKIP_OCAML=
-if test -z "$OCAMLBIN" || test -z "$OCAMLINC" ; then
+if test -z "$OCAMLC" ; then
     SKIP_OCAML="1"
 fi
 AC_SUBST(SKIP_OCAML)

From eec4e7e2eea8e819b5460aeb10d7290e9efff041 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:12:12 +1300
Subject: [PATCH 031/220] Use the ocamlc configure found

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

diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in
index 9a4e008b9..d5d533e1c 100644
--- a/Examples/test-suite/ocaml/Makefile.in
+++ b/Examples/test-suite/ocaml/Makefile.in
@@ -3,7 +3,7 @@
 #######################################################################
 
 LANGUAGE     = ocaml
-OCAMLC       = ocamlc
+OCAMLC       = @OCAMLC@
 VARIANT      = _static
 SCRIPTSUFFIX = _runme.ml
 

From 2278c9b33d7aacf7e4812192784d16604b098fe6 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:12:57 +1300
Subject: [PATCH 032/220] Remove pointless export of variables

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

diff --git a/configure.ac b/configure.ac
index 9d9aed6c7..31815411f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1777,11 +1777,6 @@ else
     fi
 fi # Disabling ocaml
 
-export OCAMLC
-export OCAMLDLGEN
-export OCAMLFIND
-export OCAMLMKTOP
-
 AC_SUBST(OCAMLC)
 AC_SUBST(OCAMLDLGEN)
 AC_SUBST(OCAMLFIND)

From b7557aeb03b0385525e774ec2ca852348fce27b8 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:31:10 +1300
Subject: [PATCH 033/220] Add ocaml to travis

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

diff --git a/.travis.yml b/.travis.yml
index 1a79187d7..5d93a72ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,6 +65,9 @@ matrix:
     # Not quite working yet
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic
+    # Until we get the dependencies sorted out
+    - compiler: gcc
+      env: SWIGLANG=ocaml
 before_install:
   - date -u
   - uname -a
@@ -80,6 +83,8 @@ before_install:
   - if test "$SWIGLANG" = "javascript" -a "$ENGINE" = "v8"; then sudo apt-get install -qq libv8-dev; fi
   - if test "$SWIGLANG" = "guile"; then sudo apt-get -qq install guile-2.0-dev; fi
   - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi
+  # configure also looks for ocamldlgen which I can't find any trace of outside of SWIG!
+  - if test "$SWIGLANG" = "ocaml"; then sudo apt-get -qq install ocaml ocaml-findlib; fi
   - if test "$SWIGLANG" = "octave" -a -z "$VER"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi
   - if test "$SWIGLANG" = "octave" -a "$VER"; then sudo add-apt-repository -y ppa:kwwette/octaves && sudo apt-get -qq update && sudo apt-get -qq install liboctave${VER}-dev; fi
   - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi

From f2c2baf2af1d38bbda56735cff70d21357180fcb Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:39:26 +1300
Subject: [PATCH 034/220] Remove bogus comment

---
 Lib/ocaml/ocamldec.swg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg
index e6b8939fb..11d7bb3ce 100644
--- a/Lib/ocaml/ocamldec.swg
+++ b/Lib/ocaml/ocamldec.swg
@@ -165,5 +165,3 @@ CAMLextern int64 Int64_val(caml_value_t v);
 #ifdef __cplusplus
 }
 #endif
-
-/* mzschemedec.swg ends here */

From 7eb890e64f82616126adcef11c3dcbf87e43ca14 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 13:42:53 +1300
Subject: [PATCH 035/220] Fix typo in forward declaration

---
 Lib/ocaml/ocamldec.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/ocaml/ocamldec.swg b/Lib/ocaml/ocamldec.swg
index 11d7bb3ce..96e1cd2ce 100644
--- a/Lib/ocaml/ocamldec.swg
+++ b/Lib/ocaml/ocamldec.swg
@@ -130,7 +130,7 @@ CAMLextern int64 Int64_val(caml_value_t v);
     SWIGSTATIC CAML_VALUE caml_array_new( int n );
     SWIGSTATIC void caml_array_set( CAML_VALUE arr, int n, CAML_VALUE item );
     SWIGSTATIC CAML_VALUE caml_array_nth( CAML_VALUE arr, int n );
-    SWIGSTATIC int caml_array_length( CAML_VALUE arr );
+    SWIGSTATIC int caml_array_len( CAML_VALUE arr );
 
     SWIGSTATIC CAML_VALUE caml_val_char( char c );
     SWIGSTATIC CAML_VALUE caml_val_uchar( unsigned char c );

From 7af659ccaa6329ac50c6f6f8e68aa6533a563667 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 15:18:44 +1300
Subject: [PATCH 036/220] ocaml testsuite is not in good shape

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5d93a72ef..fd7d6bc85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,7 @@ matrix:
     # Not quite working yet
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic
-    # Until we get the dependencies sorted out
+    # Lots of failing tests currently
     - compiler: gcc
       env: SWIGLANG=ocaml
 before_install:

From 064f18131d82b3c547c9158774aea9f34932d9bd Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 18 Mar 2015 15:49:48 +1300
Subject: [PATCH 037/220] Fix "check_quant" target in ocaml testsuite

Previously it would be confused by testcases names which were a suffix
of another testcase name (e.g. name and keyword_rename).
---
 Examples/test-suite/ocaml/Makefile.in | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in
index d5d533e1c..0956fcbc4 100644
--- a/Examples/test-suite/ocaml/Makefile.in
+++ b/Examples/test-suite/ocaml/Makefile.in
@@ -25,18 +25,11 @@ run_testcase = \
 	fi ;
 
 check_quant:
-	cat /dev/null > testing
-	cat /dev/null > success
-	cat /dev/null > results
+	: > testing
+	: > success
 	$(MAKE) check
-	echo "Failed:" >> results
-	for element in `cat testing` ; do \
-		if grep $$element success >/dev/null 2>/dev/null ; then \
-			: ; \
-		else \
-			echo $$element >> results ; \
-		fi ; \
-	done
+	echo "Failed:" > results
+	diff testing success | sed 's/^< //p;d' >> results
 	echo "Success:" >> results
 	cat success >> results
 

From 13894f803b4c19699bd2a06d259cf45c2a374f72 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 19 Mar 2015 13:15:23 +1300
Subject: [PATCH 038/220] Whitespace cleanup

---
 Doc/Manual/Ocaml.html | 308 +++++++++++++++++++++---------------------
 1 file changed, 155 insertions(+), 153 deletions(-)

diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 4f61d0179..da20b8da3 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-  <title>SWIG and Ocaml</title>
+<title>SWIG and Ocaml</title>
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
-  <body bgcolor="#ffffff">
-          <a name="n1"></a>         
+
+<body bgcolor="#ffffff">
 <H1><a name="Ocaml"></a>31 SWIG and Ocaml</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -59,20 +59,23 @@
 
 
 <p>
-                This chapter describes SWIG's
-support of Ocaml.  Ocaml     is a relatively recent addition to the ML family,
-and is a recent   addition     to SWIG.  It's the second compiled, typed
-language to be added.    Ocaml   has  widely acknowledged benefits for engineers,
-mostly derived  from  a sophisticated    type system, compile-time checking
-which eliminates  several  classes of  common  programming errors, and good
-native performance.   While  all of this  is wonderful,  there are well-written
-C and C++ libraries  that  Ocaml users  will want to  take advantage of as
-part of their arsenal  (such  as SSL and  gdbm), as well  as their own mature
-C and C++ code.  SWIG  allows   this code  to be used in  a natural, type-safe
-way with Ocaml, by  providing   the necessary,   but repetitive  glue code
-which creates and uses Ocaml values  to communicate   with C and C++ code.
- In addition, SWIG also produces the needed Ocaml source   that binds
-variants, functions,  classes, etc.
+This chapter describes SWIG's support of Ocaml.
+</p>
+
+<p>
+Ocaml is a relatively recent addition to the ML family,
+and is a recent addition to SWIG.  It's the second compiled, typed
+language to be added.  Ocaml has widely acknowledged benefits for engineers,
+mostly derived from a sophisticated type system, compile-time checking
+which eliminates several classes of common programming errors, and good
+native performance.  While all of this is wonderful, there are well-written
+C and C++ libraries that Ocaml users will want to take advantage of as
+part of their arsenal (such as SSL and gdbm), as well as their own mature
+C and C++ code.  SWIG allows this code to be used in a natural, type-safe
+way with Ocaml, by providing the necessary, but repetitive glue code
+which creates and uses Ocaml values to communicate with C and C++ code.
+In addition, SWIG also produces the needed Ocaml source that binds
+variants, functions, classes, etc.
 </p>
 
 <p>
@@ -84,17 +87,16 @@ If you're not familiar with the Objective Caml language, you can visit
 
 
 <p>
-                  SWIG 3.0 works with Ocaml 3.08.3 and above.  Given the choice,
-   you  should  use the latest stable release.  The SWIG Ocaml module has
-been   tested  on Linux (x86,PPC,Sparc) and Cygwin on Windows.  The
-best  way to determine    whether your system will work is to compile the
-examples  and test-suite  which  come with SWIG.  You can do this by running
-<tt>make  check</tt> from  the  SWIG root directory after installing SWIG.
- 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 
-<a
- href="http://download.camlcity.org/download/">Dl package 
-</a>.  The ocaml_dynamic and ocaml_dynamic_cpp targets in the
+SWIG 3.0 works with Ocaml 3.08.3 and above.  Given the choice,
+you should use the latest stable release.  The SWIG Ocaml module has
+been tested on Linux (x86,PPC,Sparc) and Cygwin on Windows.  The
+best way to determine whether your system will work is to compile the
+examples and test-suite which come with SWIG.  You can do this by running
+<tt>make check</tt> from the SWIG root directory after installing SWIG.
+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
+<a href="http://download.camlcity.org/download/">Dl package</a>.
+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.
 </p>
@@ -103,30 +105,30 @@ will be loaded dynamically.  This has only been tested on Linux so far.
 
 
 <p>
-                  The basics of getting a SWIG Ocaml module up and running
- can   be  seen  from one of SWIG's example Makefiles, but is also described
- here.   To  build  an Ocaml module, run SWIG using the <tt>-ocaml</tt>
-option. 
+The basics of getting a SWIG Ocaml module up and running
+can be seen from one of SWIG's example Makefiles, but is also described
+here.  To build an Ocaml module, run SWIG using the <tt>-ocaml</tt>
+option.
 </p>
 
-<div class="code">                                    
-  <pre>
+<div class="code">
+<pre>
 %swig -ocaml example.i
-  </pre>
+</pre>
 </div>
-                         
-<p> This will produce 3 files. The file <tt>example_wrap.c</tt> contains
+
+<p>This will produce 3 files. The file <tt>example_wrap.c</tt> contains
 all of the C code needed to build an Ocaml module.  To build the module,
-you will compile the file  <tt>example_wrap.c</tt> with <tt>ocamlc</tt> or
+you will compile the file <tt>example_wrap.c</tt> with <tt>ocamlc</tt> or
 <tt>ocamlopt</tt> to create the needed .o file.  You will need to compile
 the resulting .ml and .mli files as well, and do the final link with -custom
-(not needed for native link). </p>
-               
+(not needed for native link).</p>
+
 <H3><a name="Ocaml_nn4"></a>31.1.2 Compiling the code</H3>
 
 
 <p>
-The OCaml SWIG module now requires you to compile a module (<tt>Swig</tt>) 
+The OCaml SWIG module now requires you to compile a module (<tt>Swig</tt>)
 separately.  In addition to aggregating common SWIG functionality, the Swig
 module contains the data structure that represents C/C++ values.  This allows
 easier data sharing between modules if two or more are combined, because
@@ -134,28 +136,29 @@ the type of each SWIG'ed module's c_obj is derived from Swig.c_obj_t.  This
 also allows SWIG to acquire new conversions painlessly, as well as giving
 the user more freedom with respect to custom typing.
 
-                  Use <tt>ocamlc</tt> or <tt>ocamlopt</tt> to compile your
- SWIG   interface   like:             
+Use <tt>ocamlc</tt> or <tt>ocamlopt</tt> to compile your SWIG interface like:
 </p>
-                       
-<div class="code">                                    
-  <pre>
+
+<div class="code">
+<pre>
 % swig -ocaml -co swig.mli ; swig -ocaml co swig.ml
 % ocamlc -c swig.mli ; ocamlc -c swig.ml
 % ocamlc -c -ccopt "-I/usr/include/foo" example_wrap.c
 % ocamlc -c example.mli
 % ocamlc -c example.ml
-  </pre>
+</pre>
 </div>
-                         
-<p> <tt>ocamlc</tt> is aware of .c files and knows how to handle them. Unfortunately,
-      it does not know about .cxx, .cc, or .cpp files, so when SWIG is invoked
-     in C++ mode, you must: </p>
-                       
-<div class="code">                                    
-  <pre>
-% cp example_wrap.cxx example_wrap.cxx.c<br>% ocamlc -c ... -ccopt -xc++ example_wrap.cxx.c<br>% ...<br>
-  </pre>
+
+<p><tt>ocamlc</tt> is aware of .c files and knows how to handle them. Unfortunately,
+it does not know about .cxx, .cc, or .cpp files, so when SWIG is invoked
+in C++ mode, you must:</p>
+
+<div class="code">
+<pre>
+% cp example_wrap.cxx example_wrap.cxx.c
+% ocamlc -c ... -ccopt -xc++ example_wrap.cxx.c
+% ...
+</pre>
 </div>
 
 <H3><a name="Ocaml_nn5"></a>31.1.3 The camlp4 module</H3>
@@ -165,8 +168,8 @@ the user more freedom with respect to custom typing.
 The camlp4 module (swigp4.ml -&gt; swigp4.cmo) contains a simple rewriter which
 makes C++ code blend more seamlessly with objective caml code.  Its use is
 optional, but encouraged.  The source file is included in the Lib/ocaml
-directory of the SWIG source distribution.  You can checkout this file with 
-<tt>"swig -ocaml -co swigp4.ml"</tt>.  You should compile the file with 
+directory of the SWIG source distribution.  You can checkout this file with
+<tt>"swig -ocaml -co swigp4.ml"</tt>.  You should compile the file with
 <tt>"ocamlc -I `camlp4 -where` -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -c swigp4.ml"</tt>
 </p>
 
@@ -192,7 +195,7 @@ a '+= b</td>
 <td>
 (invoke object) "+=" argument as in<br>
 (invoke a) "+=" b<td></tr>
-<tr><th colspan=2>Note that because camlp4 always recognizes &lt;&lt; 
+<tr><th colspan=2>Note that because camlp4 always recognizes &lt;&lt;
 and &gt;&gt;, they are replaced by lsl and lsr in operator names.
 <tr><td>
 <i>'unop</i> object as in<br>
@@ -241,11 +244,11 @@ let b = C_string (getenv "PATH")
 You can test-drive your module by building a
 toplevel ocaml interpreter.  Consult the ocaml manual for details.
 </p>
-  
+
 <p>
 When linking any ocaml bytecode with your module, use the -custom
-      option to build your functions into the primitive list. This
-      option is not needed when you build native code.
+option to build your functions into the primitive list. This
+option is not needed when you build native code.
 </p>
 
 <H3><a name="Ocaml_nn7"></a>31.1.5 Compilation problems and compiling with C++</H3>
@@ -273,9 +276,9 @@ In the code as seen by the typemap
 writer, there is a value, swig_result, that always contains the
 current return data.  It is a list, and must be appended with the
 caml_list_append function, or with functions and macros provided by
-objective caml.<br>
+objective caml.
 </p>
-                 
+
 <div class="code"><pre>
 type c_obj =
     C_void
@@ -299,66 +302,65 @@ type c_obj =
 </pre></div>
 
 <p>
-        A few functions exist which generate and return these:
+A few functions exist which generate and return these:
 </p>
-               
+
 <ul>
-          <li>caml_ptr_val receives a c_obj and returns a void *. &nbsp;This
-  should   be used for all pointer purposes.</li>
-          <li>caml_long_val receives a c_obj and returns a long. &nbsp;This 
- should   be used for most integral purposes.<br>
-          </li>
-          <li>caml_val_ptr receives a void * and returns a c_obj.</li>
-          <li>caml_val_bool receives a C int and returns a c_obj representing 
-  its  bool value.</li>
-          <li>caml_val_(u)?(char|short|int|long|float|double) receives an 
-appropriate    C value and returns a c_obj representing it.</li>
-          <li>caml_val_string receives a char * and returns a string value.</li>
-          <li>caml_val_string_len receives a char * and a length and returns
-  a  string  value.</li>
-          <li>caml_val_obj receives a void * and an object type and returns 
- a  C_obj,  which contains a closure giving method access.</li>
-               
+    <li>caml_ptr_val receives a c_obj and returns a void *.  This
+	should be used for all pointer purposes.</li>
+    <li>caml_long_val receives a c_obj and returns a long.  This
+	should be used for most integral purposes.</li>
+    <li>caml_val_ptr receives a void * and returns a c_obj.</li>
+    <li>caml_val_bool receives a C int and returns a c_obj representing
+	its bool value.</li>
+    <li>caml_val_(u)?(char|short|int|long|float|double) receives an
+	appropriate C value and returns a c_obj representing it.</li>
+    <li>caml_val_string receives a char * and returns a string value.</li>
+    <li>caml_val_string_len receives a char * and a length and returns
+	a string value.</li>
+    <li>caml_val_obj receives a void * and an object type and returns
+	a C_obj, which contains a closure giving method access.</li>
 </ul>
 
 <p>
 Because of this style, a typemap can return any kind of value it
-wants    from  a function. &nbsp;This enables out typemaps and inout typemaps
-to  work  well.  &nbsp;The one thing to remember about outputting values
-is that  you  must append them to the return list with swig_result = caml_list_append(swig_result,v).
+wants from a function.  This enables out typemaps and inout typemaps
+to work well.  The one thing to remember about outputting values
+is that you must append them to the return list with swig_result = caml_list_append(swig_result,v).
 </p>
 
 <p>
-&nbsp;This function will return a new list that has your element
-    appended.  Upon return to caml space, the fnhelper function
-    beautifies the result.  A list containing a single item degrades to
-    only that item (i.e. [ C_int 3 ] -&gt; C_int 3), and a list
-    containing more than one item is wrapped in C_list (i.e. [ C_char
-    'a' ; C_char 'b' -&gt; C_list [ C_char 'a' ; C_char b
-    ]). &nbsp;This is in order to make return values easier to handle
-    when functions have only one return value, such as constructors,
-    and operators. &nbsp;In addition, string, pointer, and object
-    values are interchangeable with respect to caml_ptr_val, so you can
-    allocate memory as caml strings and still use the resulting
-    pointers for C purposes, even using them to construct simple objects
-    on.  Note, though, that foreign C++ code does not respect the garbage
-    collector, although the SWIG interface does.</p>
+This function will return a new list that has your element
+appended.  Upon return to caml space, the fnhelper function
+beautifies the result.  A list containing a single item degrades to
+only that item (i.e. [ C_int 3 ] -&gt; C_int 3), and a list
+containing more than one item is wrapped in C_list (i.e. [ C_char
+'a' ; C_char 'b' -&gt; C_list [ C_char 'a' ; C_char b
+]).  This is in order to make return values easier to handle
+when functions have only one return value, such as constructors,
+and operators.  In addition, string, pointer, and object
+values are interchangeable with respect to caml_ptr_val, so you can
+allocate memory as caml strings and still use the resulting
+pointers for C purposes, even using them to construct simple objects
+on.  Note, though, that foreign C++ code does not respect the garbage
+collector, although the SWIG interface does.</p>
 
-    <p>
-    The wild card type that you can use in lots of different ways is
-    C_obj.  It allows you to wrap any type of thing you like as an
-    object using the same mechanism that the ocaml module
-    does. &nbsp;When evaluated in caml_ptr_val, the returned value is
-    the result of a call to the object's "&amp;" operator, taken as a pointer.
-    </p>
-    <p>
-    You should only construct values using objective caml, or using the
-    functions caml_val_* functions provided as static functions to a SWIG
-    ocaml module, as well as the caml_list_* functions.  These functions
-    provide everything a typemap needs to produce values.  In addition,
-    value items pass through directly, but you must make your own type
-    signature for a function that uses value in this way.
-    </p>
+<p>
+The wild card type that you can use in lots of different ways is
+C_obj.  It allows you to wrap any type of thing you like as an
+object using the same mechanism that the ocaml module
+does.  When evaluated in caml_ptr_val, the returned value is
+the result of a call to the object's "&amp;" operator, taken as a pointer.
+</p>
+
+<p>
+You should only construct values using objective caml, or using the
+functions caml_val_* functions provided as static functions to a SWIG
+ocaml module, as well as the caml_list_* functions.  These functions
+provide everything a typemap needs to produce values.  In addition,
+value items pass through directly, but you must make your own type
+signature for a function that uses value in this way.
+</p>
 
 <H3><a name="Ocaml_nn9"></a>31.2.1 The generated module</H3>
 
@@ -376,7 +378,7 @@ that the keywords are not the same as the C++ ones.
 You can introduce extra code into the output wherever you like with SWIG.
 These are the places you can introduce code:
 <table border="1" summary="Extra code sections">
-<tr><td>"header"</td><td>This code is inserted near the beginning of the 
+<tr><td>"header"</td><td>This code is inserted near the beginning of the
 C wrapper file, before any function definitions.</td></tr>
 <tr><td>"wrapper"</td><td>This code is inserted in the function definition
 section.</td></tr>
@@ -385,25 +387,25 @@ file.</td></tr>
 <tr><td>"mli"</td><td>This code is inserted into the caml interface file.
 Special signatures should be inserted here.
 </td></tr>
-<tr><td>"ml"</td><td>This code is inserted in the caml code defining the 
+<tr><td>"ml"</td><td>This code is inserted in the caml code defining the
 interface to your C code.  Special caml code, as well as any initialization
 which should run when the module is loaded may be inserted here.
-</td></tr>   
+</td></tr>
 <tr><td>"classtemplate"</td><td>The "classtemplate" place is special because
 it describes the output SWIG will generate for class definitions.
 </td></tr>
 </table>
-               
+
 <H3><a name="Ocaml_nn10"></a>31.2.2 Enums</H3>
 
 
 <p>
 SWIG will wrap enumerations as polymorphic variants in the output
-Ocaml code, as above in C_enum.&nbsp; In order to support all
+Ocaml code, as above in C_enum.  In order to support all
 C++-style uses of enums, the function int_to_enum and enum_to_int are
 provided for ocaml code to produce and consume these values as
-integers.  &nbsp;Other than that, correct uses of enums will not have
-a problem. &nbsp;Since enum labels may overlap between enums, the
+integers.  Other than that, correct uses of enums will not have
+a problem.  Since enum labels may overlap between enums, the
 enum_to_int and int_to_enum functions take an enum type label as an
 argument.  Example:
 </p>
@@ -416,9 +418,9 @@ enum c_enum_type { a = 1, b, c = 4, d = 8 };
 enum c_enum_type { a = 1, b, c = 4, d = 8 };
 </pre></div>
 
-<p>               
+<p>
 The output mli contains:
-</p>          
+</p>
 
 <div class="code"><pre>
 type c_enum_type = [
@@ -435,16 +437,16 @@ type c_enum_tag = [
 val int_to_enum c_enum_type -&gt; int -&gt; c_obj
 val enum_to_int c_enum_type -&gt; c_obj -&gt; c_obj
 </pre>
-     </div>
+</div>
 
 <p>
-   So it's possible to do this:   
+So it's possible to do this:
 </p>
 
-<div class="code">      
-  <pre>
+<div class="code">
+<pre>
 bash-2.05a$ ocamlmktop -custom enum_test_wrap.o enum_test.cmo -o enum_test_top
-bash-2.05a$ ./enum_test_top 
+bash-2.05a$ ./enum_test_top
         Objective Caml version 3.04
 
 # open Enum_test ;;
@@ -455,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a
 # int_to_enum `c_enum_type 4 ;;
 - : Enum_test.c_obj = C_enum `c
 </pre>
-  </div>
+</div>
 
 <H4><a name="Ocaml_nn11"></a>31.2.2.1 Enum typing in Ocaml</H4>
 
@@ -485,7 +487,7 @@ distribution.
 
 <p>
 By including "carray.i", you will get access to some macros that help you
-create typemaps for array types fairly easily. 
+create typemaps for array types fairly easily.
 </p>
 
 <p>
@@ -547,7 +549,7 @@ void printfloats( float *tab, int len ) {
 		printf( "%f ", tab[i] );
 	}
 
-	printf( "\n" );  
+	printf( "\n" );
 }
 %}
 
@@ -577,25 +579,25 @@ void printfloats( float *tab, int len );
 
 <p>
 C++ classes, along with structs and unions are represented by C_obj
-(string -&gt; c_obj -&gt; c_obj) wrapped closures. &nbsp;These objects
+(string -&gt; c_obj -&gt; c_obj) wrapped closures.  These objects
 contain a method list, and a type, which allow them to be used like
 C++ objects.  When passed into typemaps that use pointers, they
-degrade to pointers through their "&amp;" method. &nbsp;Every method
+degrade to pointers through their "&amp;" method.  Every method
 an object has is represented as a string in the object's method table,
-and each method table exists in memory only once.  &nbsp;In addition
+and each method table exists in memory only once.  In addition
 to any other operators an object might have, certain builtin ones are
-provided by SWIG:  (all of these take no arguments (C_void))
+provided by SWIG: (all of these take no arguments (C_void))
 </p>
 
 <table summary="SWIG provided operators">
 <tr><td>"~"</td><td>Delete this object</td></tr>
-<tr><td>"&amp;"</td><td>Return an ordinary C_ptr value representing this 
+<tr><td>"&amp;"</td><td>Return an ordinary C_ptr value representing this
 object's address</td></tr>
 <tr><td>"sizeof"</td><td>If enabled with ("sizeof"="1") on the module node,
 return the object's size in char.</td></tr>
 <tr><td>":methods"</td><td>Returns a list of strings containing the names of
 the methods this object contains</td></tr>
-<tr><td>":classof"</td><td>Returns the name of the class this object belongs 
+<tr><td>":classof"</td><td>Returns the name of the class this object belongs
 to.</td></tr>
 <tr><td>":parents"</td><td>Returns a list of all direct parent classes which
 have been wrapped by SWIG.</td></tr>
@@ -603,8 +605,8 @@ have been wrapped by SWIG.</td></tr>
 indicated parent class.  This is mainly used internally by the SWIG module,
 but may be useful to client programs.</td></tr>
 <tr><td>"[member-variable]"</td><td>Each member variable is wrapped as a
-method with an optional parameter.  
-Called with one argument, the member variable is set to the value of the 
+method with an optional parameter.
+Called with one argument, the member variable is set to the value of the
 argument.  With zero arguments, the value is returned.
 </td></tr>
 </table>
@@ -652,12 +654,12 @@ Since there's a makefile in that directory, the example is easy to build.
 
 <p>
 Here's a sample transcript of an interactive session using a string vector
-after making a toplevel (make toplevel).  This example uses the camlp4 
+after making a toplevel (make toplevel).  This example uses the camlp4
 module.
 </p>
 
 <div class="code"><pre>
-bash-2.05a$ ./example_top 
+bash-2.05a$ ./example_top
         Objective Caml version 3.06
 
         Camlp4 Parsing version 3.06
@@ -685,14 +687,14 @@ C_list
 - : Example.c_obj = C_void
 # x '[1] ;;
 - : Example.c_obj = C_string "spam"
-# for i = 0 to (x -&gt; size() as int) - 1 do 
-    print_endline ((x '[i to int]) as string) 
+# for i = 0 to (x -&gt; size() as int) - 1 do
+    print_endline ((x '[i to int]) as string)
   done ;;
 foo
 bar
 baz
 - : unit = ()
-# 
+#
 </pre></div>
 
 <H4><a name="Ocaml_nn19"></a>31.2.4.2 C++ Class Example</H4>
@@ -703,7 +705,7 @@ Here's a simple example using Trolltech's Qt Library:
 </p>
 
 <table border="1" bgcolor="#dddddd" summary="Qt Library example">
-  <tr><th><center>qt.i</center></th></tr>
+<tr><th><center>qt.i</center></th></tr>
 <tr><td><pre>
 %module qt
 %{
@@ -733,9 +735,9 @@ bash-2.05a$ QTPATH=/your/qt/path
 bash-2.05a$ for file in swig.mli swig.ml swigp4.ml ; do swig -ocaml -co $file ; done
 bash-2.05a$ ocamlc -c swig.mli ; ocamlc -c swig.ml
 bash-2.05a$ ocamlc -I `camlp4 -where` -pp "camlp4o pa_extend.cmo q_MLast.cmo" -c swigp4.ml
-bash-2.05a$ swig -ocaml -c++ -I$QTPATH/include  qt.i
+bash-2.05a$ swig -ocaml -c++ -I$QTPATH/include qt.i
 bash-2.05a$ mv qt_wrap.cxx qt_wrap.c
-bash-2.05a$ ocamlc -c -ccopt -xc++ -ccopt -g -g -ccopt -I$QTPATH/include qt_wrap.c 
+bash-2.05a$ ocamlc -c -ccopt -xc++ -ccopt -g -g -ccopt -I$QTPATH/include qt_wrap.c
 bash-2.05a$ ocamlc -c qt.mli
 bash-2.05a$ ocamlc -c qt.ml
 bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
@@ -747,7 +749,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
 
 
 <div class="code"><pre>
-bash-2.05a$ ./qt_top 
+bash-2.05a$ ./qt_top
         Objective Caml version 3.06
 
         Camlp4 Parsing version 3.06
@@ -767,7 +769,7 @@ val hello : Qt.c_obj = C_obj &lt;fun&gt;
 
 <p>
 Assuming you have a working installation of QT, you will see a window
-containing the string "hi" in a button.  
+containing the string "hi" in a button.
 </p>
 
 <H3><a name="Ocaml_nn22"></a>31.2.5 Director Classes</H3>
@@ -852,7 +854,7 @@ let triangle_class pts ob meth args =
     | _ -&gt; (invoke ob) meth args ;;
 
 let triangle =
-  new_derived_object 
+  new_derived_object
     new_shape
     (triangle_class ((0.0,0.0),(0.5,1.0),(1.0,0.0)))
     '() ;;
@@ -896,7 +898,7 @@ The definition of the actual object triangle can be described this way:
 
 <div class="code"><pre>
 let triangle =
-  new_derived_object 
+  new_derived_object
     new_shape
     (triangle_class ((0.0,0.0),(0.5,1.0),(1.0,0.0)))
     '()
@@ -904,13 +906,13 @@ let triangle =
 
 <p>
 The first argument to <tt>new_derived_object</tt>, new_shape is the method
-which returns a shape instance.  This function will be invoked with the 
+which returns a shape instance.  This function will be invoked with the
 third argument will be appended to the argument list [ C_void ].  In the
 example, the actual argument list is sent as (C_list [ C_void ; C_void ]).
 The augmented constructor for a director class needs the first argument
 to determine whether it is being constructed as a derived object, or as
 an object of the indicated type only (in this case <tt>shape</tt>).  The
-Second argument is a closure that will be added to the final C_obj.  
+Second argument is a closure that will be added to the final C_obj.
 </p>
 
 <p>

From 3bc5348bd26cefbb12a6ea04f5300c47c3f2b589 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 19 Mar 2015 15:05:31 +1300
Subject: [PATCH 039/220] Update comment about ocamldlgen

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fd7d6bc85..9cdc5bf8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,7 +83,7 @@ before_install:
   - if test "$SWIGLANG" = "javascript" -a "$ENGINE" = "v8"; then sudo apt-get install -qq libv8-dev; fi
   - if test "$SWIGLANG" = "guile"; then sudo apt-get -qq install guile-2.0-dev; fi
   - if test "$SWIGLANG" = "lua"; then sudo apt-get -qq install lua5.1 liblua5.1-dev; fi
-  # configure also looks for ocamldlgen which I can't find any trace of outside of SWIG!
+  # configure also looks for ocamldlgen, but this isn't packaged.  But it isn't used by default so this doesn't matter.
   - if test "$SWIGLANG" = "ocaml"; then sudo apt-get -qq install ocaml ocaml-findlib; fi
   - if test "$SWIGLANG" = "octave" -a -z "$VER"; then sudo apt-get -qq install octave3.2 octave3.2-headers; fi
   - if test "$SWIGLANG" = "octave" -a "$VER"; then sudo add-apt-repository -y ppa:kwwette/octaves && sudo apt-get -qq update && sudo apt-get -qq install liboctave${VER}-dev; fi

From c8a7322a4de42ecd099c96e5dcad6b6db74d1c71 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 20 Mar 2015 13:45:19 +1300
Subject: [PATCH 040/220] Use %{ %} instead of { } after %pythoncode

Simpler and safer change to address PR#357.
---
 Lib/python/pyabc.i             |  2 +-
 Lib/python/pycontainer.swg     |  4 ++--
 Lib/python/pyiterators.swg     |  4 ++--
 Lib/python/std_map.i           | 16 ++++++++--------
 Lib/python/std_pair.i          |  4 ++--
 Lib/python/std_unordered_map.i | 16 ++++++++--------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Lib/python/pyabc.i b/Lib/python/pyabc.i
index 3da06b5a9..12ce65985 100644
--- a/Lib/python/pyabc.i
+++ b/Lib/python/pyabc.i
@@ -1,7 +1,7 @@
 %define %pythonabc(Type, Abc)
   %feature("python:abc", #Abc) Type;
 %enddef
-%pythoncode {import collections};
+%pythoncode %{import collections%}
 %pythonabc(std::vector, collections.MutableSequence);
 %pythonabc(std::list, collections.MutableSequence);
 %pythonabc(std::map, collections.MutableMapping);
diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg
index e5543cd6b..7168862f5 100644
--- a/Lib/python/pycontainer.swg
+++ b/Lib/python/pycontainer.swg
@@ -710,8 +710,8 @@ namespace swig
 #if defined(SWIGPYTHON_BUILTIN)
   %feature("python:slot", "tp_iter", functype="getiterfunc") iterator;
 #else
-  %pythoncode {def __iter__(self):
-    return self.iterator()}
+  %pythoncode %{def __iter__(self):
+    return self.iterator()%}
 #endif
   }
 
diff --git a/Lib/python/pyiterators.swg b/Lib/python/pyiterators.swg
index 110c431fe..8fbb31226 100644
--- a/Lib/python/pyiterators.swg
+++ b/Lib/python/pyiterators.swg
@@ -344,8 +344,8 @@ namespace swig
   %feature("python:slot", "tp_iternext", functype="iternextfunc") SwigPyIterator::__next__;
 #else
   %extend SwigPyIterator {
-  %pythoncode {def __iter__(self):
-    return self}
+  %pythoncode %{def __iter__(self):
+    return self%}
   }
 #endif
 
diff --git a/Lib/python/std_map.i b/Lib/python/std_map.i
index 58902bca4..454e821a5 100644
--- a/Lib/python/std_map.i
+++ b/Lib/python/std_map.i
@@ -176,14 +176,14 @@
 
 #else
   %extend {
-    %pythoncode {def __iter__(self):
-    return self.key_iterator()}    
-    %pythoncode {def iterkeys(self):
-    return self.key_iterator()}
-    %pythoncode {def itervalues(self):
-    return self.value_iterator()}
-    %pythoncode {def iteritems(self):
-    return self.iterator()}
+    %pythoncode %{def __iter__(self):
+    return self.key_iterator()%}
+    %pythoncode %{def iterkeys(self):
+    return self.key_iterator()%}
+    %pythoncode %{def itervalues(self):
+    return self.value_iterator()%}
+    %pythoncode %{def iteritems(self):
+    return self.iterator()%}
   }
 #endif
 
diff --git a/Lib/python/std_pair.i b/Lib/python/std_pair.i
index 73d47e198..5694e7e09 100644
--- a/Lib/python/std_pair.i
+++ b/Lib/python/std_pair.i
@@ -176,7 +176,7 @@ SwigPython_std_pair_setitem (PyObject *a, Py_ssize_t b, PyObject *c)
 %define %swig_pair_methods(pair...)
 #if !defined(SWIGPYTHON_BUILTIN)
 %extend {      
-%pythoncode {def __len__(self):
+%pythoncode %{def __len__(self):
     return 2
 def __repr__(self):
     return str((self.first, self.second))
@@ -189,7 +189,7 @@ def __setitem__(self, index, val):
     if not (index % 2):
         self.first = val
     else:
-        self.second = val}
+        self.second = val%}
 }
 #endif
 %enddef
diff --git a/Lib/python/std_unordered_map.i b/Lib/python/std_unordered_map.i
index 737468234..e58a4e927 100644
--- a/Lib/python/std_unordered_map.i
+++ b/Lib/python/std_unordered_map.i
@@ -231,14 +231,14 @@
       return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
 
-    %pythoncode {def __iter__(self):
-    return self.key_iterator()}    
-    %pythoncode {def iterkeys(self):
-    return self.key_iterator()}
-    %pythoncode {def itervalues(self):
-    return self.value_iterator()}
-    %pythoncode {def iteritems(self):
-    return self.iterator()}
+    %pythoncode %{def __iter__(self):
+    return self.key_iterator()%}
+    %pythoncode %{def iterkeys(self):
+    return self.key_iterator()%}
+    %pythoncode %{def itervalues(self):
+    return self.value_iterator()%}
+    %pythoncode %{def iteritems(self):
+    return self.iterator()%}
   }
 %enddef
 

From af113fa6f022b7bf29d4621fb4f60feaed3be76d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 20 Mar 2015 13:46:28 +1300
Subject: [PATCH 041/220] Add missing ; after C++ class definitions

---
 Doc/Manual/Python.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 8dae4bbf0..1886fcd45 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -3404,7 +3404,7 @@ def bar(*args):
 class Foo {
 public:
     int bar(int x);
-}
+};
 </pre>
 </div>
 
@@ -3441,7 +3441,7 @@ proxy, just before the return statement.
 class Foo {
 public:
     int bar(int x);
-}
+};
 </pre>
 </div>
 
@@ -3470,7 +3470,7 @@ SWIG version 1.3.28 you can use the directive forms
 class Foo {
 public:
     int bar(int x);
-}
+};
 </pre>
 </div>
 
@@ -3500,7 +3500,7 @@ class Foo {
 public:
     int bar(int x);
     int bar();
-}
+};
 </pre>
 </div>
 

From ec6d46f3871bd6f1e626db14f3d5e2437166fac1 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 24 Mar 2015 16:47:36 +0100
Subject: [PATCH 042/220] scilab: fix doc typos

---
 Doc/Manual/Scilab.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/Manual/Scilab.html b/Doc/Manual/Scilab.html
index d0a1d5381..cb4a3af90 100644
--- a/Doc/Manual/Scilab.html
+++ b/Doc/Manual/Scilab.html
@@ -42,7 +42,7 @@
 <li><a href="#Scilab_wrapping_pointers_null_pointers">Null pointers</a>
 </ul>
 <li><a href="#Scilab_wrapping_structs">Structures</a>
-<li><a href="#Scilab_wrapping_cpp_classes">C++ Classes</a>
+<li><a href="#Scilab_wrapping_cpp_classes">C++ classes</a>
 <li><a href="#Scilab_wrapping_cpp_inheritance">C++ inheritance</a>
 <li><a href="#Scilab_wrapping_pointers_references_values_arrays">Pointers, references, values, and arrays</a>
 <li><a href="#Scilab_wrapping_cpp_templates">C++ templates</a>
@@ -931,7 +931,7 @@ ans  =
 </pre></div>
 
 
-<H3><a name="Scilab_wrapping_cpp_classes"></a>39.3.8 C++ Classes</H3>
+<H3><a name="Scilab_wrapping_cpp_classes"></a>39.3.8 C++ classes</H3>
 
 
 <p>
@@ -1365,7 +1365,7 @@ void throw_int() throw(int) {
 }
 
 void throw_stl_invalid_arg(int i) throw(std::invalid_argument) {
-  if (i &amp;lt 0)
+  if (i &lt; 0)
     throw std::invalid_argument("argument is negative.");
 }
 %}

From cfebdc36afbcc93e1b527ed77ec45e1794da4338 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 24 Mar 2015 16:48:19 +0100
Subject: [PATCH 043/220] scilab: compile examples & test-suite with debug
 infos

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

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index a7d00929b..ee7d5f431 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1710,7 +1710,7 @@ SCILAB_LIBPREFIX = lib
 
 scilab:
 	$(SWIG) -scilab $(SWIGOPT) -o $(ISRCS) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SCILAB_INC) $(INCLUDES) $(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS)
+	$(CC) -g -c $(CCSHARED) $(CPPFLAGS) $(CFLAGS) $(SCILAB_INC) $(INCLUDES) $(ISRCS) $(SRCDIR_SRCS) $(SRCDIR_CSRCS)
 	$(LDSHARED) $(CFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
 
 # ----------------------------------------------------------------
@@ -1719,7 +1719,7 @@ scilab:
 
 scilab_cpp:
 	$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SCILAB_INC) $(INCLUDES) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
+	$(CXX) -g -c $(CCSHARED) $(CPPFLAGS) $(CXXFLAGS) $(SCILAB_INC) $(INCLUDES) $(ICXXSRCS) $(SRCDIR_SRCS) $(SRCDIR_CXXSRCS)
 	$(CXXSHARED) $(CXXFLAGS) $(LDFLAGS) $(IOBJS) $(OBJS) $(LIBS) $(CPP_DLLIBS) -o $(SCILAB_LIBPREFIX)$(TARGET)$(SO)
 
 # -----------------------------------------------------------------

From 4c6f29b778ded95b0f9b37983ff2a315e0673986 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 24 Mar 2015 16:50:18 +0100
Subject: [PATCH 044/220] scilab: fix possible crash by using consistent
 allocation/free methods (use SWIG macros)

---
 Lib/scilab/scichar.swg | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/Lib/scilab/scichar.swg b/Lib/scilab/scichar.swg
index 509a40c18..66818e991 100644
--- a/Lib/scilab/scichar.swg
+++ b/Lib/scilab/scichar.swg
@@ -117,8 +117,10 @@ SWIGINTERN int
 SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t *piLength, int *alloc, char *fname) {
   SciErr sciErr;
   int *piAddrVar = NULL;
-  int iRet;
-  char *pstStrings = NULL;
+  char *pstString = NULL;
+  int iRows = 0;
+  int iCols = 0;
+  int iLen = 0;
 
   sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
   if (sciErr.iErr) {
@@ -126,14 +128,31 @@ SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t
     return SWIG_ERROR;
   }
 
-  iRet = getAllocatedSingleString(pvApiCtx, piAddrVar, &pstStrings);
-  if (iRet) {
-    return SWIG_ERROR;
+  if (isScalar(pvApiCtx, piAddrVar) == 0 || isStringType(pvApiCtx, piAddrVar) == 0)
+  {
+      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A single string expected.\n"), fname, iVar);
+      return SWIG_TypeError;
+  }
+
+  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, NULL);
+  if (sciErr.iErr)
+  {
+      printError(&sciErr, 0);
+      return SWIG_ERROR;
+  }
+
+  pstString = %new_array(iLen + 1, char);
+
+  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, &pstString);
+  if (sciErr.iErr)
+  {
+      printError(&sciErr, 0);
+      return SWIG_ERROR;
   }
 
   // TODO: return SWIG_ERROR if pcValue NULL (now returning SWIG_ERROR fails some typechecks)
   if (pcValue) {
-    *pcValue = pstStrings;
+    *pcValue = pstString;
   }
 
   if (alloc != NULL) {
@@ -141,7 +160,7 @@ SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t
   }
 
   if (piLength != NULL) {
-    *piLength = strlen(*pcValue);
+    *piLength = strlen(pstString);
   }
 
   return SWIG_OK;

From 226b4dec5b47e93bf4cf216a532e14de4f0c7cab Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 25 Mar 2015 12:44:05 +1300
Subject: [PATCH 045/220] Probe for camlp4 in configure

See issue #364.
---
 Examples/Makefile.in | 2 +-
 configure.ac         | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index ee7d5f431..6a29e9087 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -883,7 +883,7 @@ OCAMLFIND=@OCAMLFIND@
 OCAMLMKTOP=@OCAMLMKTOP@ $(SWIGWHERE)
 NOLINK ?= false
 OCAMLPP= -pp "camlp4o ./swigp4.cmo"
-OCAMLP4WHERE=`$(COMPILETOOL) camlp4 -where`
+OCAMLP4WHERE=`$(COMPILETOOL) @CAMLP4@ -where`
 OCAMLCORE=\
 	rm -rf swig.mli swig.ml swigp4.ml && \
 	$(SWIG) -ocaml -co swig.mli 2>/dev/null &&  \
diff --git a/configure.ac b/configure.ac
index 31815411f..dfd874b75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1750,6 +1750,7 @@ AC_ARG_WITH(ocamlc,[  --with-ocamlc=path      Set location of ocamlc executable]
 AC_ARG_WITH(ocamldlgen,[  --with-ocamldlgen=path  Set location of ocamldlgen],[ OCAMLDLGEN="$withval" ], [OCAMLDLGEN=])
 AC_ARG_WITH(ocamlfind,[  --with-ocamlfind=path   Set location of ocamlfind],[OCAMLFIND="$withval"],[OCAMLFIND=])
 AC_ARG_WITH(ocamlmktop,[  --with-ocamlmktop=path  Set location of ocamlmktop executable],[ OCAMLMKTOP="$withval"], [OCAMLMKTOP=])
+AC_ARG_WITH(camlp4,[  --with-camlp4=path  Set location of camlp4 executable],[ CAMLP4="$withval"], [CAMLP4=])
 
 # First, check for "--without-ocaml" or "--with-ocaml=no".
 if test x"${with_ocaml}" = xno -o x"${with_alllang}" = xno ; then
@@ -1775,12 +1776,18 @@ else
     if test -z "$OCAMLMKTOP"; then
 	AC_CHECK_PROGS(OCAMLMKTOP, ocamlmktop, :)
     fi
+
+    AC_MSG_CHECKING(for Ocaml Pre-Processor-Pretty-Printer)
+    if test -z "$CAMLP4"; then
+	AC_CHECK_PROGS(CAMLP4, camlp4, :)
+    fi
 fi # Disabling ocaml
 
 AC_SUBST(OCAMLC)
 AC_SUBST(OCAMLDLGEN)
 AC_SUBST(OCAMLFIND)
 AC_SUBST(OCAMLMKTOP)
+AC_SUBST(CAMLP4)
 
 #----------------------------------------------------------------
 # Look for Pike

From 7a050461c6f4a926fd622a5d615ea1ec6459fe89 Mon Sep 17 00:00:00 2001
From: James Athey <james@apx-labs.com>
Date: Tue, 17 Sep 2013 11:08:23 -0400
Subject: [PATCH 046/220] When warning about multiple inheritance in C#, say C#
 in the message instead of Java

---
 Source/Modules/csharp.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 52d230d99..1e4eec3bf 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -1642,7 +1642,7 @@ public:
             String *proxyclassname = Getattr(n, "classtypeobj");
             String *baseclassname = Getattr(base.item, "name");
             Swig_warning(WARN_CSHARP_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
-                         "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
+                         "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in C#.\n", SwigType_namestr(proxyclassname), SwigType_namestr(baseclassname));
             base = Next(base);
           }
         }

From 2c08e33099ed310b487cfd6a2b5b3fbc8e23d5a4 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 27 Mar 2015 12:30:19 +1300
Subject: [PATCH 047/220] Correct java warning to save javabase not csbase

---
 Source/Modules/java.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index b010d10d5..287f8442c 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -1788,7 +1788,7 @@ public:
     } else if (Len(pure_baseclass) > 0 && Len(baseclass) > 0) {
       Swig_warning(WARN_JAVA_MULTIPLE_INHERITANCE, Getfile(n), Getline(n),
 		   "Warning for %s proxy: Base %s ignored. Multiple inheritance is not supported in Java. "
-		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the csbase typemap?\n", typemap_lookup_type, pure_baseclass);
+		   "Perhaps you need one of the 'replace' or 'notderived' attributes in the javabase typemap?\n", typemap_lookup_type, pure_baseclass);
     }
 
     // Pure Java interfaces

From 01d0ee86e03075fc803d9961a63ad656e92fe694 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 27 Mar 2015 12:40:42 +1300
Subject: [PATCH 048/220] Fix C&P references to Python in comments

---
 Source/Modules/ocaml.cxx  | 6 +++---
 Source/Modules/octave.cxx | 2 +-
 Source/Modules/perl5.cxx  | 2 +-
 Source/Modules/ruby.cxx   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx
index 72f0d98d3..bca6fa2a0 100644
--- a/Source/Modules/ocaml.cxx
+++ b/Source/Modules/ocaml.cxx
@@ -620,9 +620,9 @@ public:
     }
 
     /* if the object is a director, and the method call originated from its
-     * underlying python object, resolve the call by going up the c++ 
-     * inheritance chain.  otherwise try to resolve the method in python.  
-     * without this check an infinite loop is set up between the director and 
+     * underlying ocaml object, resolve the call by going up the c++ 
+     * inheritance chain.  otherwise try to resolve the method in ocaml.
+     * without this check an infinite loop is set up between the director and
      * shadow class method calls.
      */
 
diff --git a/Source/Modules/octave.cxx b/Source/Modules/octave.cxx
index 6d225575d..e5f18cae8 100644
--- a/Source/Modules/octave.cxx
+++ b/Source/Modules/octave.cxx
@@ -1387,7 +1387,7 @@ public:
                SwigType_namestr(name));
       }
     } else {
-      // attach typemaps to arguments (C/C++ -> Python)
+      // attach typemaps to arguments (C/C++ -> Octave)
       String *parse_args = NewString("");
 
       Swig_director_parms_fixup(l);
diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
index 3963abf5d..45ed6f6e4 100644
--- a/Source/Modules/perl5.cxx
+++ b/Source/Modules/perl5.cxx
@@ -2255,7 +2255,7 @@ public:
 	    if (SwigType_isreference(ptype)) {
 	      Insert(ppname, 0, "&");
 	    }
-	    /* if necessary, cast away const since Python doesn't support it! */
+	    /* if necessary, cast away const since Perl doesn't support it! */
 	    if (SwigType_isconst(nptype)) {
 	      nonconst = NewStringf("nc_tmp_%s", pname);
 	      String *nonconst_i = NewStringf("= const_cast< %s >(%s)", SwigType_lstr(ptype, 0), ppname);
diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx
index 5aadf86df..d484f7065 100644
--- a/Source/Modules/ruby.cxx
+++ b/Source/Modules/ruby.cxx
@@ -1795,8 +1795,8 @@ public:
 
     /* if the object is a director, and the method call originated from its
      * underlying Ruby object, resolve the call by going up the c++ 
-     * inheritance chain.  otherwise try to resolve the method in python.  
-     * without this check an infinite loop is set up between the director and 
+     * inheritance chain.  otherwise try to resolve the method in Ruby.
+     * without this check an infinite loop is set up between the director and
      * shadow class method calls.
      */
 

From 38a75a22c94830c84c20aebe0a7f36955b476985 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 27 Mar 2015 12:54:47 +1300
Subject: [PATCH 049/220] "suppport" -> "support"

---
 RELEASENOTES              | 2 +-
 Source/Modules/scilab.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES b/RELEASENOTES
index ff1c99821..6af303bc8 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -358,7 +358,7 @@ SWIG-1.3.22 summary:
   exceptions into target language exceptions.
 - Improved enum support, mapping to built-in Java 1.5 enums and C#
   enums or the typesafe enum pattern for these two languages.
-- Python - much better STL suppport and support for std::wstring,
+- Python - much better STL support and support for std::wstring,
   wchar_t and FILE *.
 - Initial support for Modula3 and Allegro CL.
 - 64 bit TCL support.
diff --git a/Source/Modules/scilab.cxx b/Source/Modules/scilab.cxx
index 6d9930431..82389f4cd 100644
--- a/Source/Modules/scilab.cxx
+++ b/Source/Modules/scilab.cxx
@@ -675,7 +675,7 @@ public:
       }
     }
 
-    /* Create variables for member pointer constants, not suppported by typemaps (like Python wrapper does) */
+    /* Create variables for member pointer constants, not supported by typemaps (like Python wrapper does) */
     if (SwigType_type(type) == T_MPOINTER) {
       String *wname = Swig_name_wrapper(constantName);
       String *str = SwigType_str(type, wname);

From 6b6b360093ada3a429a4cecf2ef8227139c0febc Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 27 Mar 2015 18:14:03 +1300
Subject: [PATCH 050/220] Fix segfault in handling unknown directives

---
 Source/CParse/cscanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index d86c4590a..a33a81062 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -886,7 +886,7 @@ int yylex(void) {
 	return (WARN);
 
       /* Note down the apparently unknown directive for error reporting. */
-      cparse_unknown_directive = Swig_copy_string(yytext);
+      cparse_unknown_directive = NewString(yytext);
     }
     /* Have an unknown identifier, as a last step, we'll do a typedef lookup on it. */
 

From dba8d4a7ea64da03369b1e984574d3a7761f2681 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Sat, 28 Mar 2015 11:26:13 +1300
Subject: [PATCH 051/220] Add regression test for 6b6b360

Reported in issue#368 by clintonstimpson.
---
 Examples/test-suite/errors/pp_unknowndirective.i      | 5 +++++
 Examples/test-suite/errors/pp_unknowndirective.stderr | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Examples/test-suite/errors/pp_unknowndirective.i b/Examples/test-suite/errors/pp_unknowndirective.i
index 659a997d3..b4e608b34 100644
--- a/Examples/test-suite/errors/pp_unknowndirective.i
+++ b/Examples/test-suite/errors/pp_unknowndirective.i
@@ -1,5 +1,10 @@
 %module xxx
 
+/* Regression test for bug introduced in 3.0.4 and fixed in 3.0.6 - the '%std'
+ * here led to SWIG calling abort().
+ */
+%typemap(jstype) std::vector<std::string>, const %std::vector<std::string>&, std::vector<std::string>&  "List<String>"
+
 /* This used to give the rather cryptic "Syntax error in input(1)." prior to
  * SWIG 3.0.4.  This testcase checks that the improved message is actually
  * issued.
diff --git a/Examples/test-suite/errors/pp_unknowndirective.stderr b/Examples/test-suite/errors/pp_unknowndirective.stderr
index d0d5e249f..2cc2377c7 100644
--- a/Examples/test-suite/errors/pp_unknowndirective.stderr
+++ b/Examples/test-suite/errors/pp_unknowndirective.stderr
@@ -1 +1 @@
-pp_unknowndirective.i:7: Error: Unknown directive '%remane'.
+pp_unknowndirective.i:12: Error: Unknown directive '%remane'.

From 084f72452fceac1a4973e84370d67fa453da8cc1 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 30 Mar 2015 08:38:20 +1300
Subject: [PATCH 052/220] Fix javadowncast to csdowncast in C# backend

See issue#367.
---
 Source/Modules/csharp.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 1e4eec3bf..b251ff892 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -2004,7 +2004,7 @@ public:
          good place to put this code, since Abstract Base Classes (ABCs) can and should have 
          downcasts, making the constructorHandler() a bad place (because ABCs don't get to
          have constructors emitted.) */
-      if (GetFlag(n, "feature:javadowncast")) {
+      if (GetFlag(n, "feature:csdowncast")) {
 	String *downcast_method = Swig_name_member(getNSpace(), proxy_class_name, "SWIGDowncast");
 	String *wname = Swig_name_wrapper(downcast_method);
 

From 2347e874512d7c73648ccd5c5523a8bf999dfc02 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 23 Jan 2015 07:46:33 +0000
Subject: [PATCH 053/220] CSharp test-suite support on windows

- Add pathconvert tool to convert to a windows path for input files for
  C# compiler
- Simplify vcfilter
---
 Examples/test-suite/csharp/Makefile.in |  7 +++----
 Tools/convertpath                      | 27 ++++++++++++++++++++++++++
 Tools/vcfilter                         |  4 ++--
 configure.ac                           | 11 ++++-------
 4 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100755 Tools/convertpath

diff --git a/Examples/test-suite/csharp/Makefile.in b/Examples/test-suite/csharp/Makefile.in
index 292c751e4..d5eac5c03 100644
--- a/Examples/test-suite/csharp/Makefile.in
+++ b/Examples/test-suite/csharp/Makefile.in
@@ -6,8 +6,7 @@ LANGUAGE     = csharp
 SCRIPTSUFFIX = _runme.cs
 CSHARPCILINTERPRETER  = @CSHARPCILINTERPRETER@
 CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@
-CSHARPPATHSEPARATOR = "@CSHARPPATHSEPARATOR@"
-CSHARPCYGPATH_W     = @CSHARPCYGPATH_W@
+CSHARPCONVERTPATH     = @top_srcdir@/@CSHARPCONVERTPATH@
 
 srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
@@ -79,13 +78,13 @@ run_testcase = \
 	if [ -f $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
 	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo -debug+ $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
-	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \
+	  CSHARPSRCS='`$(CSHARPCONVERTPATH) $(SCRIPTDIR)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCONVERTPATH) "{}" \+`' csharp_compile && \
 	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" DYLD_FALLBACK_LIBRARY_PATH= $(RUNTOOL) $(CSHARPCILINTERPRETER) $(CSHARPCILINTERPRETER_FLAGS) ./$*_runme.exe; \
 	else \
 	  cd $* && \
 	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo -debug+ $(CSHARPFLAGSSPECIAL) -t:module -out:$*.netmodule' \
-	  CSHARPSRCS='`find . -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile; \
+	  CSHARPSRCS='`find . -name "*.cs" -exec ../$(CSHARPCONVERTPATH) "{}" \+`' csharp_compile; \
 	fi
 
 # Clean: remove testcase directories
diff --git a/Tools/convertpath b/Tools/convertpath
new file mode 100755
index 000000000..fce5ac24b
--- /dev/null
+++ b/Tools/convertpath
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Unix to Windows relative path conversion in a script.
+# Useful for avoiding backslash quoting difficulties in Makefiles.
+# Acts as a much dumbed down 'cygpath -w' tool.
+
+usage()
+{
+  cat <<EOF
+Usage: $0 [-w|-u|-h] [path]...
+
+Convert Windows and Unix paths (intended for simple relative paths only)
+
+  -w  Convert backslashes to forward slashes in the paths
+  -u  Convert forward slashes to backslashes in the paths
+EOF
+}
+
+option="$1"
+case "$option" in
+  -w) shift; echo $@ | sed -e 's,/,\\,g' ;;
+  -u) shift; echo $@ | sed -e 's,\\,/,g' ;;
+  -h) shift; usage; ;;
+  *) usage; exit 1 ;;
+esac
+
+exit 0
diff --git a/Tools/vcfilter b/Tools/vcfilter
index 2683fc2db..05daefd80 100755
--- a/Tools/vcfilter
+++ b/Tools/vcfilter
@@ -2,9 +2,9 @@
 
 # This is a simple utility for Cygwin/Mingw which is useful when running the SWIG
 # test-suite through Visual Studio. If the output from the test-suite is piped
-# through this utility, it will filter the junk that the compiler generates.
+# through this utility, it will filter the junk that the compiler outputs to stdout.
 # Typical usage: make check | vcfilter
 
 # dos2unix needed for ^ and $ to work.
-2>&1 dos2unix | grep -v "\.cxx$" | grep -v "\.c$" | grep -v "^   Creating library" | grep -v "^Generating Code"
+2>&1 dos2unix | grep -v -e "\.cxx$" -e "\.c$" -e "^   Creating library" -e "^Generating Code"
 
diff --git a/configure.ac b/configure.ac
index dfd874b75..5a0298ac1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1993,8 +1993,7 @@ else
   CSHARPCOMPILER="$CSHARPCOMPILERBIN"
 fi
 
-CSHARPPATHSEPARATOR="/"
-CSHARPCYGPATH_W=echo
+CSHARPCONVERTPATH="Tools/convertpath -u"
 if test -z "$CSHARPBIN" ; then
   CSHARPCILINTERPRETER=""
   CSHARPCILINTERPRETER_FLAGS=""
@@ -2021,8 +2020,7 @@ if test -z "$CSHARPBIN" ; then
         CSHARPCILINTERPRETER_FLAGS="--debug"
     else
       if test "csc" = "$CSHARPCOMPILER"; then
-          CSHARPPATHSEPARATOR="\\\\"
-          CSHARPCYGPATH_W='cygpath -w'
+          CSHARPCONVERTPATH="Tools/convertpath -w"
       fi
     fi
   fi
@@ -2065,11 +2063,10 @@ fi
 
 AC_SUBST(CSHARPCILINTERPRETER_FLAGS)
 AC_SUBST(CSHARPCILINTERPRETER)
-AC_SUBST(CSHARPPATHSEPARATOR)
-AC_SUBST(CSHARPCYGPATH_W)
+AC_SUBST(CSHARPCONVERTPATH)
 AC_SUBST(CSHARPCOMPILER)
 AC_SUBST(CSHARPDYNAMICLINKING)
-AC_SUBST(CSHARPLIBRARYPREFIX) # Is this going to be used?
+AC_SUBST(CSHARPLIBRARYPREFIX)
 AC_SUBST(CSHARPCFLAGS)
 AC_SUBST(CSHARPSO)
 

From e60445b28007a846c912b9695b3e64713ab0373b Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 17 Feb 2015 20:37:19 +0000
Subject: [PATCH 054/220] Add support for Windows in AX_BOOST_BASE

Serial 26 in autoconf macro archive
---
 Tools/config/ax_boost_base.m4 | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Tools/config/ax_boost_base.m4 b/Tools/config/ax_boost_base.m4
index 550b64138..f3279f2b7 100644
--- a/Tools/config/ax_boost_base.m4
+++ b/Tools/config/ax_boost_base.m4
@@ -33,7 +33,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 23
+#serial 26
 
 AC_DEFUN([AX_BOOST_BASE],
 [
@@ -92,8 +92,11 @@ if test "x$want_boost" = "xyes"; then
     libsubdirs="lib"
     ax_arch=`uname -m`
     case $ax_arch in
-      x86_64|ppc64|s390x|sparc64|aarch64)
-        libsubdirs="lib64 lib lib64"
+      x86_64)
+        libsubdirs="lib64 libx32 lib lib64"
+        ;;
+      ppc64|s390x|sparc64|aarch64|ppc64le)
+        libsubdirs="lib64 lib lib64 ppc64le"
         ;;
     esac
 
@@ -170,6 +173,10 @@ if test "x$want_boost" = "xyes"; then
     dnl if we found no boost with system layout we search for boost libraries
     dnl built and installed without the --layout=system option or for a staged(not installed) version
     if test "x$succeeded" != "xyes"; then
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        LDFLAGS="$LDFLAGS_SAVED"
+        BOOST_CPPFLAGS=
+        BOOST_LDFLAGS=
         _version=0
         if test "$ac_boost_path" != ""; then
             if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
@@ -182,6 +189,12 @@ if test "x$want_boost" = "xyes"; then
                     VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
                     BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
                 done
+                dnl if nothing found search for layout used in Windows distributions
+                if test -z "$BOOST_CPPFLAGS"; then
+                    if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                    fi
+                fi
             fi
         else
             if test "$cross_compiling" != yes; then
@@ -270,4 +283,3 @@ if test "x$want_boost" = "xyes"; then
 fi
 
 ])
-

From e544ce8f82cccef9e4328217b20c44a5b9d4a27d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 23 Feb 2015 22:34:53 +0000
Subject: [PATCH 055/220] Update AX_PATH_GENERIC for spaces support

Fix when the _CFLAGS and _LIBS are provided and they contain a space

For example:
./configure PCRE_LIBS='-L/home/me/pcre/lib -lpcre'

Serial number 13 in autoconf macro archive
---
 Tools/config/ax_path_generic.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tools/config/ax_path_generic.m4 b/Tools/config/ax_path_generic.m4
index 6960d612a..f77fc78d6 100644
--- a/Tools/config/ax_path_generic.m4
+++ b/Tools/config/ax_path_generic.m4
@@ -69,7 +69,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 11
+#serial 13
 
 AU_ALIAS([AC_PATH_GENERIC], [AX_PATH_GENERIC])
 AC_DEFUN([AX_PATH_GENERIC],[
@@ -89,7 +89,7 @@ AC_DEFUN([AX_PATH_GENERIC],[
   AC_ARG_VAR(UP[]_CFLAGS, [CFLAGS used for $1])
   AC_ARG_VAR(UP[]_LIBS,   [LIBS used for $1])
 
-  AS_IF([test x$UP[]_CFLAGS != x -o x$UP[]_LIBS != x],[
+  AS_IF([test x"$UP[]_CFLAGS" != x -o x"$UP[]_LIBS" != x],[
     dnl Don't run config script at all, use user-provided values instead.
     AC_SUBST(UP[]_CFLAGS)
     AC_SUBST(UP[]_LIBS)

From f6e25f5786db989788caa9d1c0cc91ba5386e00a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Wed, 25 Mar 2015 21:26:47 +0000
Subject: [PATCH 056/220] PY3 fixes for import_package example

---
 Examples/python/import_packages/Makefile                 | 1 -
 Examples/python/import_packages/from_init1/Makefile      | 1 -
 Examples/python/import_packages/from_init2/Makefile      | 1 -
 Examples/python/import_packages/from_init3/Makefile      | 1 -
 Examples/python/import_packages/relativeimport1/Makefile | 1 -
 Examples/python/import_packages/relativeimport2/Makefile | 1 -
 Examples/python/import_packages/relativeimport3/Makefile | 1 -
 7 files changed, 7 deletions(-)

diff --git a/Examples/python/import_packages/Makefile b/Examples/python/import_packages/Makefile
index dfd46d05c..34362f65a 100644
--- a/Examples/python/import_packages/Makefile
+++ b/Examples/python/import_packages/Makefile
@@ -2,7 +2,6 @@ TOP        = ../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 import_packages_subdirs = \
 	same_modnames1 \
diff --git a/Examples/python/import_packages/from_init1/Makefile b/Examples/python/import_packages/from_init1/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/from_init1/Makefile
+++ b/Examples/python/import_packages/from_init1/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"
diff --git a/Examples/python/import_packages/from_init2/Makefile b/Examples/python/import_packages/from_init2/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/from_init2/Makefile
+++ b/Examples/python/import_packages/from_init2/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"
diff --git a/Examples/python/import_packages/from_init3/Makefile b/Examples/python/import_packages/from_init3/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/from_init3/Makefile
+++ b/Examples/python/import_packages/from_init3/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"
diff --git a/Examples/python/import_packages/relativeimport1/Makefile b/Examples/python/import_packages/relativeimport1/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/relativeimport1/Makefile
+++ b/Examples/python/import_packages/relativeimport1/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"
diff --git a/Examples/python/import_packages/relativeimport2/Makefile b/Examples/python/import_packages/relativeimport2/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/relativeimport2/Makefile
+++ b/Examples/python/import_packages/relativeimport2/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"
diff --git a/Examples/python/import_packages/relativeimport3/Makefile b/Examples/python/import_packages/relativeimport3/Makefile
index b9d803a0e..dd38f90bd 100644
--- a/Examples/python/import_packages/relativeimport3/Makefile
+++ b/Examples/python/import_packages/relativeimport3/Makefile
@@ -2,7 +2,6 @@ TOP        = ../../..
 SWIG       = $(realpath $(TOP)/../preinst-swig)
 SWIGOPT    =
 LIBS       =
-PY3        =
 
 ifeq (,$(PY3))
   PKG1DIR  = "py2"

From ec7e7145aad491d166b5dac565097d8f4cf028a2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Wed, 25 Mar 2015 22:32:51 +0000
Subject: [PATCH 057/220] Portability fixes for python example

---
 Examples/python/multimap/example.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/python/multimap/example.i b/Examples/python/multimap/example.i
index cc2482cc8..cb0e079ba 100644
--- a/Examples/python/multimap/example.i
+++ b/Examples/python/multimap/example.i
@@ -73,7 +73,7 @@ extern int gcdmain(int argc, char *argv[]);
   }
   utf8str = PyUnicode_AsUTF8String($input);
   PyBytes_AsStringAndSize(utf8str, &cstr, &len);
-  $1 = strndup(cstr, (size_t)len);
+  $1 = strncpy((char *)malloc(len+1), cstr, (size_t)len);
   $2 = (int)len;
   Py_DECREF(utf8str);
 %#else
@@ -106,7 +106,7 @@ extern int count(char *bytes, int len, char c);
   Py_ssize_t len;
   PyObject *utf8str = PyUnicode_AsUTF8String($input);
   PyBytes_AsStringAndSize(utf8str, &cstr, &len);
-  $1 = strndup(cstr, (size_t)len);
+  $1 = strncpy((char *)malloc(len+1), cstr, (size_t)len);
   $2 = (int)len;
   Py_DECREF(utf8str);
 %#else

From 3d61e84be66d087e1dfc0f9024bdde711816a604 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 31 Mar 2015 20:03:29 +0100
Subject: [PATCH 058/220] Add CSHARPOPTIONS for users to customise C# compiler
 flags

---
 Examples/Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 6a29e9087..834accdfa 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1345,6 +1345,8 @@ CSHARPCOMPILER = @CSHARPCOMPILER@
 CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
 CSHARPCILINTERPRETER_FLAGS = @CSHARPCILINTERPRETER_FLAGS@
 CSHARPCFLAGS = @CSHARPCFLAGS@
+CSHARPFLAGS =
+CSHARPOPTIONS =
 CSHARPSO = @CSHARPSO@
 CSHARP_RUNME = $(CSHARPCILINTERPRETER) $(CSHARPCILINTERPRETER_FLAGS) ./$(RUNME).exe
 
@@ -1377,7 +1379,7 @@ SRCDIR_CSHARPSRCS =
 endif
 
 csharp_compile: $(SRCDIR_SRCS)
-	$(COMPILETOOL) $(CSHARPCOMPILER) $(CSHARPFLAGS) $(CSHARPSRCS) $(SRCDIR_CSHARPSRCS)
+	$(COMPILETOOL) $(CSHARPCOMPILER) $(CSHARPFLAGS) $(CSHARPOPTIONS) $(CSHARPSRCS) $(SRCDIR_CSHARPSRCS)
 
 # -----------------------------------------------------------------
 # Run CSharp example

From af06a48430e963711446de3b226788d4a9ce333a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 14 Feb 2015 01:44:00 +0000
Subject: [PATCH 059/220] preinst-swig script support for native windows paths

- SWIG_LIB support for testing on Windows
- Only in-source builds for now
---
 configure.ac    | 9 +++++++++
 preinst-swig.in | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5a0298ac1..0a9aeff4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2656,6 +2656,7 @@ AC_SUBST(SKIP_ANDROID)
 # Miscellaneous
 #----------------------------------------------------------------
 
+ABS_SRCDIR=`(cd ${srcdir} && pwd)`
 
 # Root directory
 # Translate path for native Windows compilers for use with 'make check'
@@ -2689,6 +2690,14 @@ case $build in
 esac
 AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
 
+# For testing - Windows builds of SWIG do not need SWIG_LIB set
+AC_EGREP_CPP([yes],
+[#ifdef _WIN32
+  yes
+#endif
+], [SWIG_LIB_PREINST=], [SWIG_LIB_PREINST=$ABS_SRCDIR/Lib])
+AC_SUBST(SWIG_LIB_PREINST)
+
 AC_CONFIG_FILES([
     Makefile
     swig.spec
diff --git a/preinst-swig.in b/preinst-swig.in
index 384593ce1..e77db7858 100755
--- a/preinst-swig.in
+++ b/preinst-swig.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 builddir=`dirname $0`
-srcdir=`cd "$builddir" && cd '@srcdir@' && pwd`
-SWIG_LIB=$srcdir/Lib
-#SWIG_LIB=`cygpath -w $srcdir/Lib` # For native Windows version of SWIG
+SWIG_LIB=@SWIG_LIB_PREINST@
 export SWIG_LIB
 exec "$builddir/swig" "$@"

From a57302527a9219f22a9226dc9752ec392836e396 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 17 Jan 2015 17:25:40 +0000
Subject: [PATCH 060/220] gcc and mno-cygwin tweaks on cygwin/mingw

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

diff --git a/configure.ac b/configure.ac
index 0a9aeff4a..0c5ff5134 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1144,12 +1144,22 @@ else
   fi
 fi
 
+case $host in
+*-*-cygwin*)
+        # TODO: Only use this flag if the compiler supports it, later versions of gcc no longer have it
+        GCC_MNO_CYGWIN=" -mno-cygwin"
+        ;;
+*)
+        GCC_MNO_CYGWIN=""
+        ;;
+esac
+
 # java.exe on Cygwin requires the Windows standard (Pascal) calling convention as it is a normal Windows executable and not a Cygwin built executable
 case $host in
 *-*-cygwin* | *-*-mingw*)
     if test "$GCC" = yes; then
-        JAVADYNAMICLINKING=" -mno-cygwin -mthreads -Wl,--add-stdcall-alias"
-        JAVACFLAGS="-mno-cygwin -mthreads"
+        JAVADYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
+        JAVACFLAGS="$GCC_MNO_CYGWIN -mthreads"
     else
         JAVADYNAMICLINKING=""
         JAVACFLAGS=""
@@ -2032,8 +2042,8 @@ fi
 case $host in
 *-*-cygwin* | *-*-mingw*)
     if test "$GCC" = yes; then
-        CSHARPDYNAMICLINKING=" -mno-cygwin -mthreads -Wl,--add-stdcall-alias"
-        CSHARPCFLAGS="-mno-cygwin -mthreads"
+        CSHARPDYNAMICLINKING="$GCC_MNO_CYGWIN -mthreads -Wl,--add-stdcall-alias"
+        CSHARPCFLAGS="$GCC_MNO_CYGWIN -mthreads"
     else
         CSHARPDYNAMICLINKING=""
         CSHARPCFLAGS=""

From f27faa9c6914d26f17c6e4940699751b940a5efd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Apr 2015 06:39:30 +0100
Subject: [PATCH 061/220] Allow for spaces in path to java include directory
 and executables

For typical Windows installs of Java.
Also don't use cygpath on MinGW.
---
 configure.ac | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c5ff5134..084096ea5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1108,6 +1108,7 @@ fi
 AC_MSG_CHECKING(for java include file jni.h)
 AC_ARG_WITH(javaincl, [  --with-javaincl=path    Set location of Java include directory], [JAVAINCDIR="$withval"], [JAVAINCDIR=])
 
+JAVAINC=""
 if test -z "$JAVAINCDIR" ; then
   JAVAINCDIR="/usr/j2sdk*/include /usr/local/j2sdk*/include /usr/jdk*/include /usr/local/jdk*/include /opt/j2sdk*/include /opt/jdk*/include /usr/java/include /usr/java/j2sdk*/include /usr/java/jdk*/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/lib/java/include /usr/lib/jvm/java*/include /usr/lib64/jvm/java*/include /usr/include/kaffe /usr/local/include/kaffe /usr/include"
 
@@ -1117,30 +1118,33 @@ if test -z "$JAVAINCDIR" ; then
   *-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";;
   *);;
   esac
-fi
 
-JAVAINC=""
-for d in $JAVAINCDIR ; do
-  if test -r "$d/jni.h" ; then
-    AC_MSG_RESULT($d)
-    JAVAINCDIR=$d
-    JAVAINC=-I\"$d\"
-    break
+  for d in $JAVAINCDIR ; do
+    if test -r "$d/jni.h" ; then
+      JAVAINCDIR=$d
+      JAVAINC=-I\"$d\"
+      break
+    fi
+  done
+else
+  if test -r "$JAVAINCDIR/jni.h" ; then
+    JAVAINC=-I\"$JAVAINCDIR\"
   fi
-done
+fi
 
 if test "$JAVAINC" = "" ; then
   AC_MSG_RESULT(not found)
 else
+  AC_MSG_RESULT($JAVAINC)
   # now look for <arch>/jni_md.h
   AC_MSG_CHECKING(for java include file jni_md.h)
   JAVAMDDIR=`find "$JAVAINCDIR" -follow -name jni_md.h -print`
   if test "$JAVAMDDIR" = "" ; then
     AC_MSG_RESULT(not found)
   else
-    JAVAMDDIR=`dirname "$JAVAMDDIR" | tail -1`
-    JAVAINC="${JAVAINC} -I\"$JAVAMDDIR\""
+    JAVAMDDIR=-I\"`dirname "$JAVAMDDIR" | tail -1`\"
     AC_MSG_RESULT($JAVAMDDIR)
+    JAVAINC="${JAVAINC} ${JAVAMDDIR}"
   fi
 fi
 
@@ -1195,6 +1199,15 @@ case $host in
 esac
 fi
 
+# Quote for spaces in path to executables
+if test -n "$JAVA"; then
+  JAVA=\"$JAVA\"
+fi
+if test -n "$JAVAC"; then
+  JAVAC=\"$JAVAC\"
+fi
+
+
 AC_SUBST(JAVA)
 AC_SUBST(JAVAC)
 AC_SUBST(JAVAINC)
@@ -2669,13 +2682,18 @@ AC_SUBST(SKIP_ANDROID)
 ABS_SRCDIR=`(cd ${srcdir} && pwd)`
 
 # Root directory
-# Translate path for native Windows compilers for use with 'make check'
 ROOT_DIR=`pwd`
 case $host in
-*-*-cygwin* | *-*-mingw*)
+*-*-cygwin*)
+  # Translate path for native Windows compilers for use with 'make check'
   if (cygpath --mixed $ROOT_DIR) >/dev/null 2>/dev/null; then
     ROOT_DIR=`cygpath --mixed $ROOT_DIR`
   fi
+  ;;
+esac
+
+case $host in
+*-*-cygwin* | *-*-mingw*)
   # Extra files generated by some Windows compilers
   EXTRA_CLEAN="*.stackdump *.exp *.lib *.pdb *.ilk"
   ;;

From 0f1e8f75da0d9ed01174f12e5e081497d228dafc Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 13 Feb 2015 19:40:35 +0000
Subject: [PATCH 062/220] Detect Java on 64 bit windows

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 084096ea5..cda8b2b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1114,7 +1114,7 @@ if test -z "$JAVAINCDIR" ; then
 
   # Add in default installation directory on Windows for Cygwin
   case $host in
-  *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files/Java/jdk*/include d:/Program*Files/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
+  *-*-cygwin* | *-*-mingw*) JAVAINCDIR="c:/Program*Files*/Java/jdk*/include d:/Program*Files*/Java/jdk*/include c:/j2sdk*/include d:/j2sdk*/include c:/jdk*/include d:/jdk*/include $JAVAINCDIR";;
   *-*-darwin*) JAVAINCDIR="/System/Library/Frameworks/JavaVM.framework/Headers $JAVAINCDIR";;
   *);;
   esac

From 62fdff1bf353e3c8cdaba521f8e7a1c89346988e Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Apr 2015 06:40:43 +0100
Subject: [PATCH 063/220] Python 2 and 3 testing on Windows

---
 configure.ac | 291 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 195 insertions(+), 96 deletions(-)
 mode change 100644 => 100755 configure.ac

diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index cda8b2b8e..ce596d29c
--- a/configure.ac
+++ b/configure.ac
@@ -601,6 +601,7 @@ AC_SUBST(TCLCXXSHARED)
 
 PYINCLUDE=
 PYLIB=
+PYLINK=
 PYPACKAGE=
 
 AC_ARG_WITH(python, AS_HELP_STRING([--without-python], [Disable Python])
@@ -617,64 +618,106 @@ else
     PYTHON="$PYBIN"
   fi
 
+  PYVER=0
   if test -n "$PYTHON"; then
+    AC_MSG_CHECKING([for $PYTHON major version number])
+    PYVER=`($PYTHON -c "import sys; sys.stdout.write(sys.version[[0]])") 2>/dev/null`
+    AC_MSG_RESULT($PYVER)
+    if test -z "$PYVER"; then
+      PYVER=0
+    fi
+  fi
+
+  if test $PYVER -le 2; then
     AC_MSG_CHECKING(for Python prefix)
-    PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null`
+    PYPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.prefix)") 2>/dev/null`
     AC_MSG_RESULT($PYPREFIX)
     AC_MSG_CHECKING(for Python exec-prefix)
-    PYEPREFIX=`($PYTHON -c "import sys; print sys.exec_prefix") 2>/dev/null`
+    PYEPREFIX=`($PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)") 2>/dev/null`
     AC_MSG_RESULT($PYEPREFIX)
+    AC_MSG_CHECKING(for Python os.name)
+    PYOSNAME=`($PYTHON -c "import sys, os; sys.stdout.write(os.name)")`
+    AC_MSG_RESULT($PYOSNAME)
 
+    if test x"$PYOSNAME" = x"nt"; then
+      # Windows installations are quite different to posix installations
+      PYPREFIX=`echo "$PYPREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time
+      PYTHON_SO=.pyd
 
-    # Note: I could not think of a standard way to get the version string from different versions.
-    # This trick pulls it out of the file location for a standard library file.
-
-    AC_MSG_CHECKING(for Python version)
-
-    # Need to do this hack since autoconf replaces __file__ with the name of the configure file
-    filehack="file__"
-    PYVERSION=`($PYTHON -c "import string,operator,os.path; print operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1)")`
-    AC_MSG_RESULT($PYVERSION)
-
-    # Find the directory for libraries this is necessary to deal with
-    # platforms that can have apps built for multiple archs: e.g. x86_64
-    AC_MSG_CHECKING(for Python lib dir)
-    PYLIBDIR=`($PYTHON -c "import sys; print sys.lib") 2>/dev/null`
-    if test -z "$PYLIBDIR"; then
-      # Fedora patch Python to add sys.lib, for other distros we assume "lib".
-      PYLIBDIR="lib"
-    fi
-    AC_MSG_RESULT($PYLIBDIR)
-
-    # Set the include directory
-
-    AC_MSG_CHECKING(for Python header files)
-    if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
-      PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
-    fi
-    if test -z "$PYINCLUDE"; then
-      if test -r $PYPREFIX/include/Py/Python.h; then
-        PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
+      AC_MSG_CHECKING(for Python header files)
+      if test -r $PYPREFIX/include/Python.h; then
+        PYINCLUDE="-I$PYPREFIX/include"
       fi
-    fi
-    AC_MSG_RESULT($PYINCLUDE)
+      AC_MSG_RESULT($PYINCLUDE)
 
-    # Set the library directory blindly.   This probably won't work with older versions
-    AC_MSG_CHECKING(for Python library)
-    dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
-    for i in $dirs; do
-      if test -d $PYEPREFIX/$PYLIBDIR/$i; then
-        PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
-        break
+      AC_MSG_CHECKING(for Python library directory)
+      if test -d $PYPREFIX/libs; then
+        PYLIB=$PYPREFIX/libs
+        PYLINKFILE=`ls $PYLIB/python*.lib | grep "python[[0-9]][[0-9]]\.lib"`
+        if test -r "$PYLINKFILE"; then
+          PYLINK=-l`basename $PYLINKFILE | sed -e 's/\.lib$//'`
+        else
+          PYLIB=
+        fi
       fi
-    done
+    else
+      # Note: I could not think of a standard way to get the version string from different versions.
+      # This trick pulls it out of the file location for a standard library file.
+
+      AC_MSG_CHECKING(for Python version)
+
+      # Need to do this hack since autoconf replaces __file__ with the name of the configure file
+      filehack="file__"
+      PYVERSION=`($PYTHON -c "import sys,string,operator,os.path; sys.stdout.write(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")`
+      AC_MSG_RESULT($PYVERSION)
+
+      # Find the directory for libraries this is necessary to deal with
+      # platforms that can have apps built for multiple archs: e.g. x86_64
+      AC_MSG_CHECKING(for Python lib dir)
+      PYLIBDIR=`($PYTHON -c "import sys; sys.stdout.write(sys.lib)") 2>/dev/null`
+      if test -z "$PYLIBDIR"; then
+        # Fedora patch Python to add sys.lib, for other distros we assume "lib".
+        PYLIBDIR="lib"
+      fi
+      AC_MSG_RESULT($PYLIBDIR)
+
+      # Set the include directory
+
+      AC_MSG_CHECKING(for Python header files)
+      if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/$PYLIBDIR/$PYVERSION/config"
+      fi
+      if test -z "$PYINCLUDE"; then
+        if test -r $PYPREFIX/include/Py/Python.h; then
+          PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/$PYLIBDIR/python/lib"
+        fi
+      fi
+      AC_MSG_RESULT($PYINCLUDE)
+
+      # Set the library directory blindly.   This probably won't work with older versions
+      AC_MSG_CHECKING(for Python library directory)
+      dirs="$PYVERSION/config $PYVERSION/$PYLIBDIR python/$PYLIBDIR"
+      for i in $dirs; do
+        if test -d $PYEPREFIX/$PYLIBDIR/$i; then
+          PYLIB="$PYEPREFIX/$PYLIBDIR/$i"
+          break
+        fi
+      done
+
+      PYLINK="-l$PYVERSION"
+    fi
+
     if test -z "$PYLIB"; then
       AC_MSG_RESULT(Not found)
     else
       AC_MSG_RESULT($PYLIB)
     fi
-
-    PYLINK="-l$PYVERSION"
+    AC_MSG_CHECKING(for Python library)
+    if test -z "$PYLINK"; then
+      AC_MSG_RESULT(Not found)
+    else
+      AC_MSG_RESULT($PYLINK)
+    fi
   fi
 
   # Cygwin (Windows) needs the library for dynamic linking
@@ -697,11 +740,9 @@ AC_SUBST(PYTHONDYNAMICLINKING)
 # Look for Python 3.x
 #----------------------------------------------------------------
 
-# mostly copy & pasted from "Look for Python" section,
-# did some trim, fix and rename
-
 PY3INCLUDE=
 PY3LIB=
+PY3LINK=
 PY3PACKAGE=
 
 AC_ARG_WITH(python3, AS_HELP_STRING([--without-python3], [Disable Python 3.x support])
@@ -712,7 +753,7 @@ if test x"${PY3BIN}" = xno -o x"${with_alllang}" = xno ; then
   AC_MSG_NOTICE([Disabling Python 3.x support])
 else
   if test "x$PY3BIN" = xyes; then
-    for py_ver in 3 3.6 3.5 3.4 3.3 3.2 3.1 3.0; do
+    for py_ver in 3 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 ""; do
       AC_CHECK_PROGS(PYTHON3, [python$py_ver])
       if test -n "$PYTHON3"; then
         AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config])
@@ -726,63 +767,121 @@ else
     AC_CHECK_PROGS(PY3CONFIG, [$PYTHON3-config])
   fi
 
-
-  if test -n "$PYTHON3" -a -n "$PY3CONFIG"; then
-    AC_MSG_CHECKING([for Python 3.x prefix])
-    PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null`
-    AC_MSG_RESULT($PY3PREFIX)
-    AC_MSG_CHECKING(for Python 3.x exec-prefix)
-    PY3EPREFIX=`($PY3CONFIG --exec-prefix) 2>/dev/null`
-    AC_MSG_RESULT($PY3EPREFIX)
-
-    # Note: I could not think of a standard way to get the version string from different versions.
-    # This trick pulls it out of the file location for a standard library file.
-
-    AC_MSG_CHECKING([for Python 3.x version])
-
-    # Need to do this hack since autoconf replaces __file__ with the name of the configure file
-    filehack="file__"
-    PY3VERSION=`($PYTHON3 -c "import string,operator,os.path; print(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")`
-    AC_MSG_RESULT($PY3VERSION)
-
-    # Find the directory for libraries this is necessary to deal with
-    # platforms that can have apps built for multiple archs: e.g. x86_64
-    AC_MSG_CHECKING([for Python 3.x lib dir])
-    PY3LIBDIR=`($PYTHON3 -c "import sys; print(sys.lib)") 2>/dev/null`
-    if test -z "$PY3LIBDIR"; then
-      # some dists don't have sys.lib  so the best we can do is assume lib
-      PY3LIBDIR="lib"
+  PYVER=0
+  if test -n "$PYTHON3"; then
+    AC_MSG_CHECKING([for $PYTHON3 major version number])
+    PYVER=`($PYTHON3 -c "import sys; sys.stdout.write(sys.version[[0]])") 2>/dev/null`
+    AC_MSG_RESULT($PYVER)
+    if test -z "$PYVER"; then
+      PYVER=0
     fi
-    AC_MSG_RESULT($PY3LIBDIR)
+  fi
 
-    # Set the include directory
+  if test $PYVER -ge 3; then
+    AC_MSG_CHECKING(for Python 3.x os.name)
+    PY3OSNAME=`($PYTHON3 -c "import sys, os; sys.stdout.write(os.name)")`
+    AC_MSG_RESULT($PY3OSNAME)
 
-    AC_MSG_CHECKING([for Python 3.x header files])
-    PY3INCLUDE=`($PY3CONFIG --includes) 2>/dev/null`
-    AC_MSG_RESULT($PY3INCLUDE)
+    if test x"$PY3OSNAME" = x"nt"; then
+      # Windows installations are quite different to posix installations
+      # There is no python-config to use
+      AC_MSG_CHECKING(for Python 3.x prefix)
+      PY3PREFIX=`($PYTHON3 -c "import sys; sys.stdout.write(sys.prefix)") 2>/dev/null`
+      AC_MSG_RESULT($PY3PREFIX)
+      PY3PREFIX=`echo "$PY3PREFIX" | sed -e 's,\\\\,/,g'` # Forward slashes are easier to use and even work on Windows most of the time
+      PYTHON_SO=.pyd
 
-    # Set the library directory blindly.   This probably won't work with older versions
-    AC_MSG_CHECKING([for Python 3.x library])
-    dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
-    for i in $dirs; do
-      if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
-        PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"
-        break
+      AC_MSG_CHECKING(for Python 3.x header files)
+      if test -r $PY3PREFIX/include/Python.h; then
+        PY3INCLUDE="-I$PY3PREFIX/include"
       fi
-    done
-    if test -z "$PY3LIB"; then
-      AC_MSG_RESULT([Not found])
-    else
-      AC_MSG_RESULT($PY3LIB)
-    fi
+      AC_MSG_RESULT($PY3INCLUDE)
 
-    PY3LINK="-l$PY3VERSION"
+      AC_MSG_CHECKING(for Python 3.x library directory)
+      if test -d $PY3PREFIX/libs; then
+        PY3LIB=$PY3PREFIX/libs
+        PY3LINKFILE=`ls $PY3LIB/python*.lib | grep "python[[0-9]][[0-9]]\.lib"`
+        if test -r "$PY3LINKFILE"; then
+          PY3LINK=-l`basename $PY3LINKFILE | sed -e 's/\.lib$//'`
+        else
+          PY3LIB=
+        fi
+      fi
+      if test -z "$PY3LIB"; then
+        AC_MSG_RESULT([Not found])
+      else
+        AC_MSG_RESULT($PY3LIB)
+      fi
+      AC_MSG_CHECKING([for Python 3.x library])
+      if test -z "$PY3LINK"; then
+        AC_MSG_RESULT(Not found)
+      else
+        AC_MSG_RESULT($PY3LINK)
+      fi
+    elif test -n "$PY3CONFIG"; then
+      AC_MSG_CHECKING([for Python 3.x prefix])
+      PY3PREFIX=`($PY3CONFIG --prefix) 2>/dev/null`
+      AC_MSG_RESULT($PY3PREFIX)
+      AC_MSG_CHECKING(for Python 3.x exec-prefix)
+      PY3EPREFIX=`($PY3CONFIG --exec-prefix) 2>/dev/null`
+      AC_MSG_RESULT($PY3EPREFIX)
+
+      # Note: I could not think of a standard way to get the version string from different versions.
+      # This trick pulls it out of the file location for a standard library file.
+
+      AC_MSG_CHECKING([for Python 3.x version])
+
+      # Need to do this hack since autoconf replaces __file__ with the name of the configure file
+      filehack="file__"
+      PY3VERSION=`($PYTHON3 -c "import string,operator,os.path; print(operator.getitem(os.path.split(operator.getitem(os.path.split(string.__$filehack),0)),1))")`
+      AC_MSG_RESULT($PY3VERSION)
+
+      # Find the directory for libraries this is necessary to deal with
+      # platforms that can have apps built for multiple archs: e.g. x86_64
+      AC_MSG_CHECKING([for Python 3.x lib dir])
+      PY3LIBDIR=`($PYTHON3 -c "import sys; print(sys.lib)") 2>/dev/null`
+      if test -z "$PY3LIBDIR"; then
+        # some dists don't have sys.lib  so the best we can do is assume lib
+        PY3LIBDIR="lib"
+      fi
+      AC_MSG_RESULT($PY3LIBDIR)
+
+      # Set the include directory
+
+      AC_MSG_CHECKING([for Python 3.x header files])
+      PY3INCLUDE=`($PY3CONFIG --includes) 2>/dev/null`
+      AC_MSG_RESULT($PY3INCLUDE)
+
+      # Set the library directory blindly.   This probably won't work with older versions
+      AC_MSG_CHECKING([for Python 3.x library directory])
+      dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
+      for i in $dirs; do
+        if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
+          PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"
+          break
+        fi
+      done
+      if test -z "$PY3LIB"; then
+        AC_MSG_RESULT([Not found])
+      else
+        AC_MSG_RESULT($PY3LIB)
+      fi
+
+      PY3LINK="-l$PY3VERSION"
+
+      AC_MSG_CHECKING([for Python 3.x library])
+      if test -z "$PY3LINK"; then
+        AC_MSG_RESULT(Not found)
+      else
+        AC_MSG_RESULT($PY3LINK)
+      fi
+    fi
   fi
 
   # Cygwin (Windows) needs the library for dynamic linking
   case $host in
   *-*-cygwin* | *-*-mingw*)
-    PYTHON3DYNAMICLINKING="-L$PYLIB $PY3LINK"
+    PYTHON3DYNAMICLINKING="-L$PY3LIB $PY3LINK"
     DEFS="-DUSE_DL_IMPORT $DEFS"
     ;;
   *)PYTHON3DYNAMICLINKING="";;
@@ -2512,14 +2611,14 @@ AC_SUBST(SKIP_OCTAVE)
 
 
 SKIP_PYTHON=
-if (test -z "$PYINCLUDE") &&
-   (test -z "$PY3INCLUDE") ; then
+if (test -z "$PYINCLUDE" || test -z "$PYLINK") &&
+   (test -z "$PY3INCLUDE" || test -z "$PY3LINK") ; then
     SKIP_PYTHON="1"
 fi
 AC_SUBST(SKIP_PYTHON)
 
 SKIP_PYTHON3=
-if test -z "$PY3INCLUDE" ; then
+if test -z "$PY3INCLUDE" || test -z "$PY3LINK" ; then
     SKIP_PYTHON3="1"
 fi
 AC_SUBST(SKIP_PYTHON3)

From 1445b364ff09137e3c29fd21fddffbf22990a680 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Apr 2015 06:59:24 +0100
Subject: [PATCH 064/220] Add CI testing for Windows using Appveyor

appveyor.yml file for testing at http://appveyor.com/
---
 appveyor.yml | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100755 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100755
index 000000000..1cb7aaf8d
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,117 @@
+# Important to have C:\MinGW\bin at beginning of path as there is a version of bash in the default path
+# TODO: where is it - with Git?
+# This 32 bit version of MinGW doesn't seem to configured correctly, possibly because it is running on
+# 64 bit Windows - direct.h does not compile off64_t is not defined and struct stat is missing.
+
+os:
+- Unstable
+#- Visual Studio 2014 CTP4
+#- Visual Studio 2015 CTP
+#- Visual Studio 2015 Preview
+#- Windows Server 2012 R2
+#- MinGW
+
+platform:
+- x86
+- x64
+
+environment:
+  matrix:
+  - SWIGLANG: csharp
+  - SWIGLANG: java
+  - SWIGLANG: python
+    VER: 27
+  - SWIGLANG: python
+    VER: 34
+    PY3: 1
+
+#configuration:
+#- Release
+#
+install:
+- date /T & time /T
+- set
+#- dir C:\
+#- dir "C:\Program Files (x86)"
+#- dir "C:\Program Files"
+#- dir "C:\Python34"
+#- dir "C:\Python34\libs"
+#- set PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
+- set PATH=C:\cygwin\bin;%PATH%
+- set CYGWIN=nodosfilewarning
+# - dir C:\MinGW
+# - dir C:\MinGW\bin
+#- dir C:\MinGW\msys\1.0\bin
+- git clone -q --depth=1 --single-branch --branch cccl-1.0 git://github.com/swig/cccl.git C:\cccl-1.0
+- bash -c "cp C:/cccl-1.0/cccl /usr/bin"
+- ps: >-
+    If ($env:Platform -Match "x86") {
+      $env:PCRE_PLATFORM="Win32"
+      $env:JAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0"
+      $env:VCVARS_PLATFORM="x86"
+      $env:LANG_PLATFORM=""
+    } Else {
+      $env:PCRE_PLATFORM="x64"
+      $env:JAVA_HOME="C:/Program Files/Java/jdk1.8.0"
+      $env:VCVARS_PLATFORM="amd64"
+      $env:LANG_PLATFORM="-x64"
+    }
+- call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+- nuget install pcre -Verbosity detailed -Version 8.33.0.1 -OutputDirectory C:\pcre
+- set PCRE_ROOT=C:/pcre/pcre.8.33.0.1/build/native
+#- cinst php
+#- set PATH=%PATH%;C:\tools\php
+- set PATH=C:\Python%VER%%LANG_PLATFORM%;%PATH%
+#- path
+- python -V
+- bash -c "which python"
+- bash -c "python -V"
+- bash -c "which cl.exe"
+- bash -c "cl.exe /? 2>&1 | head -n 2"
+- bash -c "which csc.exe"
+- bash -c "csc.exe /? | head -n 2"
+- bash -c "which cccl"
+- bash -c "cccl --version"
+- make --version
+#- gcc -v
+#- php.exe --version
+#- cygcheck -s
+#- set
+- uname -a
+
+build_script:
+#- echo C:\MinGW /mingw >> C:\MinGW\msys\1.0\etc\fstab
+#- echo. >> C:\MinGW\msys\1.0\etc\fstab
+#- type C:\MinGW\msys\1.0\etc\fstab
+#- bash -c "echo $PATH"
+#- bash -c "ls -la /; echo xx; ls -la /c; echo xxx; ls -la /mingw; true"
+#- bash -c "mount; echo xx; ls /mingw/share/automake-1.11; echo xxx"
+#- bash -c "set"
+#- bash -c "find C:/Libraries/boost -maxdepth 3 -type d || true"
+#- bash -c "find C:/Libraries/boost -maxdepth 3 -type f || true"
+- set CCCL_OPTIONS=--cccl-muffle /W3
+- set CHECK_OPTIONS=CSHARPOPTIONS=-platform:%Platform%
+  # Open dummy file descriptor to fix error on cygwin: ./configure: line 560: 0: Bad file descriptor
+- bash -c "exec 0</dev/null && ./autogen.sh && time ./configure --disable-dependency-tracking --disable-ccache CC=cccl CXX=cccl CFLAGS='-O2' CXXFLAGS='-O2' LDFLAGS='--cccl-link /LTCG' PCRE_CFLAGS='-I%PCRE_ROOT%/include -DPCRE_STATIC' PCRE_LIBS='-L%PCRE_ROOT%/lib/v110/%PCRE_PLATFORM%/Release/static/utf8 -lpcre8' --with-java='%JAVA_HOME%/bin/java.exe' --with-javac='%JAVA_HOME%/bin/javac.exe' --with-javaincl='%JAVA_HOME%/include' --without-perl5 --without-go --with-boost=C:/Libraries/boost || cat config.log"
+#- bash -c "cat Source/Makefile || true"
+#- bash -c "cat Examples/Makefile || true"
+- bash -c "time make -s"
+#- bash -c "time make ccache || true"
+
+test_script:
+- set CCCL_OPTIONS=--cccl-muffle /W3 /EHsc
+# (Warning below is fixed in newer versions of Python (2.7.9)) '_hypot' : recursive on all control paths, function will cause runtime stack overflow
+- ps: >-
+    If ("$env:SWIGLANG$env:VER" -Match "python27") {
+      $env:CCCL_OPTIONS="$env:CCCL_OPTIONS /wd4717"
+    }
+- .\swig.exe -version
+- bash -c "file ./swig.exe"
+#- .\ccache-swig.exe -V
+#- make check-errors-test-suite
+- bash -c "time make -k check-%SWIGLANG%-version"
+#- bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
+- bash -c "time make -k check-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
+
+# Do not build on tags (GitHub only)
+skip_tags: true

From b0e0237347b7e1ebcf40fe90df8033a886817d1f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Apr 2015 07:25:50 +0100
Subject: [PATCH 065/220] Remove appveyor debugging code

---
 appveyor.yml | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1cb7aaf8d..27e8162ad 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,5 @@
-# Important to have C:\MinGW\bin at beginning of path as there is a version of bash in the default path
-# TODO: where is it - with Git?
-# This 32 bit version of MinGW doesn't seem to configured correctly, possibly because it is running on
-# 64 bit Windows - direct.h does not compile off64_t is not defined and struct stat is missing.
-
 os:
 - Unstable
-#- Visual Studio 2014 CTP4
-#- Visual Studio 2015 CTP
-#- Visual Studio 2015 Preview
-#- Windows Server 2012 R2
-#- MinGW
 
 platform:
 - x86
@@ -25,23 +15,11 @@ environment:
     VER: 34
     PY3: 1
 
-#configuration:
-#- Release
-#
 install:
 - date /T & time /T
 - set
-#- dir C:\
-#- dir "C:\Program Files (x86)"
-#- dir "C:\Program Files"
-#- dir "C:\Python34"
-#- dir "C:\Python34\libs"
-#- set PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
 - set PATH=C:\cygwin\bin;%PATH%
 - set CYGWIN=nodosfilewarning
-# - dir C:\MinGW
-# - dir C:\MinGW\bin
-#- dir C:\MinGW\msys\1.0\bin
 - git clone -q --depth=1 --single-branch --branch cccl-1.0 git://github.com/swig/cccl.git C:\cccl-1.0
 - bash -c "cp C:/cccl-1.0/cccl /usr/bin"
 - ps: >-
@@ -59,10 +37,7 @@ install:
 - call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
 - nuget install pcre -Verbosity detailed -Version 8.33.0.1 -OutputDirectory C:\pcre
 - set PCRE_ROOT=C:/pcre/pcre.8.33.0.1/build/native
-#- cinst php
-#- set PATH=%PATH%;C:\tools\php
 - set PATH=C:\Python%VER%%LANG_PLATFORM%;%PATH%
-#- path
 - python -V
 - bash -c "which python"
 - bash -c "python -V"
@@ -73,30 +48,14 @@ install:
 - bash -c "which cccl"
 - bash -c "cccl --version"
 - make --version
-#- gcc -v
-#- php.exe --version
-#- cygcheck -s
-#- set
 - uname -a
 
 build_script:
-#- echo C:\MinGW /mingw >> C:\MinGW\msys\1.0\etc\fstab
-#- echo. >> C:\MinGW\msys\1.0\etc\fstab
-#- type C:\MinGW\msys\1.0\etc\fstab
-#- bash -c "echo $PATH"
-#- bash -c "ls -la /; echo xx; ls -la /c; echo xxx; ls -la /mingw; true"
-#- bash -c "mount; echo xx; ls /mingw/share/automake-1.11; echo xxx"
-#- bash -c "set"
-#- bash -c "find C:/Libraries/boost -maxdepth 3 -type d || true"
-#- bash -c "find C:/Libraries/boost -maxdepth 3 -type f || true"
 - set CCCL_OPTIONS=--cccl-muffle /W3
 - set CHECK_OPTIONS=CSHARPOPTIONS=-platform:%Platform%
   # Open dummy file descriptor to fix error on cygwin: ./configure: line 560: 0: Bad file descriptor
 - bash -c "exec 0</dev/null && ./autogen.sh && time ./configure --disable-dependency-tracking --disable-ccache CC=cccl CXX=cccl CFLAGS='-O2' CXXFLAGS='-O2' LDFLAGS='--cccl-link /LTCG' PCRE_CFLAGS='-I%PCRE_ROOT%/include -DPCRE_STATIC' PCRE_LIBS='-L%PCRE_ROOT%/lib/v110/%PCRE_PLATFORM%/Release/static/utf8 -lpcre8' --with-java='%JAVA_HOME%/bin/java.exe' --with-javac='%JAVA_HOME%/bin/javac.exe' --with-javaincl='%JAVA_HOME%/include' --without-perl5 --without-go --with-boost=C:/Libraries/boost || cat config.log"
-#- bash -c "cat Source/Makefile || true"
-#- bash -c "cat Examples/Makefile || true"
 - bash -c "time make -s"
-#- bash -c "time make ccache || true"
 
 test_script:
 - set CCCL_OPTIONS=--cccl-muffle /W3 /EHsc
@@ -107,8 +66,6 @@ test_script:
     }
 - .\swig.exe -version
 - bash -c "file ./swig.exe"
-#- .\ccache-swig.exe -V
-#- make check-errors-test-suite
 - bash -c "time make -k check-%SWIGLANG%-version"
 #- bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
 - bash -c "time make -k check-%SWIGLANG%-test-suite %CHECK_OPTIONS%"

From 083c75e9b691afb594266d0eba1f007ee1b4cc29 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Apr 2015 07:26:51 +0100
Subject: [PATCH 066/220] Appveyor: partialcheck test-suite

Java and Python time out when running just the test-suite.
Compromise for now... run just partialcheck-test-suite, ie
test just invoking SWIG and not C/C++compile and run tests.
---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 27e8162ad..ff66b884d 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -67,8 +67,8 @@ test_script:
 - .\swig.exe -version
 - bash -c "file ./swig.exe"
 - bash -c "time make -k check-%SWIGLANG%-version"
-#- bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
-- bash -c "time make -k check-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
+- bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
+- bash -c "time make -k partialcheck-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
 
 # Do not build on tags (GitHub only)
 skip_tags: true

From 6c76c7bb753faf8baf4174fc9c948378ad00fea6 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Apr 2015 02:24:14 +0100
Subject: [PATCH 067/220] Appveyor - don't show env variables anymore

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index ff66b884d..e84bf6c88 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,7 +17,6 @@ environment:
 
 install:
 - date /T & time /T
-- set
 - set PATH=C:\cygwin\bin;%PATH%
 - set CYGWIN=nodosfilewarning
 - git clone -q --depth=1 --single-branch --branch cccl-1.0 git://github.com/swig/cccl.git C:\cccl-1.0

From d62aad9de93ea7b6051e30dcfcf62cbb006a64a2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Apr 2015 10:23:44 +0100
Subject: [PATCH 068/220] Remove unwanted x bit in configure.ac

---
 configure.ac | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 configure.ac

diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644

From fa4223e4969c4c98b50b8e9fdac486172f809384 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 7 Apr 2015 21:34:23 +0100
Subject: [PATCH 069/220] Fix parsing of extern "C" and typedef for example:

extern "C" typedef void (*Hook2_t)(int, const char *);
extern "C" typedef int Integer;

Closes #375
---
 CHANGES.current                |  5 +++++
 Examples/test-suite/extern_c.i | 15 +++++++++++++++
 Source/CParse/parser.y         | 22 ++++++++--------------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index c8a376e0a..c1e293413 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-07: wsfulton
+            Fix #375 - parsing of extern "C" and typedef for example:
+              extern "C" typedef void (*Hook2_t)(int, const char *);
+              extern "C" typedef int Integer;
+
 2015-03-12: olly
 	    -DSWIG_DIRECTOR_STATIC is now supported for all languages with
 	    director support, not only Python and PHP.
diff --git a/Examples/test-suite/extern_c.i b/Examples/test-suite/extern_c.i
index 9c17d18fb..e56d9f128 100644
--- a/Examples/test-suite/extern_c.i
+++ b/Examples/test-suite/extern_c.i
@@ -14,3 +14,18 @@ typedef int Integer2;
 void RealFunction(int value) {}
 %}
 
+
+%inline %{
+extern "C" {
+  typedef void (*Hook1_t)(int, const char *);
+}
+extern "C" typedef void (*Hook2_t)(int, const char *);
+void funcy1(Hook1_t) {}
+void funcy2(Hook2_t) {}
+Hook1_t hook1;
+Hook2_t hook2;
+
+extern "C" typedef int Integer;
+Integer int1;
+%}
+
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 1fb759081..3050cd02a 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1414,7 +1414,7 @@ static void mark_nodes_as_extend(Node *n) {
 /* Misc */
 %type <id>       identifier;
 %type <dtype>    initializer cpp_const exception_specification;
-%type <id>       storage_class;
+%type <id>       storage_class extern_string;
 %type <pl>       parms  ptail rawparms varargs_parms ;
 %type <pl>       templateparameters templateparameterstail;
 %type <p>        parm valparm rawvalparms valparms valptail ;
@@ -4652,9 +4652,7 @@ anon_bitfield_type : primitive_type { $$ = $1;
 /* ====================================================================== 
  *                       PRIMITIVES
  * ====================================================================== */
-
-storage_class  : EXTERN { $$ = "extern"; }
-               | EXTERN string {
+extern_string :  EXTERN string {
                    if (strcmp($2,"C") == 0) {
 		     $$ = "externc";
                    } else if (strcmp($2,"C++") == 0) {
@@ -4664,16 +4662,12 @@ storage_class  : EXTERN { $$ = "extern"; }
 		     $$ = 0;
 		   }
                }
-               | EXTERN string THREAD_LOCAL {
-                   if (strcmp($2,"C") == 0) {
-		     $$ = "externc thread_local";
-                   } else if (strcmp($2,"C++") == 0) {
-		     $$ = "extern thread_local";
-		   } else {
-		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", $2);
-		     $$ = 0;
-		   }
-               }
+	       ;
+
+storage_class  : EXTERN { $$ = "extern"; }
+	       | extern_string { $$ = $1; }
+	       | extern_string THREAD_LOCAL { $$ = "thread_local"; }
+	       | extern_string TYPEDEF { $$ = "typedef"; }
                | STATIC { $$ = "static"; }
                | TYPEDEF { $$ = "typedef"; }
                | VIRTUAL { $$ = "virtual"; }

From 92b88db7abcc688735fd0bbd315207864911767f Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoannv@gmail.com>
Date: Mon, 2 Feb 2015 11:15:31 +0100
Subject: [PATCH 070/220] Make __dict__ accessible for Python builtin classes

Attribute set within instance of a SWIG Python wrapped class are
stored in SwigPyObject->dict, which tp_dictoffset slot is pointing to.

However, SWIG wrapped classes did not have a __dict__ attribute.
Inheriting subclasses did not get the attribute either because the
SWIG wrapped classes initialize the tp_dictoffset slot:

From http://bugs.python.org/issue16272:

"If a type defines a nonzero tp_dictoffset, that type is responsible for
defining a `__dict__` slot as part of the tp_getset structures. Failure to
do so will result in the dict being inaccessible from Python via
`obj.__dict__` from instances of the type or subtypes."

Provide a SwigPyObject_get___dict__() function to retrieve the dict
attribute or create it when it does not exist yet (it is normally
created when setting attribute set), and a PyGetSetDef entry pointing
to this function.
---
 Lib/python/pyrun.swg      | 17 +++++++++++++++++
 Source/Modules/python.cxx | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index a713486d1..daa0b7eef 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -381,6 +381,23 @@ typedef struct {
 #endif
 } SwigPyObject;
 
+
+#ifdef SWIGPYTHON_BUILTIN
+
+SWIGRUNTIME PyObject *
+SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args))
+{
+  SwigPyObject *sobj = (SwigPyObject *)v;
+
+  if (!sobj->dict)
+    sobj->dict = PyDict_New();
+
+  Py_INCREF(sobj->dict);
+  return sobj->dict;
+}
+
+#endif
+
 SWIGRUNTIME PyObject *
 SwigPyObject_long(SwigPyObject *v)
 {
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index c71a0f364..9b1cb71e5 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -3057,6 +3057,17 @@ public:
     }
 
     /* If this is a builtin type, create a PyGetSetDef entry for this member variable. */
+    if (builtin) {
+      const char *memname = "__dict__";
+      Hash *h = Getattr(builtin_getset, memname);
+      if (!h) {
+        h = NewHash();
+        Setattr(builtin_getset, memname, h);
+        Delete(h);
+      }
+      Setattr(h, "getter", "SwigPyObject_get___dict__");
+    }
+
     if (builtin_getter) {
       String *memname = Getattr(n, "membervariableHandler:sym:name");
       if (!memname)

From 3983d7b2308c27bf2eb40602fe22ae161d5e5e2d Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoannv@gmail.com>
Date: Fri, 6 Feb 2015 14:30:47 +0100
Subject: [PATCH 071/220] Fix SwigPyObject->dict memory leak

The following patch attempt to fix a memory leak happening when a
random class attribute is set. The internal instance dictionary is
created but never freed.

This fixes the problem for me, although I am not sure the patch
is correct.

<code>
 p = MySWIGClass()
 p.random_attribute = 0
</code>

Valgrind report:
==18267== 280 bytes in 1 blocks are definitely lost in loss record 1,372 of 1,780
==18267==    at 0x4A0645D: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==18267==    by 0x3A90A885DC: PyObject_Malloc (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90B101A8: _PyObject_GC_Malloc (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90B102AC: _PyObject_GC_New (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90A80943: PyDict_New (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90A6E8FC: PyFrame_New (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AE1A65: PyEval_EvalCodeEx (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AE088E: PyEval_EvalFrameEx (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AE21DC: PyEval_EvalCodeEx (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AE22E1: PyEval_EvalCode (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AFB71E: ??? (in /usr/lib64/libpython2.7.so.1.0)
==18267==    by 0x3A90AFC8DD: PyRun_FileExFlags (in /usr/lib64/libpython2.7.so.1.0)
==18267==
---
 Lib/python/builtin.swg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lib/python/builtin.swg b/Lib/python/builtin.swg
index 28c557a21..1d892375c 100644
--- a/Lib/python/builtin.swg
+++ b/Lib/python/builtin.swg
@@ -9,6 +9,7 @@ SWIGINTERN void					\
 wrapper##_closure(PyObject *a) {		\
     SwigPyObject *sobj;				\
     sobj = (SwigPyObject *)a;			\
+    Py_XDECREF(sobj->dict);	                \
     if (sobj->own) {				\
 	PyObject *o = wrapper(a, NULL);		\
 	Py_XDECREF(o);				\

From 327d7c968d5eab272ef5ebd1cba3129b95418145 Mon Sep 17 00:00:00 2001
From: Yoann Vandoorselaere <yoannv@gmail.com>
Date: Fri, 6 Feb 2015 16:24:43 +0100
Subject: [PATCH 072/220] Attribute of SWIG wrapped classes instances were
 overwritten on __init__()

When a SWIG classes instances is initialized, its internal dictionary was
reset to NULL, which result in the loss of any attribute that might have
been set for the instance.

Only initialize the internal dictionary on actual PyObject creation.

class Test(MySwigWrappedClass):
        def __init__(self):
                self.val = "Random Value"
                MySwigWrappedClass.__init__(self)

p = Test()
print hasattr(p, "val") # Should return True, but used to return False
---
 Lib/python/pyrun.swg | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index daa0b7eef..7ef8d5e39 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -1437,18 +1437,21 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f
 	  newobj = (SwigPyObject *) newobj->next;
         newobj->next = next_self;
         newobj = (SwigPyObject *)next_self;
+#ifdef SWIGPYTHON_BUILTIN
+        newobj->dict = 0;
+#endif
       }
     } else {
       newobj = PyObject_New(SwigPyObject, clientdata->pytype);
+#ifdef SWIGPYTHON_BUILTIN
+      newobj->dict = 0;
+#endif
     }
     if (newobj) {
       newobj->ptr = ptr;
       newobj->ty = type;
       newobj->own = own;
       newobj->next = 0;
-#ifdef SWIGPYTHON_BUILTIN
-      newobj->dict = 0;
-#endif
       return (PyObject*) newobj;
     }
     return SWIG_Py_Void();

From 3f549a2a5fabc32708299be8b5aaab750c49cff8 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 10 Apr 2015 20:34:01 +0100
Subject: [PATCH 073/220] Correct changes notes on %pythonnondynamic usage

---
 CHANGES | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8bea8c1c2..4b5e55a4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10707,7 +10707,7 @@ Version 1.3.23 (November 11, 2004)
 
 	      now if you have
 	      
-	      %pythonnondynamic(1) A;
+	      %pythonnondynamic A;
 	      
 	      struct A {
 	       int a;
@@ -10725,11 +10725,11 @@ Version 1.3.23 (November 11, 2004)
 	    
 	    Since this is a feature, you can use
 
-	      %pythonnondynamic(1);
+	      %pythonnondynamic;
 
             or 
 
-	      %pythondynamic(0); [ Note: %pythondynamic since deprecated ]
+	      %pythondynamic; [ Note: %pythondynamic since deprecated ]
    
 	    to force all the wrapped classes to be "nondynamic" ones.
 

From 1a64e74c46be2275ad3b62993de7b9eb125fcf57 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 11 Apr 2015 12:35:58 +0100
Subject: [PATCH 074/220] Add python runtime test for dynamically added
 attributes

From #320
---
 .../test-suite/python/struct_value_runme.py   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/Examples/test-suite/python/struct_value_runme.py b/Examples/test-suite/python/struct_value_runme.py
index 727996f53..a20e83439 100644
--- a/Examples/test-suite/python/struct_value_runme.py
+++ b/Examples/test-suite/python/struct_value_runme.py
@@ -7,3 +7,24 @@ if b.a.x != 3: raise RuntimeError
 
 b.b.x = 3
 if b.b.x != 3: raise RuntimeError
+
+
+# Test dynamically added attributes - Github pull request #320
+b.added = 123
+
+if b.added != 123:
+  raise RuntimeError("Wrong attribute value")
+
+if not b.__dict__.has_key("added"):
+  raise RuntimeError("Missing added attribute in __dict__")
+
+class PyBar(struct_value.Bar):
+  def __init__(self):
+    self.extra = "hi"
+    struct_value.Bar.__init__(self)
+
+pybar = PyBar()
+if not pybar.__dict__.has_key("extra"):
+  raise RuntimeError("Missing extra attribute in __dict__")
+if pybar.extra != "hi":
+  raise RuntimeError("Incorrect attribute value for extra")

From b28ea7d963b1c931d44764c6941b5519d1d5d0bf Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 11 Apr 2015 12:50:34 +0100
Subject: [PATCH 075/220] Add __dict__ fix to changes file

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

diff --git a/CHANGES.current b/CHANGES.current
index c1e293413..b13ffb382 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-11: wsfulton
+            Merge #320 - Make __dict__ accessible for Python builtin classes.
+
 2015-04-07: wsfulton
             Fix #375 - parsing of extern "C" and typedef for example:
               extern "C" typedef void (*Hook2_t)(int, const char *);

From 25b48b85ec2a0e24b5155a88a596d2ad0b5c39e2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 11 Apr 2015 22:51:29 +0100
Subject: [PATCH 076/220] Fix multiple definitions of 'ExceptionMatches' when
 using directors and multiple modules.

Java problem, closes #353 and closes #355.
---
 CHANGES.current       | 4 ++++
 Lib/java/director.swg | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index b13ffb382..8a30babcd 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-11: wsfulton
+            [Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
+            using directors and multiple modules.
+
 2015-04-11: wsfulton
             Merge #320 - Make __dict__ accessible for Python builtin classes.
 
diff --git a/Lib/java/director.swg b/Lib/java/director.swg
index 031cdf2a9..2d8754da3 100644
--- a/Lib/java/director.swg
+++ b/Lib/java/director.swg
@@ -367,7 +367,7 @@ namespace Swig {
   };
 
   // Helper method to determine if a Java throwable matches a particular Java class type
-  bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) {
+  SWIGINTERN bool ExceptionMatches(JNIEnv *jenv, jthrowable throwable, const char *classname) {
     bool matches = false;
 
     if (throwable && jenv && classname) {

From 073bb244e41be5681ed235061efc50dd2ae99084 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 13 Apr 2015 20:28:32 +0100
Subject: [PATCH 077/220] Add docs about missing precedence levels for
 typecheck typemaps

---
 Doc/Manual/Typemaps.html | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index 040244d45..b698e2985 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -4429,7 +4429,7 @@ before arrays, and so forth.
 
 <p>
 Using the above table as a guide, each target language defines a collection of "typecheck" typemaps. 
-The follow excerpt from the Python module illustrates this:
+The following excerpt from the Python module illustrates this:
 </p>
 
 <div class="code">
@@ -4542,11 +4542,31 @@ Here is an example,
 
 <p>
 The bottom line:  If you are writing new typemaps and you are using overloaded methods, you will probably 
-have to write typecheck code or copy existing code.   Since this is a relatively new SWIG feature, there are
-few examples to work with.  However, you might look at some of the existing library files likes 'typemaps.i' for
-a guide.
+have to write new typecheck code or copy and modify existing typecheck code.
 </p>
 
+<p>
+If you write a typecheck typemap and omit the precedence level, for example commenting it out as shown below:
+</p>
+
+<div class="code">
+<pre>
+%typemap(typecheck /*,precedence=SWIG_TYPECHECK_INTEGER*/) int {
+   $1 = PyInt_Check($input) ? 1 : 0;
+}
+</pre>
+</div>
+
+<p>
+then the type is given a precedence higher than any other known precedence level and a <a href="Warnings.html#Warnings">warning</a> is issued:
+</p>
+
+<div class="shell">
+<pre>
+example.i:18: Warning 467: Overloaded method foo(int) not supported (no type checking rule for 'int').
+</pre>
+</div>
+
 <p>
 <b>Notes:</b>
 </p>

From 4010d25b918a5e8a6e5bb7ac4f12c8824e4f3ac4 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 13 Apr 2015 20:29:40 +0100
Subject: [PATCH 078/220] HTML corrections

[skip ci]
---
 Doc/Manual/Contents.html   | 4 ++--
 Doc/Manual/Javascript.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 8522e8af4..dd0faace6 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -1074,7 +1074,7 @@
 </ul>
 <li><a href="Javascript.html#Javascript_applications_webkit">Creating Applications with node-webkit</a>
 </ul>
-<li><a href="Javascript.html#Javascript_nn14">Examples</a>
+<li><a href="Javascript.html#Javascript_examples">Examples</a>
 <ul>
 <li><a href="Javascript.html#Javascript_simple_example">Simple</a>
 <li><a href="Javascript.html#Javascript_class_example">Class</a>
@@ -1762,7 +1762,7 @@
 <li><a href="Scilab.html#Scilab_wrapping_pointers_null_pointers">Null pointers</a>
 </ul>
 <li><a href="Scilab.html#Scilab_wrapping_structs">Structures</a>
-<li><a href="Scilab.html#Scilab_wrapping_cpp_classes">C++ Classes</a>
+<li><a href="Scilab.html#Scilab_wrapping_cpp_classes">C++ classes</a>
 <li><a href="Scilab.html#Scilab_wrapping_cpp_inheritance">C++ inheritance</a>
 <li><a href="Scilab.html#Scilab_wrapping_pointers_references_values_arrays">Pointers, references, values, and arrays</a>
 <li><a href="Scilab.html#Scilab_wrapping_cpp_templates">C++ templates</a>
diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index 5e6540c7d..7857d9770 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -30,7 +30,7 @@
 </ul>
 <li><a href="#Javascript_applications_webkit">Creating Applications with node-webkit</a>
 </ul>
-<li><a href="#Javascript_nn14">Examples</a>
+<li><a href="#Javascript_examples">Examples</a>
 <ul>
 <li><a href="#Javascript_simple_example">Simple</a>
 <li><a href="#Javascript_class_example">Class</a>
@@ -410,7 +410,7 @@ open new windows, and many more things.
 };</pre>
 </div>
 
-<H2><a id="Javascript_examples" name="Javascript_nn14"></a>26.4 Examples</H2>
+<H2><a name="Javascript_examples"></a>26.4 Examples</H2>
 
 
 <p>Some basic examples are shown here in more detail.</p>

From 55e7264d438638ed5a317c34ecba53f1488a3e48 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 14 Apr 2015 07:34:40 +0100
Subject: [PATCH 079/220] Clearer warning message for badly constructed
 typecheck typemaps

---
 CHANGES.current              | 11 +++++++++++
 Doc/Manual/SWIGPlus.html     |  9 +++++----
 Doc/Manual/Typemaps.html     |  2 +-
 Doc/Manual/Warnings.html     |  2 +-
 Source/Modules/allegrocl.cxx |  4 ++--
 Source/Modules/overload.cxx  |  4 ++--
 Source/Modules/r.cxx         |  4 ++--
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 8a30babcd..68e64bc17 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,17 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-14: wsfulton
+            Clearer warning message for badly constructed typecheck typemaps. For example, was:
+
+              example.i:3: Warning 467: Overloaded foo(int) not supported (no type checking
+              rule for 'int').
+
+            Now:
+
+              example.i:3: Warning 467: Overloaded foo(int) not supported (incomplete type checking
+              rule - no precedence level in typecheck typemap for 'int').
+
 2015-04-11: wsfulton
             [Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
             using directors and multiple modules.
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index eeca0291c..d138073d9 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -2101,13 +2101,13 @@ Therefore, earlier methods will shadow methods that appear later.
 </p>
 
 <p>
-When wrapping an overloaded function, there is a chance that you will get an error message like this:
+When wrapping an overloaded function, there is a chance that you will get a warning message like this:
 </p>
 
 <div class="shell">
 <pre>
-example.i:3: Warning 467: Overloaded foo(int) not supported (no type checking
-rule for 'int').
+example.i:3: Warning 467: Overloaded foo(int) not supported (incomplete type checking rule - 
+no precedence level in typecheck typemap for 'int').
 </pre>
 </div>
 
@@ -2116,7 +2116,8 @@ This error means that the target language module supports overloading,
 but for some reason there is no type-checking rule that can be used to
 generate a working dispatch function.  The resulting behavior is then
 undefined.  You should report this as a bug to the
-<a href="http://www.swig.org/bugs.html">SWIG bug tracking database</a>.
+<a href="http://www.swig.org/bugs.html">SWIG bug tracking database</a>
+if this is due to one of the typemaps supplied with SWIG.
 </p>
 
 <p>
diff --git a/Doc/Manual/Typemaps.html b/Doc/Manual/Typemaps.html
index b698e2985..5f484531b 100644
--- a/Doc/Manual/Typemaps.html
+++ b/Doc/Manual/Typemaps.html
@@ -4563,7 +4563,7 @@ then the type is given a precedence higher than any other known precedence level
 
 <div class="shell">
 <pre>
-example.i:18: Warning 467: Overloaded method foo(int) not supported (no type checking rule for 'int').
+example.i:18: Warning 467: Overloaded method foo(int) not supported (incomplete type checking rule - no precedence level in typecheck typemap for 'int').
 </pre>
 </div>
 
diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index fda162615..2336120d3 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -492,7 +492,7 @@ example.i(4) : Syntax error in input(1).
 <li>464. Unsupported constant value.
 <li>465. Unable to handle type <em>type</em>.
 <li>466. Unsupported variable type <em>type</em>.
-<li>467. Overloaded <em>declaration</em> not supported (no type checking rule for '<em>type</em>')
+<li>467. Overloaded <em>declaration</em> not supported (incomplete type checking rule - no precedence level in typecheck typemap for '<em>type</em>')
 <li>468. No 'throw' typemap defined for exception type <em>type</em>
 <li>469. No or improper directorin typemap defined for <em>type</em>
 <li>470. Thread/reentrant unsafe wrapping, consider returning by value instead.
diff --git a/Source/Modules/allegrocl.cxx b/Source/Modules/allegrocl.cxx
index c7d9ff21b..4b2f325ba 100644
--- a/Source/Modules/allegrocl.cxx
+++ b/Source/Modules/allegrocl.cxx
@@ -1794,12 +1794,12 @@ static List *Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 	    String *t2 = Getattr(p2, "tmap:typecheck:precedence");
 	    if ((!t1) && (!nodes[i].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
 	      nodes[i].error = 1;
 	    } else if ((!t2) && (!nodes[j].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
 	      nodes[j].error = 1;
 	    }
diff --git a/Source/Modules/overload.cxx b/Source/Modules/overload.cxx
index e95ef557f..dd3ca4972 100644
--- a/Source/Modules/overload.cxx
+++ b/Source/Modules/overload.cxx
@@ -158,12 +158,12 @@ List *Swig_overload_rank(Node *n, bool script_lang_wrapping) {
 	    String *t2 = Getattr(p2, "tmap:typecheck:precedence");
 	    if ((!t1) && (!nodes[i].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
 	      nodes[i].error = 1;
 	    } else if ((!t2) && (!nodes[j].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
 	      nodes[j].error = 1;
 	    }
diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index 3befcfbdd..a42ee97a1 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -1381,12 +1381,12 @@ List * R::Swig_overload_rank(Node *n,
 	    }
 	    if ((!t1) && (!nodes[i].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[i].n), Getline(nodes[i].n),
-			   "Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[i].n), SwigType_str(Getattr(p1, "type"), 0));
 	      nodes[i].error = 1;
 	    } else if ((!t2) && (!nodes[j].error)) {
 	      Swig_warning(WARN_TYPEMAP_TYPECHECK, Getfile(nodes[j].n), Getline(nodes[j].n),
-			   "xx Overloaded method %s not supported (no type checking rule for '%s').\n",
+			   "Overloaded method %s not supported (incomplete type checking rule - no precedence level in typecheck typemap for '%s').\n",
 			   Swig_name_decl(nodes[j].n), SwigType_str(Getattr(p2, "type"), 0));
 	      nodes[j].error = 1;
 	    }

From aebc9379ed6dde9c8b903845decb3f017ebb873a Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@krycho.com>
Date: Tue, 10 Mar 2015 16:45:36 -0400
Subject: [PATCH 080/220] Document %include behavior for __declspec
 preprocessor directives.

Add a short paragraph and example of how to handle the way Microsoft
recommends to wrap `__declspec` definitions in preprocessor macros and
supply them in a common header file.
---
 Doc/Manual/Windows.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html
index 0685242ba..b1bc42bc6 100644
--- a/Doc/Manual/Windows.html
+++ b/Doc/Manual/Windows.html
@@ -293,9 +293,9 @@ Execute the steps in the order shown and don't use spaces in path names. In fact
   Start the MSYS command prompt and execute:
 <div class="shell"><pre>
 cd /
-tar -jxf msys-automake-1.8.2.tar.bz2 
+tar -jxf msys-automake-1.8.2.tar.bz2
 tar -jxf msys-autoconf-2.59.tar.bz2
-tar -zxf bison-2.0-MSYS.tar.gz   
+tar -zxf bison-2.0-MSYS.tar.gz
 </pre></div>
   </li>
 
@@ -387,6 +387,22 @@ Include it like you would any other interface file, for example:
 
 __declspec(dllexport) ULONG __stdcall foo(DWORD, __int32);
 </pre></div>
+<p>Note that if you follow Microsoft's recommendation of wrapping the
+<tt>__declspec</tt> calls in a preprocessor definition, you will need to
+make sure that the definition is included by SWIG as well, whether you define it
+manually or it is included in a header. For example, if you have specified the
+preprocessor definition in a header named <tt>export_lib.h</tt> and include
+other headers which depend on it, you should use the <tt>%include</tt> directive
+to include the definition explicitly. For example, if you had a header file,
+<tt>bar.h</tt>, which depended on <tt>export_lib.h</tt>, your SWIG definition
+file might look like:</p>
+
+<div class="code"><pre>
+%module bar
+%include &lt;windows.i&gt;
+%include "export_lib.h"
+%include "bar.h"
+</pre></div>
 
 
 </body>

From 7178bb11d3f089da7b241f49af6eba603a0e636d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 14 Apr 2015 08:13:13 +0100
Subject: [PATCH 081/220] Expand __declspec documentation

---
 Doc/Manual/Windows.html | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/Doc/Manual/Windows.html b/Doc/Manual/Windows.html
index b1bc42bc6..d85737e52 100644
--- a/Doc/Manual/Windows.html
+++ b/Doc/Manual/Windows.html
@@ -387,10 +387,11 @@ Include it like you would any other interface file, for example:
 
 __declspec(dllexport) ULONG __stdcall foo(DWORD, __int32);
 </pre></div>
+
 <p>Note that if you follow Microsoft's recommendation of wrapping the
 <tt>__declspec</tt> calls in a preprocessor definition, you will need to
-make sure that the definition is included by SWIG as well, whether you define it
-manually or it is included in a header. For example, if you have specified the
+make sure that the definition is included by SWIG as well, by either defining it
+manually or via a header. For example, if you have specified the
 preprocessor definition in a header named <tt>export_lib.h</tt> and include
 other headers which depend on it, you should use the <tt>%include</tt> directive
 to include the definition explicitly. For example, if you had a header file,
@@ -398,12 +399,42 @@ to include the definition explicitly. For example, if you had a header file,
 file might look like:</p>
 
 <div class="code"><pre>
+// bar.i
 %module bar
 %include &lt;windows.i&gt;
 %include "export_lib.h"
 %include "bar.h"
 </pre></div>
 
+<p>
+where export_lib.h may contain:
+</p>
+
+<div class="code"><pre>
+// export_lib.h
+#define BAR_API __declspec(dllexport)
+</pre></div>
+
+<p>
+and bar.h may look like:
+</p>
+
+<div class="code"><pre>
+// bar.h
+#include "export_lib.h"
+BAR_API void bar_function(int, double);
+</pre></div>
+
+<p>
+Using the preprocessor to remove BAR_API is a popular simpler solution:
+</p>
+
+<div class="code"><pre>
+// bar.i
+%module bar
+#define BAR_API
+%include "bar.h"
+</pre></div>
 
 </body>
 </html>

From 6207b8bfa322b68d14cd31cd330c78806ceb7735 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 16 Apr 2015 10:55:34 +1200
Subject: [PATCH 082/220] Move testflags.py into Tools/

---
 .travis.yml                        | 4 ++--
 testflags.py => Tools/testflags.py | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename testflags.py => Tools/testflags.py (100%)

diff --git a/.travis.yml b/.travis.yml
index 9cdc5bf8b..cd849f05f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,8 +96,8 @@ before_install:
   - $CC --version
   - $CXX --version
   # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
-  - export cflags=$(./testflags.py --language $SWIGLANG --cflags) && echo $cflags
-  - export cxxflags=$(./testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags
+  - export cflags=$(Tools/testflags.py --language $SWIGLANG --cflags) && echo $cflags
+  - export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
   - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure $CONFIGOPTS
diff --git a/testflags.py b/Tools/testflags.py
similarity index 100%
rename from testflags.py
rename to Tools/testflags.py

From 661c4ba036b1889f7bef94d4e7582e28109bc342 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 17 Apr 2015 09:44:40 -0700
Subject: [PATCH 083/220] [Go] Add comments telling users that _swig_goallocate
 and _swig_makegostring will no longer work in the Go 1.5 release. Keep the
 existing code so that existing users with current versions of Go will not
 break suddenly.

---
 Lib/go/goruntime.swg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index d776e414a..8f6eb742e 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -113,6 +113,8 @@ static char *_swig_topofstack() {
   }
 }
 
+/* This is here for backward compatibility, but it will not work
+   with Go 1.5 or later.  Do not use it in new code.  */
 static void *_swig_goallocate(size_t len) {
   struct {
     size_t len;
@@ -246,6 +248,8 @@ void SwigCgocallBackDone() {
 
 %insert(runtime) %{
 
+/* This is here for backward compatibility, but it will not work
+   with Go 1.5 or later.  Do not use it in new code.  */
 static _gostring_ _swig_makegostring(const char *p, size_t l) {
   _gostring_ ret;
   ret.p = (char*)_swig_goallocate(l + 1);

From 84e9cc657015af83759e0a998830278b322ff5e1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Wed, 22 Apr 2015 23:38:41 +0200
Subject: [PATCH 084/220] Mark the not-always-using-args in Python change as
 incompatible.

Some existing typemaps actually rely on "*args" being always used, so document
the change fixing the bug which resulted in their use as being potentially
incompatible and point to a way to restore the previous behaviour.
---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4b5e55a4c..4548de0fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -100,6 +100,10 @@ Version 3.0.3 (30 Dec 2014)
             [Python] Patch #201 The generated .py file no longer uses *args for all Python parameters.
             Instead, the parameters are named using the C++ parameter names.
 
+            "compactdefaultargs" feature can be enabled to restore the old behaviour.
+
+            *** POTENTIAL INCOMPATIBILITY ***
+
 2014-10-24: timotheecour
             [D] Patch #204 Use core.atomic.atomicOp to mutate shared variables
 

From 3394eab52e28658a18f0d89238a6a7fb1fcb8d34 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 23 Apr 2015 08:20:13 +0100
Subject: [PATCH 085/220] Fix 'make check-ccache' when one of the CCACHE_
 environment variables is set.

Note that CCACHE_DISABLE is now set in the Travis environment.
---
 CCache/test.sh  | 23 +++++++++++++++++++++++
 CHANGES.current |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/CCache/test.sh b/CCache/test.sh
index f64c3e3de..6e5d26703 100755
--- a/CCache/test.sh
+++ b/CCache/test.sh
@@ -402,6 +402,29 @@ swigtests() {
 rm -rf $TESTDIR
 mkdir $TESTDIR
 cd $TESTDIR || exit 1
+
+unset CCACHE_DIR
+unset CCACHE_TEMPDIR
+unset CCACHE_LOGFILE
+unset CCACHE_VERBOSE
+unset CCACHE_PATH
+unset CCACHE_CC
+unset CCACHE_PREFIX
+unset CCACHE_DISABLE
+unset CCACHE_READONLY
+unset CCACHE_CPP2
+unset CCACHE_NOCOMPRESS
+unset CCACHE_NOSTATS
+unset CCACHE_NLEVELS
+unset CCACHE_HARDLINK
+unset CCACHE_RECACHE
+unset CCACHE_UMASK
+unset CCACHE_HASHDIR
+unset CCACHE_UNIFY
+unset CCACHE_EXTENSION
+unset CCACHE_STRIPC
+unset CCACHE_SWIG
+
 CCACHE_DIR="ccache dir" # with space in directory name (like Windows default)
 mkdir "$CCACHE_DIR"
 export CCACHE_DIR
diff --git a/CHANGES.current b/CHANGES.current
index 68e64bc17..afe54e293 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-23: wsfulton
+            Fix 'make check-ccache' which is part of 'make check' when one of the CCACHE_
+            environment variables, for example CCACHE_DISABLE, is set.
+
 2015-04-14: wsfulton
             Clearer warning message for badly constructed typecheck typemaps. For example, was:
 

From 0eae8a8efaa5ce1d5c918542d34a23afd2f92c9e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Wed, 22 Apr 2015 19:30:55 +0200
Subject: [PATCH 086/220] Fix handling of NULL default argument values for
 pointer types.

Accept not only manifest pointer types (such as e.g. "void *") but also types
that are typedefs for pointer types when checking whether C++ value of 0 must
be represented as 0 or None in Python.

Closes #365, #376.
---
 CHANGES.current                                |  3 +++
 Examples/test-suite/default_args.i             |  5 +++++
 .../test-suite/python/default_args_runme.py    | 11 +++++++++++
 Source/Modules/python.cxx                      | 18 ++++++++++++++++--
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index afe54e293..94eac2347 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-23: vadz
+            [Python] Fix the use of default values for the pointer types (#365, #376).
+
 2015-04-23: wsfulton
             Fix 'make check-ccache' which is part of 'make check' when one of the CCACHE_
             environment variables, for example CCACHE_DISABLE, is set.
diff --git a/Examples/test-suite/default_args.i b/Examples/test-suite/default_args.i
index bcb8766a8..2c1187fb5 100644
--- a/Examples/test-suite/default_args.i
+++ b/Examples/test-suite/default_args.i
@@ -115,6 +115,7 @@
 %rename(renamed1arg) Foo::renameme() const;
 
 %inline %{
+  typedef void* MyHandle;
 
   // Define a class
   class Foo {
@@ -139,6 +140,10 @@
       // test the method itself being renamed
       void oldname(int x = 1234) {}
       void renameme(int x = 1234, double d=123.4) const {}
+
+      // test default values for pointer arguments
+      int double_if_void_ptr_is_null(int n, void* p = NULL) { return p ? n : 2*n; }
+      int double_if_handle_is_null(int n, MyHandle h = 0) { return h ? n : 2*n; }
   };
   int Foo::bar = 1;
   int Foo::spam = 2;
diff --git a/Examples/test-suite/python/default_args_runme.py b/Examples/test-suite/python/default_args_runme.py
index 25bef14ca..62ba0ea78 100644
--- a/Examples/test-suite/python/default_args_runme.py
+++ b/Examples/test-suite/python/default_args_runme.py
@@ -31,6 +31,17 @@ def run(module_name):
   f.newname()
   f.newname(1)
 
+  if f.double_if_void_ptr_is_null(2, None) != 4:
+    raise RuntimeError
+
+  if f.double_if_void_ptr_is_null(3) != 6:
+    raise RuntimeError
+
+  if f.double_if_handle_is_null(4, None) != 8:
+    raise RuntimeError
+
+  if f.double_if_handle_is_null(5) != 10:
+    raise RuntimeError
 
   try:
     f = default_args.Foo(1)
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index bc31c4264..17ffbbd67 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1827,6 +1827,20 @@ public:
     return doc;
   }
 
+  /* ------------------------------------------------------------
+   * isPointerType()
+   *   Return true if the given type is a pointer after resolving
+   *   it if it's a typedef. This should be typically used instead
+   *   of SwigType_ispointer(), unless the type is already resolved.
+   * ------------------------------------------------------------ */
+  static bool isPointerType(SwigType* t) {
+    SwigType* const full_type = SwigType_typedef_resolve_all(t);
+    bool const ispointer = SwigType_ispointer(full_type);
+    Delete(full_type);
+
+    return ispointer;
+  }
+
   /* ------------------------------------------------------------
    *  convertDoubleValue()
    *    Check if the given string looks like a decimal floating point constant
@@ -1922,7 +1936,7 @@ public:
 	if (Len(v) == 1) {
 	  // This is just a lone 0, but it needs to be represented differently
 	  // in Python depending on whether it's a zero or a null pointer.
-	  if (SwigType_ispointer(t))
+	  if (isPointerType(t))
 	    return NewString("None");
 	  else
 	    return v;
@@ -1959,7 +1973,7 @@ public:
     if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
       return NewString("False");
     if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
-      return SwigType_ispointer(t) ? NewString("None") : NewString("0");
+      return isPointerType(t) ? NewString("None") : NewString("0");
 
     // This could also be an enum type, default value of which could be
     // representable in Python if it doesn't include any scope (which could,

From 2369e2c500ee19d492954bc04ac76d1a17db1e2d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Wed, 22 Apr 2015 20:37:20 +0200
Subject: [PATCH 087/220] No changes, just added an explanatory comment to
 Python module.

Explain a bit better when and why do we decide to use "*args" in the generated
Python code.
---
 Source/Modules/python.cxx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 17ffbbd67..5ae4b6d55 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2068,7 +2068,15 @@ public:
     if (nn)
       n = nn;
 
-    /* For overloaded function, just use *args */
+    /* We prefer to explicitly list all parameters of the C function in the
+       generated Python code as this makes the function more convenient to use,
+       however in some cases we must replace the real parameters list with just
+       the catch all "*args". This happens when:
+
+	1. The function is overloaded as Python doesn't support this.
+	2. We were explicitly asked to use the "compact" arguments form.
+	3. One of the default argument values can't be represented in Python.
+     */
     if (is_real_overloaded(n) || GetFlag(n, "feature:compactdefaultargs") || !is_representable_as_pyargs(n)) {
       String *parms = NewString("");
       if (in_class)

From 5569d91bd02432eef4fb7ef2c2ed0df2f51c8472 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Wed, 22 Apr 2015 20:37:55 +0200
Subject: [PATCH 088/220] Fix handling of "default" typemap in Python.

Use "compact" arguments form for the function if "default" typemap is defined
for any of its arguments to allow omitting this argument when calling it from
Python.

Closes #377.
---
 CHANGES.current                               |  3 +++
 Examples/test-suite/default_args.i            |  4 ++++
 .../test-suite/python/default_args_runme.py   |  6 ++++++
 Source/Modules/python.cxx                     | 21 ++++++++++++-------
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 94eac2347..24c36d6a0 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-23: vadz
+            [Python] Make "default" typemap work again (#330, #377).
+
 2015-04-23: vadz
             [Python] Fix the use of default values for the pointer types (#365, #376).
 
diff --git a/Examples/test-suite/default_args.i b/Examples/test-suite/default_args.i
index 2c1187fb5..4ab24d335 100644
--- a/Examples/test-suite/default_args.i
+++ b/Examples/test-suite/default_args.i
@@ -114,6 +114,8 @@
 %rename(renamed2arg) Foo::renameme(int x) const;
 %rename(renamed1arg) Foo::renameme() const;
 
+%typemap(default) double* null_by_default "$1=0;";
+
 %inline %{
   typedef void* MyHandle;
 
@@ -144,6 +146,8 @@
       // test default values for pointer arguments
       int double_if_void_ptr_is_null(int n, void* p = NULL) { return p ? n : 2*n; }
       int double_if_handle_is_null(int n, MyHandle h = 0) { return h ? n : 2*n; }
+      int double_if_dbl_ptr_is_null(int n, double* null_by_default)
+        { return null_by_default ? n : 2*n; }
   };
   int Foo::bar = 1;
   int Foo::spam = 2;
diff --git a/Examples/test-suite/python/default_args_runme.py b/Examples/test-suite/python/default_args_runme.py
index 62ba0ea78..18cc2c27a 100644
--- a/Examples/test-suite/python/default_args_runme.py
+++ b/Examples/test-suite/python/default_args_runme.py
@@ -43,6 +43,12 @@ def run(module_name):
   if f.double_if_handle_is_null(5) != 10:
     raise RuntimeError
 
+  if f.double_if_dbl_ptr_is_null(6, None) != 12:
+    raise RuntimeError
+
+  if f.double_if_dbl_ptr_is_null(7) != 14:
+    raise RuntimeError
+
   try:
     f = default_args.Foo(1)
     error = 1
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 5ae4b6d55..ca9e7f2ba 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1999,9 +1999,9 @@ public:
    *    at C++ code level where they can always be handled.
    * ------------------------------------------------------------ */
   bool is_representable_as_pyargs(Node *n) {
-    bool is_representable = true;
-
     ParmList *plist = CopyParmList(Getattr(n, "parms"));
+    Swig_typemap_attach_parms("default", plist, NULL);
+
     Parm *p;
     Parm *pnext;
 
@@ -2017,16 +2017,23 @@ public:
       if (!pnext) {
 	pnext = nextSibling(p);
       }
+
+      // "default" typemap can contain arbitrary C++ code, so while it could, in
+      // principle, be possible to examine it and check if it's just something
+      // simple of the form "$1 = expression" and then use convertValue() to
+      // check if expression can be used in Python, but for now we just
+      // pessimistically give up and prefer to handle this at C++ level only.
+      if (Getattr(p, "tmap:default"))
+	return false;
+
       if (String *value = Getattr(p, "value")) {
 	String *type = Getattr(p, "type");
-	if (!convertValue(value, type)) {
-	  is_representable = false;
-	  break;
-	}
+	if (!convertValue(value, type))
+	  return false;
       }
     }
 
-    return is_representable;
+    return true;
   }
 
 

From d4a06d75a3ca544a051a1932b9fc4364b3bda033 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jon.schlueter@gmail.com>
Date: Thu, 23 Apr 2015 12:15:55 -0400
Subject: [PATCH 089/220] Add some generated example files to the .gitignore
 list

---
 .gitignore | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/.gitignore b/.gitignore
index 400ce4469..67d369145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,7 +157,36 @@ Examples/test-suite/octave/*.oct
 *.py[cod]
 */__pycache__/
 /__pycache__/
+Examples/python/*/example.py
+Examples/python/*/example_wrap.h
+Examples/python/import/bar.py
+Examples/python/import/base.py
+Examples/python/import/foo.py
+Examples/python/import/spam.py
+Examples/python/import_packages/from_init1/py2/pkg2/bar.py
+Examples/python/import_packages/from_init1/py2/pkg2/foo.py
+Examples/python/import_packages/from_init2/py2/pkg2/bar.py
+Examples/python/import_packages/from_init2/py2/pkg2/pkg3/foo.py
+Examples/python/import_packages/from_init3/py2/pkg2/bar.py
+Examples/python/import_packages/from_init3/py2/pkg2/pkg3/pkg4/foo.py
+Examples/python/import_packages/relativeimport1/py2/pkg2/bar.py
+Examples/python/import_packages/relativeimport1/py2/pkg2/pkg3/foo.py
+Examples/python/import_packages/relativeimport2/py2/pkg2/bar.py
+Examples/python/import_packages/relativeimport2/py2/pkg2/pkg3/pkg4/foo.py
+Examples/python/import_packages/relativeimport3/py2/pkg2/bar.py
+Examples/python/import_packages/relativeimport3/py2/pkg2/pkg3/foo.py
+Examples/python/import_packages/same_modnames1/pkg1/foo.py
+Examples/python/import_packages/same_modnames1/pkg2/foo.py
+Examples/python/import_packages/same_modnames2/pkg1/foo.py
+Examples/python/import_packages/same_modnames2/pkg1/pkg2/foo.py
+Examples/python/import_template/bar.py
+Examples/python/import_template/base.py
+Examples/python/import_template/foo.py
+Examples/python/import_template/spam.py
 
 # Scilab generated files
 loader.sce
 
+# Pearl Examples generated files
+Examples/test-suite/perl5/*.pm
+Examples/test-suite/perl5/*.h

From ea1b6e8ed57bf67b21873abc90adaaa532d1828f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 23 Apr 2015 19:17:35 +0100
Subject: [PATCH 090/220] Memory leak in java directors when passing byte
 arrays (char*, size_t)

When passing a byte array from c++ to Java using the director feature, the generated jni code does not release a temporary byte array.

This is the typemap specified in Java.swg:

    %typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) {
    jbyteArray jb = (jenv)->NewByteArray($2);
    (jenv)->SetByteArrayRegion(jb, 0, $2, (jbyte *)$1);
    $input = jb;
    }

    %typemap(directorargout) (char *STRING, size_t LENGTH)
    %{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1); %}

Notice that the call to NewByteArray doesn't contain a symmetric release logic as the SetByteArrayRegion/GetByteArrayRegion does.

Closes #386
---
 CHANGES.current   | 3 +++
 Lib/java/java.swg | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 24c36d6a0..4fc30370a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-23: wsfulton
+            [Java] Bug #386 - Memory leak fix in (char *STRING, size_t LENGTH) typemaps.
+
 2015-04-23: vadz
             [Python] Make "default" typemap work again (#330, #377).
 
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index e7e041d13..9374f5783 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -1346,7 +1346,8 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
   $input = jb;
 }
 %typemap(directorargout) (char *STRING, size_t LENGTH)
-%{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1); %}
+%{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1);
+(jenv)->DeleteLocalRef($input);%}
 %apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }
 
 /* java keywords */

From e4d02d20ad8900cc1c1df4dd3d8dbdcaa578b53a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 23 Apr 2015 19:21:59 +0100
Subject: [PATCH 091/220] Warning fix for VC++

---
 Source/Modules/python.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index ca9e7f2ba..c85e3b9cd 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1835,7 +1835,7 @@ public:
    * ------------------------------------------------------------ */
   static bool isPointerType(SwigType* t) {
     SwigType* const full_type = SwigType_typedef_resolve_all(t);
-    bool const ispointer = SwigType_ispointer(full_type);
+    bool ispointer = SwigType_ispointer(full_type) ? true : false;
     Delete(full_type);
 
     return ispointer;

From 57f715e2b1c1182b3264d6ed333acacd8d37b867 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jon.schlueter@gmail.com>
Date: Fri, 24 Apr 2015 11:59:44 -0400
Subject: [PATCH 092/220] fix typo of Perl in .gitignore

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

diff --git a/.gitignore b/.gitignore
index 67d369145..0f35e63ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,6 +187,6 @@ Examples/python/import_template/spam.py
 # Scilab generated files
 loader.sce
 
-# Pearl Examples generated files
+# Perl5 Examples generated files
 Examples/test-suite/perl5/*.pm
 Examples/test-suite/perl5/*.h

From 416277b3a56646c2934ca9ee542a3f36d4f9a436 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 24 Apr 2015 21:08:17 +0100
Subject: [PATCH 093/220] Python code generated with '-builtin -modernargs'
 segfaults for any method taking zero arguments.

Also fixes: "SystemError: error return without exception set" during error checking
when using just -builtin and the incorrect number of arguments is passed to a class
method expecting zero arguments.

Closes #256
Closes #382
---
 CHANGES.current                               |  8 ++++
 .../python/template_classes_runme.py          | 44 +++++++++++++++++++
 Examples/test-suite/template_classes.i        |  3 ++
 Source/Modules/python.cxx                     | 14 +++---
 4 files changed, 61 insertions(+), 8 deletions(-)
 create mode 100644 Examples/test-suite/python/template_classes_runme.py

diff --git a/CHANGES.current b/CHANGES.current
index 4fc30370a..60023a0c6 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,14 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-24: wsfulton
+            [Python] Fix #256. Code generated with '-builtin -modernargs' segfaults for any
+            method taking zero arguments.
+
+            Also fixes: "SystemError: error return without exception set" during error checking
+            when using just -builtin and the incorrect number of arguments is passed to a class
+            method expecting zero arguments.
+
 2015-04-23: wsfulton
             [Java] Bug #386 - Memory leak fix in (char *STRING, size_t LENGTH) typemaps.
 
diff --git a/Examples/test-suite/python/template_classes_runme.py b/Examples/test-suite/python/template_classes_runme.py
new file mode 100644
index 000000000..9c04fee95
--- /dev/null
+++ b/Examples/test-suite/python/template_classes_runme.py
@@ -0,0 +1,44 @@
+from template_classes import *
+
+# This test is just testing incorrect number of arguments/parameters checking
+
+point = PointInt()
+
+rectangle = RectangleInt()
+rectangle.setPoint(point)
+rectangle.getPoint()
+RectangleInt.static_noargs()
+RectangleInt.static_onearg(1)
+
+fail = True
+try:
+  rectangle.setPoint()
+except TypeError, e:
+  fail = False
+if fail:
+  raise RuntimeError("argument count check failed")
+
+
+fail = True
+try:
+  rectangle.getPoint(0)
+except TypeError, e:
+  fail = False
+if fail:
+  raise RuntimeError("argument count check failed")
+
+fail = True
+try:
+  RectangleInt.static_noargs(0)
+except TypeError, e:
+  fail = False
+if fail:
+  raise RuntimeError("argument count check failed")
+
+fail = True
+try:
+  RectangleInt.static_onearg()
+except TypeError, e:
+  fail = False
+if fail:
+  raise RuntimeError("argument count check failed")
diff --git a/Examples/test-suite/template_classes.i b/Examples/test-suite/template_classes.i
index ebe13bd9f..d357e418e 100644
--- a/Examples/test-suite/template_classes.i
+++ b/Examples/test-suite/template_classes.i
@@ -18,6 +18,9 @@ class RectangleTest {
 public:
   Point<T>& getPoint() {return point;}
   void setPoint(Point<T>& value) {point = value;}
+
+  static int static_noargs() { return 0; }
+  static int static_onearg(int i) { return i; }
 private:
   Point<T> point;
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index c85e3b9cd..a6a81b514 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2713,14 +2713,12 @@ public:
       Printv(f->locals, "  char *  kwnames[] = ", kwargs, ";\n", NIL);
     }
 
-    if (use_parse || allow_kwargs || !modernargs) {
-      if (builtin && in_class && tuple_arguments == 0) {
-	Printf(parse_args, "    if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_fail;\n");
-      } else {
-	Printf(parse_args, ":%s\"", iname);
-	Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL);
-	funpack = 0;
-      }
+    if (builtin && in_class && tuple_arguments == 0) {
+      Printf(parse_args, "    if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_exception_fail(SWIG_TypeError, \"%s takes no arguments\");\n", iname);
+    } else if (use_parse || allow_kwargs || !modernargs) {
+      Printf(parse_args, ":%s\"", iname);
+      Printv(parse_args, arglist, ")) SWIG_fail;\n", NIL);
+      funpack = 0;
     } else {
       Clear(parse_args);
       if (funpack) {

From 4b69bdadd44cd9b900083bb4c7a3ebe4cc0b35e6 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 21 Apr 2015 21:01:58 +0100
Subject: [PATCH 094/220] Add Python Travis tests for -O

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

diff --git a/.travis.yml b/.travis.yml
index cd849f05f..679d42a5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,8 @@ matrix:
       env: SWIGLANG=python SWIG_FEATURES=-builtin
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-builtin PY3=3
+    - compiler: gcc
+      env: SWIGLANG=python SWIG_FEATURES=-O
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic
     - compiler: gcc
@@ -65,6 +67,9 @@ matrix:
     # Not quite working yet
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic
+    # Not quite working yet
+    - compiler: gcc
+      env: SWIGLANG=python SWIG_FEATURES=-O
     # Lots of failing tests currently
     - compiler: gcc
       env: SWIGLANG=ocaml

From a0fe65839c31c52e2d6aae66866e3cac3f7f0548 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 25 Apr 2015 18:18:34 +0100
Subject: [PATCH 095/220] Add generated director header files to .ignore

---
 .gitignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f35e63ef..759a3eaa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ Examples/test-suite/tcl/*/
 Examples/test-suite/uffi/*/
 *_wrap.c
 *_wrap.cxx
+*_wrap.h
 *-gypcopy.cxx
 
 # Scratch directories
@@ -152,13 +153,15 @@ Examples/scratch
 swigexample*.oct
 Examples/test-suite/octave/*.oct
 
+# Perl5 generated files
+Examples/test-suite/perl5/*.pm
+
 # Python generated files, based on:
 #   https://github.com/github/gitignore/blob/master/Python.gitignore
 *.py[cod]
 */__pycache__/
 /__pycache__/
 Examples/python/*/example.py
-Examples/python/*/example_wrap.h
 Examples/python/import/bar.py
 Examples/python/import/base.py
 Examples/python/import/foo.py
@@ -187,6 +190,3 @@ Examples/python/import_template/spam.py
 # Scilab generated files
 loader.sce
 
-# Perl5 Examples generated files
-Examples/test-suite/perl5/*.pm
-Examples/test-suite/perl5/*.h

From f8e4b1beb59696bf009b2dcb3cd4e31e3c6590a9 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 25 Apr 2015 21:09:16 +0100
Subject: [PATCH 096/220] gitignore for python

---
 .gitignore | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 759a3eaa8..4d4531da2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,31 +161,13 @@ Examples/test-suite/perl5/*.pm
 *.py[cod]
 */__pycache__/
 /__pycache__/
+Examples/test-suite/python/*.py
+!Examples/test-suite/python/*_runme.py
 Examples/python/*/example.py
-Examples/python/import/bar.py
-Examples/python/import/base.py
-Examples/python/import/foo.py
-Examples/python/import/spam.py
-Examples/python/import_packages/from_init1/py2/pkg2/bar.py
-Examples/python/import_packages/from_init1/py2/pkg2/foo.py
-Examples/python/import_packages/from_init2/py2/pkg2/bar.py
-Examples/python/import_packages/from_init2/py2/pkg2/pkg3/foo.py
-Examples/python/import_packages/from_init3/py2/pkg2/bar.py
-Examples/python/import_packages/from_init3/py2/pkg2/pkg3/pkg4/foo.py
-Examples/python/import_packages/relativeimport1/py2/pkg2/bar.py
-Examples/python/import_packages/relativeimport1/py2/pkg2/pkg3/foo.py
-Examples/python/import_packages/relativeimport2/py2/pkg2/bar.py
-Examples/python/import_packages/relativeimport2/py2/pkg2/pkg3/pkg4/foo.py
-Examples/python/import_packages/relativeimport3/py2/pkg2/bar.py
-Examples/python/import_packages/relativeimport3/py2/pkg2/pkg3/foo.py
-Examples/python/import_packages/same_modnames1/pkg1/foo.py
-Examples/python/import_packages/same_modnames1/pkg2/foo.py
-Examples/python/import_packages/same_modnames2/pkg1/foo.py
-Examples/python/import_packages/same_modnames2/pkg1/pkg2/foo.py
-Examples/python/import_template/bar.py
-Examples/python/import_template/base.py
-Examples/python/import_template/foo.py
-Examples/python/import_template/spam.py
+Examples/python/**/bar.py
+Examples/python/**/base.py
+Examples/python/**/foo.py
+Examples/python/**/spam.py
 
 # Scilab generated files
 loader.sce

From 3f8034395bd333fc9e38ef8d7bb1d3d3b11e4dba Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 25 Apr 2015 23:57:50 +0100
Subject: [PATCH 097/220] Add language specific files to gitignore

---
 .gitignore | 81 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d4531da2..95edbf140 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,31 +101,9 @@ Doc/Manual/SWIGDocumentation.html
 Doc/Manual/SWIGDocumentation.pdf
 Doc/Manual/*.book
 
-# Test Suite Generated Files
-Examples/test-suite/allegrocl/*/
-Examples/test-suite/cffi/*/
-Examples/test-suite/chicken/*/
-Examples/test-suite/clisp/*/
-Examples/test-suite/csharp/*/
-Examples/test-suite/d/*/
-Examples/test-suite/go/*/
-Examples/test-suite/guile/*/
-Examples/test-suite/java/*/
-Examples/test-suite/javascript/*/
-Examples/test-suite/lua/*/
-Examples/test-suite/mzscheme/*/
-Examples/test-suite/ocaml/*/
-Examples/test-suite/octave/*/
-Examples/test-suite/perl5/*/
-Examples/test-suite/php/*/
-Examples/test-suite/pike/*/
-Examples/test-suite/python/*/
-Examples/test-suite/r/*/
-Examples/test-suite/ruby/*/
-Examples/test-suite/scilab/*/
-Examples/test-suite/tcl/*/
-Examples/test-suite/uffi/*/
+# SWIG common generated files
 *_wrap.c
+*_wrap.cpp
 *_wrap.cxx
 *_wrap.h
 *-gypcopy.cxx
@@ -138,37 +116,70 @@ Examples/scratch
 
 ########## Language specific files ##########
 
-# C# generated files
-*_runme.exe.mdb
-*_runme.exe
+# C#
+Examples/test-suite/csharp/*/
+*runme.exe.mdb
+*runme.exe
+Examples/csharp/*/*.cs
+!Examples/csharp/*/runme.cs
 
-# Go generated files
+# D
+Examples/test-suite/d/*/
+Examples/d/**/example.d
+Examples/d/**/example_im.d
+Examples/d/**/runme
+
+# Go
 *.[5689]
 *_gc.c
 
-# Javascript generated files
+# Java
+Examples/test-suite/java/*/
+Examples/java/*/*.java
+!Examples/java/*/runme.java
+
+# Javascript
+Examples/test-suite/javascript/*/
 *.gyp
 
-# Octave generated files
+# Octave
 swigexample*.oct
 Examples/test-suite/octave/*.oct
 
-# Perl5 generated files
+# Perl5
 Examples/test-suite/perl5/*.pm
+Examples/perl5/*/*.pm
 
-# Python generated files, based on:
-#   https://github.com/github/gitignore/blob/master/Python.gitignore
+# PHP
+Examples/test-suite/php/php_*.h
+Examples/test-suite/php/*.php
+!Examples/test-suite/php/*runme.php
+!Examples/test-suite/php/skel.php
+Examples/php/*/php_*.h
+Examples/php/*/example.php
+
+# Python
+#   Based on https://github.com/github/gitignore/blob/master/Python.gitignore
 *.py[cod]
 */__pycache__/
 /__pycache__/
 Examples/test-suite/python/*.py
-!Examples/test-suite/python/*_runme.py
+!Examples/test-suite/python/*runme.py
 Examples/python/*/example.py
 Examples/python/**/bar.py
 Examples/python/**/base.py
 Examples/python/**/foo.py
 Examples/python/**/spam.py
 
-# Scilab generated files
+# R
+Examples/test-suite/r/*.R
+Examples/test-suite/r/*.Rout
+!Examples/test-suite/r/*runme.R
+Examples/r/*/example.R
+Examples/r/*/*.Rout
+Examples/r/*/.RData
+
+# Scilab
+Examples/test-suite/scilab/*/
 loader.sce
 

From d7f37f3974f5a2abffb6cddd51151f7376dbc92b Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 26 Apr 2015 00:17:42 +0100
Subject: [PATCH 098/220] Guile gitignore and consistent naming in examples

Use my-guile for the executable for all the augmented examples
Fix gitignore for Guile
---
 .gitignore                     | 3 +++
 Examples/guile/matrix/Makefile | 2 +-
 Examples/guile/matrix/README   | 2 +-
 Examples/guile/port/Makefile   | 2 +-
 Examples/guile/port/README     | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95edbf140..4001af7c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,6 +133,9 @@ Examples/d/**/runme
 *.[5689]
 *_gc.c
 
+# Guile
+Examples/guile/*/my-guile
+
 # Java
 Examples/test-suite/java/*/
 Examples/java/*/*.java
diff --git a/Examples/guile/matrix/Makefile b/Examples/guile/matrix/Makefile
index 53638c867..9e541c36f 100644
--- a/Examples/guile/matrix/Makefile
+++ b/Examples/guile/matrix/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = matrix.c vector.c
-TARGET     = matrix
+TARGET     = my-guile
 INTERFACE  = example.i
 
 check: build
diff --git a/Examples/guile/matrix/README b/Examples/guile/matrix/README
index db7395b70..496e81bf1 100644
--- a/Examples/guile/matrix/README
+++ b/Examples/guile/matrix/README
@@ -6,7 +6,7 @@ type the following :
 
 Alternatively, use the command-line:
 
-	./matrix -e do-test -s runme.scm
+	./my-guile -e do-test -s runme.scm
 
 Or, if your operating system is spiffy enough:
 
diff --git a/Examples/guile/port/Makefile b/Examples/guile/port/Makefile
index 95a3a479f..0274dbf9b 100644
--- a/Examples/guile/port/Makefile
+++ b/Examples/guile/port/Makefile
@@ -1,7 +1,7 @@
 TOP        = ../..
 SWIG       = $(TOP)/../preinst-swig
 SRCS       = example.c
-TARGET     = port
+TARGET     = my-guile
 INTERFACE  = example.i
 
 check: build
diff --git a/Examples/guile/port/README b/Examples/guile/port/README
index 784e39e5d..174d8767a 100644
--- a/Examples/guile/port/README
+++ b/Examples/guile/port/README
@@ -1,2 +1,2 @@
 This example illustrates the translation from Scheme file ports to
-temporary FILE streams. Read the source and run ./port -s runme.scm
+temporary FILE streams. Read the source and run ./my-guile -s runme.scm

From d64c241e1c95dd81b02bae60cfd0ba934ce3afe8 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 26 Apr 2015 01:15:54 +0100
Subject: [PATCH 099/220] gcc-5.1 warning fixes

---
 Source/Modules/perl5.cxx  | 2 --
 Source/Modules/python.cxx | 3 ---
 Source/Modules/ruby.cxx   | 6 ++----
 Source/Modules/tcl8.cxx   | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Source/Modules/perl5.cxx b/Source/Modules/perl5.cxx
index 45ed6f6e4..979f96484 100644
--- a/Source/Modules/perl5.cxx
+++ b/Source/Modules/perl5.cxx
@@ -13,8 +13,6 @@
 
 #include "swigmod.h"
 #include "cparse.h"
-static int treduce = SWIG_cparse_template_reduce(0);
-
 #include <ctype.h>
 
 static const char *usage = "\
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index a6a81b514..532b15f4f 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -13,9 +13,6 @@
 
 #include "swigmod.h"
 #include "cparse.h"
-
-static int treduce = SWIG_cparse_template_reduce(0);
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/Source/Modules/ruby.cxx b/Source/Modules/ruby.cxx
index d484f7065..4b45b87ca 100644
--- a/Source/Modules/ruby.cxx
+++ b/Source/Modules/ruby.cxx
@@ -13,14 +13,12 @@
 
 #include "swigmod.h"
 #include "cparse.h"
-static int treduce = SWIG_cparse_template_reduce(0);
-
-#define SWIG_PROTECTED_TARGET_METHODS 1
-
 #include <ctype.h>
 #include <string.h>
 #include <limits.h>		/* for INT_MAX */
 
+#define SWIG_PROTECTED_TARGET_METHODS 1
+
 class RClass {
 private:
   String *temp;
diff --git a/Source/Modules/tcl8.cxx b/Source/Modules/tcl8.cxx
index ac356098b..2e32fc808 100644
--- a/Source/Modules/tcl8.cxx
+++ b/Source/Modules/tcl8.cxx
@@ -13,7 +13,6 @@
 
 #include "swigmod.h"
 #include "cparse.h"
-static int treduce = SWIG_cparse_template_reduce(0);
 
 static const char *usage = "\
 Tcl 8 Options (available with -tcl)\n\

From 6988b00aba4967f3e01352fbac3eb7f84090d87e Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Mon, 27 Apr 2015 23:14:34 +0200
Subject: [PATCH 100/220] Fix handling of default arguments after ignored ones
 in Python.

Don't skip checking subsequent arguments just because one of them has "in"
typemap with numinputs=0 attribute.

Add a unit test showing the problem which is relatively rare as it doesn't
happen for the class methods and is hidden unless autodoc feature is used for
the global functions.

Closes #377.
---
 CHANGES.current                                  |  3 +++
 Examples/test-suite/default_args.i               | 14 ++++++++++++++
 Examples/test-suite/python/default_args_runme.py |  7 +++++++
 Source/Modules/python.cxx                        |  9 ++++-----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 60023a0c6..16637426a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-27: vadz
+            [Python] Fix "default" typemap used after an argument with "numinputs=0" (#377).
+
 2015-04-24: wsfulton
             [Python] Fix #256. Code generated with '-builtin -modernargs' segfaults for any
             method taking zero arguments.
diff --git a/Examples/test-suite/default_args.i b/Examples/test-suite/default_args.i
index 4ab24d335..719681f95 100644
--- a/Examples/test-suite/default_args.i
+++ b/Examples/test-suite/default_args.i
@@ -278,3 +278,17 @@ struct ConstMethods {
     } Pointf;
   }
 %}
+
+// Default arguments after ignored ones.
+%typemap(in, numinputs=0) int square_error { $1 = 2; };
+%typemap(default, noblock=1) int def17 { $1 = 17; };
+
+// Enabling autodoc feature has a side effect of disabling the generation of
+// aliases for functions that can hide problems with default arguments at
+// Python level.
+%feature("autodoc","0") slightly_off_square;
+
+%inline %{
+  inline int slightly_off_square(int square_error, int def17) { return def17*def17 + square_error; }
+%}
+
diff --git a/Examples/test-suite/python/default_args_runme.py b/Examples/test-suite/python/default_args_runme.py
index 18cc2c27a..0931bfd3d 100644
--- a/Examples/test-suite/python/default_args_runme.py
+++ b/Examples/test-suite/python/default_args_runme.py
@@ -110,6 +110,13 @@ def run(module_name):
   default_args.trickyvalue3(10); default_args.trickyvalue3(10, 10)
   default_args.seek(); default_args.seek(10)
 
+  if default_args.slightly_off_square(10) != 102:
+    raise RuntimeError
+
+  if default_args.slightly_off_square() != 291:
+    raise RuntimeError
+
+
 if __name__=="__main__":
   run('default_args')
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 532b15f4f..6ee39ac34 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2003,17 +2003,16 @@ public:
     Parm *pnext;
 
     for (p = plist; p; p = pnext) {
-      pnext = NIL;
+      pnext = nextSibling(p);
       String *tm = Getattr(p, "tmap:in");
       if (tm) {
-	pnext = Getattr(p, "tmap:in:next");
+	Parm *in_next = Getattr(p, "tmap:in:next");
+	if (in_next)
+	  pnext = in_next;
 	if (checkAttribute(p, "tmap:in:numinputs", "0")) {
 	  continue;
 	}
       }
-      if (!pnext) {
-	pnext = nextSibling(p);
-      }
 
       // "default" typemap can contain arbitrary C++ code, so while it could, in
       // principle, be possible to examine it and check if it's just something

From ece1009c5dc1caf6597b8a62e877891f4ac8d73b Mon Sep 17 00:00:00 2001
From: Alexander Warg <alexander.warg@kernkonzept.com>
Date: Fri, 24 Apr 2015 09:29:41 +0200
Subject: [PATCH 101/220] lua: push integer constants as integer

This allows better compatibility with Lua 5.3. Otherwise function
overloading assuming integer parameters might not work.
---
 Lib/lua/luarun.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index d9124887d..0ab045287 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -1831,7 +1831,7 @@ SWIG_Lua_InstallConstants(lua_State *L, swig_lua_const_info constants[]) {
     switch(constants[i].type) {
     case SWIG_LUA_INT:
       lua_pushstring(L,constants[i].name);
-      lua_pushnumber(L,(lua_Number)constants[i].lvalue);
+      lua_pushinteger(L,(lua_Number)constants[i].lvalue);
       lua_rawset(L,-3);
       break;
     case SWIG_LUA_FLOAT:

From d26a505dad5fce497364a1d04ee3fb9bc9f122a8 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 30 Apr 2015 13:40:42 +1200
Subject: [PATCH 102/220] Ignore unknown preprocessor directives which are
 inside an inactive conditional (github issue #394, reported by Dan Wilcox).
 Regression introduced in 3.0.3.

---
 CHANGES.current                       |  5 +++++
 Examples/test-suite/preproc_defined.i | 15 +++++++++++++++
 Source/Preprocessor/cpp.c             |  5 ++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 16637426a..35ce98b3e 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-04-30: olly
+	    Ignore unknown preprocessor directives which are inside an inactive
+	    conditional (github issue #394, reported by Dan Wilcox).
+	    Regression introduced in 3.0.3.
+
 2015-04-27: vadz
             [Python] Fix "default" typemap used after an argument with "numinputs=0" (#377).
 
diff --git a/Examples/test-suite/preproc_defined.i b/Examples/test-suite/preproc_defined.i
index 617e84f61..0a91bd98a 100644
--- a/Examples/test-suite/preproc_defined.i
+++ b/Examples/test-suite/preproc_defined.i
@@ -107,3 +107,18 @@ void another_macro_checking(void) {
   bumpf(10);
 }
 %}
+
+/* Check that unknown preprocessor directives are ignored inside an inactive
+ * conditional (github issue #394).
+ */
+#ifdef APPLE_OPENGL
+# import <OpenGLES/ES1/gl.h>
+#endif
+#ifdef AAA
+# define B
+#else
+# wibble wibble
+#endif
+#if 0
+# wobble wobble
+#endif
diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index ac912f49e..a183eecde 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -1771,7 +1771,10 @@ String *Preprocessor_parse(String *s) {
       } else if (Equal(id, "")) {
 	/* Null directive */
       } else {
-	Swig_error(Getfile(s), Getline(id), "Unknown SWIG preprocessor directive: %s (if this is a block of target language code, delimit it with %%{ and %%})\n", id);
+	/* Ignore unknown preprocessor directives which are inside an inactive
+	 * conditional (github issue #394). */
+	if (allow)
+	  Swig_error(Getfile(s), Getline(id), "Unknown SWIG preprocessor directive: %s (if this is a block of target language code, delimit it with %%{ and %%})\n", id);
       }
       for (i = 0; i < cpp_lines; i++)
 	Putc('\n', ns);

From 50ba1ea6fa85212559103032077a4edefaf13364 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 30 Apr 2015 15:27:12 +1200
Subject: [PATCH 103/220] Adjust testcase for unknown directive error

Fixes testcase failure caused by fix for issue #394.
---
 Examples/test-suite/errors/pp_unknowndirective2.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/errors/pp_unknowndirective2.i b/Examples/test-suite/errors/pp_unknowndirective2.i
index 889e6c5b2..5c914e507 100644
--- a/Examples/test-suite/errors/pp_unknowndirective2.i
+++ b/Examples/test-suite/errors/pp_unknowndirective2.i
@@ -1,6 +1,6 @@
 %module xxx
 
-#ifdef FOO
+#ifndef FOO
 long long i;
 /* Check we get an error for an unknown directive (this should be #elif).
  * Unknown directives were silently ignored by SWIG < 3.0.3. */

From 8acca78953e8e2fa0cb7b14e9089466dec93674e Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@gmail.com>
Date: Thu, 30 Apr 2015 21:16:30 -0700
Subject: [PATCH 104/220] Zero-initialize swig_override in the director
 constructor.

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

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 287f8442c..572c7ad3a 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4321,6 +4321,7 @@ public:
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
 	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
+	Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
 	Printf(f_directors, "}\n\n");
 
 	Delete(classtype);
@@ -4355,6 +4356,7 @@ public:
     Wrapper *w = NewWrapper();
 
     Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor"));
+    Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 

From e8ca8fb2e6f56faa4d06b1b20e9749901b36f004 Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@gmail.com>
Date: Thu, 30 Apr 2015 23:14:48 -0700
Subject: [PATCH 105/220] Only output memset if the array exists.

---
 Source/Modules/java.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 572c7ad3a..4fb05d33f 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4301,6 +4301,8 @@ public:
       }
     }
 
+    int n_methods = curr_class_dmethod - first_class_dmethod;
+
     /* insert jenv prefix argument */
     parms = CopyParmList(superparms);
 
@@ -4321,7 +4323,9 @@ public:
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
 	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
+	if (n_methods) {
+	  Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
+	}
 	Printf(f_directors, "}\n\n");
 
 	Delete(classtype);
@@ -4355,8 +4359,12 @@ public:
     String *dirClassName = directorClassName(n);
     Wrapper *w = NewWrapper();
 
+    int n_methods = curr_class_dmethod - first_class_dmethod;
+
     Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor"));
-    Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
+    if (n_methods) {
+      Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
+    }
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 

From 0fad8a3728fc6586671444efc066a79a606f008d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Sat, 2 May 2015 00:06:58 +1200
Subject: [PATCH 106/220] '#undef seed' macro which Perl API headers define

This macro breaks '#include <algorithm>', causing generated Perl
bindings to fail to compile with 'g++ -std=gnu++11'.
---
 Lib/perl5/noembed.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Lib/perl5/noembed.h b/Lib/perl5/noembed.h
index 936d50ba6..4e30f1117 100644
--- a/Lib/perl5/noembed.h
+++ b/Lib/perl5/noembed.h
@@ -103,6 +103,9 @@
 #ifdef stat
   #undef stat
 #endif
+#ifdef seed
+  #undef seed
+#endif
 
 #ifdef bool
   /* Leave if macro is from C99 stdbool.h */

From cf29b90a2b4372dcfa8ac2504a275ba71c254226 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 1 May 2015 19:20:22 +0100
Subject: [PATCH 107/220] Fix comments and newlines within operator definitions

Fix handling of conversion operators where the operator is split over multiple lines or
has comments within the operator type.

Also fix similar problem with normal operators which gave a syntax error if split over
multiple lines or had a comment within the operator declaration.

Closes #401
---
 CHANGES.current                               |  7 +++
 Examples/test-suite/common.mk                 |  1 +
 Examples/test-suite/conversion_operators.i    | 55 +++++++++++++++++++
 Examples/test-suite/operator_overload_break.i |  9 +++
 Source/CParse/cscanner.c                      |  7 ++-
 5 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 Examples/test-suite/conversion_operators.i

diff --git a/CHANGES.current b/CHANGES.current
index 35ce98b3e..a3b03b07a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-01: wsfulton
+            Fix handling of conversion operators where the operator is split over multiple
+            lines or has comments within the operator type. Fixes #401.
+
+            Also fix similar problem with normal operators which gave a syntax error if split over
+            multiple lines or had a comment within the operator declaration.
+
 2015-04-30: olly
 	    Ignore unknown preprocessor directives which are inside an inactive
 	    conditional (github issue #394, reported by Dan Wilcox).
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 6376bc79d..e2ab8ed3f 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -156,6 +156,7 @@ CPP_TEST_CASES += \
 	conversion \
 	conversion_namespace \
 	conversion_ns_template \
+	conversion_operators \
 	cplusplus_throw \
 	cpp_basic \
 	cpp_enum \
diff --git a/Examples/test-suite/conversion_operators.i b/Examples/test-suite/conversion_operators.i
new file mode 100644
index 000000000..fa9e52cac
--- /dev/null
+++ b/Examples/test-suite/conversion_operators.i
@@ -0,0 +1,55 @@
+%module conversion_operators
+
+// Test bug #401 where the conversion operator name incorrectly included the newline character
+// Also test comments around conversion operators due to special handling in the scanner for conversion operators
+
+// These one line ignores should match the conversion operator names to suppress Warning 503 - SWIGWARN_LANG_IDENTIFIER
+%ignore operator const EcReal;
+%ignore operator EcImaginary const;
+%ignore operator EcComplex const;
+
+%inline %{
+
+struct EcReal {};
+struct EcImaginary {};
+struct EcComplex {};
+
+struct EcAngle {
+   operator const EcReal
+      (
+      ) const;
+   operator EcImaginary
+const (
+      ) const;
+   operator
+EcComplex
+      const (
+      ) const;
+};
+
+struct EcAngle2 {
+   operator const EcReal/* C comment */
+      (
+      ) const;
+   operator EcImaginary/* C comment */
+const (
+      ) const;
+   operator/* C comment */
+EcComplex
+      const (
+      ) const;
+};
+
+struct EcAngle3 {
+   operator const EcReal // C++ comment
+      (
+      ) const;
+   operator EcImaginary // C++ comment
+const (
+      ) const;
+   operator // C++ comment
+EcComplex
+      const (
+      ) const;
+};
+%}
diff --git a/Examples/test-suite/operator_overload_break.i b/Examples/test-suite/operator_overload_break.i
index f5f3c1a46..cad19a71e 100644
--- a/Examples/test-suite/operator_overload_break.i
+++ b/Examples/test-suite/operator_overload_break.i
@@ -12,6 +12,10 @@
 %rename(PlusPlusPostfix) operator++(int);
 #endif
 
+%ignore operator new (size_t);
+%ignore operator delete (void *);
+%ignore operator delete[] (void *);
+
 %{
 #include <iostream>
 using namespace std;
@@ -58,6 +62,11 @@ public:
     void PrintK() {std::cerr << k << std::endl;}
 
     int k;
+    void *operator new
+         (size_t); // definition split over two lines was giving syntax error
+    void operator delete /* comment here did not work */ (void *);
+    void operator
+         delete[] (void *);
 };
 
 %}
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index a33a81062..788445d88 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -610,7 +610,10 @@ int yylex(void) {
  
 	  */
 
-	  nexttok = Scanner_token(scan);
+	  do {
+	    nexttok = Scanner_token(scan);
+	  } while (nexttok == SWIG_TOKEN_ENDLINE || nexttok == SWIG_TOKEN_COMMENT);
+
 	  if (Scanner_isoperator(nexttok)) {
 	    /* One of the standard C/C++ symbolic operators */
 	    Append(s,Scanner_text(scan));
@@ -681,6 +684,8 @@ int yylex(void) {
 		  Append(s," ");
 		}
 		Append(s,Scanner_text(scan));
+	      } else if (nexttok == SWIG_TOKEN_ENDLINE) {
+	      } else if (nexttok == SWIG_TOKEN_COMMENT) {
 	      } else {
 		Append(s,Scanner_text(scan));
 		needspace = 0;

From 463b2a324caefcf9df5aa74bcf55f54db181e24a Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 1 May 2015 19:26:09 +0100
Subject: [PATCH 108/220] Cosmetic rename COPERATOR to CONVERSIONOPERATOR

Was never very obvious what C in COPERATOR was.
---
 Source/CParse/cscanner.c |  2 +-
 Source/CParse/parser.y   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index 788445d88..637ac9d60 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -722,7 +722,7 @@ int yylex(void) {
 		Setfile(cs,cparse_file);
 		Scanner_push(scan,cs);
 		Delete(cs);
-		return COPERATOR;
+		return CONVERSIONOPERATOR;
 	      }
 	    }
 	    if (termtoken)
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 3050cd02a..08d391b38 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1372,7 +1372,7 @@ static void mark_nodes_as_extend(Node *n) {
 %token NONID DSTAR DCNOT
 %token <intvalue> TEMPLATE
 %token <str> OPERATOR
-%token <str> COPERATOR
+%token <str> CONVERSIONOPERATOR
 %token PARSETYPE PARSEPARM PARSEPARMS
 
 %left  CAST
@@ -1530,11 +1530,11 @@ declaration    : swig_directive { $$ = $1; }
 
    This is nearly impossible to parse normally.  We just let the
    first part generate a syntax error and then resynchronize on the
-   COPERATOR token---discarding the rest of the definition. Ugh.
+   CONVERSIONOPERATOR token---discarding the rest of the definition. Ugh.
 
  */
 
-               | error COPERATOR {
+               | error CONVERSIONOPERATOR {
                   $$ = 0;
                   skip_decl();
                }
@@ -4435,7 +4435,7 @@ cpp_destructor_decl : NOT idtemplate LPAREN parms RPAREN cpp_end {
 
 
 /* C++ type conversion operator */
-cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAREN cpp_vend {
+cpp_conversion_operator : storage_class CONVERSIONOPERATOR type pointer LPAREN parms RPAREN cpp_vend {
                  $$ = new_node("cdecl");
                  Setattr($$,"type",$3);
 		 Setattr($$,"name",$2);
@@ -4450,7 +4450,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
 		 Setattr($$,"conversion_operator","1");
 		 add_symbols($$);
               }
-               | storage_class COPERATOR type AND LPAREN parms RPAREN cpp_vend {
+               | storage_class CONVERSIONOPERATOR type AND LPAREN parms RPAREN cpp_vend {
 		 SwigType *decl;
                  $$ = new_node("cdecl");
                  Setattr($$,"type",$3);
@@ -4467,7 +4467,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
 		 Setattr($$,"conversion_operator","1");
 		 add_symbols($$);
 	       }
-               | storage_class COPERATOR type LAND LPAREN parms RPAREN cpp_vend {
+               | storage_class CONVERSIONOPERATOR type LAND LPAREN parms RPAREN cpp_vend {
 		 SwigType *decl;
                  $$ = new_node("cdecl");
                  Setattr($$,"type",$3);
@@ -4485,7 +4485,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
 		 add_symbols($$);
 	       }
 
-               | storage_class COPERATOR type pointer AND LPAREN parms RPAREN cpp_vend {
+               | storage_class CONVERSIONOPERATOR type pointer AND LPAREN parms RPAREN cpp_vend {
 		 SwigType *decl;
                  $$ = new_node("cdecl");
                  Setattr($$,"type",$3);
@@ -4504,7 +4504,7 @@ cpp_conversion_operator : storage_class COPERATOR type pointer LPAREN parms RPAR
 		 add_symbols($$);
 	       }
 
-              | storage_class COPERATOR type LPAREN parms RPAREN cpp_vend {
+              | storage_class CONVERSIONOPERATOR type LPAREN parms RPAREN cpp_vend {
 		String *t = NewStringEmpty();
 		$$ = new_node("cdecl");
 		Setattr($$,"type",$3);
@@ -6471,7 +6471,7 @@ idcolontail    : DCOLON idtemplate idcolontail {
                | DCOLON OPERATOR {
                    $$ = NewStringf("::%s",$2);
                }
-/*               | DCOLON COPERATOR {
+/*               | DCOLON CONVERSIONOPERATOR {
                  $$ = NewString($2);                 
 		 } */
 

From 5f0181bfdd10988dbbf8037b68fe03aa6bfba890 Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@gmail.com>
Date: Fri, 1 May 2015 12:40:07 -0700
Subject: [PATCH 109/220] Too hard to conditionally define the
 memset....instead just make sure the array is defined even if it's unused.

---
 Source/Modules/java.cxx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 4fb05d33f..63fa14279 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4301,8 +4301,6 @@ public:
       }
     }
 
-    int n_methods = curr_class_dmethod - first_class_dmethod;
-
     /* insert jenv prefix argument */
     parms = CopyParmList(superparms);
 
@@ -4323,9 +4321,7 @@ public:
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
 	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	if (n_methods) {
-	  Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
-	}
+	Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
 	Printf(f_directors, "}\n\n");
 
 	Delete(classtype);
@@ -4359,12 +4355,8 @@ public:
     String *dirClassName = directorClassName(n);
     Wrapper *w = NewWrapper();
 
-    int n_methods = curr_class_dmethod - first_class_dmethod;
-
     Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor"));
-    if (n_methods) {
-      Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
-    }
+    Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 
@@ -4539,6 +4531,8 @@ public:
       Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
       Printf(f_directors_h, "      return false;\n");
       Printf(f_directors_h, "    }\n");
+      Printf(f_directors_h, "protected:\n");
+      Printf(f_directors_h, "    bool swig_override[1];  // Unused\n");
     }
 
     Printf(f_directors_h, "};\n\n");

From 140782054a1be924dda81b3abd9f1b181415e606 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 2 May 2015 00:25:15 +0100
Subject: [PATCH 110/220] Fix unresolved symbols in testcase

---
 Examples/test-suite/operator_overload_break.i | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Examples/test-suite/operator_overload_break.i b/Examples/test-suite/operator_overload_break.i
index cad19a71e..a948f2d49 100644
--- a/Examples/test-suite/operator_overload_break.i
+++ b/Examples/test-suite/operator_overload_break.i
@@ -62,6 +62,9 @@ public:
     void PrintK() {std::cerr << k << std::endl;}
 
     int k;
+};
+
+struct Op2 {
     void *operator new
          (size_t); // definition split over two lines was giving syntax error
     void operator delete /* comment here did not work */ (void *);
@@ -69,4 +72,8 @@ public:
          delete[] (void *);
 };
 
+void *Op2::operator new(size_t) { return malloc(sizeof(Op)); }
+void Op2::operator delete(void *p) { free(p); }
+void Op2::operator delete[] (void *) {}
+
 %}

From 48263f48028aef62a7a162ca869050cf62ff8b15 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 4 May 2015 15:11:31 -0700
Subject: [PATCH 111/220] [Go] Make sure that arguments for which use memcpy
 when calling C are still live after the call.  This ensures that they will
 not be collected if the GC runs during the call.

---
 Examples/test-suite/go_director_inout.i | 31 ++++++++++++---------
 Examples/test-suite/go_inout.i          | 16 +++++------
 Lib/go/goruntime.swg                    | 36 ++++++++++++++++---------
 Source/Modules/go.cxx                   | 28 ++++++++++++++++++-
 4 files changed, 77 insertions(+), 34 deletions(-)

diff --git a/Examples/test-suite/go_director_inout.i b/Examples/test-suite/go_director_inout.i
index af59e313c..5a7fbdf89 100644
--- a/Examples/test-suite/go_director_inout.i
+++ b/Examples/test-suite/go_director_inout.i
@@ -44,14 +44,14 @@ type GoRetStruct struct {
   $result.str.assign($input.p, $input.n);
 %}
 
-%typemap(out) RetStruct
+%typemap(out,fragment="AllocateString") RetStruct
 %{
-  $result = _swig_makegostring($1.str.data(), $1.str.length());
+  $result = Swig_AllocateString($1.str.data(), $1.str.length());
 %}
 
-%typemap(goout) RetStruct
+%typemap(goout,fragment="CopyString") RetStruct
 %{
-	$result = GoRetStruct{Str: $input}
+	$result = GoRetStruct{Str: swigCopyString($input)}
 %}
 
 %typemap(godirectorout) RetStruct
@@ -81,23 +81,28 @@ type GoRetStruct struct {
 	}
 %}
 
-%typemap(directorin) MyStruct
+%typemap(directorin,fragment="AllocateString") MyStruct
 %{
-  $input = _swig_makegostring($1.str.data(), $1.str.length());
+  $input = Swig_AllocateString($1.str.data(), $1.str.length());
 %}
 
-%typemap(out) MyStruct
+%typemap(godirectorin,fragment="CopyString") MyStruct
 %{
-  $result = _swig_makegostring($1.str.data(), $1.str.length());
-%}
-
-%typemap(godirectorin) MyStruct
-%{
-	if err := json.Unmarshal([]byte($input), &$result); err != nil {
+	if err := json.Unmarshal([]byte(swigCopyString($input)), &$result); err != nil {
 		panic(err)
 	}
 %}
 
+%typemap(out,fragment="AllocateString") MyStruct
+%{
+  $result = Swig_AllocateString($1.str.data(), $1.str.length());
+%}
+
+%typemap(goout,fragment="CopyString") MyStruct
+%{
+	$result = swigCopyString($input)
+%}
+
 %typemap(in) MyStruct
 %{
   $1.str.assign($input.p, $input.n);
diff --git a/Examples/test-suite/go_inout.i b/Examples/test-suite/go_inout.i
index 510ed68e0..57e7bf2fb 100644
--- a/Examples/test-suite/go_inout.i
+++ b/Examples/test-suite/go_inout.i
@@ -56,14 +56,14 @@ type In json.Marshaler
 
 %typemap(imtype) RetStruct "string"
 
-%typemap(out) RetStruct
+%typemap(out,fragment="AllocateString") RetStruct
 %{
-  $result = _swig_makegostring($1.str.data(), $1.str.length());
+  $result = Swig_AllocateString($1.str.data(), $1.str.length());
 %}
 
-%typemap(goout) RetStruct
+%typemap(goout,fragment="CopyString") RetStruct
 %{
-	if err := json.Unmarshal([]byte($1), &$result); err != nil {
+	if err := json.Unmarshal([]byte(swigCopyString($1)), &$result); err != nil {
 		panic(err)
 	}
 %}
@@ -146,7 +146,7 @@ static void putuint64(std::string *s, size_t off, uint64_t v) {
 %}
 
 // Pack the vector into a string.
-%typemap(argout) MyArray*
+%typemap(argout,fragment="AllocateString") MyArray*
 %{
   {
     size_t tot = 8;
@@ -164,15 +164,15 @@ static void putuint64(std::string *s, size_t off, uint64_t v) {
       str.replace(off, p->size(), *p);
       off += p->size();
     }
-    *$input = _swig_makegostring(str.data(), str.size());
+    *$input = Swig_AllocateString(str.data(), str.size());
   }
 %}
 
 // Unpack the string into a []string.
-%typemap(goargout) MyArray*
+%typemap(goargout,fragment="CopyString") MyArray*
 %{
 	{
-		str := *$input
+		str := swigCopyString(*$input)
 		bin := binary.LittleEndian
 		size := bin.Uint64([]byte(str[:8]))
 		str = str[8:]
diff --git a/Lib/go/goruntime.swg b/Lib/go/goruntime.swg
index 8f6eb742e..031a7f6f0 100644
--- a/Lib/go/goruntime.swg
+++ b/Lib/go/goruntime.swg
@@ -113,8 +113,22 @@ static char *_swig_topofstack() {
   }
 }
 
+static void _swig_gopanic(const char *p) {
+  struct {
+    const char *p;
+  } a;
+  a.p = p;
+  crosscall2(_cgo_panic, &a, (int) sizeof a);
+}
+
+%}
+
+#if !SWIGGO_CGO
+
 /* This is here for backward compatibility, but it will not work
    with Go 1.5 or later.  Do not use it in new code.  */
+%insert(runtime) %{
+
 static void *_swig_goallocate(size_t len) {
   struct {
     size_t len;
@@ -125,16 +139,10 @@ static void *_swig_goallocate(size_t len) {
   return a.ret;
 }
 
-static void _swig_gopanic(const char *p) {
-  struct {
-    const char *p;
-  } a;
-  a.p = p;
-  crosscall2(_cgo_panic, &a, (int) sizeof a);
-}
-
 %}
 
+#endif
+
 #if !SWIGGO_CGO
 
 /* Boilerplate for C code when using 6g/8g.  This code is compiled
@@ -246,6 +254,8 @@ void SwigCgocallBackDone() {
 
 #endif
 
+#if !SWIGGO_CGO
+
 %insert(runtime) %{
 
 /* This is here for backward compatibility, but it will not work
@@ -258,6 +268,12 @@ static _gostring_ _swig_makegostring(const char *p, size_t l) {
   return ret;
 }
 
+%}
+
+#endif
+
+%insert(runtime) %{
+
 #define SWIG_contract_assert(expr, msg) \
   if (!(expr)) { _swig_gopanic(msg); } else
 %}
@@ -290,8 +306,6 @@ type _ unsafe.Pointer
 
 %}
 
-#if !SWIGGO_CGO
-
 /* Swig_always_false is used to conditionally assign parameters to
    Swig_escape_val so that the compiler thinks that they escape.  We
    only assign them if Swig_always_false is true, which it never is.
@@ -302,8 +316,6 @@ var Swig_escape_always_false bool
 var Swig_escape_val interface{}
 %}
 
-#endif
-
 /* Function pointers are translated by the code in go.cxx into
    _swig_fnptr.  Member pointers are translated to _swig_memberptr.  */
 
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 087a71999..502b41091 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -2035,7 +2035,7 @@ private:
    * needs to explicitly escape.  This is true if the parameter has a
    * non-empty argout or freearg typemap, because in those cases the
    * Go argument might be or contain a pointer.  We need to ensure
-   * that that pointer does not oint into the stack, which means that
+   * that that pointer does not point into the stack, which means that
    * it needs to escape.
    * ---------------------------------------------------------------------- */
   bool paramNeedsEscape(Parm *p) {
@@ -2502,6 +2502,28 @@ private:
 	p = Getattr(p, "tmap:goargout:next");
       }
     }
+
+    // When using cgo, if we need to memcpy a parameter to pass it to
+    // the C code, the compiler may think that the parameter is not
+    // live during the function call.  If the garbage collector runs
+    // while the C/C++ function is running, the parameter may be
+    // freed.  Force the compiler to see the parameter as live across
+    // the C/C++ function.
+    if (cgo_flag) {
+      int parm_count = emit_num_arguments(parms);
+      p = parms;
+      for (int i = 0; i < parm_count; ++i) {
+	p = getParm(p);
+	bool c_struct_type;
+	Delete(cgoTypeForGoValue(p, Getattr(p, "type"), &c_struct_type));
+	if (c_struct_type) {
+	  Printv(f_go_wrappers, "\tif Swig_escape_always_false {\n", NULL);
+	  Printv(f_go_wrappers, "\t\tSwig_escape_val = ", Getattr(p, "emit:goinput"), "\n", NULL);
+	  Printv(f_go_wrappers, "\t}\n", NULL);
+	}
+	p = nextParm(p);
+      }
+    }
   }
 
   /* -----------------------------------------------------------------------
@@ -3537,6 +3559,8 @@ private:
     DelWrapper(dummy);
 
     Swig_typemap_attach_parms("gotype", parms, NULL);
+    Swig_typemap_attach_parms("goin", parms, NULL);
+    Swig_typemap_attach_parms("goargout", parms, NULL);
     Swig_typemap_attach_parms("imtype", parms, NULL);
     int parm_count = emit_num_arguments(parms);
 
@@ -3689,6 +3713,8 @@ private:
 
       Printv(f_go_wrappers, call, "\n", NULL);
 
+      goargout(parms);
+
       Printv(f_go_wrappers, "\treturn p\n", NULL);
       Printv(f_go_wrappers, "}\n\n", NULL);
 

From bd0fa5670582b482034216988259b3a022170b0b Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@google.com>
Date: Mon, 4 May 2015 15:22:14 -0700
Subject: [PATCH 112/220] Added director_ref test.

---
 Examples/test-suite/common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 6376bc79d..7b2d36425 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -198,6 +198,7 @@ CPP_TEST_CASES += \
 	director_protected \
 	director_protected_overloaded \
 	director_redefined \
+	director_ref \
 	director_smartptr \
 	director_thread \
 	director_unroll \

From 3ce7867a0a2e9349b1c6a1c20eb2cec3d566d7d2 Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@google.com>
Date: Mon, 4 May 2015 15:27:51 -0700
Subject: [PATCH 113/220] Added missing untracked files.

---
 Examples/test-suite/director_ref.i            | 82 +++++++++++++++++++
 .../test-suite/java/director_ref_runme.java   | 71 ++++++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 Examples/test-suite/director_ref.i
 create mode 100644 Examples/test-suite/java/director_ref_runme.java

diff --git a/Examples/test-suite/director_ref.i b/Examples/test-suite/director_ref.i
new file mode 100644
index 000000000..8bb8a9b63
--- /dev/null
+++ b/Examples/test-suite/director_ref.i
@@ -0,0 +1,82 @@
+%module(directors="1") director_ref
+
+%{
+#include <string>
+
+class Foo {
+public:
+        Foo(int i = -1) : count(0) {}
+	virtual void OnDelete() {}
+	virtual ~Foo() {}
+	virtual std::string Msg(std::string msg = "default") { return "Foo-" + msg; }
+
+	std::string GetMsg() { return Msg(); }
+	std::string GetMsg(std::string msg) { return Msg(msg); }
+
+	void Ref() { ++count; }
+	void Unref() { --count; if (count == 0) { OnDelete(); delete this; } }
+	int GetRefCount() { return count; }
+private:
+	int count;
+};
+
+class FooPtr {
+public:
+        FooPtr(Foo* f = NULL) : my_f(f) { if (my_f) { my_f->Ref(); } }
+        ~FooPtr() { if (my_f) { my_f->Unref(); } }
+        void Reset(Foo* f = NULL) {
+		if (f) { f->Ref(); }
+		if (my_f) { my_f->Unref(); }
+		my_f = f;
+	}
+	int GetOwnedRefCount() {
+		if (my_f) { return my_f->GetRefCount(); }
+		return 0;
+	}
+
+private:
+        Foo* my_f;
+};
+
+%}
+
+%include <std_string.i>
+
+%feature("director") Foo;
+%feature("ref") Foo "$this->Ref();"
+%feature("unref") Foo "$this->Unref();"
+
+class Foo {
+public:
+        Foo(int i = -1) : count(0) {}
+	virtual void OnDelete() {}
+	virtual ~Foo() {}
+	virtual std::string Msg(std::string msg = "default") { return "Foo-" + msg; }
+
+	std::string GetMsg() { return Msg(); }
+	std::string GetMsg(std::string msg) { return Msg(msg); }
+
+	void Ref() { ++count; }
+	void Unref() { --count; if (count == 0) { OnDelete(); delete this; } }
+	int GetRefCount() { return count; }
+private:
+	int count;
+};
+
+class FooPtr {
+public:
+        FooPtr(Foo* f = NULL) : my_f(f) { if (my_f) { my_f->Ref(); } }
+        ~FooPtr() { if (my_f) { my_f->Unref(); } }
+        void Reset(Foo* f = NULL) {
+		if (f) { f->Ref(); }
+		if (my_f) { my_f->Unref(); }
+		my_f = f;
+	}
+	int GetOwnedRefCount() {
+		if (my_f) { return my_f->GetRefCount(); }
+		return 0;
+	}
+
+private:
+        Foo* my_f;
+};
diff --git a/Examples/test-suite/java/director_ref_runme.java b/Examples/test-suite/java/director_ref_runme.java
new file mode 100644
index 000000000..1f85a6698
--- /dev/null
+++ b/Examples/test-suite/java/director_ref_runme.java
@@ -0,0 +1,71 @@
+
+import director_ref.*;
+
+public class director_ref_runme {
+
+  static {
+    try {
+      System.loadLibrary("director_ref");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    director_ref_MyFoo a = new director_ref_MyFoo();
+    if (a.GetRefCount() != 1) {
+      throw new RuntimeException ( "Refcount test 1 failed." );
+    }
+    
+    // Make sure director logic still works.
+    if (!a.GetMsg().equals("director_ref_MyFoo-default")) {
+      throw new RuntimeException ( "Test 1 failed" );
+    }
+    if (!a.GetMsg("boo").equals("director_ref_MyFoo-boo")) {
+      throw new RuntimeException ( "Test 2 failed" );
+    }
+
+    a.delete();  // should delete the object.
+    if (a.cppDeleted != true) {
+      throw new RuntimeException ( "Unref test 1 failed." );
+    }
+
+    a = new director_ref_MyFoo();
+    FooPtr p = new FooPtr(a);
+    if (a.GetRefCount() != 2) {
+      throw new RuntimeException ( "Refcount test 2 failed." );
+    }
+    a.delete();  // Shouldn't actually delete the underlying object
+    if (a.cppDeleted) {
+      throw new RuntimeException ( "Unref test 2 failed." );
+    }
+    if (p.GetOwnedRefCount() != 1) {
+      throw new RuntimeException ( "Unref test 3 failed." );
+    }
+    p.Reset();  // Now it should be deleted on the cpp side.
+    // We can't check cppDeleted because the director will stop
+    // working after a delete() call.
+    if (p.GetOwnedRefCount() != 0) {
+      throw new RuntimeException ( "Unref test 4 failed." );
+    }
+  }
+}
+
+class director_ref_MyFoo extends Foo {
+    public director_ref_MyFoo() {
+      super();
+    }
+    public director_ref_MyFoo(int i) {
+      super(i);
+    }
+    public String Msg(String msg) { 
+      return "director_ref_MyFoo-" + msg; 
+    }
+    public void OnDelete() {
+      cppDeleted = true;
+    }
+
+    public boolean cppDeleted = false;
+}
+

From e044dc440591cc8487cb9fb9b8c0d4808f98d568 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 4 May 2015 17:16:44 -0700
Subject: [PATCH 114/220] [Go] Fix Go multimap example to use
 Swig_AllocateString and swigCopyString.

---
 Examples/go/multimap/example.i | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Examples/go/multimap/example.i b/Examples/go/multimap/example.i
index 8de6b0dc3..30a37d3bf 100644
--- a/Examples/go/multimap/example.i
+++ b/Examples/go/multimap/example.i
@@ -74,16 +74,21 @@ extern int count(char *bytes, int len, char c);
 %}
 
 /* Return the mutated string as a modified element in the array. */
-%typemap(argout) (char *str, int len)
+%typemap(argout,fragment="AllocateString") (char *str, int len)
 %{
   {
     _gostring_ *a;
 
     a = (_gostring_*) $input.array;
-    a[0] = _swig_makegostring($1, $2);
+    a[0] = Swig_AllocateString($1, $2);
   }
 %}
 
+%typemap(goargout,fragment="CopyString") (char *str, int len)
+%{
+	$input[0] = swigCopyString($input[0])
+%}
+
 %typemap(freearg) (char *str, int len)
 %{
   free($1);

From 428b6176df750e41e3db98f029381af0df2a34c3 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 4 May 2015 10:01:34 +0100
Subject: [PATCH 115/220] Add support for friend templates, including operator
 overloading.

Closes #196.
---
 CHANGES.current                               | 21 +++++++++
 Examples/test-suite/common.mk                 |  1 +
 .../test-suite/errors/cpp_template_friend.i   | 26 +++++++++++
 .../errors/cpp_template_friend.stderr         |  8 ++++
 Examples/test-suite/friends_template.i        | 46 +++++++++++++++++++
 .../java/friends_template_runme.java          | 28 +++++++++++
 Source/CParse/parser.y                        |  4 +-
 Source/CParse/templ.c                         |  9 ++++
 Source/Modules/lang.cxx                       |  2 +-
 Source/Swig/naming.c                          |  4 ++
 10 files changed, 146 insertions(+), 3 deletions(-)
 create mode 100644 Examples/test-suite/errors/cpp_template_friend.i
 create mode 100644 Examples/test-suite/errors/cpp_template_friend.stderr
 create mode 100644 Examples/test-suite/friends_template.i
 create mode 100644 Examples/test-suite/java/friends_template_runme.java

diff --git a/CHANGES.current b/CHANGES.current
index a3b03b07a..3bc2a950b 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,27 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-04: wsfulton
+            Add support for friend templates, including operator overloading - fixes #196. Considering
+            the example below, previously the operator gave a syntax error and friendfunc incorrectly
+            warned with:
+
+             "Warning 503: Can't wrap 'friendfunc<(Type)>' unless renamed to a valid identifier."
+
+              template <class Type> class MyClass {
+                friend int friendfunc <Type>(double is, MyClass <Type> & x);
+                friend int operator<< <Type>(double un, const MyClass <Type> &x);
+              };
+
+            The following also previously incorrectly warned with:
+
+              "Warning 302: Identifier 'template_friend' redefined (ignored),"
+
+              template<typename T> T template_friend(T);
+              struct MyTemplate {
+                template<typename T> friend T template_friend(T);
+              };
+
 2015-05-01: wsfulton
             Fix handling of conversion operators where the operator is split over multiple
             lines or has comments within the operator type. Fixes #401.
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index e2ab8ed3f..c9e7b701d 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -234,6 +234,7 @@ CPP_TEST_CASES += \
 	features \
 	fragments \
 	friends \
+	friends_template \
 	funcptr_cpp \
 	fvirtual \
 	global_namespace \
diff --git a/Examples/test-suite/errors/cpp_template_friend.i b/Examples/test-suite/errors/cpp_template_friend.i
new file mode 100644
index 000000000..c9d1c9d5d
--- /dev/null
+++ b/Examples/test-suite/errors/cpp_template_friend.i
@@ -0,0 +1,26 @@
+%module cpp_template_friend
+
+template<typename T> T template_friend1(T);
+template<typename T> T template_friend1(T);
+struct MyTemplate1 {
+  template<typename T> friend T template_friend1(T);
+};
+
+template<typename T> T template_friend2(T);
+struct MyTemplate2 {
+  template<typename T> friend T template_friend2(T);
+};
+template<typename T> T template_friend2(T);
+
+
+int normal_friend1(int);
+int normal_friend1(int);
+struct MyClass1 {
+  friend int normal_friend1(int);
+};
+
+int normal_friend2(int);
+struct MyClass2 {
+  friend int normal_friend2(int);
+};
+int normal_friend2(int);
diff --git a/Examples/test-suite/errors/cpp_template_friend.stderr b/Examples/test-suite/errors/cpp_template_friend.stderr
new file mode 100644
index 000000000..8dea195dc
--- /dev/null
+++ b/Examples/test-suite/errors/cpp_template_friend.stderr
@@ -0,0 +1,8 @@
+cpp_template_friend.i:4: Warning 302: Identifier 'template_friend1' redefined (ignored),
+cpp_template_friend.i:3: Warning 302: previous definition of 'template_friend1'.
+cpp_template_friend.i:13: Warning 302: Identifier 'template_friend2' redefined (ignored),
+cpp_template_friend.i:9: Warning 302: previous definition of 'template_friend2'.
+cpp_template_friend.i:17: Warning 322: Redundant redeclaration of 'normal_friend1',
+cpp_template_friend.i:16: Warning 322: previous declaration of 'normal_friend1'.
+cpp_template_friend.i:26: Warning 322: Redundant redeclaration of 'normal_friend2',
+cpp_template_friend.i:22: Warning 322: previous declaration of 'normal_friend2'.
diff --git a/Examples/test-suite/friends_template.i b/Examples/test-suite/friends_template.i
new file mode 100644
index 000000000..48623f2ca
--- /dev/null
+++ b/Examples/test-suite/friends_template.i
@@ -0,0 +1,46 @@
+%module friends_template
+
+%{
+template <typename Type> class MyClass;
+
+template <typename Type> int operator<<(double un, const MyClass <Type> & x) { return 0; }
+template <typename Type> int funk_hidden(double is, MyClass <Type>  & x) { return 2; }
+
+template <typename T> T template_friend_hidden(T t) { return t + 1; }
+%}
+
+%inline %{
+template <typename Type> int operator>>(double is, MyClass <Type>  & x) { return 1; }
+template <typename Type> int funk_seen(double is, MyClass <Type>  & x) { return 2; }
+template <typename T> T template_friend_seen(T t1, T t2) { return t1 + t2; }
+int friend_plain_seen(int i) { return i; }
+
+template <class Type> class MyClass
+{
+  friend int operator<<  <Type>(double un, const MyClass <Type> & x);
+  friend int operator>>  <Type>(double is, MyClass <Type> & x);
+  friend int funk_hidden <Type>(double is, MyClass <Type> & x);
+  friend int funk_seen   <Type>(double is, MyClass <Type> & x);
+};
+
+struct MyTemplate {
+  template <typename T> friend T template_friend_hidden(T);
+  template <typename T> friend T template_friend_seen(T, T);
+  friend int friend_plain_seen(int i);
+};
+
+MyClass<int> makeMyClassInt() { return MyClass<int>(); }
+%}
+
+// Although the friends in MyClass are automatically instantiated via %template(MyClassDouble) MyClass<int>,
+// the operator friends are not valid and hence %rename is needed.
+%rename(OperatorInputDouble) operator>> <double>;
+%rename(OperatorOutputDouble) operator<< <double>;
+%template(MyClassDouble) MyClass<double>;
+
+%template(TemplateFriendHiddenInt) template_friend_hidden<int>;
+%template(TemplateFriendSeenInt) template_friend_seen<int>;
+
+// These have no %template(XX) MyClass<int> to instantiate, but they can be instantiated separately...
+%template(OperatorInputInt) operator>> <int>;
+%template(OperatorFunkSeenInt) funk_seen <int>;
diff --git a/Examples/test-suite/java/friends_template_runme.java b/Examples/test-suite/java/friends_template_runme.java
new file mode 100644
index 000000000..eb66cd5cb
--- /dev/null
+++ b/Examples/test-suite/java/friends_template_runme.java
@@ -0,0 +1,28 @@
+
+import friends_template.*;
+
+public class friends_template_runme {
+
+  static {
+    try {
+	System.loadLibrary("friends_template");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    friends_template.OperatorOutputDouble(1.1, new MyClassDouble());
+    friends_template.OperatorInputDouble(1.1, new MyClassDouble());
+    friends_template.funk_hidden(1.1, new MyClassDouble());
+    friends_template.funk_seen(1.1, new MyClassDouble());
+
+    friends_template.TemplateFriendHiddenInt(0);
+    friends_template.TemplateFriendSeenInt(0, 0);
+
+    SWIGTYPE_p_MyClassT_int_t myClassInt = friends_template.makeMyClassInt();
+    friends_template.OperatorInputInt(1, myClassInt);
+    friends_template.OperatorFunkSeenInt(1.1, myClassInt);
+  }
+}
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 08d391b38..30b0edfe2 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -6453,8 +6453,8 @@ idcolon        : idtemplate idcolontail {
                | NONID DCOLON idtemplate {
 		 $$ = NewStringf("::%s",$3);
                }
-               | OPERATOR {
-                 $$ = NewString($1);
+               | OPERATOR template_decl {
+                 $$ = NewStringf("%s%s",$1,$2);
 	       }
                | NONID DCOLON OPERATOR {
                  $$ = NewStringf("::%s",$3);
diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c
index fe8fc2800..9768f1b99 100644
--- a/Source/CParse/templ.c
+++ b/Source/CParse/templ.c
@@ -97,6 +97,15 @@ static int cparse_template_expand(Node *n, String *tname, String *rname, String
 	Append(cpatchlist, Getattr(n, "sym:name"));
       }
     }
+    if (checkAttribute(n, "storage", "friend")) {
+      String *symname = Getattr(n, "sym:name");
+      if (symname) {
+	String *stripped_name = SwigType_templateprefix(symname);
+	Setattr(n, "sym:name", stripped_name);
+	Delete(stripped_name);
+      }
+      Append(typelist, Getattr(n, "name"));
+    }
 
     add_parms(Getattr(n, "parms"), cpatchlist, typelist);
     add_parms(Getattr(n, "throws"), cpatchlist, typelist);
diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 3efd4e425..7943dc4c7 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -940,7 +940,7 @@ int Language::cDeclaration(Node *n) {
   }
 
   if (!validIdentifier(symname)) {
-    Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap '%s' unless renamed to a valid identifier.\n", symname);
+    Swig_warning(WARN_LANG_IDENTIFIER, input_file, line_number, "Can't wrap '%s' unless renamed to a valid identifier.\n", SwigType_namestr(symname));
     return SWIG_NOWRAP;
   }
 
diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index 9e2b4a436..272961c25 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -1003,6 +1003,10 @@ static int nodes_are_equivalent(Node *a, Node *b, int a_inclass) {
       }
       return 0;
     }
+    if (Equal(ta, "template") && Equal(tb, "template")) {
+      if (Cmp(a_storage, "friend") == 0 || Cmp(b_storage, "friend") == 0)
+	return 1;
+    }
   }
   return 0;
 }

From b19d506db7efcc50ee0512fdb747bb5e5f3bcde3 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 5 May 2015 18:06:04 +1200
Subject: [PATCH 116/220] Suppress warning 325 "Nested class not currently
 supported (Foo ignored)" when Foo has already been explicitly ignored with
 "%ignore".

---
 CHANGES.current                                |  4 ++++
 Examples/test-suite/errors/cpp_macro_locator.i |  7 ++++++-
 Source/CParse/parser.y                         | 14 ++++++--------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 3bc2a950b..58905c6dd 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-05: olly
+	    Suppress warning 325 "Nested class not currently supported (Foo
+	    ignored)" when Foo has already been explicitly ignored with "%ignore".
+
 2015-05-04: wsfulton
             Add support for friend templates, including operator overloading - fixes #196. Considering
             the example below, previously the operator gave a syntax error and friendfunc incorrectly
diff --git a/Examples/test-suite/errors/cpp_macro_locator.i b/Examples/test-suite/errors/cpp_macro_locator.i
index bd441a121..e00caf00d 100644
--- a/Examples/test-suite/errors/cpp_macro_locator.i
+++ b/Examples/test-suite/errors/cpp_macro_locator.i
@@ -100,4 +100,9 @@ void overloadinline2(const int *) {}
 void overload5(int *) {}
 void overload5(const int *) {}
 
-
+%ignore Outer2::QuietInner;
+struct Outer2 {
+  struct QuietInner {
+    VARIABLEMACRO(MyInnerVar)
+  };
+};
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 30b0edfe2..c8dc44a79 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -977,7 +977,6 @@ static void update_nested_classes(Node *n)
 
 static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) {
   Node *nn = 0;
-  int warned = 0;
 
   if (sname) {
     /* Add forward declaration of the nested type */
@@ -1021,13 +1020,12 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S
   if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) {
     if (nn && Equal(nodeType(nn), "classforward")) {
       Node *n = nn;
-      SWIG_WARN_NODE_BEGIN(n);
-      Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
-      SWIG_WARN_NODE_END(n);
-      warned = 1;
-    }
-
-    if (!warned) {
+      if (!GetFlag(n, "feature:ignore")) {
+	SWIG_WARN_NODE_BEGIN(n);
+	Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
+	SWIG_WARN_NODE_END(n);
+      }
+    } else {
       Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind);
     }
   }

From 159b3c7958c80b7965a35768f6347b83d9e5ccd8 Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@google.com>
Date: Wed, 6 May 2015 11:33:28 -0700
Subject: [PATCH 117/220] Use a bitset which is automatically initialized to 0,
 instead of a bool array which is not.

---
 Source/Modules/java.cxx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 63fa14279..ddd8570f5 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -435,6 +435,7 @@ public:
       Printf(f_directors_h, "\n");
       Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name);
       Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name);
+      Printf(f_directors_h, "#include <bitset>\n");
 
       Printf(f_directors, "\n\n");
       Printf(f_directors, "/* ---------------------------------------------------\n");
@@ -4321,7 +4322,6 @@ public:
 	String *classtype = SwigType_namestr(Getattr(n, "name"));
 
 	Printf(f_directors, "%s::%s : %s, %s {\n", dirclassname, target, call, Getattr(parent, "director:ctor"));
-	Printf(f_directors, "  memset(swig_override, 0, sizeof(swig_override));\n");
 	Printf(f_directors, "}\n\n");
 
 	Delete(classtype);
@@ -4356,7 +4356,6 @@ public:
     Wrapper *w = NewWrapper();
 
     Printf(w->def, "%s::%s(JNIEnv *jenv) : %s {", dirClassName, dirClassName, Getattr(n, "director:ctor"));
-    Printf(w->code, "  memset(swig_override, 0, sizeof(swig_override));\n");
     Printf(w->code, "}\n");
     Wrapper_print(w, f_directors);
 
@@ -4485,13 +4484,13 @@ public:
     int n_methods = curr_class_dmethod - first_class_dmethod;
 
     if (n_methods) {
-      /* Emit the swig_overrides() method and the swig_override array */
+      /* Emit the swig_overrides() method and the swig_override bitset */
       Printf(f_directors_h, "public:\n");
       Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
       Printf(f_directors_h, "      return (n < %d ? swig_override[n] : false);\n", n_methods);
       Printf(f_directors_h, "    }\n");
       Printf(f_directors_h, "protected:\n");
-      Printf(f_directors_h, "    bool swig_override[%d];\n", n_methods);
+      Printf(f_directors_h, "    std::bitset<%d> swig_override;\n", n_methods);
 
       /* Emit the code to look up the class's methods, initialize the override array */
 
@@ -4531,8 +4530,6 @@ public:
       Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
       Printf(f_directors_h, "      return false;\n");
       Printf(f_directors_h, "    }\n");
-      Printf(f_directors_h, "protected:\n");
-      Printf(f_directors_h, "    bool swig_override[1];  // Unused\n");
     }
 
     Printf(f_directors_h, "};\n\n");

From c2a13b9b7bb406874a890e5b2ae73ab938ecd0e7 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 7 May 2015 13:29:03 +1200
Subject: [PATCH 118/220] Add entry for #403

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

diff --git a/CHANGES.current b/CHANGES.current
index 58905c6dd..02563c8f3 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-07: LindleyF
+	    [Java] Allow feature("director") and feature("ref") to be used
+	    together.  Github PR#403.
+
 2015-05-05: olly
 	    Suppress warning 325 "Nested class not currently supported (Foo
 	    ignored)" when Foo has already been explicitly ignored with "%ignore".

From c2972b8bf0b9181a59db02e4a9c67242681eb184 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 7 May 2015 16:24:56 +1200
Subject: [PATCH 119/220] [Python] Deal with an integer as the default value of
 a bool parameter in the C++ prototype.  Fixes github #327, reported by Greg
 Allen.

---
 CHANGES.current                                        | 5 +++++
 Examples/test-suite/default_arg_values.i               | 4 ++++
 Examples/test-suite/python/default_arg_values_runme.py | 5 +++++
 Source/Modules/python.cxx                              | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 02563c8f3..5fd6d6135 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-07: olly
+	    [Python] Deal with an integer as the default value of a bool
+	    parameter in the C++ prototype.  Fixes github #327, reported by
+	    Greg Allen.
+
 2015-05-07: LindleyF
 	    [Java] Allow feature("director") and feature("ref") to be used
 	    together.  Github PR#403.
diff --git a/Examples/test-suite/default_arg_values.i b/Examples/test-suite/default_arg_values.i
index 47ca2d12f..ca82d1af4 100644
--- a/Examples/test-suite/default_arg_values.i
+++ b/Examples/test-suite/default_arg_values.i
@@ -6,6 +6,8 @@ struct Display {
   // Bad Python wrappers were being generated when NULL used for primitive type
   float draw1(float v = 0) { return v; }
   float draw2(float *v = 0) { return v ? *v : 0; }
+  bool bool0(bool x = 0) { return x; }
+  bool bool1(bool x = 1) { return x; }
 };
 float* createPtr(float v) { static float val; val = v; return &val; }
 %}
@@ -14,5 +16,7 @@ struct Display {
   // Bad Python wrappers were being generated when NULL used for primitive type
   float draw1(float v = NULL) { return v; }
   float draw2(float *v = NULL) { return v ? *v : 0; }
+  bool bool0(bool x = 0) { return x; }
+  bool bool1(bool x = 1) { return x; }
 };
 float* createPtr(float v) { static float val; val = v; return &val; }
diff --git a/Examples/test-suite/python/default_arg_values_runme.py b/Examples/test-suite/python/default_arg_values_runme.py
index 44e9a3b5e..28145b256 100644
--- a/Examples/test-suite/python/default_arg_values_runme.py
+++ b/Examples/test-suite/python/default_arg_values_runme.py
@@ -15,3 +15,8 @@ if d.draw2() != 0:
 if d.draw2(p) != 123:
   raise RuntimeError
 
+if d.bool0() != False or type(d.bool0()) != type(False):
+    raise RuntimeError
+
+if d.bool1() != True or type(d.bool1()) != type(True):
+    raise RuntimeError
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 6ee39ac34..6b603ea9e 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1927,6 +1927,10 @@ public:
 	}
       }
 
+      // Allow integers as the default value for a bool parameter.
+      if (Cmp(t, "bool") == 0)
+	return NewString(value ? "True" : "False");
+
       // Deal with the values starting with 0 first as they can be octal or
       // hexadecimal numbers or even pointers.
       if (s[0] == '0') {

From 8f19d77fecd00fbae883d7c45d7873af0da2b643 Mon Sep 17 00:00:00 2001
From: Lindley French <lindleyf@google.com>
Date: Thu, 7 May 2015 11:29:47 -0700
Subject: [PATCH 120/220] Don't include an STL header in SWIG.

---
 Source/Modules/java.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index ddd8570f5..69b1bd74e 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -435,7 +435,6 @@ public:
       Printf(f_directors_h, "\n");
       Printf(f_directors_h, "#ifndef SWIG_%s_WRAP_H_\n", module_class_name);
       Printf(f_directors_h, "#define SWIG_%s_WRAP_H_\n\n", module_class_name);
-      Printf(f_directors_h, "#include <bitset>\n");
 
       Printf(f_directors, "\n\n");
       Printf(f_directors, "/* ---------------------------------------------------\n");
@@ -4484,13 +4483,19 @@ public:
     int n_methods = curr_class_dmethod - first_class_dmethod;
 
     if (n_methods) {
-      /* Emit the swig_overrides() method and the swig_override bitset */
+      /* Emit the swig_overrides() method and the swig_override array */
       Printf(f_directors_h, "public:\n");
       Printf(f_directors_h, "    bool swig_overrides(int n) {\n");
       Printf(f_directors_h, "      return (n < %d ? swig_override[n] : false);\n", n_methods);
       Printf(f_directors_h, "    }\n");
       Printf(f_directors_h, "protected:\n");
-      Printf(f_directors_h, "    std::bitset<%d> swig_override;\n", n_methods);
+      Printf(f_directors_h, "    struct ZeroedBoolArray {\n");
+      Printf(f_directors_h, "        bool array[%d];\n", n_methods);
+      Printf(f_directors_h, "        ZeroedBoolArray() { memset(array, sizeof(array), 0); }\n");
+      Printf(f_directors_h, "        bool& operator[](int n) { return array[n]; }\n");
+      Printf(f_directors_h, "        bool operator[](int n) const { return array[n]; }\n");
+      Printf(f_directors_h, "    };\n");
+      Printf(f_directors_h, "    ZeroedBoolArray swig_override;\n");
 
       /* Emit the code to look up the class's methods, initialize the override array */
 

From 255715d9ad38d9d1faf265f890712a99b540f9f8 Mon Sep 17 00:00:00 2001
From: Michael Schaller <michael@5challer.de>
Date: Fri, 8 May 2015 14:32:22 +0200
Subject: [PATCH 121/220] [Go] Improved Go Class Memory Management section of
 the Go documentation.

Fixes #289.
---
 Doc/Manual/Go.html | 127 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 106 insertions(+), 21 deletions(-)

diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 175f22f26..0a413b25a 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -436,34 +436,119 @@ for this by calling the Swigcptr() method.
 
 
 <p>
-Calling <tt>NewClassName</tt> for some C++ class <tt>ClassName</tt>
-will allocate memory using the C++ memory allocator.  This memory will
-not be automatically freed by Go's garbage collector as the object ownership is
-not tracked.  When you are done with the C++ object you must free it manually
-using <tt>DeleteClassName</tt>.
-</p>
-
-<p>
-A common technique is to store the C++ object into a Go object, and
-use the Go function <tt>runtime.SetFinalizer</tt> to free the C++ object when
-the Go object is freed. It is strongly recommended to read the
-<a href="https://golang.org/pkg/runtime/#SetFinalizer">runtime.SetFinalizer</a>
-documentation before using this technique to understand its limitations.
-For example, if the SWIG package is imported as "wrap":
+Calling <tt>NewClassName</tt> for a C++ class <tt>ClassName</tt> will allocate
+memory using the C++ memory allocator.  This memory will not be automatically
+freed by Go's garbage collector as the object ownership is not tracked.  When
+you are done with the C++ object you must free it using
+<tt>DeleteClassName</tt>.<br>
+<br>
+The most Go idiomatic way to manage the memory for some C++ class is to call
+<tt>NewClassName</tt> followed by a
+<tt><a href="https://golang.org/doc/effective_go.html#defer">defer</a></tt> of
+the <tt>DeleteClassName</tt> call.  Using <tt>defer</tt> ensures that the memory
+of the C++ object is freed as soon as the function containing the <tt>defer</tt>
+statement returns.  Furthemore <tt>defer</tt> works great for short-lived
+objects and fits nicely C++'s RAII idiom.  Example:
 </p>
 <div class="code">
 <pre>
+func UseClassName(...) ... {
+	o := NewClassName(...)
+	defer DeleteClassName(o)
+	// Use the ClassName object
+	return ...
+}
+</pre>
+</div>
+
+<p>
+With increasing complexity, especially complex C++ object hierarchies, the
+correct placement of <tt>defer</tt> statements becomes harder and harder as C++
+objects need to be freed in the correct order.  This problem can be eased by
+keeping a C++ object function local so that it is only available to the function
+that creates a C++ object and functions called by this function.  Example:
+</p>
+<div class="code">
+<pre>
+func WithClassName(constructor args, f func(ClassName, ...interface{}) error, data ...interface{}) error {
+	o := NewClassName(constructor args)
+	defer DeleteClassName(o)
+	return f(o, data...)
+}
+
+func UseClassName(o ClassName, data ...interface{}) (err error) {
+	// Use the ClassName object and additional data and return error.
+}
+
+func main() {
+	WithClassName(constructor args, UseClassName, additional data)
+}
+</pre>
+</div>
+
+<p>
+Using <tt>defer</tt> has limitations though, especially when it comes to
+long-lived C++ objects whichs lifetimes are hard to predict.  For such C++
+objects a common technique is to store the C++ object into a Go object, and to
+use the Go function <tt>runtime.SetFinalizer</tt> to add a finalizer which frees
+the C++ object when the Go object is freed.  It is strongly recommended  to read
+the <a href="https://golang.org/pkg/runtime/#SetFinalizer">runtime.SetFinalizer
+</a> documentation before using this technique to understand the
+<tt>runtime.SetFinalizer</tt> limitations.<br>
+<br>
+Common pitfalls with <tt>runtime.SetFinalizer</tt> are:
+<ul>
+<li>
+If a hierarchy of C++ objects will be automatically freed by Go finalizers then
+the Go objects that store the C++ objects need to replicate the hierarchy of the
+C++ objects to prevent that C++ objects are freed prematurely while other C++
+objects still rely on them.
+</li>
+<li>
+The usage of Go finalizers is problematic with C++'s RAII idiom as it isn't
+predictable when the finalizer will run and this might require a Close or Delete
+method to be added the Go object that stores a C++ object to mitigate.
+</li>
+<li>
+The Go finalizer function typically runs in a different OS thread which can be
+problematic with C++ code that uses thread-local storage.
+</li>
+</ul>
+</p>
+
+<p>
+<tt>runtime.SetFinalizer</tt> Example:
+</p>
+<div class="code">
+<pre>
+import (
+	"runtime"
+	"wrap" // SWIG generated wrapper code
+)
+
 type GoClassName struct {
-	w wrap.ClassName
+	wcn wrap.ClassName
 }
 
 func NewGoClassName() *GoClassName {
-	r := &amp;GoClassName{wrap.NewClassName()}
-	runtime.SetFinalizer(r,
-		func(r *GoClassName) {
-			wrap.DeleteClassName(r.w)
-		})
-	return r
+	o := &amp;GoClassName{wcn: wrap.NewClassName()}
+	runtime.SetFinalizer(o, deleteGoClassName)
+	return o
+}
+
+func deleteGoClassName(o *GoClassName) {
+	// Runs typically in a different OS thread!
+	wrap.DeleteClassName(o.wcn)
+	o.wcn = nil
+}
+
+func (o *GoClassName) Close() {
+	// If the C++ object has a Close method.
+	o.wcn.Close()
+
+	// If the GoClassName object is no longer in an usable state.
+	runtime.SetFinalizer(o, nil) // Remove finalizer.
+	deleteGoClassName() // Free the C++ object.
 }
 </pre>
 </div>

From 77707154574f1852f56ed552bab832249c80bbfc Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jon.schlueter@gmail.com>
Date: Fri, 8 May 2015 08:33:29 -0400
Subject: [PATCH 122/220] autopep8 cleanup of Examples/python whitespace

automated cleanup only of the Examples/python example code
---
 Examples/python/callback/runme.py             | 15 ++++---
 Examples/python/class/runme.py                | 18 ++++----
 Examples/python/constants/runme.py            |  6 +--
 Examples/python/contract/runme.py             | 15 ++-----
 Examples/python/docstrings/runme.py           |  3 +-
 Examples/python/enum/runme.py                 |  3 +-
 Examples/python/exception/runme.py            | 45 +++++++++----------
 Examples/python/exceptproxy/runme.py          | 42 ++++++++---------
 Examples/python/extend/runme.py               | 13 +++---
 Examples/python/funcptr/runme.py              |  8 ++--
 Examples/python/funcptr2/runme.py             | 12 ++---
 Examples/python/functor/runme.py              |  3 +-
 Examples/python/import/runme.py               | 22 ++++-----
 .../import_packages/from_init1/runme.py       | 10 ++---
 .../import_packages/from_init2/runme.py       | 10 ++---
 .../import_packages/from_init3/runme.py       | 10 ++---
 .../import_packages/relativeimport1/runme.py  | 10 ++---
 .../import_packages/relativeimport2/runme.py  | 10 ++---
 .../import_packages/relativeimport3/runme.py  | 10 ++---
 .../import_packages/same_modnames1/runme.py   |  2 +-
 .../import_packages/same_modnames2/runme.py   |  4 +-
 Examples/python/import_template/runme.py      | 22 ++++-----
 Examples/python/java/runme.py                 |  8 ++--
 Examples/python/multimap/runme.py             | 15 ++-----
 Examples/python/operator/runme.py             | 23 +++++-----
 .../python/performance/constructor/runme.py   |  5 ++-
 Examples/python/performance/func/runme.py     |  5 ++-
 Examples/python/performance/harness.py        | 16 ++++---
 .../python/performance/hierarchy/runme.py     |  5 ++-
 .../performance/hierarchy_operator/runme.py   |  5 ++-
 Examples/python/performance/operator/runme.py |  5 ++-
 Examples/python/pointer/runme.py              | 39 ++++++++--------
 Examples/python/reference/runme.py            | 25 +++++------
 Examples/python/simple/runme.py               | 15 ++-----
 Examples/python/smartptr/runme.py             | 19 ++++----
 Examples/python/std_map/runme.py              | 15 +++----
 Examples/python/std_vector/runme.py           | 11 +++--
 Examples/python/template/runme.py             | 22 +++++----
 Examples/python/varargs/runme.py              | 22 +++------
 Examples/python/variables/runme.py            | 39 ++++++++--------
 40 files changed, 264 insertions(+), 323 deletions(-)

diff --git a/Examples/python/callback/runme.py b/Examples/python/callback/runme.py
index ddb668407..345a3eb6e 100644
--- a/Examples/python/callback/runme.py
+++ b/Examples/python/callback/runme.py
@@ -2,14 +2,16 @@
 
 # This file illustrates the cross language polymorphism using directors.
 
-import example 
+import example
 
 
 class PyCallback(example.Callback):
-	def __init__(self):
-		example.Callback.__init__(self)
-	def run(self):
-		print "PyCallback.run()"
+
+    def __init__(self):
+        example.Callback.__init__(self)
+
+    def run(self):
+        print "PyCallback.run()"
 
 # Create an Caller instance
 
@@ -25,7 +27,7 @@ callback = example.Callback()
 callback.thisown = 0
 caller.setCallback(callback)
 caller.call()
-caller.delCallback();
+caller.delCallback()
 
 print
 print "Adding and calling a Python callback"
@@ -53,4 +55,3 @@ caller.delCallback()
 
 print
 print "python exit"
-
diff --git a/Examples/python/class/runme.py b/Examples/python/class/runme.py
index 8f4f27eb9..34d21505c 100644
--- a/Examples/python/class/runme.py
+++ b/Examples/python/class/runme.py
@@ -3,7 +3,7 @@
 # This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
-import example 
+import example
 
 # ----- Object creation -----
 
@@ -15,7 +15,7 @@ print "    Created square", s
 
 # ----- Access a static member -----
 
-print "\nA total of", example.cvar.Shape_nshapes,"shapes were created"
+print "\nA total of", example.cvar.Shape_nshapes, "shapes were created"
 
 # ----- Member data access -----
 
@@ -28,16 +28,16 @@ s.x = -10
 s.y = 5
 
 print "\nHere is their current position:"
-print "    Circle = (%f, %f)" % (c.x,c.y)
-print "    Square = (%f, %f)" % (s.x,s.y)
+print "    Circle = (%f, %f)" % (c.x, c.y)
+print "    Square = (%f, %f)" % (s.x, s.y)
 
 # ----- Call some methods -----
 
 print "\nHere are some properties of the shapes:"
-for o in [c,s]:
-      print "   ", o
-      print "        area      = ", o.area()
-      print "        perimeter = ", o.perimeter()
+for o in [c, s]:
+    print "   ", o
+    print "        area      = ", o.area()
+    print "        perimeter = ", o.perimeter()
 # prevent o from holding a reference to the last object looked at
 o = None
 
@@ -47,5 +47,5 @@ print "\nGuess I'll clean up now"
 del c
 del s
 
-print example.cvar.Shape_nshapes,"shapes remain"
+print example.cvar.Shape_nshapes, "shapes remain"
 print "Goodbye"
diff --git a/Examples/python/constants/runme.py b/Examples/python/constants/runme.py
index 8d25b878b..3f4d5066f 100644
--- a/Examples/python/constants/runme.py
+++ b/Examples/python/constants/runme.py
@@ -1,6 +1,6 @@
 # file: runme.py
 
-import example 
+import example
 
 print "ICONST  =", example.ICONST, "(should be 42)"
 print "FCONST  =", example.FCONST, "(should be 2.1828)"
@@ -21,7 +21,3 @@ try:
     print "FOO    = ", example.FOO, "(Arg! This shouldn't print anything)"
 except AttributeError:
     print "FOO isn't defined (good)"
-
-
-
-
diff --git a/Examples/python/contract/runme.py b/Examples/python/contract/runme.py
index d484ae916..ce01e5a1d 100644
--- a/Examples/python/contract/runme.py
+++ b/Examples/python/contract/runme.py
@@ -1,13 +1,13 @@
 # file: runme.py
 
-import example 
+import example
 
 # Call our gcd() function
 
 x = 42
 y = 105
-g = example.gcd(x,y)
-print "The gcd of %d and %d is %d" % (x,y,g)
+g = example.gcd(x, y)
+print "The gcd of %d and %d is %d" % (x, y, g)
 
 # Manipulate the Foo global variable
 
@@ -19,12 +19,3 @@ example.cvar.Foo = 3.1415926
 
 # See if the change took effect
 print "Foo = ", example.cvar.Foo
-
-
-
-
-
-
-
-
-
diff --git a/Examples/python/docstrings/runme.py b/Examples/python/docstrings/runme.py
index b6c95e613..c25d291b6 100644
--- a/Examples/python/docstrings/runme.py
+++ b/Examples/python/docstrings/runme.py
@@ -1,6 +1,5 @@
 # file: runme.py
 
-import example 
+import example
 
 print "example.Foo.bar.__doc__  =", repr(example.Foo.bar.__doc__), "(Should be 'No comment')"
-
diff --git a/Examples/python/enum/runme.py b/Examples/python/enum/runme.py
index 10c4a260d..92e6aea39 100644
--- a/Examples/python/enum/runme.py
+++ b/Examples/python/enum/runme.py
@@ -20,7 +20,7 @@ print "\nTesting use of enums with functions\n"
 example.enum_test(example.RED, example.Foo.IMPULSE)
 example.enum_test(example.BLUE,  example.Foo.WARP)
 example.enum_test(example.GREEN, example.Foo.LUDICROUS)
-example.enum_test(1234,5678)
+example.enum_test(1234, 5678)
 
 print "\nTesting use of enum with class method"
 f = example.Foo()
@@ -28,4 +28,3 @@ f = example.Foo()
 f.enum_test(example.Foo.IMPULSE)
 f.enum_test(example.Foo.WARP)
 f.enum_test(example.Foo.LUDICROUS)
-
diff --git a/Examples/python/exception/runme.py b/Examples/python/exception/runme.py
index 9e9241194..7fae49030 100644
--- a/Examples/python/exception/runme.py
+++ b/Examples/python/exception/runme.py
@@ -6,38 +6,37 @@ import example
 
 t = example.Test()
 try:
-      t.unknown()
-except RuntimeError,e:
-      print "incomplete type", e.args[0]
+    t.unknown()
+except RuntimeError, e:
+    print "incomplete type", e.args[0]
 
 try:
-      t.simple()
-except RuntimeError,e:
-      print e.args[0]
+    t.simple()
+except RuntimeError, e:
+    print e.args[0]
 
 try:
-      t.message()
-except RuntimeError,e:
-      print e.args[0]
+    t.message()
+except RuntimeError, e:
+    print e.args[0]
 
 if not example.is_python_builtin():
-  try:
+    try:
         t.hosed()
-  except example.Exc,e:
+    except example.Exc, e:
         print e.code, e.msg
 else:
-  try:
+    try:
         t.hosed()
-  except BaseException,e:
-        # Throwing builtin classes as exceptions not supported (-builtin option)
+    except BaseException, e:
+        # Throwing builtin classes as exceptions not supported (-builtin
+        # option)
         print e
 
-for i in range(1,4):
-      try:
-            t.multi(i)
-      except RuntimeError,e:
-            print e.args[0]
-      except example.Exc,e:
-            print e.code, e.msg
-
-
+for i in range(1, 4):
+    try:
+        t.multi(i)
+    except RuntimeError, e:
+        print e.args[0]
+    except example.Exc, e:
+        print e.code, e.msg
diff --git a/Examples/python/exceptproxy/runme.py b/Examples/python/exceptproxy/runme.py
index 07e4b0a7f..970d6201d 100644
--- a/Examples/python/exceptproxy/runme.py
+++ b/Examples/python/exceptproxy/runme.py
@@ -2,8 +2,8 @@
 import example
 
 if example.is_python_builtin():
-  print "Skipping example: -builtin option does not support %exceptionclass"
-  exit(0)
+    print "Skipping example: -builtin option does not support %exceptionclass"
+    exit(0)
 
 q = example.intQueue(10)
 
@@ -12,18 +12,18 @@ print "Inserting items into intQueue"
 print type(example.FullError)
 
 try:
-      for i in range(0,100):
-            q.enqueue(i)
-except example.FullError,e:
-      print "Maxsize is", e.maxsize
+    for i in range(0, 100):
+        q.enqueue(i)
+except example.FullError, e:
+    print "Maxsize is", e.maxsize
 
 print "Removing items"
 
 try:
-      while 1:
-            q.dequeue()
-except example.EmptyError,e:
-      pass
+    while 1:
+        q.dequeue()
+except example.EmptyError, e:
+    pass
 
 
 q = example.doubleQueue(1000)
@@ -31,21 +31,15 @@ q = example.doubleQueue(1000)
 print "Inserting items into doubleQueue"
 
 try:
-      for i in range(0,10000):
-            q.enqueue(i*1.5)
-except example.FullError,e:
-      print "Maxsize is", e.maxsize
+    for i in range(0, 10000):
+        q.enqueue(i * 1.5)
+except example.FullError, e:
+    print "Maxsize is", e.maxsize
 
 print "Removing items"
 
 try:
-      while 1:
-            q.dequeue()
-except example.EmptyError,e:
-      pass
-
-
-
-
-
-      
+    while 1:
+        q.dequeue()
+except example.EmptyError, e:
+    pass
diff --git a/Examples/python/extend/runme.py b/Examples/python/extend/runme.py
index 240b09894..2bb38fadc 100644
--- a/Examples/python/extend/runme.py
+++ b/Examples/python/extend/runme.py
@@ -2,16 +2,18 @@
 
 # This file illustrates the cross language polymorphism using directors.
 
-import example 
+import example
 
 
 # CEO class, which overrides Employee::getPosition().
 
 class CEO(example.Manager):
-	def __init__(self, name):
-		example.Manager.__init__(self, name)
-	def getPosition(self):
-		return "CEO"
+
+    def __init__(self, name):
+        example.Manager.__init__(self, name)
+
+    def getPosition(self):
+        return "CEO"
 
 
 # Create an instance of our employee extension class, CEO. The calls to
@@ -78,4 +80,3 @@ print "----------------------"
 # All done.
 
 print "python exit"
-
diff --git a/Examples/python/funcptr/runme.py b/Examples/python/funcptr/runme.py
index bce065057..bf0c6e1ac 100644
--- a/Examples/python/funcptr/runme.py
+++ b/Examples/python/funcptr/runme.py
@@ -1,6 +1,6 @@
 # file: runme.py
 
-import example 
+import example
 
 a = 37
 b = 42
@@ -10,9 +10,9 @@ b = 42
 print "Trying some C callback functions"
 print "    a        =", a
 print "    b        =", b
-print "    ADD(a,b) =", example.do_op(a,b,example.ADD)
-print "    SUB(a,b) =", example.do_op(a,b,example.SUB)
-print "    MUL(a,b) =", example.do_op(a,b,example.MUL)
+print "    ADD(a,b) =", example.do_op(a, b, example.ADD)
+print "    SUB(a,b) =", example.do_op(a, b, example.SUB)
+print "    MUL(a,b) =", example.do_op(a, b, example.MUL)
 
 print "Here is what the C callback function objects look like in Python"
 print "    ADD      =", example.ADD
diff --git a/Examples/python/funcptr2/runme.py b/Examples/python/funcptr2/runme.py
index bd58fb620..a4405d9d9 100644
--- a/Examples/python/funcptr2/runme.py
+++ b/Examples/python/funcptr2/runme.py
@@ -1,6 +1,6 @@
 # file: runme.py
 
-import example 
+import example
 
 a = 37
 b = 42
@@ -10,9 +10,9 @@ b = 42
 print "Trying some C callback functions"
 print "    a        =", a
 print "    b        =", b
-print "    ADD(a,b) =", example.do_op(a,b,example.ADD)
-print "    SUB(a,b) =", example.do_op(a,b,example.SUB)
-print "    MUL(a,b) =", example.do_op(a,b,example.MUL)
+print "    ADD(a,b) =", example.do_op(a, b, example.ADD)
+print "    SUB(a,b) =", example.do_op(a, b, example.SUB)
+print "    MUL(a,b) =", example.do_op(a, b, example.MUL)
 
 print "Here is what the C callback function objects look like in Python"
 print "    ADD      =", example.ADD
@@ -20,5 +20,5 @@ print "    SUB      =", example.SUB
 print "    MUL      =", example.MUL
 
 print "Call the functions directly..."
-print "    add(a,b) =", example.add(a,b)
-print "    sub(a,b) =", example.sub(a,b)
+print "    add(a,b) =", example.add(a, b)
+print "    sub(a,b) =", example.sub(a, b)
diff --git a/Examples/python/functor/runme.py b/Examples/python/functor/runme.py
index 8fc0f2ff2..7f6f2b649 100644
--- a/Examples/python/functor/runme.py
+++ b/Examples/python/functor/runme.py
@@ -8,10 +8,9 @@ b = example.doubleSum(100.0)
 # Use the objects.  They should be callable just like a normal
 # python function.
 
-for i in range(0,100):
+for i in range(0, 100):
     a(i)                # Note: function call
     b(math.sqrt(i))     # Note: function call
 
 print a.result()
 print b.result()
-
diff --git a/Examples/python/import/runme.py b/Examples/python/import/runme.py
index 6b800ecb8..0e83acad0 100644
--- a/Examples/python/import/runme.py
+++ b/Examples/python/import/runme.py
@@ -81,31 +81,27 @@ x = d.toBase()
 print " Spam -> Base -> Foo : ",
 y = foo.Foo_fromBase(x)
 if y:
-      print "bad swig"
+    print "bad swig"
 else:
-      print "good swig"
+    print "good swig"
 
 print " Spam -> Base -> Bar : ",
 y = bar.Bar_fromBase(x)
 if y:
-      print "good swig"
+    print "good swig"
 else:
-      print "bad swig"
-      
+    print "bad swig"
+
 print " Spam -> Base -> Spam : ",
 y = spam.Spam_fromBase(x)
 if y:
-      print "good swig"
+    print "good swig"
 else:
-      print "bad swig"
+    print "bad swig"
 
 print " Foo -> Spam : ",
 y = spam.Spam_fromBase(b)
 if y:
-      print "bad swig"
+    print "bad swig"
 else:
-      print "good swig"
-
-
-
-
+    print "good swig"
diff --git a/Examples/python/import_packages/from_init1/runme.py b/Examples/python/import_packages/from_init1/runme.py
index bbe092bab..dda397487 100644
--- a/Examples/python/import_packages/from_init1/runme.py
+++ b/Examples/python/import_packages/from_init1/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) + python 'import' in __init__.py"
 
-if sys.version_info < (3,0):
-  import py2.pkg2
-  print "  Finished importing py2.pkg2"
+if sys.version_info < (3, 0):
+    import py2.pkg2
+    print "  Finished importing py2.pkg2"
 else:
-  import py3.pkg2
-  print "  Finished importing py3.pkg2"
+    import py3.pkg2
+    print "  Finished importing py3.pkg2"
diff --git a/Examples/python/import_packages/from_init2/runme.py b/Examples/python/import_packages/from_init2/runme.py
index bbe092bab..dda397487 100644
--- a/Examples/python/import_packages/from_init2/runme.py
+++ b/Examples/python/import_packages/from_init2/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) + python 'import' in __init__.py"
 
-if sys.version_info < (3,0):
-  import py2.pkg2
-  print "  Finished importing py2.pkg2"
+if sys.version_info < (3, 0):
+    import py2.pkg2
+    print "  Finished importing py2.pkg2"
 else:
-  import py3.pkg2
-  print "  Finished importing py3.pkg2"
+    import py3.pkg2
+    print "  Finished importing py3.pkg2"
diff --git a/Examples/python/import_packages/from_init3/runme.py b/Examples/python/import_packages/from_init3/runme.py
index bbe092bab..dda397487 100644
--- a/Examples/python/import_packages/from_init3/runme.py
+++ b/Examples/python/import_packages/from_init3/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) + python 'import' in __init__.py"
 
-if sys.version_info < (3,0):
-  import py2.pkg2
-  print "  Finished importing py2.pkg2"
+if sys.version_info < (3, 0):
+    import py2.pkg2
+    print "  Finished importing py2.pkg2"
 else:
-  import py3.pkg2
-  print "  Finished importing py3.pkg2"
+    import py3.pkg2
+    print "  Finished importing py3.pkg2"
diff --git a/Examples/python/import_packages/relativeimport1/runme.py b/Examples/python/import_packages/relativeimport1/runme.py
index 99b6e513e..997476b1d 100644
--- a/Examples/python/import_packages/relativeimport1/runme.py
+++ b/Examples/python/import_packages/relativeimport1/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) with -relativeimport"
 
-if sys.version_info < (3,0):
-  import py2.pkg2.bar
-  print "  Finished importing py2.pkg2.bar"
+if sys.version_info < (3, 0):
+    import py2.pkg2.bar
+    print "  Finished importing py2.pkg2.bar"
 else:
-  import py3.pkg2.bar
-  print "  Finished importing py3.pkg2.bar"
+    import py3.pkg2.bar
+    print "  Finished importing py3.pkg2.bar"
diff --git a/Examples/python/import_packages/relativeimport2/runme.py b/Examples/python/import_packages/relativeimport2/runme.py
index f0ab6c446..9789afc18 100644
--- a/Examples/python/import_packages/relativeimport2/runme.py
+++ b/Examples/python/import_packages/relativeimport2/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) + python 'import' in __init__.py"
 
-if sys.version_info < (3,0):
-  import py2.pkg2.bar
-  print "  Finished importing py2.pkg2.bar"
+if sys.version_info < (3, 0):
+    import py2.pkg2.bar
+    print "  Finished importing py2.pkg2.bar"
 else:
-  import py3.pkg2.bar
-  print "  Finished importing py3.pkg2.bar"
+    import py3.pkg2.bar
+    print "  Finished importing py3.pkg2.bar"
diff --git a/Examples/python/import_packages/relativeimport3/runme.py b/Examples/python/import_packages/relativeimport3/runme.py
index 99b6e513e..997476b1d 100644
--- a/Examples/python/import_packages/relativeimport3/runme.py
+++ b/Examples/python/import_packages/relativeimport3/runme.py
@@ -5,9 +5,9 @@ import os.path
 testname = os.path.basename(os.path.dirname(os.path.abspath(__file__)))
 print "Testing " + testname + " - %module(package=...) with -relativeimport"
 
-if sys.version_info < (3,0):
-  import py2.pkg2.bar
-  print "  Finished importing py2.pkg2.bar"
+if sys.version_info < (3, 0):
+    import py2.pkg2.bar
+    print "  Finished importing py2.pkg2.bar"
 else:
-  import py3.pkg2.bar
-  print "  Finished importing py3.pkg2.bar"
+    import py3.pkg2.bar
+    print "  Finished importing py3.pkg2.bar"
diff --git a/Examples/python/import_packages/same_modnames1/runme.py b/Examples/python/import_packages/same_modnames1/runme.py
index 7bec1ec1e..2107597b3 100644
--- a/Examples/python/import_packages/same_modnames1/runme.py
+++ b/Examples/python/import_packages/same_modnames1/runme.py
@@ -9,5 +9,5 @@ print "  Finished importing pkg2.foo"
 
 var2 = pkg2.foo.Pkg2_Foo()
 if str(type(var2)).find("'pkg2.foo.Pkg2_Foo'") == -1:
-  raise RuntimeError("failed type checking: " + str(type(var2)))
+    raise RuntimeError("failed type checking: " + str(type(var2)))
 print "  Successfully created object pkg2.foo.Pkg2_Foo"
diff --git a/Examples/python/import_packages/same_modnames2/runme.py b/Examples/python/import_packages/same_modnames2/runme.py
index eec6121eb..41ff1afec 100644
--- a/Examples/python/import_packages/same_modnames2/runme.py
+++ b/Examples/python/import_packages/same_modnames2/runme.py
@@ -6,7 +6,7 @@ print "Testing " + testname + " - %module(package=...) + python 'import' in __in
 import pkg1.pkg2.foo
 print "  Finished importing pkg1.pkg2.foo"
 
-var2 = pkg1.pkg2.foo.Pkg2_Foo();
+var2 = pkg1.pkg2.foo.Pkg2_Foo()
 if str(type(var2)).find("'pkg1.pkg2.foo.Pkg2_Foo'") == -1:
-  raise RuntimeError("failed type checking: " + str(type(var2)))
+    raise RuntimeError("failed type checking: " + str(type(var2)))
 print "  Successfully created object pkg1.pkg2.foo.Pkg2_Foo"
diff --git a/Examples/python/import_template/runme.py b/Examples/python/import_template/runme.py
index 0d5aded14..35f8924c1 100644
--- a/Examples/python/import_template/runme.py
+++ b/Examples/python/import_template/runme.py
@@ -81,31 +81,27 @@ x = d.toBase()
 print " Spam -> Base -> Foo : ",
 y = foo.intFoo_fromBase(x)
 if y:
-      print "bad swig"
+    print "bad swig"
 else:
-      print "good swig"
+    print "good swig"
 
 print " Spam -> Base -> Bar : ",
 y = bar.intBar_fromBase(x)
 if y:
-      print "good swig"
+    print "good swig"
 else:
-      print "bad swig"
-      
+    print "bad swig"
+
 print " Spam -> Base -> Spam : ",
 y = spam.intSpam_fromBase(x)
 if y:
-      print "good swig"
+    print "good swig"
 else:
-      print "bad swig"
+    print "bad swig"
 
 print " Foo -> Spam : ",
 y = spam.intSpam_fromBase(b)
 if y:
-      print "bad swig"
+    print "bad swig"
 else:
-      print "good swig"
-
-
-
-
+    print "good swig"
diff --git a/Examples/python/java/runme.py b/Examples/python/java/runme.py
index 0cec8a7cb..641ba27dd 100644
--- a/Examples/python/java/runme.py
+++ b/Examples/python/java/runme.py
@@ -6,11 +6,11 @@ JvAttachCurrentThread(None, None)
 e1 = Example(1)
 e2 = Example(2)
 
-print e1.Add(1,2)
-print e1.Add(1.0,2.0)
-e3 = e1.Add(e1,e2)
+print e1.Add(1, 2)
+print e1.Add(1.0, 2.0)
+e3 = e1.Add(e1, e2)
 print e3.mPublicInt
 
-print e1.Add("1","2")
+print e1.Add("1", "2")
 
 JvDetachCurrentThread()
diff --git a/Examples/python/multimap/runme.py b/Examples/python/multimap/runme.py
index f996ab3ae..ad693b73a 100644
--- a/Examples/python/multimap/runme.py
+++ b/Examples/python/multimap/runme.py
@@ -1,16 +1,16 @@
 # file: runme.py
 
-import example 
+import example
 
 # Call our gcd() function
 
 x = 42
 y = 105
-g = example.gcd(x,y)
-print "The gcd of %d and %d is %d" % (x,y,g)
+g = example.gcd(x, y)
+print "The gcd of %d and %d is %d" % (x, y, g)
 
 # Call the gcdmain() function
-example.gcdmain(["gcdmain","42","105"])
+example.gcdmain(["gcdmain", "42", "105"])
 
 # Call the count function
 print example.count("Hello World", "l")
@@ -18,10 +18,3 @@ print example.count("Hello World", "l")
 # Call the capitalize function
 
 print example.capitalize("hello world")
-
-
-
-
-
-
-
diff --git a/Examples/python/operator/runme.py b/Examples/python/operator/runme.py
index 3687a38de..ac48f2676 100644
--- a/Examples/python/operator/runme.py
+++ b/Examples/python/operator/runme.py
@@ -1,21 +1,20 @@
 # Operator overloading example
 import example
 
-a = example.Complex(2,3)
-b = example.Complex(-5,10)
+a = example.Complex(2, 3)
+b = example.Complex(-5, 10)
 
-print "a   =",a
-print "b   =",b
+print "a   =", a
+print "b   =", b
 
 c = a + b
-print "c   =",c
-print "a*b =",a*b
-print "a-c =",a-c
+print "c   =", c
+print "a*b =", a * b
+print "a-c =", a - c
 
-e = example.ComplexCopy(a-c)
-print "e   =",e
+e = example.ComplexCopy(a - c)
+print "e   =", e
 
 # Big expression
-f = ((a+b)*(c+b*e)) + (-a)
-print "f   =",f
-
+f = ((a + b) * (c + b * e)) + (-a)
+print "f   =", f
diff --git a/Examples/python/performance/constructor/runme.py b/Examples/python/performance/constructor/runme.py
index 274cbf85e..1771fba7b 100644
--- a/Examples/python/performance/constructor/runme.py
+++ b/Examples/python/performance/constructor/runme.py
@@ -2,8 +2,9 @@ import sys
 sys.path.append('..')
 import harness
 
-def proc (mod) :
-    for i in range(1000000) :
+
+def proc(mod):
+    for i in range(1000000):
         x = mod.MyClass()
 
 harness.run(proc)
diff --git a/Examples/python/performance/func/runme.py b/Examples/python/performance/func/runme.py
index f9032b9d2..760a8ab6d 100644
--- a/Examples/python/performance/func/runme.py
+++ b/Examples/python/performance/func/runme.py
@@ -2,9 +2,10 @@ import sys
 sys.path.append('..')
 import harness
 
-def proc (mod) :
+
+def proc(mod):
     x = mod.MyClass()
-    for i in range(10000000) :
+    for i in range(10000000):
         x.func()
 
 harness.run(proc)
diff --git a/Examples/python/performance/harness.py b/Examples/python/performance/harness.py
index 00f48e66a..c3d38b4fb 100644
--- a/Examples/python/performance/harness.py
+++ b/Examples/python/performance/harness.py
@@ -3,9 +3,10 @@ import time
 import imp
 from subprocess import *
 
-def run (proc) :
 
-    try :
+def run(proc):
+
+    try:
         mod = imp.find_module(sys.argv[1])
         mod = imp.load_module(sys.argv[1], *mod)
 
@@ -14,15 +15,18 @@ def run (proc) :
         t2 = time.clock()
         print "%s took %f seconds" % (mod.__name__, t2 - t1)
 
-    except IndexError :
-        proc = Popen([sys.executable, 'runme.py', 'Simple_baseline'], stdout=PIPE)
+    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)
+        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)
+        proc = Popen(
+            [sys.executable, 'runme.py', 'Simple_builtin'], stdout=PIPE)
         (stdout, stderr) = proc.communicate()
         print stdout
diff --git a/Examples/python/performance/hierarchy/runme.py b/Examples/python/performance/hierarchy/runme.py
index 9b22586a1..8255cdc86 100644
--- a/Examples/python/performance/hierarchy/runme.py
+++ b/Examples/python/performance/hierarchy/runme.py
@@ -2,9 +2,10 @@ import sys
 sys.path.append('..')
 import harness
 
-def proc (mod) :
+
+def proc(mod):
     x = mod.H()
-    for i in range(10000000) :
+    for i in range(10000000):
         x.func()
 
 harness.run(proc)
diff --git a/Examples/python/performance/hierarchy_operator/runme.py b/Examples/python/performance/hierarchy_operator/runme.py
index 5a8c52557..eabfae864 100644
--- a/Examples/python/performance/hierarchy_operator/runme.py
+++ b/Examples/python/performance/hierarchy_operator/runme.py
@@ -2,9 +2,10 @@ import sys
 sys.path.append('..')
 import harness
 
-def proc (mod) :
+
+def proc(mod):
     x = mod.H()
-    for i in range(10000000) :
+    for i in range(10000000):
         x += i
 
 harness.run(proc)
diff --git a/Examples/python/performance/operator/runme.py b/Examples/python/performance/operator/runme.py
index 4a6031f48..d75ae404c 100644
--- a/Examples/python/performance/operator/runme.py
+++ b/Examples/python/performance/operator/runme.py
@@ -2,9 +2,10 @@ import sys
 sys.path.append('..')
 import harness
 
-def proc (mod) :
+
+def proc(mod):
     x = mod.MyClass()
-    for i in range(10000000) :
+    for i in range(10000000):
         x = x + i
 
 harness.run(proc)
diff --git a/Examples/python/pointer/runme.py b/Examples/python/pointer/runme.py
index e38a306c1..5b5f16bc2 100644
--- a/Examples/python/pointer/runme.py
+++ b/Examples/python/pointer/runme.py
@@ -1,25 +1,25 @@
 # file: runme.py
 
-import example;
+import example
 
 # First create some objects using the pointer library.
-print "Testing the pointer library";
-a = example.new_intp();
-b = example.new_intp();
-c = example.new_intp();
-example.intp_assign(a,37);
-example.intp_assign(b,42);
+print "Testing the pointer library"
+a = example.new_intp()
+b = example.new_intp()
+c = example.new_intp()
+example.intp_assign(a, 37)
+example.intp_assign(b, 42)
 
-print "     a =",a
-print "     b =",b
-print "     c =",c
+print "     a =", a
+print "     b =", b
+print "     c =", c
 
 # Call the add() function with some pointers
-example.add(a,b,c)
+example.add(a, b, c)
 
 # Now get the result
 r = example.intp_value(c)
-print "     37 + 42 =",r
+print "     37 + 42 =", r
 
 # Clean up the pointers
 example.delete_intp(a)
@@ -30,15 +30,12 @@ example.delete_intp(c)
 # This should be much easier. Now how it is no longer
 # necessary to manufacture pointers.
 
-print "Trying the typemap library";
-r = example.sub(37,42)
-print "     37 - 42 =",r
+print "Trying the typemap library"
+r = example.sub(37, 42)
+print "     37 - 42 =", r
 
 # Now try the version with multiple return values
 
-print "Testing multiple return values";
-q,r = example.divide(42,37)
-print "     42/37 = %d remainder %d" % (q,r)
-
-
-
+print "Testing multiple return values"
+q, r = example.divide(42, 37)
+print "     42/37 = %d remainder %d" % (q, r)
diff --git a/Examples/python/reference/runme.py b/Examples/python/reference/runme.py
index a1f53368e..0ff217b02 100644
--- a/Examples/python/reference/runme.py
+++ b/Examples/python/reference/runme.py
@@ -7,22 +7,22 @@ import example
 # ----- Object creation -----
 
 print "Creating some objects:"
-a = example.Vector(3,4,5)
-b = example.Vector(10,11,12)
+a = example.Vector(3, 4, 5)
+b = example.Vector(10, 11, 12)
 
-print "    Created",a.cprint()
-print "    Created",b.cprint()
+print "    Created", a.cprint()
+print "    Created", b.cprint()
 
 # ----- Call an overloaded operator -----
 
 # This calls the wrapper we placed around
 #
-#      operator+(const Vector &a, const Vector &) 
+#      operator+(const Vector &a, const Vector &)
 #
 # It returns a new allocated object.
 
 print "Adding a+b"
-c = example.addv(a,b)
+c = example.addv(a, b)
 print "    a+b =", c.cprint()
 
 # Note: Unless we free the result, a memory leak will occur
@@ -33,25 +33,25 @@ del c
 # Note: Using the high-level interface here
 print "Creating an array of vectors"
 va = example.VectorArray(10)
-print "    va = ",va
+print "    va = ", va
 
 # ----- Set some values in the array -----
 
 # These operators copy the value of $a and $b to the vector array
-va.set(0,a)
-va.set(1,b)
+va.set(0, a)
+va.set(1, b)
 
-va.set(2,example.addv(a,b))
+va.set(2, example.addv(a, b))
 
 # Get some values from the array
 
 print "Getting some array values"
-for i in range(0,5):
+for i in range(0, 5):
     print "    va(%d) = %s" % (i, va.get(i).cprint())
 
 # Watch under resource meter to check on this
 print "Making sure we don't leak memory."
-for i in xrange(0,1000000):
+for i in xrange(0, 1000000):
     c = va.get(i % 10)
 
 # ----- Clean up -----
@@ -60,4 +60,3 @@ print "Cleaning up"
 del va
 del a
 del b
-
diff --git a/Examples/python/simple/runme.py b/Examples/python/simple/runme.py
index d484ae916..ce01e5a1d 100644
--- a/Examples/python/simple/runme.py
+++ b/Examples/python/simple/runme.py
@@ -1,13 +1,13 @@
 # file: runme.py
 
-import example 
+import example
 
 # Call our gcd() function
 
 x = 42
 y = 105
-g = example.gcd(x,y)
-print "The gcd of %d and %d is %d" % (x,y,g)
+g = example.gcd(x, y)
+print "The gcd of %d and %d is %d" % (x, y, g)
 
 # Manipulate the Foo global variable
 
@@ -19,12 +19,3 @@ example.cvar.Foo = 3.1415926
 
 # See if the change took effect
 print "Foo = ", example.cvar.Foo
-
-
-
-
-
-
-
-
-
diff --git a/Examples/python/smartptr/runme.py b/Examples/python/smartptr/runme.py
index 5ea1fb947..5f8b73476 100644
--- a/Examples/python/smartptr/runme.py
+++ b/Examples/python/smartptr/runme.py
@@ -3,7 +3,7 @@
 # This file illustrates the proxy class C++ interface generated
 # by SWIG.
 
-import example 
+import example
 
 # ----- Object creation -----
 
@@ -17,7 +17,7 @@ print "    Created square", s
 
 # ----- Access a static member -----
 
-print "\nA total of", example.cvar.Shape_nshapes,"shapes were created"
+print "\nA total of", example.cvar.Shape_nshapes, "shapes were created"
 
 # ----- Member data access -----
 
@@ -30,16 +30,16 @@ s.x = -10
 s.y = 5
 
 print "\nHere is their current position:"
-print "    Circle = (%f, %f)" % (c.x,c.y)
-print "    Square = (%f, %f)" % (s.x,s.y)
+print "    Circle = (%f, %f)" % (c.x, c.y)
+print "    Square = (%f, %f)" % (s.x, s.y)
 
 # ----- Call some methods -----
 
 print "\nHere are some properties of the shapes:"
-for o in [c,s]:
-      print "   ", o
-      print "        area      = ", o.area()
-      print "        perimeter = ", o.perimeter()
+for o in [c, s]:
+    print "   ", o
+    print "        area      = ", o.area()
+    print "        perimeter = ", o.perimeter()
 
 print "\nGuess I'll clean up now"
 
@@ -50,6 +50,5 @@ del cc
 del ss
 
 s = 3
-print example.cvar.Shape_nshapes,"shapes remain"
+print example.cvar.Shape_nshapes, "shapes remain"
 print "Goodbye"
-
diff --git a/Examples/python/std_map/runme.py b/Examples/python/std_map/runme.py
index b521c9c9c..26031f3f4 100644
--- a/Examples/python/std_map/runme.py
+++ b/Examples/python/std_map/runme.py
@@ -7,8 +7,6 @@ pmap["hi"] = 1
 pmap["hello"] = 2
 
 
-
-
 dmap = {}
 dmap["hello"] = 1.0
 dmap["hi"] = 2.0
@@ -28,8 +26,8 @@ for i in dmap.iterkeys():
 for i in dmap.itervalues():
     print "val", i
 
-for k,v in dmap.iteritems():
-    print "item", k,v
+for k, v in dmap.iteritems():
+    print "item", k, v
 
 dmap = example.DoubleMap()
 dmap["hello"] = 1.0
@@ -41,8 +39,8 @@ for i in dmap.iterkeys():
 for i in dmap.itervalues():
     print "val", i
 
-for k,v in dmap.iteritems():
-    print "item", k,v
+for k, v in dmap.iteritems():
+    print "item", k, v
 
 
 print dmap.items()
@@ -54,7 +52,6 @@ print hmap.keys()
 print hmap.values()
 
 
-
 dmap = {}
 dmap["hello"] = 2
 dmap["hi"] = 4
@@ -76,7 +73,7 @@ for i in dmap.itervalues():
 for i in dmap.iteritems():
     print "item", i
 
-for k,v in dmap.iteritems():
-    print "item", k,v
+for k, v in dmap.iteritems():
+    print "item", k, v
 
 print dmap
diff --git a/Examples/python/std_vector/runme.py b/Examples/python/std_vector/runme.py
index d248ccbbb..d7d3c2ea4 100644
--- a/Examples/python/std_vector/runme.py
+++ b/Examples/python/std_vector/runme.py
@@ -4,13 +4,13 @@ import example
 
 # Call average with a Python list...
 
-print example.average([1,2,3,4])
+print example.average([1, 2, 3, 4])
 
 # ... or a wrapped std::vector<int>
 
 v = example.IntVector(4)
 for i in range(len(v)):
-      v[i] = i+1
+    v[i] = i + 1
 print example.average(v)
 
 
@@ -22,8 +22,8 @@ print example.half((1.0, 1.5, 2.0, 2.5, 3.0))
 # ... or a wrapped std::vector<double>
 
 v = example.DoubleVector()
-for i in [1,2,3,4]:
-      v.append(i)
+for i in [1, 2, 3, 4]:
+    v.append(i)
 print example.half(v)
 
 
@@ -31,6 +31,5 @@ print example.half(v)
 
 example.halve_in_place(v)
 for i in range(len(v)):
-      print v[i], "; ",
+    print v[i], "; ",
 print
-
diff --git a/Examples/python/template/runme.py b/Examples/python/template/runme.py
index 05940bc67..e408e15f9 100644
--- a/Examples/python/template/runme.py
+++ b/Examples/python/template/runme.py
@@ -3,32 +3,30 @@
 import example
 
 # Call some templated functions
-print example.maxint(3,7)
-print example.maxdouble(3.14,2.18)
+print example.maxint(3, 7)
+print example.maxdouble(3.14, 2.18)
 
 # Create some class
 
 iv = example.vecint(100)
 dv = example.vecdouble(1000)
 
-for i in range(0,100):
-      iv.setitem(i,2*i)
+for i in range(0, 100):
+    iv.setitem(i, 2 * i)
 
-for i in range(0,1000):
-      dv.setitem(i, 1.0/(i+1))
+for i in range(0, 1000):
+    dv.setitem(i, 1.0 / (i + 1))
 
 sum = 0
-for i in range(0,100):
-      sum = sum + iv.getitem(i)
+for i in range(0, 100):
+    sum = sum + iv.getitem(i)
 
 print sum
 
 sum = 0.0
-for i in range(0,1000):
-      sum = sum + dv.getitem(i)
+for i in range(0, 1000):
+    sum = sum + dv.getitem(i)
 print sum
 
 del iv
 del dv
-
-      
diff --git a/Examples/python/varargs/runme.py b/Examples/python/varargs/runme.py
index 8eab77041..48e3134f3 100644
--- a/Examples/python/varargs/runme.py
+++ b/Examples/python/varargs/runme.py
@@ -1,13 +1,13 @@
 # file: runme.py
 
 import sys
-import example 
+import example
 
 # Call printf
 example.printf("Hello World. I'm printf\n")
 
 # Note: We call printf, but use *python* string formatting
-for i in range(0,10):
+for i in range(0, 10):
     example.printf("i is %d\n" % i)
 
 # This will probably be garbled because %d is interpreted by C
@@ -15,21 +15,13 @@ example.printf("The value is %d\n")
 
 stdout = example.stdout_stream()
 # Call fprintf
-example.fprintf(stdout,"Hello World. I'm fprintf\n")
-for i in range(0,10):
-    example.fprintf(stdout,"i is %d\n" % i)
+example.fprintf(stdout, "Hello World. I'm fprintf\n")
+for i in range(0, 10):
+    example.fprintf(stdout, "i is %d\n" % i)
 
 # This won't be garbled since %d is not interpreted
-example.fprintf(stdout,"The value is %d\n")
+example.fprintf(stdout, "The value is %d\n")
 
 # This function calls our NULL-terminated function
 
-example.printv("Hello","World","this","is","a","test.")
-
-
-
-
-
-
-
-
+example.printv("Hello", "World", "this", "is", "a", "test.")
diff --git a/Examples/python/variables/runme.py b/Examples/python/variables/runme.py
index b635b9859..3388a0eba 100644
--- a/Examples/python/variables/runme.py
+++ b/Examples/python/variables/runme.py
@@ -4,21 +4,21 @@ import example
 
 # Try to set the values of some global variables
 
-example.cvar.ivar   =  42
-example.cvar.svar   = -31000
-example.cvar.lvar   =  65537
-example.cvar.uivar  =  123456
-example.cvar.usvar  =  61000
-example.cvar.ulvar  =  654321
-example.cvar.scvar  =  -13
-example.cvar.ucvar  =  251
-example.cvar.cvar   =  "S"
-example.cvar.fvar   =  3.14159
-example.cvar.dvar   =  2.1828
-example.cvar.strvar =  "Hello World"
-example.cvar.iptrvar= example.new_int(37)
-example.cvar.ptptr  = example.new_Point(37,42)
-example.cvar.name   = "Bill"
+example.cvar.ivar = 42
+example.cvar.svar = -31000
+example.cvar.lvar = 65537
+example.cvar.uivar = 123456
+example.cvar.usvar = 61000
+example.cvar.ulvar = 654321
+example.cvar.scvar = -13
+example.cvar.ucvar = 251
+example.cvar.cvar = "S"
+example.cvar.fvar = 3.14159
+example.cvar.dvar = 2.1828
+example.cvar.strvar = "Hello World"
+example.cvar.iptrvar = example.new_int(37)
+example.cvar.ptptr = example.new_Point(37, 42)
+example.cvar.name = "Bill"
 
 # Now print out the values of the variables
 
@@ -46,16 +46,16 @@ print "\nVariables (values printed from C)"
 
 example.print_vars()
 
-print "\nNow I'm going to try and modify some read only variables";
+print "\nNow I'm going to try and modify some read only variables"
 
-print "     Tring to set 'path'";
+print "     Tring to set 'path'"
 try:
     example.cvar.path = "Whoa!"
     print "Hey, what's going on?!?! This shouldn't work"
 except:
     print "Good."
 
-print "     Trying to set 'status'";
+print "     Trying to set 'status'"
 try:
     example.cvar.status = 0
     print "Hey, what's going on?!?! This shouldn't work"
@@ -70,6 +70,3 @@ example.cvar.pt = example.cvar.ptptr
 print "The new value is"
 example.pt_print()
 print "You should see the value", example.Point_print(example.cvar.ptptr)
-
-
-

From ae8554bb4c63c6c62ec4e58ebbf9aa75c7c3525a Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jschlueter@navigationsolutions.com>
Date: Wed, 6 May 2015 08:50:27 -0400
Subject: [PATCH 123/220] Add pep8 check for Examples/python

build step as part of build process for make check-python-examples

warnings from pep8 are not treated as failures.
using same initial ignore list as used for test-suite pep8
---
 Examples/Makefile.in | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 834accdfa..36f68f2e1 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -66,6 +66,9 @@ LIBCRYPT   = @LIBCRYPT@
 SYSLIBS    = $(LIBM) $(LIBC) $(LIBCRYPT)
 LIBPREFIX  =
 
+PEP8         = @PEP8@
+PEP8_FLAGS   = --ignore=E402,E501,E30,W291,W391
+
 # RUNTOOL is for use with runtime tools, eg set it to valgrind
 RUNTOOL    =
 # COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing
@@ -372,7 +375,7 @@ endif
 
 PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
 
-python_run: $(PYSCRIPT)
+python_run: $(PYSCRIPT) python_check
 	export PYTHONPATH=".:$$PYTHONPATH"; \
 	$(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE)
 
@@ -385,6 +388,16 @@ $(RUNME)3.py: $(SRCDIR)$(RUNME).py
 	cp $< $@
 	$(PY2TO3) -w $@ >/dev/null 2>&1
 
+# -----------------------------------------------------------------
+# Run Python pep8 if it exists
+# -----------------------------------------------------------------
+
+python_check: $(PYSCRIPT)
+	+if [ -n "$(PEP8)" ]; then \
+		$(PEP8) $(PEP8_FLAGS) $(PYSCRIPT) || true;\
+	fi
+
+
 # -----------------------------------------------------------------
 # Version display
 # -----------------------------------------------------------------

From b909d0c680c322d0bf27cf6c23276f5094b950b5 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jon.schlueter@gmail.com>
Date: Fri, 8 May 2015 10:35:04 -0400
Subject: [PATCH 124/220] Fixup 2 additional whitespace warnings pep8 found

E241 multiple spaces after ','

cleanup in enum/runme.py and constants/runme.py
---
 Examples/python/constants/runme.py | 2 +-
 Examples/python/enum/runme.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/python/constants/runme.py b/Examples/python/constants/runme.py
index 3f4d5066f..415d1adc4 100644
--- a/Examples/python/constants/runme.py
+++ b/Examples/python/constants/runme.py
@@ -8,7 +8,7 @@ print "CCONST  =", example.CCONST, "(should be 'x')"
 print "CCONST2 =", example.CCONST2, "(this should be on a new line)"
 print "SCONST  =", example.SCONST, "(should be 'Hello World')"
 print "SCONST2 =", example.SCONST2, "(should be '\"Hello World\"')"
-print "EXPR    =", example.EXPR,   "(should be 48.5484)"
+print "EXPR    =", example.EXPR, "(should be 48.5484)"
 print "iconst  =", example.iconst, "(should be 37)"
 print "fconst  =", example.fconst, "(should be 3.14)"
 
diff --git a/Examples/python/enum/runme.py b/Examples/python/enum/runme.py
index 92e6aea39..def01b147 100644
--- a/Examples/python/enum/runme.py
+++ b/Examples/python/enum/runme.py
@@ -18,7 +18,7 @@ print "    Foo_LUDICROUS =", example.Foo.LUDICROUS
 print "\nTesting use of enums with functions\n"
 
 example.enum_test(example.RED, example.Foo.IMPULSE)
-example.enum_test(example.BLUE,  example.Foo.WARP)
+example.enum_test(example.BLUE, example.Foo.WARP)
 example.enum_test(example.GREEN, example.Foo.LUDICROUS)
 example.enum_test(1234, 5678)
 

From b77f3afafbce63a6ef595aea851213b635739fb6 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jschlueter@navigationsolutions.com>
Date: Wed, 6 May 2015 08:27:35 -0400
Subject: [PATCH 125/220] autopep8 cleanup of Examples/test-suite/python

automated cleanup of python pep8 whitespace compliance
---
 .../python/abstract_access_runme.py           |    3 +-
 .../python/abstract_typedef2_runme.py         |    7 +-
 .../python/abstract_typedef_runme.py          |    9 +-
 .../test-suite/python/argcargvtest_runme.py   |   29 +-
 .../test-suite/python/array_member_runme.py   |   15 +-
 .../test-suite/python/arrays_global_runme.py  |    8 +-
 Examples/test-suite/python/autodoc_runme.py   |  595 +++++----
 Examples/test-suite/python/callback_runme.py  |   18 +-
 .../test-suite/python/char_binary_runme.py    |   17 +-
 .../python/compactdefaultargs_runme.py        |    9 +-
 .../test-suite/python/complextest_runme.py    |   12 +-
 .../python/constant_directive_runme.py        |   19 +-
 Examples/test-suite/python/constover_runme.py |    6 +-
 .../python/constructor_copy_runme.py          |    7 +-
 Examples/test-suite/python/contract_runme.py  |  151 ++-
 .../cpp11_alternate_function_syntax_runme.py  |   11 +-
 .../test-suite/python/cpp11_decltype_runme.py |    9 +-
 .../python/cpp11_function_objects_runme.py    |   17 +-
 .../cpp11_initializer_list_extend_runme.py    |    3 +-
 .../python/cpp11_initializer_list_runme.py    |    1 -
 .../cpp11_null_pointer_constant_runme.py      |   10 +-
 .../python/cpp11_raw_string_literals_runme.py |   32 +-
 .../python/cpp11_result_of_runme.py           |    6 +-
 .../python/cpp11_rvalue_reference_runme.py    |   13 +-
 ...cpp11_strongly_typed_enumerations_runme.py |    9 +-
 .../python/cpp11_thread_local_runme.py        |   21 +-
 .../python/cpp11_type_traits_runme.py         |    4 +-
 .../cpp11_uniform_initialization_runme.py     |   16 +-
 Examples/test-suite/python/cpp_enum_runme.py  |   16 +-
 .../test-suite/python/cpp_namespace_runme.py  |   12 +-
 .../test-suite/python/cpp_static_runme.py     |   15 +-
 .../python/default_arg_values_runme.py        |   10 +-
 .../test-suite/python/default_args_runme.py   |  233 ++--
 .../python/default_constructor_runme.py       |    9 +-
 .../python/director_abstract_runme.py         |   82 +-
 .../python/director_alternating_runme.py      |    2 +-
 .../test-suite/python/director_basic_runme.py |   69 +-
 .../python/director_classic_runme.py          |  131 +-
 .../python/director_detect_runme.py           |   36 +-
 .../test-suite/python/director_enum_runme.py  |    8 +-
 .../python/director_exception_runme.py        |   80 +-
 .../python/director_extend_runme.py           |   12 +-
 .../python/director_finalizer_runme.py        |   27 +-
 .../test-suite/python/director_frob_runme.py  |    6 +-
 .../python/director_keywords_runme.py         |    1 -
 .../python/director_nested_runme.py           |   61 +-
 .../python/director_profile_runme.py          |   50 +-
 .../python/director_property_runme.py         |   13 +-
 .../python/director_protected_runme.py        |  147 +--
 .../test-suite/python/director_stl_runme.py   |   36 +-
 .../python/director_string_runme.py           |   26 +-
 .../python/director_thread_runme.py           |    4 +-
 .../python/director_unroll_runme.py           |   11 +-
 .../python/director_wstring_runme.py          |   24 +-
 Examples/test-suite/python/disown_runme.py    |    2 +-
 .../test-suite/python/dynamic_cast_runme.py   |    1 -
 .../test-suite/python/enum_forward_runme.py   |   14 +-
 .../test-suite/python/enum_template_runme.py  |    5 +-
 Examples/test-suite/python/enums_runme.py     |    9 +-
 .../python/exception_order_runme.py           |   45 +-
 .../python/extend_placement_runme.py          |   20 +-
 Examples/test-suite/python/extern_c_runme.py  |    1 -
 Examples/test-suite/python/file_test_runme.py |    2 +-
 Examples/test-suite/python/friends_runme.py   |   27 +-
 .../test-suite/python/funcptr_cpp_runme.py    |    7 +-
 Examples/test-suite/python/fvirtual_runme.py  |    5 +-
 .../python/global_functions_runme.py          |   36 +-
 .../python/global_namespace_runme.py          |   21 +-
 .../test-suite/python/global_ns_arg_runme.py  |    1 -
 .../test-suite/python/global_vars_runme.py    |   21 +-
 Examples/test-suite/python/iadd_runme.py      |    2 +-
 .../test-suite/python/implicittest_runme.py   |   36 +-
 .../python/import_nomodule_runme.py           |    6 +-
 .../test-suite/python/import_stl_runme.py     |    7 +-
 Examples/test-suite/python/imports_runme.py   |    2 +-
 Examples/test-suite/python/inctest_runme.py   |   27 +-
 Examples/test-suite/python/inout_runme.py     |   27 +-
 .../test-suite/python/inplaceadd_runme.py     |   10 +-
 Examples/test-suite/python/input_runme.py     |   18 +-
 .../test-suite/python/kwargs_feature_runme.py |   64 +-
 Examples/test-suite/python/langobj_runme.py   |    2 +-
 .../test-suite/python/li_attribute_runme.py   |   49 +-
 .../python/li_attribute_template_runme.py     |   57 +-
 .../python/li_boost_shared_ptr_bits_runme.py  |   29 +-
 .../python/li_boost_shared_ptr_runme.py       | 1084 +++++++++--------
 .../li_boost_shared_ptr_template_runme.py     |   20 +-
 Examples/test-suite/python/li_cdata_runme.py  |    3 +-
 .../test-suite/python/li_cpointer_runme.py    |    2 +-
 .../test-suite/python/li_cstring_runme.py     |    9 +-
 .../test-suite/python/li_cwstring_runme.py    |    7 +-
 .../test-suite/python/li_implicit_runme.py    |    7 +-
 .../python/li_std_auto_ptr_runme.py           |    8 +-
 .../test-suite/python/li_std_carray_runme.py  |   16 +-
 .../python/li_std_containers_int_runme.py     |  355 +++---
 .../python/li_std_except_as_class_runme.py    |   38 +-
 .../python/li_std_map_member_runme.py         |    4 +-
 .../test-suite/python/li_std_map_runme.py     |   36 +-
 .../python/li_std_pair_extra_runme.py         |   47 +-
 .../python/li_std_pair_using_runme.py         |    3 +-
 .../test-suite/python/li_std_set_runme.py     |   20 +-
 .../test-suite/python/li_std_stream_runme.py  |    7 +-
 .../python/li_std_string_extra_runme.py       |   89 +-
 .../python/li_std_vector_enum_runme.py        |   12 +-
 .../python/li_std_vector_extra_runme.py       |  111 +-
 .../python/li_std_vector_ptr_runme.py         |    1 -
 .../test-suite/python/li_std_wstream_runme.py |    7 +-
 .../test-suite/python/li_std_wstring_runme.py |   60 +-
 .../test-suite/python/member_pointer_runme.py |   26 +-
 .../python/memberin_extend_c_runme.py         |    2 +-
 Examples/test-suite/python/minherit_runme.py  |   40 +-
 .../test-suite/python/multi_import_runme.py   |   10 +-
 .../python/namespace_class_runme.py           |   29 +-
 .../python/namespace_typemap_runme.py         |    2 +-
 .../python/nested_template_base_runme.py      |    8 +-
 .../python/nested_workaround_runme.py         |    4 +-
 Examples/test-suite/python/operbool_runme.py  |    1 -
 .../test-suite/python/overload_bool_runme.py  |   33 +-
 .../python/overload_complicated_runme.py      |   26 +-
 .../python/overload_extend_runme.py           |    3 +-
 .../python/overload_extendc_runme.py          |   11 +-
 .../python/overload_numeric_runme.py          |   17 +-
 .../python/overload_rename_runme.py           |    7 +-
 .../python/overload_simple_runme.py           |    5 +-
 .../python/overload_subtype_runme.py          |    1 -
 .../python/overload_template_fast_runme.py    |   89 +-
 .../python/overload_template_runme.py         |   82 +-
 .../python/pointer_reference_runme.py         |    8 +-
 .../python/preproc_defined_runme.py           |    2 +-
 .../python/preproc_include_runme.py           |   15 +-
 Examples/test-suite/python/preproc_runme.py   |   12 +-
 .../python/primitive_types_runme.py           |  404 +++---
 .../test-suite/python/profiletest_runme.py    |   46 +-
 .../test-suite/python/profiletestc_runme.py   |   88 +-
 .../python/python_abstractbase_runme3.py      |    3 +-
 .../test-suite/python/python_append_runme.py  |   16 +-
 .../python/python_nondynamic_runme.py         |   44 +-
 .../python_overload_simple_cast_runme.py      |   31 +-
 .../test-suite/python/python_pybuf_runme3.py  |   33 +-
 .../python/python_richcompare_runme.py        |   76 +-
 .../test-suite/python/python_threads_runme.py |    7 +-
 .../python/python_varargs_typemap_runme.py    |    4 +-
 Examples/test-suite/python/refcount_runme.py  |   20 +-
 .../python/reference_global_vars_runme.py     |    1 -
 .../python/rename_pcre_encoder_runme.py       |    2 +-
 .../python/rename_predicates_runme.py         |   18 +-
 .../python/rename_strip_encoder_runme.py      |    1 -
 .../python/return_const_value_runme.py        |    8 +-
 .../smart_pointer_const_overload_runme.py     |  199 +--
 .../python/smart_pointer_extend_runme.py      |   14 +-
 .../python/smart_pointer_member_runme.py      |   29 +-
 .../python/smart_pointer_multi_runme.py       |    1 -
 .../smart_pointer_multi_typedef_runme.py      |    1 -
 .../python/smart_pointer_not_runme.py         |    6 +-
 .../python/smart_pointer_overload_runme.py    |    2 -
 .../python/smart_pointer_rename_runme.py      |    2 +-
 .../smart_pointer_templatevariables_runme.py  |    9 +-
 Examples/test-suite/python/sneaky1_runme.py   |    8 +-
 .../python/special_variable_macros_runme.py   |   15 +-
 .../python/static_const_member_2_runme.py     |    2 +-
 .../test-suite/python/std_containers_runme.py |   91 +-
 .../python/struct_initialization_runme.py     |   13 +-
 .../test-suite/python/struct_value_runme.py   |   22 +-
 .../test-suite/python/swigobject_runme.py     |   15 +-
 .../python/template_classes_runme.py          |   24 +-
 .../python/template_default_arg_runme.py      |   47 +-
 .../python/template_inherit_runme.py          |    1 -
 .../python/template_matrix_runme.py           |   10 +-
 .../test-suite/python/template_ns4_runme.py   |    4 +-
 .../test-suite/python/template_ns_runme.py    |    4 +-
 .../python/template_opaque_runme.py           |    1 -
 .../python/template_ref_type_runme.py         |    2 +-
 .../python/template_static_runme.py           |    2 +-
 .../python/template_tbase_template_runme.py   |    2 +-
 .../python/template_type_namespace_runme.py   |    3 +-
 .../python/template_typedef_cplx2_runme.py    |   79 +-
 .../python/template_typedef_cplx3_runme.py    |    8 +-
 .../python/template_typedef_cplx4_runme.py    |    8 +-
 .../python/template_typedef_cplx_runme.py     |   72 +-
 .../python/template_typedef_import_runme.py   |    8 +-
 .../python/template_typedef_runme.py          |   36 +-
 .../template_typemaps_typedef2_runme.py       |    5 +-
 .../python/template_typemaps_typedef_runme.py |    5 +-
 .../python/threads_exception_runme.py         |   55 +-
 .../test-suite/python/typedef_class_runme.py  |   10 +-
 .../test-suite/python/typedef_scope_runme.py  |    6 +-
 .../python/typedef_typedef_runme.py           |    2 +-
 .../test-suite/python/typemap_arrays_runme.py |    1 -
 .../python/typemap_namespace_runme.py         |    1 -
 .../python/typemap_out_optimal_runme.py       |    1 -
 .../python/typemap_qualifier_strip_runme.py   |    1 -
 Examples/test-suite/python/typename_runme.py  |    9 +-
 .../python/types_directive_runme.py           |   11 +-
 Examples/test-suite/python/unions_runme.py    |   13 +-
 .../python/using_composition_runme.py         |   19 +-
 .../test-suite/python/using_extend_runme.py   |   16 +-
 .../test-suite/python/using_inherit_runme.py  |   25 +-
 .../python/varargs_overload_runme.py          |    1 -
 Examples/test-suite/python/varargs_runme.py   |    2 +-
 .../python/virtual_derivation_runme.py        |    3 +-
 .../test-suite/python/virtual_poly_runme.py   |   14 +-
 Examples/test-suite/python/voidtest_runme.py  |    3 +-
 Examples/test-suite/python/wrapmacro_runme.py |    4 +-
 202 files changed, 3477 insertions(+), 3382 deletions(-)

diff --git a/Examples/test-suite/python/abstract_access_runme.py b/Examples/test-suite/python/abstract_access_runme.py
index 55638e40e..8abce98ae 100644
--- a/Examples/test-suite/python/abstract_access_runme.py
+++ b/Examples/test-suite/python/abstract_access_runme.py
@@ -2,5 +2,4 @@ import abstract_access
 
 d = abstract_access.D()
 if d.do_x() != 1:
-   raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/abstract_typedef2_runme.py b/Examples/test-suite/python/abstract_typedef2_runme.py
index 2a11d1944..ef6f415dd 100644
--- a/Examples/test-suite/python/abstract_typedef2_runme.py
+++ b/Examples/test-suite/python/abstract_typedef2_runme.py
@@ -1,8 +1,3 @@
-from  abstract_typedef2 import *
+from abstract_typedef2 import *
 
 a = A_UF()
-  
-
-
-
-
diff --git a/Examples/test-suite/python/abstract_typedef_runme.py b/Examples/test-suite/python/abstract_typedef_runme.py
index 15d70aa42..d69134f2e 100644
--- a/Examples/test-suite/python/abstract_typedef_runme.py
+++ b/Examples/test-suite/python/abstract_typedef_runme.py
@@ -1,11 +1,8 @@
-from  abstract_typedef import *
+from abstract_typedef import *
 e = Engine()
 
 a = A()
-  
+
 
 if a.write(e) != 1:
-  raise RuntimeError
-
-
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/argcargvtest_runme.py b/Examples/test-suite/python/argcargvtest_runme.py
index 047ea9551..38843b932 100644
--- a/Examples/test-suite/python/argcargvtest_runme.py
+++ b/Examples/test-suite/python/argcargvtest_runme.py
@@ -1,27 +1,26 @@
 from argcargvtest import *
 
-largs=['hi','hola','hello']
+largs = ['hi', 'hola', 'hello']
 if mainc(largs) != 3:
-  raise RuntimeError("bad main typemap")
+    raise RuntimeError("bad main typemap")
 
-targs=('hi','hola')
-if mainv(targs,1) != 'hola':
-  print(mainv(targs,1))
-  raise RuntimeError("bad main typemap")
+targs = ('hi', 'hola')
+if mainv(targs, 1) != 'hola':
+    print(mainv(targs, 1))
+    raise RuntimeError("bad main typemap")
 
-targs=('hi', 'hola')
-if mainv(targs,1) != 'hola':
-  raise RuntimeError("bad main typemap")
+targs = ('hi', 'hola')
+if mainv(targs, 1) != 'hola':
+    raise RuntimeError("bad main typemap")
 
 try:
-  error = 0
-  mainv('hello',1)
-  error = 1
+    error = 0
+    mainv('hello', 1)
+    error = 1
 except TypeError:
-  pass
+    pass
 if error:
-  raise RuntimeError("bad main typemap")
-
+    raise RuntimeError("bad main typemap")
 
 
 initializeApp(largs)
diff --git a/Examples/test-suite/python/array_member_runme.py b/Examples/test-suite/python/array_member_runme.py
index 95cf03b44..de6e0f3e7 100644
--- a/Examples/test-suite/python/array_member_runme.py
+++ b/Examples/test-suite/python/array_member_runme.py
@@ -3,19 +3,16 @@ from array_member import *
 f = Foo()
 f.data = cvar.global_data
 
-for i in range(0,8):
-    if get_value(f.data,i) != get_value(cvar.global_data,i):
+for i in range(0, 8):
+    if get_value(f.data, i) != get_value(cvar.global_data, i):
         raise RuntimeError, "Bad array assignment"
 
 
-for i in range(0,8):
-    set_value(f.data,i,-i)
+for i in range(0, 8):
+    set_value(f.data, i, -i)
 
 cvar.global_data = f.data
 
-for i in range(0,8):
-    if get_value(f.data,i) != get_value(cvar.global_data,i):
+for i in range(0, 8):
+    if get_value(f.data, i) != get_value(cvar.global_data, i):
         raise RuntimeError, "Bad array assignment"
-    
-
-
diff --git a/Examples/test-suite/python/arrays_global_runme.py b/Examples/test-suite/python/arrays_global_runme.py
index ab7fd6a41..fa3b9f2ec 100644
--- a/Examples/test-suite/python/arrays_global_runme.py
+++ b/Examples/test-suite/python/arrays_global_runme.py
@@ -2,19 +2,19 @@ import arrays_global
 
 arrays_global.cvar.array_i = arrays_global.cvar.array_const_i
 
-from  arrays_global import *
+from arrays_global import *
 
 BeginString_FIX44a
 cvar.BeginString_FIX44b
 BeginString_FIX44c
 cvar.BeginString_FIX44d
 cvar.BeginString_FIX44d
-cvar.BeginString_FIX44b ="12"'\0'"45"
+cvar.BeginString_FIX44b = "12"'\0'"45"
 cvar.BeginString_FIX44b
 cvar.BeginString_FIX44d
 cvar.BeginString_FIX44e
 BeginString_FIX44f
 
-test_a("hello","hi","chello","chi")
+test_a("hello", "hi", "chello", "chi")
 
-test_b("1234567","hi")
+test_b("1234567", "hi")
diff --git a/Examples/test-suite/python/autodoc_runme.py b/Examples/test-suite/python/autodoc_runme.py
index 9b493bb43..f5b6b7ce6 100644
--- a/Examples/test-suite/python/autodoc_runme.py
+++ b/Examples/test-suite/python/autodoc_runme.py
@@ -1,341 +1,332 @@
 from autodoc import *
 import sys
 
-def check(got, expected, expected_builtin = None, skip = False):
-  if not skip:
-    expect = expected
-    if is_python_builtin() and expected_builtin != None:
-      expect = expected_builtin
-    if expect != got:
-      raise RuntimeError("\n" + "Expected: [" + str(expect) + "]\n" + "Got     : [" + str(got) + "]")
+
+def check(got, expected, expected_builtin=None, skip=False):
+    if not skip:
+        expect = expected
+        if is_python_builtin() and expected_builtin != None:
+            expect = expected_builtin
+        if expect != got:
+            raise RuntimeError(
+                "\n" + "Expected: [" + str(expect) + "]\n" + "Got     : [" + str(got) + "]")
+
 
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 if not is_new_style_class(A):
-  # Missing static methods make this hard to test... skip if -classic is used!
-  sys.exit(0)
+    # Missing static methods make this hard to test... skip if -classic is
+    # used!
+    sys.exit(0)
 
-skip = True # skip builtin check - the autodoc is missing, but it probably should not be
+# skip builtin check - the autodoc is missing, but it probably should not be
+skip = True
 
 check(A.__doc__, "Proxy of C++ A class", "::A")
 check(A.funk.__doc__, "just a string")
 check(A.func0.__doc__,
-"func0(self, arg2, hello) -> int",
-"func0(arg2, hello) -> int")
+      "func0(self, arg2, hello) -> int",
+      "func0(arg2, hello) -> int")
 check(A.func1.__doc__,
-"func1(A self, short arg2, Tuple hello) -> int",
-"func1(short arg2, Tuple hello) -> int")
+      "func1(A self, short arg2, Tuple hello) -> int",
+      "func1(short arg2, Tuple hello) -> int")
 check(A.func2.__doc__,
-"\n"
-"        func2(self, arg2, hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func2(arg2, hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func2(self, arg2, hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func2(arg2, hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 check(A.func3.__doc__,
-"\n"
-"        func3(A self, short arg2, Tuple hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func3(short arg2, Tuple hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func3(A self, short arg2, Tuple hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func3(short arg2, Tuple hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 
 check(A.func0default.__doc__,
-"\n"
-"        func0default(self, e, arg3, hello, f=2) -> int\n"
-"        func0default(self, e, arg3, hello) -> int\n"
-"        "
-,
-"\n"
-"func0default(e, arg3, hello, f=2) -> int\n"
-"func0default(e, arg3, hello) -> int\n"
-""
-)
+      "\n"
+      "        func0default(self, e, arg3, hello, f=2) -> int\n"
+      "        func0default(self, e, arg3, hello) -> int\n"
+      "        ",
+      "\n"
+      "func0default(e, arg3, hello, f=2) -> int\n"
+      "func0default(e, arg3, hello) -> int\n"
+      ""
+      )
 check(A.func1default.__doc__,
-"\n"
-"        func1default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
-"        func1default(A self, A e, short arg3, Tuple hello) -> int\n"
-"        "
-,
-"\n"
-"func1default(A e, short arg3, Tuple hello, double f=2) -> int\n"
-"func1default(A e, short arg3, Tuple hello) -> int\n"
-""
-)
+      "\n"
+      "        func1default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
+      "        func1default(A self, A e, short arg3, Tuple hello) -> int\n"
+      "        ",
+      "\n"
+      "func1default(A e, short arg3, Tuple hello, double f=2) -> int\n"
+      "func1default(A e, short arg3, Tuple hello) -> int\n"
+      ""
+      )
 check(A.func2default.__doc__,
-"\n"
-"        func2default(self, e, arg3, hello, f=2) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg3: short\n"
-"            hello: int tuple[2]\n"
-"            f: double\n"
-"\n"
-"        func2default(self, e, arg3, hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg3: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func2default(e, arg3, hello, f=2) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg3: short\n"
-"    hello: int tuple[2]\n"
-"    f: double\n"
-"\n"
-"func2default(e, arg3, hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg3: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func2default(self, e, arg3, hello, f=2) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg3: short\n"
+      "            hello: int tuple[2]\n"
+      "            f: double\n"
+      "\n"
+      "        func2default(self, e, arg3, hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg3: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func2default(e, arg3, hello, f=2) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg3: short\n"
+      "    hello: int tuple[2]\n"
+      "    f: double\n"
+      "\n"
+      "func2default(e, arg3, hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg3: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 check(A.func3default.__doc__,
-"\n"
-"        func3default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg3: short\n"
-"            hello: int tuple[2]\n"
-"            f: double\n"
-"\n"
-"        func3default(A self, A e, short arg3, Tuple hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg3: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func3default(A e, short arg3, Tuple hello, double f=2) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg3: short\n"
-"    hello: int tuple[2]\n"
-"    f: double\n"
-"\n"
-"func3default(A e, short arg3, Tuple hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg3: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func3default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg3: short\n"
+      "            hello: int tuple[2]\n"
+      "            f: double\n"
+      "\n"
+      "        func3default(A self, A e, short arg3, Tuple hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg3: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func3default(A e, short arg3, Tuple hello, double f=2) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg3: short\n"
+      "    hello: int tuple[2]\n"
+      "    f: double\n"
+      "\n"
+      "func3default(A e, short arg3, Tuple hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg3: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 
 check(A.func0static.__doc__,
-"\n"
-"        func0static(e, arg2, hello, f=2) -> int\n"
-"        func0static(e, arg2, hello) -> int\n"
-"        "
-,
-"\n"
-"func0static(e, arg2, hello, f=2) -> int\n"
-"func0static(e, arg2, hello) -> int\n"
-""
-)
+      "\n"
+      "        func0static(e, arg2, hello, f=2) -> int\n"
+      "        func0static(e, arg2, hello) -> int\n"
+      "        ",
+      "\n"
+      "func0static(e, arg2, hello, f=2) -> int\n"
+      "func0static(e, arg2, hello) -> int\n"
+      ""
+      )
 check(A.func1static.__doc__,
-"\n"
-"        func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
-"        func1static(A e, short arg2, Tuple hello) -> int\n"
-"        "
-,
-"\n"
-"func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
-"func1static(A e, short arg2, Tuple hello) -> int\n"
-""
-)
+      "\n"
+      "        func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
+      "        func1static(A e, short arg2, Tuple hello) -> int\n"
+      "        ",
+      "\n"
+      "func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
+      "func1static(A e, short arg2, Tuple hello) -> int\n"
+      ""
+      )
 check(A.func2static.__doc__,
-"\n"
-"        func2static(e, arg2, hello, f=2) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"            f: double\n"
-"\n"
-"        func2static(e, arg2, hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func2static(e, arg2, hello, f=2) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"    f: double\n"
-"\n"
-"func2static(e, arg2, hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func2static(e, arg2, hello, f=2) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "            f: double\n"
+      "\n"
+      "        func2static(e, arg2, hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func2static(e, arg2, hello, f=2) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "    f: double\n"
+      "\n"
+      "func2static(e, arg2, hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 check(A.func3static.__doc__,
-"\n"
-"        func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"            f: double\n"
-"\n"
-"        func3static(A e, short arg2, Tuple hello) -> int\n"
-"\n"
-"        Parameters:\n"
-"            e: A *\n"
-"            arg2: short\n"
-"            hello: int tuple[2]\n"
-"\n"
-"        "
-,
-"\n"
-"func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"    f: double\n"
-"\n"
-"func3static(A e, short arg2, Tuple hello) -> int\n"
-"\n"
-"Parameters:\n"
-"    e: A *\n"
-"    arg2: short\n"
-"    hello: int tuple[2]\n"
-"\n"
-""
-)
+      "\n"
+      "        func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "            f: double\n"
+      "\n"
+      "        func3static(A e, short arg2, Tuple hello) -> int\n"
+      "\n"
+      "        Parameters:\n"
+      "            e: A *\n"
+      "            arg2: short\n"
+      "            hello: int tuple[2]\n"
+      "\n"
+      "        ",
+      "\n"
+      "func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "    f: double\n"
+      "\n"
+      "func3static(A e, short arg2, Tuple hello) -> int\n"
+      "\n"
+      "Parameters:\n"
+      "    e: A *\n"
+      "    arg2: short\n"
+      "    hello: int tuple[2]\n"
+      "\n"
+      ""
+      )
 
 if sys.version_info[0:2] > (2, 4):
-  # Python 2.4 does not seem to work
-  check(A.variable_a.__doc__,
-  "A_variable_a_get(self) -> int",
-  "A.variable_a"
-  )
-  check(A.variable_b.__doc__,
-  "A_variable_b_get(A self) -> int",
-  "A.variable_b"
-  )
-  check(A.variable_c.__doc__,
-  "\n"
-  "A_variable_c_get(self) -> int\n"
-  "\n"
-  "Parameters:\n"
-  "    self: A *\n"
-  "\n"
-  ,
-  "A.variable_c"
-  )
-  check(A.variable_d.__doc__,
-  "\n"
-  "A_variable_d_get(A self) -> int\n"
-  "\n"
-  "Parameters:\n"
-  "    self: A *\n"
-  "\n"
-  ,
-  "A.variable_d"
-  )
+    # Python 2.4 does not seem to work
+    check(A.variable_a.__doc__,
+          "A_variable_a_get(self) -> int",
+          "A.variable_a"
+          )
+    check(A.variable_b.__doc__,
+          "A_variable_b_get(A self) -> int",
+          "A.variable_b"
+          )
+    check(A.variable_c.__doc__,
+          "\n"
+          "A_variable_c_get(self) -> int\n"
+          "\n"
+          "Parameters:\n"
+          "    self: A *\n"
+          "\n",
+          "A.variable_c"
+          )
+    check(A.variable_d.__doc__,
+          "\n"
+          "A_variable_d_get(A self) -> int\n"
+          "\n"
+          "Parameters:\n"
+          "    self: A *\n"
+          "\n",
+          "A.variable_d"
+          )
 
 check(B.__doc__,
-"Proxy of C++ B class",
-"::B"
-)
+      "Proxy of C++ B class",
+      "::B"
+      )
 check(C.__init__.__doc__, "__init__(self, a, b, h) -> C", None, skip)
-check(D.__init__.__doc__, "__init__(D self, int a, int b, Hola h) -> D", None, skip)
+check(D.__init__.__doc__,
+      "__init__(D self, int a, int b, Hola h) -> D", None, skip)
 check(E.__init__.__doc__,
-"\n"
-"        __init__(self, a, b, h) -> E\n"
-"\n"
-"        Parameters:\n"
-"            a: special comment for parameter a\n"
-"            b: another special comment for parameter b\n"
-"            h: enum Hola\n"
-"\n"
-"        "
-, None, skip
-)
+      "\n"
+      "        __init__(self, a, b, h) -> E\n"
+      "\n"
+      "        Parameters:\n"
+      "            a: special comment for parameter a\n"
+      "            b: another special comment for parameter b\n"
+      "            h: enum Hola\n"
+      "\n"
+      "        ", None, skip
+      )
 check(F.__init__.__doc__,
-"\n"
-"        __init__(F self, int a, int b, Hola h) -> F\n"
-"\n"
-"        Parameters:\n"
-"            a: special comment for parameter a\n"
-"            b: another special comment for parameter b\n"
-"            h: enum Hola\n"
-"\n"
-"        "
-, None, skip
-)
+      "\n"
+      "        __init__(F self, int a, int b, Hola h) -> F\n"
+      "\n"
+      "        Parameters:\n"
+      "            a: special comment for parameter a\n"
+      "            b: another special comment for parameter b\n"
+      "            h: enum Hola\n"
+      "\n"
+      "        ", None, skip
+      )
 
 check(B.funk.__doc__,
-"funk(B self, int c, int d) -> int",
-"funk(int c, int d) -> int")
+      "funk(B self, int c, int d) -> int",
+      "funk(int c, int d) -> int")
 check(funk.__doc__, "funk(A e, short arg2, int c, int d) -> int")
 check(funkdefaults.__doc__,
-"\n"
-"    funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
-"    funkdefaults(A e, short arg2, int c, int d) -> int\n"
-"    "
-,
-"\n"
-"funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
-"funkdefaults(A e, short arg2, int c, int d) -> int\n"
-""
-)
+      "\n"
+      "    funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
+      "    funkdefaults(A e, short arg2, int c, int d) -> int\n"
+      "    ",
+      "\n"
+      "funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
+      "funkdefaults(A e, short arg2, int c, int d) -> int\n"
+      ""
+      )
 
 check(func_input.__doc__, "func_input(int * INPUT) -> int")
 check(func_output.__doc__, "func_output() -> int")
diff --git a/Examples/test-suite/python/callback_runme.py b/Examples/test-suite/python/callback_runme.py
index b2bbb2d0f..ef7baad4e 100644
--- a/Examples/test-suite/python/callback_runme.py
+++ b/Examples/test-suite/python/callback_runme.py
@@ -2,30 +2,30 @@ import _callback
 from callback import *
 
 if foo(2) != 2:
-  raise RuntimeError
+    raise RuntimeError
 
 if A_bar(2) != 4:
-  raise RuntimeError
+    raise RuntimeError
 
 if foobar(3, _callback.foo) != foo(3):
-  raise RuntimeError  
+    raise RuntimeError
 
 if foobar(3, foo) != foo(3):
-  raise RuntimeError  
+    raise RuntimeError
 
 if foobar(3, A_bar) != A_bar(3):
-  raise RuntimeError
+    raise RuntimeError
 
 if foobar(3, foof) != foof(3):
-  raise RuntimeError
+    raise RuntimeError
 
 if foobar_i(3, foo_i) != foo_i(3):
-  raise RuntimeError
+    raise RuntimeError
 
 
 if foobar_d(3.5, foo_d) != foo_d(3.5):
-  raise RuntimeError
+    raise RuntimeError
 
 a = A()
 if foobarm(3, a, A.foom_cb_ptr) != a.foom(3):
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/char_binary_runme.py b/Examples/test-suite/python/char_binary_runme.py
index b6d9c81c8..13457253f 100644
--- a/Examples/test-suite/python/char_binary_runme.py
+++ b/Examples/test-suite/python/char_binary_runme.py
@@ -2,11 +2,11 @@ from char_binary import *
 
 t = Test()
 if t.strlen('hile') != 4:
-  print t.strlen('hile')
-  raise RuntimeError, "bad multi-arg typemap"
+    print t.strlen('hile')
+    raise RuntimeError, "bad multi-arg typemap"
 
 if t.strlen('hil\0') != 4:
-  raise RuntimeError, "bad multi-arg typemap"
+    raise RuntimeError, "bad multi-arg typemap"
 
 #
 # creating a raw char*
@@ -20,17 +20,16 @@ pchar_setitem(pc, 4, 0)
 
 
 if t.strlen(pc) != 4:
-  raise RuntimeError, "bad multi-arg typemap"
+    raise RuntimeError, "bad multi-arg typemap"
 
 cvar.var_pchar = pc
 if cvar.var_pchar != "hola":
-  print cvar.var_pchar
-  raise RuntimeError, "bad pointer case"
+    print cvar.var_pchar
+    raise RuntimeError, "bad pointer case"
 
 cvar.var_namet = pc
-#if cvar.var_namet != "hola\0":
+# if cvar.var_namet != "hola\0":
 if cvar.var_namet != "hola":
-  raise RuntimeError, "bad pointer case"
+    raise RuntimeError, "bad pointer case"
 
 delete_pchar(pc)
-
diff --git a/Examples/test-suite/python/compactdefaultargs_runme.py b/Examples/test-suite/python/compactdefaultargs_runme.py
index ff865714c..e81c8d173 100644
--- a/Examples/test-suite/python/compactdefaultargs_runme.py
+++ b/Examples/test-suite/python/compactdefaultargs_runme.py
@@ -4,17 +4,16 @@ defaults1 = Defaults1(1000)
 defaults1 = Defaults1()
 
 if defaults1.ret(10.0) != 10.0:
-  raise RuntimeError
+    raise RuntimeError
 
 if defaults1.ret() != -1.0:
-  raise RuntimeError
+    raise RuntimeError
 
 defaults2 = Defaults2(1000)
 defaults2 = Defaults2()
 
 if defaults2.ret(10.0) != 10.0:
-  raise RuntimeError
+    raise RuntimeError
 
 if defaults2.ret() != -1.0:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/complextest_runme.py b/Examples/test-suite/python/complextest_runme.py
index cc2463a39..7dd7f5a3b 100644
--- a/Examples/test-suite/python/complextest_runme.py
+++ b/Examples/test-suite/python/complextest_runme.py
@@ -1,17 +1,17 @@
 import complextest
 
-a = complex(-1,2)
+a = complex(-1, 2)
 
 if complextest.Conj(a) != a.conjugate():
-  raise RuntimeError, "bad complex mapping"
+    raise RuntimeError, "bad complex mapping"
 
 if complextest.Conjf(a) != a.conjugate():
-  raise RuntimeError, "bad complex mapping"
+    raise RuntimeError, "bad complex mapping"
 
 
-v = (complex(1,2), complex(2,3), complex(4,3), 1)
+v = (complex(1, 2), complex(2, 3), complex(4, 3), 1)
 
 try:
-  complextest.Copy_h(v)
+    complextest.Copy_h(v)
 except:
-  pass
+    pass
diff --git a/Examples/test-suite/python/constant_directive_runme.py b/Examples/test-suite/python/constant_directive_runme.py
index 48f85ce8a..a7ed82b8b 100644
--- a/Examples/test-suite/python/constant_directive_runme.py
+++ b/Examples/test-suite/python/constant_directive_runme.py
@@ -1,15 +1,20 @@
 import constant_directive
 
-if not isinstance(constant_directive.TYPE1_CONSTANT1,constant_directive.Type1):
-  raise RuntimeError("Failure: TYPE1_CONSTANT1 type: {}".format(type(constant_directive.TYPE1_CONSTANT1)))
-if not isinstance(constant_directive.getType1Instance(),constant_directive.Type1):
-  raise RuntimeError("Failure: getType1Instance() type: {}".format(type(constant_directive.getType1Instance())))
+if not isinstance(constant_directive.TYPE1_CONSTANT1, constant_directive.Type1):
+    raise RuntimeError("Failure: TYPE1_CONSTANT1 type: {}".format(
+        type(constant_directive.TYPE1_CONSTANT1)))
+if not isinstance(constant_directive.getType1Instance(), constant_directive.Type1):
+    raise RuntimeError("Failure: getType1Instance() type: {}".format(
+        type(constant_directive.getType1Instance())))
 
 if constant_directive.TYPE1_CONSTANT1.val != 1:
-  raise RuntimeError("constant_directive.TYPE1_CONSTANT1.val is %r (should be 1)" % constant_directive.TYPE1_CONSTANT1.val)
+    raise RuntimeError("constant_directive.TYPE1_CONSTANT1.val is %r (should be 1)" %
+                       constant_directive.TYPE1_CONSTANT1.val)
 
 if constant_directive.TYPE1_CONSTANT2.val != 2:
-  raise RuntimeError("constant_directive.TYPE1_CONSTANT2.val is %r (should be 2)" % constant_directive.TYPE1_CONSTANT2.val)
+    raise RuntimeError("constant_directive.TYPE1_CONSTANT2.val is %r (should be 2)" %
+                       constant_directive.TYPE1_CONSTANT2.val)
 
 if constant_directive.TYPE1_CONSTANT3.val != 3:
-  raise RuntimeError("constant_directive.TYPE1_CONSTANT3.val is %r (should be 3)" % constant_directive.TYPE1_CONSTANT3.val)
+    raise RuntimeError("constant_directive.TYPE1_CONSTANT3.val is %r (should be 3)" %
+                       constant_directive.TYPE1_CONSTANT3.val)
diff --git a/Examples/test-suite/python/constover_runme.py b/Examples/test-suite/python/constover_runme.py
index 5c5419706..2d28a55cc 100644
--- a/Examples/test-suite/python/constover_runme.py
+++ b/Examples/test-suite/python/constover_runme.py
@@ -11,7 +11,7 @@ p = constover.test_pconst("test")
 if p != "test_pconst":
     print "test_pconst failed!"
     error = 1
-    
+
 f = constover.Foo()
 p = f.test("test")
 if p != "test":
@@ -32,7 +32,5 @@ p = f.test_pconstm("test")
 if p != "test_pconstmethod":
     print "member-test_pconstm failed!"
     error = 1
-    
+
 sys.exit(error)
-
-
diff --git a/Examples/test-suite/python/constructor_copy_runme.py b/Examples/test-suite/python/constructor_copy_runme.py
index 431d3232f..a54bc106f 100644
--- a/Examples/test-suite/python/constructor_copy_runme.py
+++ b/Examples/test-suite/python/constructor_copy_runme.py
@@ -1,7 +1,7 @@
 from constructor_copy import *
 
-f1 = Foo1(3);
-f11 = Foo1(f1);
+f1 = Foo1(3)
+f11 = Foo1(f1)
 
 
 if f1.x != f11.x:
@@ -24,7 +24,7 @@ bc = Bari(bi)
 
 if (bi.x != bc.x):
     raise RuntimeError
-    
+
 
 bd = Bard(5)
 try:
@@ -35,4 +35,3 @@ except:
 
 if not good:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/contract_runme.py b/Examples/test-suite/python/contract_runme.py
index 905bf1196..cd75a51d2 100644
--- a/Examples/test-suite/python/contract_runme.py
+++ b/Examples/test-suite/python/contract_runme.py
@@ -1,143 +1,142 @@
 import contract
 
-contract.test_preassert(1,2)
+contract.test_preassert(1, 2)
 try:
-	contract.test_preassert(-1)
-	print "Failed! Preassertions are broken"
+    contract.test_preassert(-1)
+    print "Failed! Preassertions are broken"
 except:
-	pass
+    pass
 
 contract.test_postassert(3)
 try:
-	contract.test_postassert(-3)
-	print "Failed! Postassertions are broken"
+    contract.test_postassert(-3)
+    print "Failed! Postassertions are broken"
 except:
-	pass
+    pass
 
-contract.test_prepost(2,3)
-contract.test_prepost(5,-4)
+contract.test_prepost(2, 3)
+contract.test_prepost(5, -4)
 try:
-	contract.test_prepost(-3,4)
-	print "Failed! Preassertions are broken"
+    contract.test_prepost(-3, 4)
+    print "Failed! Preassertions are broken"
 except:
-	pass
+    pass
 
 try:
-	contract.test_prepost(4,-10)
-	print "Failed! Postassertions are broken"
+    contract.test_prepost(4, -10)
+    print "Failed! Postassertions are broken"
 
 except:
-	pass
+    pass
 
 f = contract.Foo()
-f.test_preassert(4,5)
+f.test_preassert(4, 5)
 try:
-	f.test_preassert(-2,3)
-	print "Failed! Method preassertion."
+    f.test_preassert(-2, 3)
+    print "Failed! Method preassertion."
 except:
-	pass
+    pass
 
 f.test_postassert(4)
 try:
-	f.test_postassert(-4)
-	print "Failed! Method postassertion"
+    f.test_postassert(-4)
+    print "Failed! Method postassertion"
 except:
-	pass
+    pass
 
-f.test_prepost(3,4)
-f.test_prepost(4,-3)
+f.test_prepost(3, 4)
+f.test_prepost(4, -3)
 try:
-	f.test_prepost(-4,2)
-	print "Failed! Method preassertion."
+    f.test_prepost(-4, 2)
+    print "Failed! Method preassertion."
 except:
-	pass
+    pass
 
 try:
-	f.test_prepost(4,-10)
-	print "Failed! Method postassertion."
+    f.test_prepost(4, -10)
+    print "Failed! Method postassertion."
 except:
-	pass
+    pass
 
-contract.Foo_stest_prepost(4,0)
+contract.Foo_stest_prepost(4, 0)
 try:
-	contract.Foo_stest_prepost(-4,2)
-	print "Failed! Static method preassertion"
+    contract.Foo_stest_prepost(-4, 2)
+    print "Failed! Static method preassertion"
 except:
-	pass
+    pass
 
 try:
-	contract.Foo_stest_prepost(4,-10)
-	print "Failed! Static method posteassertion"
+    contract.Foo_stest_prepost(4, -10)
+    print "Failed! Static method posteassertion"
 except:
-	pass
-	
+    pass
+
 b = contract.Bar()
 try:
-	b.test_prepost(2,-4)
-	print "Failed! Inherited preassertion."
+    b.test_prepost(2, -4)
+    print "Failed! Inherited preassertion."
 except:
-	pass
+    pass
 
 
 d = contract.D()
 try:
-	d.foo(-1,1,1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.foo(-1, 1, 1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.foo(1,-1,1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.foo(1, -1, 1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.foo(1,1,-1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.foo(1, 1, -1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.foo(1,1,1,-1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.foo(1, 1, 1, -1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.foo(1,1,1,1,-1)
-	print "Failed! Inherited preassertion (D)."
+    d.foo(1, 1, 1, 1, -1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 
 
 try:
-	d.bar(-1,1,1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.bar(-1, 1, 1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.bar(1,-1,1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.bar(1, -1, 1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.bar(1,1,-1,1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.bar(1, 1, -1, 1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.bar(1,1,1,-1,1)
-	print "Failed! Inherited preassertion (D)."
+    d.bar(1, 1, 1, -1, 1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 try:
-	d.bar(1,1,1,1,-1)
-	print "Failed! Inherited preassertion (D)."
+    d.bar(1, 1, 1, 1, -1)
+    print "Failed! Inherited preassertion (D)."
 except:
-	pass
+    pass
 
-#Namespace
+# Namespace
 my = contract.myClass(1)
 try:
-	my = contract.myClass(0)
-	print "Failed! constructor preassertion"
+    my = contract.myClass(0)
+    print "Failed! constructor preassertion"
 except:
-	pass
-
+    pass
diff --git a/Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py b/Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py
index 0a1c45716..363736a84 100644
--- a/Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py
+++ b/Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py
@@ -2,12 +2,13 @@ import cpp11_alternate_function_syntax
 
 a = cpp11_alternate_function_syntax.SomeStruct()
 
-res = a.addNormal(4,5)
+res = a.addNormal(4, 5)
 if res != 9:
-	raise RuntimeError, ("SomeStruct::addNormal(4,5) returns ", res, " should be 9.")
+    raise RuntimeError, ("SomeStruct::addNormal(4,5) returns ",
+                         res, " should be 9.")
 
 
-res = a.addAlternate(4,5)
+res = a.addAlternate(4, 5)
 if res != 9:
-	raise RuntimeError, ("SomeStruct::addAlternate(4,5) returns ", res, " should be 9.")
-
+    raise RuntimeError, ("SomeStruct::addAlternate(4,5) returns ",
+                         res, " should be 9.")
diff --git a/Examples/test-suite/python/cpp11_decltype_runme.py b/Examples/test-suite/python/cpp11_decltype_runme.py
index bfcbbec79..1650d9004 100644
--- a/Examples/test-suite/python/cpp11_decltype_runme.py
+++ b/Examples/test-suite/python/cpp11_decltype_runme.py
@@ -3,17 +3,16 @@ import cpp11_decltype
 a = cpp11_decltype.A()
 a.i = 5
 if a.i != 5:
-	raise RuntimeError, "Assignment to a.i failed."
+    raise RuntimeError, "Assignment to a.i failed."
 
 a.j = 10
 if a.j != 10:
-	raise RuntimeError, "Assignment to a.j failed."
+    raise RuntimeError, "Assignment to a.j failed."
 
 b = a.foo(5)
 if b != 10:
-	raise RuntimeError, "foo(5) should return 10."
+    raise RuntimeError, "foo(5) should return 10."
 
 b = a.foo(6)
 if b != 0:
-	raise RuntimeError, "foo(6) should return 0."
-
+    raise RuntimeError, "foo(6) should return 0."
diff --git a/Examples/test-suite/python/cpp11_function_objects_runme.py b/Examples/test-suite/python/cpp11_function_objects_runme.py
index 5a63b632b..d1515c16c 100644
--- a/Examples/test-suite/python/cpp11_function_objects_runme.py
+++ b/Examples/test-suite/python/cpp11_function_objects_runme.py
@@ -1,7 +1,9 @@
 import cpp11_function_objects
 import sys
 
+
 class Test1(cpp11_function_objects.Test):
+
     def __init__(self):
         cpp11_function_objects.Test.__init__(self)
 
@@ -10,14 +12,17 @@ class Test1(cpp11_function_objects.Test):
 
 t = cpp11_function_objects.Test()
 if t.value != 0:
-	raise RuntimeError("Runtime cpp11_function_objects failed. t.value should be 0, but is " + str(t.value))
+    raise RuntimeError(
+        "Runtime cpp11_function_objects failed. t.value should be 0, but is " + str(t.value))
 
-t(1,2) # adds numbers and sets value
+t(1, 2)  # adds numbers and sets value
 
 if t.value != 3:
-	raise RuntimeError("Runtime cpp11_function_objects failed. t.value not changed - should be 3, but is " + str(t.value))
- 
+    raise RuntimeError(
+        "Runtime cpp11_function_objects failed. t.value not changed - should be 3, but is " + str(t.value))
+
 t2 = Test1()
-a = cpp11_function_objects.testit1(t2, 4,3)
+a = cpp11_function_objects.testit1(t2, 4, 3)
 if a != 12:
-	raise RuntimeError("Runtime cpp11_function_objects failed. t.value not changed - should be 12, but is " + str(a))
+    raise RuntimeError(
+        "Runtime cpp11_function_objects failed. t.value not changed - should be 12, but is " + str(a))
diff --git a/Examples/test-suite/python/cpp11_initializer_list_extend_runme.py b/Examples/test-suite/python/cpp11_initializer_list_extend_runme.py
index eedf8f148..285273efa 100644
--- a/Examples/test-suite/python/cpp11_initializer_list_extend_runme.py
+++ b/Examples/test-suite/python/cpp11_initializer_list_extend_runme.py
@@ -1,4 +1,3 @@
 import cpp11_initializer_list_extend
 
-c = cpp11_initializer_list_extend.Container( [10, 20, 30, 40] )
-
+c = cpp11_initializer_list_extend.Container([10, 20, 30, 40])
diff --git a/Examples/test-suite/python/cpp11_initializer_list_runme.py b/Examples/test-suite/python/cpp11_initializer_list_runme.py
index 395cd610d..84f955f63 100644
--- a/Examples/test-suite/python/cpp11_initializer_list_runme.py
+++ b/Examples/test-suite/python/cpp11_initializer_list_runme.py
@@ -2,4 +2,3 @@ import cpp11_initializer_list
 
 a = cpp11_initializer_list.A()
 a = cpp11_initializer_list.A(11.1)
-
diff --git a/Examples/test-suite/python/cpp11_null_pointer_constant_runme.py b/Examples/test-suite/python/cpp11_null_pointer_constant_runme.py
index d304c139d..54a8fe0eb 100644
--- a/Examples/test-suite/python/cpp11_null_pointer_constant_runme.py
+++ b/Examples/test-suite/python/cpp11_null_pointer_constant_runme.py
@@ -3,13 +3,15 @@ import cpp11_null_pointer_constant
 a = cpp11_null_pointer_constant.A()
 
 if a._myA != None:
-	raise RuntimeError, ("cpp11_null_pointer_constant: _myA should be None, but is ", a._myA)
+    raise RuntimeError, (
+        "cpp11_null_pointer_constant: _myA should be None, but is ", a._myA)
 
 b = cpp11_null_pointer_constant.A()
 if a._myA != b._myA:
-	raise RuntimeError, ("cpp11_null_pointer_constant: a._myA should be the same as b._myA, but ", a._myA, "!=", b._myA)
+    raise RuntimeError, (
+        "cpp11_null_pointer_constant: a._myA should be the same as b._myA, but ", a._myA, "!=", b._myA)
 
 a._myA = cpp11_null_pointer_constant.A()
 if a._myA == None:
-	raise RuntimeError, ("cpp11_null_pointer_constant: _myA should be object, but is None")
-
+    raise RuntimeError, (
+        "cpp11_null_pointer_constant: _myA should be object, but is None")
diff --git a/Examples/test-suite/python/cpp11_raw_string_literals_runme.py b/Examples/test-suite/python/cpp11_raw_string_literals_runme.py
index 32282d8d8..29e53c6a7 100644
--- a/Examples/test-suite/python/cpp11_raw_string_literals_runme.py
+++ b/Examples/test-suite/python/cpp11_raw_string_literals_runme.py
@@ -1,50 +1,48 @@
 from cpp11_raw_string_literals import *
 
 if cvar.L != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.u8 != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.u != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if UStruct.U != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 
 if cvar.R != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.LR != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.u8R != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.uR != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if URStruct.UR != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 
 if cvar.aa != "Wide string":
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.bb != "UTF-8 string":
-  raise RuntimeError, cvar.wide
+    raise RuntimeError, cvar.wide
 
 if cvar.xx != ")I'm an \"ascii\" \\ string.":
-  raise RuntimeError, cvar.xx
+    raise RuntimeError, cvar.xx
 
 if cvar.ee != ")I'm an \"ascii\" \\ string.":
-  raise RuntimeError, cvar.ee
+    raise RuntimeError, cvar.ee
 
 if cvar.ff != "I'm a \"raw wide\" \\ string.":
-  raise RuntimeError, cvar.ff
+    raise RuntimeError, cvar.ff
 
 if cvar.gg != "I'm a \"raw UTF-8\" \\ string.":
-  raise RuntimeError, cvar.gg
-
-
+    raise RuntimeError, cvar.gg
diff --git a/Examples/test-suite/python/cpp11_result_of_runme.py b/Examples/test-suite/python/cpp11_result_of_runme.py
index 4dc39fcdf..4469efd81 100644
--- a/Examples/test-suite/python/cpp11_result_of_runme.py
+++ b/Examples/test-suite/python/cpp11_result_of_runme.py
@@ -2,8 +2,10 @@ import cpp11_result_of
 
 result = cpp11_result_of.test_result(cpp11_result_of.SQUARE, 3.0)
 if result != 9.0:
-  raise RuntimeError, "test_result(square, 3.0) is not 9.0. Got: " + str(result)
+    raise RuntimeError, "test_result(square, 3.0) is not 9.0. Got: " + str(
+        result)
 
 result = cpp11_result_of.test_result_alternative1(cpp11_result_of.SQUARE, 3.0)
 if result != 9.0:
-  raise RuntimeError, "test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(result)
+    raise RuntimeError, "test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(
+        result)
diff --git a/Examples/test-suite/python/cpp11_rvalue_reference_runme.py b/Examples/test-suite/python/cpp11_rvalue_reference_runme.py
index a72a3e63b..c1cd3bf26 100644
--- a/Examples/test-suite/python/cpp11_rvalue_reference_runme.py
+++ b/Examples/test-suite/python/cpp11_rvalue_reference_runme.py
@@ -4,21 +4,24 @@ a = cpp11_rvalue_reference.A()
 
 a.setAcopy(5)
 if a.getAcopy() != 5:
-	raise RunTimeError, ("int A::getAcopy() value is ", a.getAcopy(), " should be 5")
+    raise RunTimeError, ("int A::getAcopy() value is ",
+                         a.getAcopy(), " should be 5")
 
 ptr = a.getAptr()
 
 a.setAptr(ptr)
 if a.getAcopy() != 5:
-	raise RunTimeError, ("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(), " should be 5")
+    raise RunTimeError, ("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(
+    ), " should be 5")
 
 a.setAref(ptr)
 if a.getAcopy() != 5:
-	raise RunTimeError, ("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(), " should be 5")
+    raise RunTimeError, ("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(
+    ), " should be 5")
 
 rvalueref = a.getAmove()
 
 a.setAmove(rvalueref)
 if a.getAcopy() != 5:
-	raise RunTimeError, ("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(), " should be 5")
-
+    raise RunTimeError, ("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(
+    ), " should be 5")
diff --git a/Examples/test-suite/python/cpp11_strongly_typed_enumerations_runme.py b/Examples/test-suite/python/cpp11_strongly_typed_enumerations_runme.py
index 6509ba873..21b4f63f5 100644
--- a/Examples/test-suite/python/cpp11_strongly_typed_enumerations_runme.py
+++ b/Examples/test-suite/python/cpp11_strongly_typed_enumerations_runme.py
@@ -1,9 +1,11 @@
 from cpp11_strongly_typed_enumerations import *
 
+
 def enumCheck(actual, expected):
-  if actual != expected:
-    raise RuntimeError("Enum value mismatch. Expected " + str(expected) + " Actual: " + str(actual))
-  return expected + 1
+    if actual != expected:
+        raise RuntimeError(
+            "Enum value mismatch. Expected " + str(expected) + " Actual: " + str(actual))
+    return expected + 1
 
 val = 0
 val = enumCheck(Enum1_Val1, val)
@@ -161,4 +163,3 @@ enumCheck(class1.class1Test2(Class1.Enum12_Val5c), 1121)
 enumCheck(globalTest1(Enum1_Val5a), 13)
 enumCheck(globalTest2(Class1.Enum12_Val5c), 1121)
 #enumCheck(globalTest3(Class1.Struct1.Enum12_Val5f), 3121)
-
diff --git a/Examples/test-suite/python/cpp11_thread_local_runme.py b/Examples/test-suite/python/cpp11_thread_local_runme.py
index 59a657488..83f2390ec 100644
--- a/Examples/test-suite/python/cpp11_thread_local_runme.py
+++ b/Examples/test-suite/python/cpp11_thread_local_runme.py
@@ -2,37 +2,36 @@ from cpp11_thread_local import *
 
 t = ThreadLocals()
 if t.stval != 11:
-  raise RuntimeError
+    raise RuntimeError
 if t.tsval != 22:
-  raise RuntimeError
+    raise RuntimeError
 if t.tscval99 != 99:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.etval = -11
 if cvar.etval != -11:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.stval = -22
 if cvar.stval != -22:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.tsval = -33
 if cvar.tsval != -33:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.etval = -44
 if cvar.etval != -44:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.teval = -55
 if cvar.teval != -55:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.ectval = -66
 if cvar.ectval != -66:
-  raise RuntimeError
+    raise RuntimeError
 
 cvar.ecpptval = -66
 if cvar.ecpptval != -66:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/cpp11_type_traits_runme.py b/Examples/test-suite/python/cpp11_type_traits_runme.py
index cb58656a6..d0dfb23d7 100644
--- a/Examples/test-suite/python/cpp11_type_traits_runme.py
+++ b/Examples/test-suite/python/cpp11_type_traits_runme.py
@@ -1,7 +1,7 @@
 from cpp11_type_traits import *
 
 if Elaborate(0, 0) != 1:
-  raise RuntimeError("Elaborate should have returned 1")
+    raise RuntimeError("Elaborate should have returned 1")
 
 if Elaborate(0, 0.0) != 2:
-  raise RuntimeError("Elaborate should have returned 2")
+    raise RuntimeError("Elaborate should have returned 2")
diff --git a/Examples/test-suite/python/cpp11_uniform_initialization_runme.py b/Examples/test-suite/python/cpp11_uniform_initialization_runme.py
index 85c3b2478..ecb468ccb 100644
--- a/Examples/test-suite/python/cpp11_uniform_initialization_runme.py
+++ b/Examples/test-suite/python/cpp11_uniform_initialization_runme.py
@@ -2,20 +2,20 @@ import cpp11_uniform_initialization
 
 var1 = cpp11_uniform_initialization.cvar.var1
 if var1.x != 5:
-  raise RuntimeError
+    raise RuntimeError
 var2 = cpp11_uniform_initialization.cvar.var2
 if var2.getX() != 2:
-  raise RuntimeError
+    raise RuntimeError
 
 m = cpp11_uniform_initialization.MoreInit()
 if m.charptr != None:
-  raise RuntimeError, m.charptr
+    raise RuntimeError, m.charptr
 m.charptr = "hello sir"
 if m.charptr != "hello sir":
-  raise RuntimeError, m.charptr
+    raise RuntimeError, m.charptr
 if m.more1(m.vi) != 15:
-  raise RuntimeError, m.vi
-if m.more1( [-1,1,2] ) != 2:
-  raise RuntimeError, m.vi
+    raise RuntimeError, m.vi
+if m.more1([-1, 1, 2]) != 2:
+    raise RuntimeError, m.vi
 if m.more1() != 10:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/cpp_enum_runme.py b/Examples/test-suite/python/cpp_enum_runme.py
index 0054ae281..5f1e91c97 100644
--- a/Examples/test-suite/python/cpp_enum_runme.py
+++ b/Examples/test-suite/python/cpp_enum_runme.py
@@ -3,21 +3,21 @@ import cpp_enum
 f = cpp_enum.Foo()
 
 if f.hola != f.Hello:
-  print f.hola
-  raise RuntimeError
+    print f.hola
+    raise RuntimeError
 
 f.hola = f.Hi
 if f.hola != f.Hi:
-  print f.hola
-  raise RuntimeError
+    print f.hola
+    raise RuntimeError
 
 f.hola = f.Hello
 
 if f.hola != f.Hello:
-  print f.hola
-  raise RuntimeError
+    print f.hola
+    raise RuntimeError
 
 cpp_enum.cvar.hi = cpp_enum.Hello
 if cpp_enum.cvar.hi != cpp_enum.Hello:
-  print cpp_enum.cvar.hi
-  raise RuntimeError
+    print cpp_enum.cvar.hi
+    raise RuntimeError
diff --git a/Examples/test-suite/python/cpp_namespace_runme.py b/Examples/test-suite/python/cpp_namespace_runme.py
index a454774f5..2ab959aea 100644
--- a/Examples/test-suite/python/cpp_namespace_runme.py
+++ b/Examples/test-suite/python/cpp_namespace_runme.py
@@ -17,7 +17,7 @@ if cpp_namespace.do_method(t) != "Test::method":
 
 if cpp_namespace.do_method2(t) != "Test::method":
     raise RuntimeError("Bad return value!")
-    
+
 cpp_namespace.weird("hello", 4)
 
 del t
@@ -30,16 +30,14 @@ t5 = cpp_namespace.Test5()
 if cpp_namespace.foo3(42) != 42:
     raise RuntimeError("Bad return value!")
 
-if cpp_namespace.do_method3(t2,40) != "Test2::method":
+if cpp_namespace.do_method3(t2, 40) != "Test2::method":
     raise RuntimeError("Bad return value!")
 
-if cpp_namespace.do_method3(t3,40) != "Test3::method":
+if cpp_namespace.do_method3(t3, 40) != "Test3::method":
     raise RuntimeError("Bad return value!")
 
-if cpp_namespace.do_method3(t4,40) != "Test4::method":
+if cpp_namespace.do_method3(t4, 40) != "Test4::method":
     raise RuntimeError("Bad return value!")
 
-if cpp_namespace.do_method3(t5,40) != "Test5::method":
+if cpp_namespace.do_method3(t5, 40) != "Test5::method":
     raise RuntimeError("Bad return value!")
-
-    
diff --git a/Examples/test-suite/python/cpp_static_runme.py b/Examples/test-suite/python/cpp_static_runme.py
index eef921780..b742de285 100644
--- a/Examples/test-suite/python/cpp_static_runme.py
+++ b/Examples/test-suite/python/cpp_static_runme.py
@@ -1,16 +1,17 @@
 #!/usr/bin/evn python
 from cpp_static import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 if is_new_style_class(StaticFunctionTest):
-  StaticFunctionTest.static_func()
-  StaticFunctionTest.static_func_2(1)
-  StaticFunctionTest.static_func_3(1,2)
+    StaticFunctionTest.static_func()
+    StaticFunctionTest.static_func_2(1)
+    StaticFunctionTest.static_func_3(1, 2)
 else:
-  StaticFunctionTest().static_func()
-  StaticFunctionTest().static_func_2(1)
-  StaticFunctionTest().static_func_3(1,2)
+    StaticFunctionTest().static_func()
+    StaticFunctionTest().static_func_2(1)
+    StaticFunctionTest().static_func_3(1, 2)
 StaticMemberTest.static_int = 10
 assert StaticMemberTest.static_int == 10
diff --git a/Examples/test-suite/python/default_arg_values_runme.py b/Examples/test-suite/python/default_arg_values_runme.py
index 28145b256..7ed52a65b 100644
--- a/Examples/test-suite/python/default_arg_values_runme.py
+++ b/Examples/test-suite/python/default_arg_values_runme.py
@@ -3,17 +3,17 @@ from default_arg_values import *
 d = Display()
 
 if d.draw1() != 0:
-  raise RuntimeError
+    raise RuntimeError
 
 if d.draw1(12) != 12:
-  raise RuntimeError
+    raise RuntimeError
 
-p = createPtr(123);
+p = createPtr(123)
 if d.draw2() != 0:
-  raise RuntimeError
+    raise RuntimeError
 
 if d.draw2(p) != 123:
-  raise RuntimeError
+    raise RuntimeError
 
 if d.bool0() != False or type(d.bool0()) != type(False):
     raise RuntimeError
diff --git a/Examples/test-suite/python/default_args_runme.py b/Examples/test-suite/python/default_args_runme.py
index 0931bfd3d..11878f7a4 100644
--- a/Examples/test-suite/python/default_args_runme.py
+++ b/Examples/test-suite/python/default_args_runme.py
@@ -1,122 +1,133 @@
-# Note that this test is also used by python_default_args_runme.py hence the use of __main__ and the run function
+# Note that this test is also used by python_default_args_runme.py hence
+# the use of __main__ and the run function
+
 
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
+
 
 def run(module_name):
-  default_args = __import__(module_name)
-  ec = default_args.EnumClass()
-  if not ec.blah():
-    raise RuntimeError("EnumClass::blah() default arguments don't work")
+    default_args = __import__(module_name)
+    ec = default_args.EnumClass()
+    if not ec.blah():
+        raise RuntimeError("EnumClass::blah() default arguments don't work")
 
-  de = default_args.DerivedEnumClass()
-  de.accelerate()
-  de.accelerate(default_args.EnumClass.SLOW)
+    de = default_args.DerivedEnumClass()
+    de.accelerate()
+    de.accelerate(default_args.EnumClass.SLOW)
 
-  if default_args.Statics_staticMethod() != 60:
-    raise RuntimeError
+    if default_args.Statics_staticMethod() != 60:
+        raise RuntimeError
 
-  if default_args.cfunc1(1) != 2:
-    raise RuntimeError
+    if default_args.cfunc1(1) != 2:
+        raise RuntimeError
 
-  if default_args.cfunc2(1) != 3:
-    raise RuntimeError
+    if default_args.cfunc2(1) != 3:
+        raise RuntimeError
 
-  if default_args.cfunc3(1) != 4:
-    raise RuntimeError
+    if default_args.cfunc3(1) != 4:
+        raise RuntimeError
+
+    f = default_args.Foo()
+
+    f.newname()
+    f.newname(1)
+
+    if f.double_if_void_ptr_is_null(2, None) != 4:
+        raise RuntimeError
+
+    if f.double_if_void_ptr_is_null(3) != 6:
+        raise RuntimeError
+
+    if f.double_if_handle_is_null(4, None) != 8:
+        raise RuntimeError
+
+    if f.double_if_handle_is_null(5) != 10:
+        raise RuntimeError
+
+    if f.double_if_dbl_ptr_is_null(6, None) != 12:
+        raise RuntimeError
+
+    if f.double_if_dbl_ptr_is_null(7) != 14:
+        raise RuntimeError
+
+    try:
+        f = default_args.Foo(1)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::Foo ignore is not working")
+
+    try:
+        f = default_args.Foo(1, 2)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::Foo ignore is not working")
+
+    try:
+        f = default_args.Foo(1, 2, 3)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::Foo ignore is not working")
+
+    try:
+        m = f.meth(1)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::meth ignore is not working")
+
+    try:
+        m = f.meth(1, 2)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::meth ignore is not working")
+
+    try:
+        m = f.meth(1, 2, 3)
+        error = 1
+    except:
+        error = 0
+    if error:
+        raise RuntimeError("Foo::meth ignore is not working")
+
+    if is_new_style_class(default_args.Klass):
+        Klass_inc = default_args.Klass.inc
+    else:
+        Klass_inc = default_args.Klass_inc
+
+    if Klass_inc(100, default_args.Klass(22)).val != 122:
+        raise RuntimeError("Klass::inc failed")
+
+    if Klass_inc(100).val != 99:
+        raise RuntimeError("Klass::inc failed")
+
+    if Klass_inc().val != 0:
+        raise RuntimeError("Klass::inc failed")
+
+    default_args.trickyvalue1(10)
+    default_args.trickyvalue1(10, 10)
+    default_args.trickyvalue2(10)
+    default_args.trickyvalue2(10, 10)
+    default_args.trickyvalue3(10)
+    default_args.trickyvalue3(10, 10)
+    default_args.seek()
+    default_args.seek(10)
+
+    if default_args.slightly_off_square(10) != 102:
+        raise RuntimeError
+
+    if default_args.slightly_off_square() != 291:
+        raise RuntimeError
 
 
-  f = default_args.Foo()
-
-  f.newname()
-  f.newname(1)
-
-  if f.double_if_void_ptr_is_null(2, None) != 4:
-    raise RuntimeError
-
-  if f.double_if_void_ptr_is_null(3) != 6:
-    raise RuntimeError
-
-  if f.double_if_handle_is_null(4, None) != 8:
-    raise RuntimeError
-
-  if f.double_if_handle_is_null(5) != 10:
-    raise RuntimeError
-
-  if f.double_if_dbl_ptr_is_null(6, None) != 12:
-    raise RuntimeError
-
-  if f.double_if_dbl_ptr_is_null(7) != 14:
-    raise RuntimeError
-
-  try:
-    f = default_args.Foo(1)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::Foo ignore is not working")
-
-  try:
-    f = default_args.Foo(1,2)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::Foo ignore is not working")
-
-  try:
-    f = default_args.Foo(1,2,3)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::Foo ignore is not working")
-
-  try:
-    m = f.meth(1)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::meth ignore is not working")
-
-  try:
-    m = f.meth(1,2)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::meth ignore is not working")
-
-  try:
-    m = f.meth(1,2,3)
-    error = 1
-  except:
-    error = 0
-  if error:  raise RuntimeError("Foo::meth ignore is not working")
-
-  if is_new_style_class(default_args.Klass):
-    Klass_inc = default_args.Klass.inc
-  else:
-    Klass_inc = default_args.Klass_inc
-
-  if Klass_inc(100, default_args.Klass(22)).val != 122:
-    raise RuntimeError("Klass::inc failed")
-
-  if Klass_inc(100).val != 99:
-    raise RuntimeError("Klass::inc failed")
-
-  if Klass_inc().val != 0:
-    raise RuntimeError("Klass::inc failed")
-
-  default_args.trickyvalue1(10); default_args.trickyvalue1(10, 10)
-  default_args.trickyvalue2(10); default_args.trickyvalue2(10, 10)
-  default_args.trickyvalue3(10); default_args.trickyvalue3(10, 10)
-  default_args.seek(); default_args.seek(10)
-
-  if default_args.slightly_off_square(10) != 102:
-    raise RuntimeError
-
-  if default_args.slightly_off_square() != 291:
-    raise RuntimeError
-
-
-if __name__=="__main__":
-  run('default_args')
-
+if __name__ == "__main__":
+    run('default_args')
diff --git a/Examples/test-suite/python/default_constructor_runme.py b/Examples/test-suite/python/default_constructor_runme.py
index e6532031b..c80c1e81e 100644
--- a/Examples/test-suite/python/default_constructor_runme.py
+++ b/Examples/test-suite/python/default_constructor_runme.py
@@ -4,7 +4,7 @@ import _default_constructor
 # It uses the old static syntax (e.g., dc.new_A() rather than dc.A()),
 # which is not provided with the -builtin option.
 if _default_constructor.is_python_builtin():
-  exit(0)
+    exit(0)
 
 dc = _default_constructor
 
@@ -23,7 +23,7 @@ except:
 del_b = dc.delete_B
 
 try:
-    bb = dc.new_BB();
+    bb = dc.new_BB()
     print "Whoa. new_BB created."
 except:
     pass
@@ -42,7 +42,7 @@ cc = dc.new_CC()
 dc.delete_CC(cc)
 
 try:
-    d = dc.new_D();
+    d = dc.new_D()
     print "Whoa. new_D created"
 except:
     pass
@@ -113,5 +113,4 @@ dc.delete_GG(gg)
 
 
 import default_constructor
-hh = default_constructor.HH(1,1)
-
+hh = default_constructor.HH(1, 1)
diff --git a/Examples/test-suite/python/director_abstract_runme.py b/Examples/test-suite/python/director_abstract_runme.py
index 886cda0ae..031c476d8 100644
--- a/Examples/test-suite/python/director_abstract_runme.py
+++ b/Examples/test-suite/python/director_abstract_runme.py
@@ -1,79 +1,91 @@
 import director_abstract
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
+
 
 class MyFoo(director_abstract.Foo):
-	def __init__(self):
-		director_abstract.Foo.__init__(self)
-	def ping(self):
-		return "MyFoo::ping()"
+
+    def __init__(self):
+        director_abstract.Foo.__init__(self)
+
+    def ping(self):
+        return "MyFoo::ping()"
 
 
 a = MyFoo()
 
 if a.ping() != "MyFoo::ping()":
-	raise RuntimeError, a.ping()
+    raise RuntimeError, a.ping()
 
 if a.pong() != "Foo::pong();MyFoo::ping()":
-	raise RuntimeError, a.pong()
+    raise RuntimeError, a.pong()
 
 
 class MyExample1(director_abstract.Example1):
-	def Color(self, r, g, b):
-		return r
+
+    def Color(self, r, g, b):
+        return r
+
 
 class MyExample2(director_abstract.Example2):
-	def Color(self, r, g, b):
-		return g
+
+    def Color(self, r, g, b):
+        return g
+
 
 class MyExample3(director_abstract.Example3_i):
-	def Color(self, r, g, b):
-		return b
+
+    def Color(self, r, g, b):
+        return b
 
 me1 = MyExample1()
-if director_abstract.Example1_get_color(me1, 1,2,3) != 1:
-	raise RuntimeError
+if director_abstract.Example1_get_color(me1, 1, 2, 3) != 1:
+    raise RuntimeError
 
 if is_new_style_class(MyExample2):
-  MyExample2_static = MyExample2
+    MyExample2_static = MyExample2
 else:
-  MyExample2_static = MyExample2(0, 0)
-me2 = MyExample2(1,2)
-if MyExample2_static.get_color(me2, 1,2,3) != 2:
-	raise RuntimeError
+    MyExample2_static = MyExample2(0, 0)
+me2 = MyExample2(1, 2)
+if MyExample2_static.get_color(me2, 1, 2, 3) != 2:
+    raise RuntimeError
 
 if is_new_style_class(MyExample3):
-  MyExample3_static = MyExample3
+    MyExample3_static = MyExample3
 else:
-  MyExample3_static = MyExample3()
+    MyExample3_static = MyExample3()
 me3 = MyExample3()
-if MyExample3_static.get_color(me3, 1,2,3) != 3:
-	raise RuntimeError
+if MyExample3_static.get_color(me3, 1, 2, 3) != 3:
+    raise RuntimeError
 
 error = 1
 try:
-	me1 = director_abstract.Example1()
+    me1 = director_abstract.Example1()
 except:
-	error = 0
-if (error): raise RuntimeError
+    error = 0
+if (error):
+    raise RuntimeError
 
 error = 1
 try:
-	me2 = director_abstract.Example2()
+    me2 = director_abstract.Example2()
 except:
-	error = 0
-if (error): raise RuntimeError
+    error = 0
+if (error):
+    raise RuntimeError
 
 error = 1
 try:
-	me3 = director_abstract.Example3_i()
+    me3 = director_abstract.Example3_i()
 except:
-	error = 0
-if (error): raise RuntimeError
+    error = 0
+if (error):
+    raise RuntimeError
 
 
 try:
-	f = director_abstract.A.f
+    f = director_abstract.A.f
 except:
-	raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_alternating_runme.py b/Examples/test-suite/python/director_alternating_runme.py
index a92ae1c5c..a93ffec34 100644
--- a/Examples/test-suite/python/director_alternating_runme.py
+++ b/Examples/test-suite/python/director_alternating_runme.py
@@ -2,4 +2,4 @@ from director_alternating import *
 
 id = getBar().id()
 if id != idFromGetBar():
-  raise RuntimeError, "Got wrong id: " + str(id)
+    raise RuntimeError, "Got wrong id: " + str(id)
diff --git a/Examples/test-suite/python/director_basic_runme.py b/Examples/test-suite/python/director_basic_runme.py
index 541139814..6564c95a2 100644
--- a/Examples/test-suite/python/director_basic_runme.py
+++ b/Examples/test-suite/python/director_basic_runme.py
@@ -1,41 +1,43 @@
 import director_basic
 
+
 class PyFoo(director_basic.Foo):
-	def ping(self):
-		return "PyFoo::ping()"
+
+    def ping(self):
+        return "PyFoo::ping()"
 
 
 a = PyFoo()
 
 if a.ping() != "PyFoo::ping()":
-	raise RuntimeError, a.ping()
+    raise RuntimeError, a.ping()
 
 if a.pong() != "Foo::pong();PyFoo::ping()":
-	raise RuntimeError, a.pong()
+    raise RuntimeError, a.pong()
 
 b = director_basic.Foo()
 
 if b.ping() != "Foo::ping()":
-	raise RuntimeError, b.ping()
+    raise RuntimeError, b.ping()
 
 if b.pong() != "Foo::pong();Foo::ping()":
-	raise RuntimeError, b.pong()
+    raise RuntimeError, b.pong()
 
 a = director_basic.A1(1)
 
 if a.rg(2) != 2:
-	raise RuntimeError
-
+    raise RuntimeError
 
 
 class PyClass(director_basic.MyClass):
-	def method(self, vptr):
-		self.cmethod = 7
-		pass
-	
-	def vmethod(self, b):
-		b.x = b.x + 31
-		return b
+
+    def method(self, vptr):
+        self.cmethod = 7
+        pass
+
+    def vmethod(self, b):
+        b.x = b.x + 31
+        return b
 
 
 b = director_basic.Bar(3)
@@ -50,49 +52,42 @@ bd = dd.cmethod(b)
 
 cc.method(b)
 if c.cmethod != 7:
-	raise RuntimeError
+    raise RuntimeError
 
 if bc.x != 34:
-	raise RuntimeError
+    raise RuntimeError
 
 
 if bd.x != 16:
-	raise RuntimeError
-
+    raise RuntimeError
 
 
 class PyMulti(director_basic.Foo, director_basic.MyClass):
-	def __init__(self):
-		director_basic.Foo.__init__(self)
-		director_basic.MyClass.__init__(self)		
-		pass
 
-		
-	def vmethod(self, b):
-		b.x = b.x  + 31
-		return b
+    def __init__(self):
+        director_basic.Foo.__init__(self)
+        director_basic.MyClass.__init__(self)
+        pass
 
-	
-	def ping(self):
-		return "PyFoo::ping()"
+    def vmethod(self, b):
+        b.x = b.x + 31
+        return b
+
+    def ping(self):
+        return "PyFoo::ping()"
 
 a = 0
-for i in range(0,100):
+for i in range(0, 100):
     pymult = PyMulti()
     pymult.pong()
-    del pymult 
-
+    del pymult
 
 
 pymult = PyMulti()
 
 
-
-
 p1 = director_basic.Foo_get_self(pymult)
 p2 = director_basic.MyClass_get_self(pymult)
 
 p1.ping()
 p2.vmethod(bc)
-
-
diff --git a/Examples/test-suite/python/director_classic_runme.py b/Examples/test-suite/python/director_classic_runme.py
index 7e18a9a61..9dd5f5967 100644
--- a/Examples/test-suite/python/director_classic_runme.py
+++ b/Examples/test-suite/python/director_classic_runme.py
@@ -1,53 +1,76 @@
 from director_classic import *
 
+
 class TargetLangPerson(Person):
+
     def __init__(self):
         Person.__init__(self)
+
     def id(self):
         identifier = "TargetLangPerson"
         return identifier
 
+
 class TargetLangChild(Child):
+
     def __init__(self):
         Child.__init__(self)
+
     def id(self):
         identifier = "TargetLangChild"
         return identifier
 
+
 class TargetLangGrandChild(GrandChild):
+
     def __init__(self):
         GrandChild.__init__(self)
+
     def id(self):
         identifier = "TargetLangGrandChild"
         return identifier
 
 # Semis - don't override id() in target language
+
+
 class TargetLangSemiPerson(Person):
+
     def __init__(self):
         Person.__init__(self)
         # No id() override
 
+
 class TargetLangSemiChild(Child):
+
     def __init__(self):
         Child.__init__(self)
         # No id() override
 
+
 class TargetLangSemiGrandChild(GrandChild):
+
     def __init__(self):
         GrandChild.__init__(self)
         # No id() override
 
 # Orphans - don't override id() in C++
+
+
 class TargetLangOrphanPerson(OrphanPerson):
+
     def __init__(self):
         OrphanPerson.__init__(self)
+
     def id(self):
         identifier = "TargetLangOrphanPerson"
         return identifier
 
+
 class TargetLangOrphanChild(OrphanChild):
+
     def __init__(self):
         Child.__init__(self)
+
     def id(self):
         identifier = "TargetLangOrphanChild"
         return identifier
@@ -55,88 +78,90 @@ class TargetLangOrphanChild(OrphanChild):
 
 def check(person, expected):
 
-  debug = 0
-  # Normal target language polymorphic call
-  ret = person.id()
-  if (debug):
-    print(ret)
-  if (ret != expected):
-    raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected)
+    debug = 0
+    # Normal target language polymorphic call
+    ret = person.id()
+    if (debug):
+        print(ret)
+    if (ret != expected):
+        raise RuntimeError(
+            "Failed. Received: " + str(ret) + " Expected: " + expected)
 
-  # Polymorphic call from C++
-  caller = Caller()
-  caller.setCallback(person)
-  ret = caller.call()
-  if (debug):
-    print(ret)
-  if (ret != expected):
-    raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected)
+    # Polymorphic call from C++
+    caller = Caller()
+    caller.setCallback(person)
+    ret = caller.call()
+    if (debug):
+        print(ret)
+    if (ret != expected):
+        raise RuntimeError(
+            "Failed. Received: " + str(ret) + " Expected: " + expected)
 
-  # Polymorphic call of object created in target language and passed to C++ and back again
-  baseclass = caller.baseClass()
-  ret = baseclass.id()
-  if (debug):
-    print(ret)
-  if (ret != expected):
-    raise RuntimeError("Failed. Received: " + str(ret)+ " Expected: " + expected)
+    # Polymorphic call of object created in target language and passed to C++
+    # and back again
+    baseclass = caller.baseClass()
+    ret = baseclass.id()
+    if (debug):
+        print(ret)
+    if (ret != expected):
+        raise RuntimeError(
+            "Failed. Received: " + str(ret) + " Expected: " + expected)
 
-  caller.resetCallback()
-  if (debug):
-    print("----------------------------------------")
+    caller.resetCallback()
+    if (debug):
+        print("----------------------------------------")
 
 
-
-person = Person();
-check(person, "Person");
+person = Person()
+check(person, "Person")
 del person
 
-person = Child();
-check(person, "Child");
+person = Child()
+check(person, "Child")
 del person
 
-person = GrandChild();
-check(person, "GrandChild"); 
+person = GrandChild()
+check(person, "GrandChild")
 del person
 
-person = TargetLangPerson();
-check(person, "TargetLangPerson"); 
+person = TargetLangPerson()
+check(person, "TargetLangPerson")
 del person
 
-person = TargetLangChild();
-check(person, "TargetLangChild"); 
+person = TargetLangChild()
+check(person, "TargetLangChild")
 del person
 
-person = TargetLangGrandChild();
-check(person, "TargetLangGrandChild"); 
+person = TargetLangGrandChild()
+check(person, "TargetLangGrandChild")
 del person
 
 # Semis - don't override id() in target language
-person = TargetLangSemiPerson();
-check(person, "Person"); 
+person = TargetLangSemiPerson()
+check(person, "Person")
 del person
 
-person = TargetLangSemiChild();
-check(person, "Child"); 
+person = TargetLangSemiChild()
+check(person, "Child")
 del person
 
-person = TargetLangSemiGrandChild();
-check(person, "GrandChild"); 
+person = TargetLangSemiGrandChild()
+check(person, "GrandChild")
 del person
 
 # Orphans - don't override id() in C++
-person = OrphanPerson();
-check(person, "Person");
+person = OrphanPerson()
+check(person, "Person")
 del person
 
-person = OrphanChild();
-check(person, "Child");
+person = OrphanChild()
+check(person, "Child")
 del person
 
-person = TargetLangOrphanPerson();
-check(person, "TargetLangOrphanPerson"); 
+person = TargetLangOrphanPerson()
+check(person, "TargetLangOrphanPerson")
 del person
 
-person = TargetLangOrphanChild();
-check(person, "TargetLangOrphanChild"); 
+person = TargetLangOrphanChild()
+check(person, "TargetLangOrphanChild")
 del person
-
diff --git a/Examples/test-suite/python/director_detect_runme.py b/Examples/test-suite/python/director_detect_runme.py
index a90cfe8b4..345051982 100644
--- a/Examples/test-suite/python/director_detect_runme.py
+++ b/Examples/test-suite/python/director_detect_runme.py
@@ -1,24 +1,26 @@
-import director_detect 
+import director_detect
+
 
 class MyBar(director_detect.Bar):
-  def __init__(self, val = 2):
-    director_detect.Bar.__init__(self)
-    self.val = val
 
-  def get_value(self):
-    self.val = self.val + 1
-    return self.val
-  
-  def get_class(self):
-    self.val = self.val + 1
-    return director_detect.A()
+    def __init__(self, val=2):
+        director_detect.Bar.__init__(self)
+        self.val = val
 
-  def just_do_it(self):
-    self.val = self.val + 1
+    def get_value(self):
+        self.val = self.val + 1
+        return self.val
 
-  def clone(self):
-    return MyBar(self.val)
-  pass
+    def get_class(self):
+        self.val = self.val + 1
+        return director_detect.A()
+
+    def just_do_it(self):
+        self.val = self.val + 1
+
+    def clone(self):
+        return MyBar(self.val)
+    pass
 
 
 b = MyBar()
@@ -33,4 +35,4 @@ c = b.clone()
 vc = c.get_value()
 
 if (v != 3) or (b.val != 5) or (vc != 6):
-  raise RuntimeError,"Bad virtual detection"
+    raise RuntimeError, "Bad virtual detection"
diff --git a/Examples/test-suite/python/director_enum_runme.py b/Examples/test-suite/python/director_enum_runme.py
index 5692c88b8..faa2d82df 100644
--- a/Examples/test-suite/python/director_enum_runme.py
+++ b/Examples/test-suite/python/director_enum_runme.py
@@ -1,12 +1,14 @@
 import director_enum
 
+
 class MyFoo(director_enum.Foo):
-  def say_hi(self, val):
-    return val
+
+    def say_hi(self, val):
+        return val
 
 
 b = director_enum.Foo()
 a = MyFoo()
 
 if a.say_hi(director_enum.hello) != b.say_hello(director_enum.hi):
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_exception_runme.py b/Examples/test-suite/python/director_exception_runme.py
index de3ef22a5..892c7e653 100644
--- a/Examples/test-suite/python/director_exception_runme.py
+++ b/Examples/test-suite/python/director_exception_runme.py
@@ -1,21 +1,29 @@
 from director_exception import *
 
+
 class MyException(Exception):
-	def __init__(self, a, b):
-		self.msg = a + b
+
+    def __init__(self, a, b):
+        self.msg = a + b
+
 
 class MyFoo(Foo):
-	def ping(self):
-		raise NotImplementedError, "MyFoo::ping() EXCEPTION"
+
+    def ping(self):
+        raise NotImplementedError, "MyFoo::ping() EXCEPTION"
+
 
 class MyFoo2(Foo):
-	def ping(self):
-		return True
-		pass # error: should return a string
+
+    def ping(self):
+        return True
+        pass  # error: should return a string
+
 
 class MyFoo3(Foo):
-	def ping(self):
-		raise MyException("foo", "bar")
+
+    def ping(self):
+        raise MyException("foo", "bar")
 
 # Check that the NotImplementedError raised by MyFoo.ping() is returned by
 # MyFoo.pong().
@@ -23,16 +31,16 @@ ok = 0
 a = MyFoo()
 b = launder(a)
 try:
-	b.pong()
+    b.pong()
 except NotImplementedError, e:
-	if str(e) == "MyFoo::ping() EXCEPTION":
-		ok = 1
-	else:
-		print "Unexpected error message: %s" % str(e)
+    if str(e) == "MyFoo::ping() EXCEPTION":
+        ok = 1
+    else:
+        print "Unexpected error message: %s" % str(e)
 except:
-	pass
+    pass
 if not ok:
-	raise RuntimeError
+    raise RuntimeError
 
 
 # Check that the director returns the appropriate TypeError if the return type
@@ -41,14 +49,14 @@ ok = 0
 a = MyFoo2()
 b = launder(a)
 try:
-	b.pong()
+    b.pong()
 except TypeError, e:
-	if str(e) == "SWIG director type mismatch in output value of type 'std::string'":
-		ok = 1
-	else:
-		print "Unexpected error message: %s" % str(e)
+    if str(e) == "SWIG director type mismatch in output value of type 'std::string'":
+        ok = 1
+    else:
+        print "Unexpected error message: %s" % str(e)
 if not ok:
-	raise RuntimeError
+    raise RuntimeError
 
 
 # Check that the director can return an exception which requires two arguments
@@ -57,24 +65,24 @@ ok = 0
 a = MyFoo3()
 b = launder(a)
 try:
-	b.pong()
+    b.pong()
 except MyException, e:
-	if e.msg == 'foobar':
-		ok = 1
-	else:
-		print "Unexpected error message: %s" % str(e)
+    if e.msg == 'foobar':
+        ok = 1
+    else:
+        print "Unexpected error message: %s" % str(e)
 if not ok:
-	raise RuntimeError
+    raise RuntimeError
 
 # This is expected to fail with -builtin option
 # Throwing builtin classes as exceptions not supported
 if not is_python_builtin():
-	try:
-		raise Exception2()
-	except Exception2:
-		pass
+    try:
+        raise Exception2()
+    except Exception2:
+        pass
 
-	try:
-		raise Exception1()
-	except Exception1:
-		pass
+    try:
+        raise Exception1()
+    except Exception1:
+        pass
diff --git a/Examples/test-suite/python/director_extend_runme.py b/Examples/test-suite/python/director_extend_runme.py
index 1ab58676a..a5aad8245 100644
--- a/Examples/test-suite/python/director_extend_runme.py
+++ b/Examples/test-suite/python/director_extend_runme.py
@@ -1,20 +1,22 @@
 # Test case from bug #1506850
 #"When threading is enabled, the interpreter will infinitely wait on a mutex the second
-#time this type of extended method is called. Attached is an example
-#program that waits on the mutex to be unlocked."
+# time this type of extended method is called. Attached is an example
+# program that waits on the mutex to be unlocked."
 
 from director_extend import *
 
+
 class MyObject(SpObject):
+
     def __init__(self):
         SpObject.__init__(self)
         return
 
     def getFoo(self):
         return 123
-    
+
 m = MyObject()
 if m.dummy() != 666:
-  raise RuntimeError, "1st call"
+    raise RuntimeError, "1st call"
 if m.dummy() != 666:                        # Locked system
-  raise RuntimeError, "2nd call"
+    raise RuntimeError, "2nd call"
diff --git a/Examples/test-suite/python/director_finalizer_runme.py b/Examples/test-suite/python/director_finalizer_runme.py
index 4cd1f573e..9c9eed693 100644
--- a/Examples/test-suite/python/director_finalizer_runme.py
+++ b/Examples/test-suite/python/director_finalizer_runme.py
@@ -1,10 +1,14 @@
 from director_finalizer import *
 
+
 class MyFoo(Foo):
-	def __del__(self):
-		self.orStatus(2)
-		try: Foo.__del__(self)
-		except: pass
+
+    def __del__(self):
+        self.orStatus(2)
+        try:
+            Foo.__del__(self)
+        except:
+            pass
 
 
 resetStatus()
@@ -13,7 +17,7 @@ a = MyFoo()
 del a
 
 if getStatus() != 3:
-	raise RuntimeError
+    raise RuntimeError
 
 resetStatus()
 
@@ -21,12 +25,12 @@ a = MyFoo()
 launder(a)
 
 if getStatus() != 0:
-	raise RuntimeError
+    raise RuntimeError
 
 del a
 
 if getStatus() != 3:
-	raise RuntimeError
+    raise RuntimeError
 
 resetStatus()
 
@@ -34,15 +38,14 @@ a = MyFoo().__disown__()
 deleteFoo(a)
 
 if getStatus() != 3:
-	raise RuntimeError
-	
+    raise RuntimeError
+
 resetStatus()
 
 a = MyFoo().__disown__()
 deleteFoo(launder(a))
 
 if getStatus() != 3:
-	raise RuntimeError
-	
-resetStatus()
+    raise RuntimeError
 
+resetStatus()
diff --git a/Examples/test-suite/python/director_frob_runme.py b/Examples/test-suite/python/director_frob_runme.py
index c2dd734cf..0ef4ad900 100644
--- a/Examples/test-suite/python/director_frob_runme.py
+++ b/Examples/test-suite/python/director_frob_runme.py
@@ -1,7 +1,7 @@
 from director_frob import *
 
-foo = Bravo();
-s = foo.abs_method();
+foo = Bravo()
+s = foo.abs_method()
 
 if s != "Bravo::abs_method()":
-  raise RuntimeError, s
+    raise RuntimeError, s
diff --git a/Examples/test-suite/python/director_keywords_runme.py b/Examples/test-suite/python/director_keywords_runme.py
index 03a50206a..495d9375e 100644
--- a/Examples/test-suite/python/director_keywords_runme.py
+++ b/Examples/test-suite/python/director_keywords_runme.py
@@ -2,4 +2,3 @@ from director_keywords import *
 
 f = Foo()
 f.check_self(20)
-
diff --git a/Examples/test-suite/python/director_nested_runme.py b/Examples/test-suite/python/director_nested_runme.py
index cff82f55b..f3d973630 100644
--- a/Examples/test-suite/python/director_nested_runme.py
+++ b/Examples/test-suite/python/director_nested_runme.py
@@ -2,62 +2,63 @@ from director_nested import *
 
 
 class A(FooBar_int):
-  def do_step(self):
-    return "A::do_step;"
-  
-  def get_value(self):
-    return "A::get_value"
 
-  pass
+    def do_step(self):
+        return "A::do_step;"
+
+    def get_value(self):
+        return "A::get_value"
+
+    pass
 
 
 a = A()
 if a.step() != "Bar::step;Foo::advance;Bar::do_advance;A::do_step;":
-  raise RuntimeError,"Bad A virtual resolution"
+    raise RuntimeError, "Bad A virtual resolution"
 
 
 class B(FooBar_int):
-  def do_advance(self):
-    return "B::do_advance;" + self.do_step()
 
-  def do_step(self):
-    return "B::do_step;"
-  
-  def get_value(self):
-    return 1
+    def do_advance(self):
+        return "B::do_advance;" + self.do_step()
 
-  pass
+    def do_step(self):
+        return "B::do_step;"
+
+    def get_value(self):
+        return 1
+
+    pass
 
 
 b = B()
 
 if b.step() != "Bar::step;Foo::advance;B::do_advance;B::do_step;":
-  raise RuntimeError,"Bad B virtual resolution"
-
+    raise RuntimeError, "Bad B virtual resolution"
 
 
 class C(FooBar_int):
-  def do_advance(self):
-    return "C::do_advance;" + FooBar_int.do_advance(self)
 
-  def do_step(self):
-    return "C::do_step;"
-  
-  def get_value(self):
-    return 2
+    def do_advance(self):
+        return "C::do_advance;" + FooBar_int.do_advance(self)
 
-  def get_name(self):
-    return FooBar_int.get_name(self) + " hello"
+    def do_step(self):
+        return "C::do_step;"
 
-  
-  pass
+    def get_value(self):
+        return 2
+
+    def get_name(self):
+        return FooBar_int.get_name(self) + " hello"
+
+    pass
 
 cc = C()
 c = FooBar_int_get_self(cc)
 c.advance()
 
 if c.get_name() != "FooBar::get_name hello":
-  raise RuntimeError
+    raise RuntimeError
 
 if c.name() != "FooBar::get_name hello":
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_profile_runme.py b/Examples/test-suite/python/director_profile_runme.py
index 2f67481f5..035007c61 100644
--- a/Examples/test-suite/python/director_profile_runme.py
+++ b/Examples/test-suite/python/director_profile_runme.py
@@ -1,9 +1,10 @@
 import director_profile
 
-class MyB(director_profile.B):
-    def vfi(self, a):
-        return a+3
 
+class MyB(director_profile.B):
+
+    def vfi(self, a):
+        return a + 3
 
 
 a = director_profile.A()
@@ -15,27 +16,26 @@ fi = b.fi
 i = 50000
 a = 1
 while i:
-  a = fi(a) #1
-  a = fi(a) #2
-  a = fi(a) #3
-  a = fi(a) #4
-  a = fi(a) #5
-  a = fi(a) #6
-  a = fi(a) #7
-  a = fi(a) #8
-  a = fi(a) #9
-  a = fi(a) #10
-  a = fi(a) #1
-  a = fi(a) #2
-  a = fi(a) #3
-  a = fi(a) #4
-  a = fi(a) #5
-  a = fi(a) #6
-  a = fi(a) #7
-  a = fi(a) #8
-  a = fi(a) #9
-  a = fi(a) #20
-  i -= 1
+    a = fi(a)  # 1
+    a = fi(a)  # 2
+    a = fi(a)  # 3
+    a = fi(a)  # 4
+    a = fi(a)  # 5
+    a = fi(a)  # 6
+    a = fi(a)  # 7
+    a = fi(a)  # 8
+    a = fi(a)  # 9
+    a = fi(a)  # 10
+    a = fi(a)  # 1
+    a = fi(a)  # 2
+    a = fi(a)  # 3
+    a = fi(a)  # 4
+    a = fi(a)  # 5
+    a = fi(a)  # 6
+    a = fi(a)  # 7
+    a = fi(a)  # 8
+    a = fi(a)  # 9
+    a = fi(a)  # 20
+    i -= 1
 
 print a
-
diff --git a/Examples/test-suite/python/director_property_runme.py b/Examples/test-suite/python/director_property_runme.py
index 303e53b67..5d713c27f 100644
--- a/Examples/test-suite/python/director_property_runme.py
+++ b/Examples/test-suite/python/director_property_runme.py
@@ -1,18 +1,19 @@
 import director_property
 
-class PyFoo(director_property.Foo):
-	a = property(director_property.Foo.getA, director_property.Foo.setA)
 
-	def ping(self):
-		return "PyFoo::ping()"
+class PyFoo(director_property.Foo):
+    a = property(director_property.Foo.getA, director_property.Foo.setA)
+
+    def ping(self):
+        return "PyFoo::ping()"
 
 
 foo = PyFoo()
 
 foo.setA("BLABLA")
 if foo.getA() != "BLABLA":
-	raise RuntimeError
+    raise RuntimeError
 
 foo.a = "BIBI"
 if foo.a != "BIBI":
-	raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_protected_runme.py b/Examples/test-suite/python/director_protected_runme.py
index fd3c868a1..c3118a7c0 100644
--- a/Examples/test-suite/python/director_protected_runme.py
+++ b/Examples/test-suite/python/director_protected_runme.py
@@ -1,129 +1,132 @@
 from director_protected import *
 
 
-
 class FooBar(Bar):
-  def ping(self):
-    return "FooBar::ping();"
+
+    def ping(self):
+        return "FooBar::ping();"
+
 
 class FooBar2(Bar):
-  def ping(self):
-    return "FooBar2::ping();"
-  def pang(self):
-    return "FooBar2::pang();"
+
+    def ping(self):
+        return "FooBar2::ping();"
+
+    def pang(self):
+        return "FooBar2::pang();"
+
 
 class FooBar3(Bar):
-  def cheer(self):
-    return "FooBar3::cheer();"
+
+    def cheer(self):
+        return "FooBar3::cheer();"
 
 
-b  = Bar()
-f  = b.create()
+b = Bar()
+f = b.create()
 fb = FooBar()
 fb2 = FooBar2()
 fb3 = FooBar3()
 
 
 try:
-  s = fb.used()
-  if s != "Foo::pang();Bar::pong();Foo::pong();FooBar::ping();":
-    raise RuntimeError
-  pass
+    s = fb.used()
+    if s != "Foo::pang();Bar::pong();Foo::pong();FooBar::ping();":
+        raise RuntimeError
+    pass
 except:
-  raise RuntimeError, "bad FooBar::used"
+    raise RuntimeError, "bad FooBar::used"
 
 try:
-  s = fb2.used()
-  if s != "FooBar2::pang();Bar::pong();Foo::pong();FooBar2::ping();":
-    raise RuntimeError
-  pass
+    s = fb2.used()
+    if s != "FooBar2::pang();Bar::pong();Foo::pong();FooBar2::ping();":
+        raise RuntimeError
+    pass
 except:
-  raise RuntimeError, "bad FooBar2::used"
+    raise RuntimeError, "bad FooBar2::used"
 
 try:
-  s = b.pong()
-  if s != "Bar::pong();Foo::pong();Bar::ping();":
-    raise RuntimeError
-  pass
+    s = b.pong()
+    if s != "Bar::pong();Foo::pong();Bar::ping();":
+        raise RuntimeError
+    pass
 except:
-  raise RuntimeError, "bad Bar::pong"
+    raise RuntimeError, "bad Bar::pong"
 
 try:
-  s = f.pong()
-  if s != "Bar::pong();Foo::pong();Bar::ping();":
-    raise RuntimeError
-  pass
+    s = f.pong()
+    if s != "Bar::pong();Foo::pong();Bar::ping();":
+        raise RuntimeError
+    pass
 except:
-  raise RuntimeError," bad Foo::pong"
-  
-try:
-  s = fb.pong()
-  if s != "Bar::pong();Foo::pong();FooBar::ping();":
-    raise RuntimeError
-  pass
-except:
-  raise RuntimeError," bad FooBar::pong"
+    raise RuntimeError, " bad Foo::pong"
 
-protected=1  
 try:
-  b.ping()
-  protected=0
+    s = fb.pong()
+    if s != "Bar::pong();Foo::pong();FooBar::ping();":
+        raise RuntimeError
+    pass
 except:
-  pass
+    raise RuntimeError, " bad FooBar::pong"
+
+protected = 1
+try:
+    b.ping()
+    protected = 0
+except:
+    pass
 if not protected:
-  raise  RuntimeError,"Foo::ping is protected"
-  
-protected=1  
+    raise RuntimeError, "Foo::ping is protected"
+
+protected = 1
 try:
-  f.ping()
-  protected=0
+    f.ping()
+    protected = 0
 except:
-  pass
+    pass
 if not protected:
-  raise  RuntimeError,"Foo::ping is protected"
+    raise RuntimeError, "Foo::ping is protected"
 
 
-protected=1  
+protected = 1
 try:
-  f.pang()
-  protected=0
+    f.pang()
+    protected = 0
 except:
-  pass
+    pass
 if not protected:
-  raise  RuntimeError,"FooBar::pang is protected"
+    raise RuntimeError, "FooBar::pang is protected"
 
 
-protected=1  
+protected = 1
 try:
-  b.cheer()
-  protected=0
+    b.cheer()
+    protected = 0
 except:
-  pass
+    pass
 if not protected:
-  raise  RuntimeError,"Bar::cheer is protected"
+    raise RuntimeError, "Bar::cheer is protected"
 
-protected=1  
+protected = 1
 try:
-  f.cheer()
-  protected=0
+    f.cheer()
+    protected = 0
 except:
-  pass
+    pass
 if not protected:
-  raise  RuntimeError,"Foo::cheer is protected"
+    raise RuntimeError, "Foo::cheer is protected"
 
 if fb3.cheer() != "FooBar3::cheer();":
-  raise RuntimeError, "bad fb3::cheer"
+    raise RuntimeError, "bad fb3::cheer"
 
 if fb2.callping() != "FooBar2::ping();":
-  raise RuntimeError, "bad fb2.callping"
+    raise RuntimeError, "bad fb2.callping"
 
 if fb2.callcheer() != "FooBar2::pang();Bar::pong();Foo::pong();FooBar2::ping();":
-  raise RuntimeError, "bad fb2.callcheer"
+    raise RuntimeError, "bad fb2.callcheer"
 
 if fb3.callping() != "Bar::ping();":
-  raise RuntimeError, "bad fb3.callping"
+    raise RuntimeError, "bad fb3.callping"
 
 if fb3.callcheer() != "FooBar3::cheer();":
-  raise RuntimeError, "bad fb3.callcheer"
-
-
+    raise RuntimeError, "bad fb3.callcheer"
diff --git a/Examples/test-suite/python/director_stl_runme.py b/Examples/test-suite/python/director_stl_runme.py
index aaea0362a..0c3e5af97 100644
--- a/Examples/test-suite/python/director_stl_runme.py
+++ b/Examples/test-suite/python/director_stl_runme.py
@@ -1,20 +1,22 @@
 import director_stl
 
+
 class MyFoo(director_stl.Foo):
-  def ping(self, s):
-    return "MyFoo::ping():" + s
 
-  def pident(self, arg):
-    return arg
-    
-  def vident(self,v):
-    return v
+    def ping(self, s):
+        return "MyFoo::ping():" + s
 
-  def vidents(self,v):
-    return v
+    def pident(self, arg):
+        return arg
 
-  def vsecond(self,v1,v2):
-    return v2
+    def vident(self, v):
+        return v
+
+    def vidents(self, v):
+        return v
+
+    def vsecond(self, v1, v2):
+        return v2
 
 
 a = MyFoo()
@@ -22,18 +24,18 @@ a = MyFoo()
 a.tping("hello")
 a.tpong("hello")
 
-p = (1,2)
+p = (1, 2)
 a.pident(p)
-v = (3,4)
+v = (3, 4)
 a.vident(v)
 
 a.tpident(p)
 a.tvident(v)
 
-v1 = (3,4)
-v2 = (5,6)
-a.tvsecond(v1,v2)
+v1 = (3, 4)
+v2 = (5, 6)
+a.tvsecond(v1, v2)
 
-vs=("hi", "hello")
+vs = ("hi", "hello")
 vs
 a.tvidents(vs)
diff --git a/Examples/test-suite/python/director_string_runme.py b/Examples/test-suite/python/director_string_runme.py
index f2db416ca..dcd47d647 100644
--- a/Examples/test-suite/python/director_string_runme.py
+++ b/Examples/test-suite/python/director_string_runme.py
@@ -1,29 +1,29 @@
 from director_string import *
 
+
 class B(A):
-  def __init__(self,string):
-    A.__init__(self,string)
 
-  def get_first(self):
-    return A.get_first(self) + " world!"
+    def __init__(self, string):
+        A.__init__(self, string)
 
-  def process_text(self, string):
-    A.process_text(self, string)
-    self.smem = "hello"
-    
+    def get_first(self):
+        return A.get_first(self) + " world!"
+
+    def process_text(self, string):
+        A.process_text(self, string)
+        self.smem = "hello"
 
 
 b = B("hello")
 
 b.get(0)
 if b.get_first() != "hello world!":
-  print b.get_first() 
-  raise RuntimeError
+    print b.get_first()
+    raise RuntimeError
 
 
 b.call_process_func()
 
 if b.smem != "hello":
-  print smem
-  raise RuntimeError
-  
+    print smem
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_thread_runme.py b/Examples/test-suite/python/director_thread_runme.py
index 15a12ab80..4fcf3bfd1 100644
--- a/Examples/test-suite/python/director_thread_runme.py
+++ b/Examples/test-suite/python/director_thread_runme.py
@@ -1,6 +1,8 @@
 from director_thread import Foo
 
-class Derived(Foo) :
+
+class Derived(Foo):
+
     def __init__(self):
         Foo.__init__(self)
 
diff --git a/Examples/test-suite/python/director_unroll_runme.py b/Examples/test-suite/python/director_unroll_runme.py
index e2bc93779..60bc05585 100644
--- a/Examples/test-suite/python/director_unroll_runme.py
+++ b/Examples/test-suite/python/director_unroll_runme.py
@@ -1,8 +1,10 @@
 import director_unroll
 
+
 class MyFoo(director_unroll.Foo):
-	def ping(self):
-		return "MyFoo::ping()"
+
+    def ping(self):
+        return "MyFoo::ping()"
 
 
 a = MyFoo()
@@ -14,6 +16,5 @@ c = b.get()
 
 
 if not (a.this == c.this):
-	print a, c
-	raise RuntimeError
-
+    print a, c
+    raise RuntimeError
diff --git a/Examples/test-suite/python/director_wstring_runme.py b/Examples/test-suite/python/director_wstring_runme.py
index f3f29de5e..242b27582 100644
--- a/Examples/test-suite/python/director_wstring_runme.py
+++ b/Examples/test-suite/python/director_wstring_runme.py
@@ -1,28 +1,28 @@
 from director_wstring import *
 
+
 class B(A):
-  def __init__(self,string):
-    A.__init__(self,string)
 
-  def get_first(self):
-    return A.get_first(self) + u" world!"
+    def __init__(self, string):
+        A.__init__(self, string)
 
-  def process_text(self, string):
-    self.smem = u"hello"
-    
+    def get_first(self):
+        return A.get_first(self) + u" world!"
+
+    def process_text(self, string):
+        self.smem = u"hello"
 
 
 b = B(u"hello")
 
 b.get(0)
 if b.get_first() != u"hello world!":
-  print b.get_first() 
-  raise RuntimeError
+    print b.get_first()
+    raise RuntimeError
 
 
 b.call_process_func()
 
 if b.smem != u"hello":
-  print smem
-  raise RuntimeError
-  
+    print smem
+    raise RuntimeError
diff --git a/Examples/test-suite/python/disown_runme.py b/Examples/test-suite/python/disown_runme.py
index b8cae077a..1f355f040 100644
--- a/Examples/test-suite/python/disown_runme.py
+++ b/Examples/test-suite/python/disown_runme.py
@@ -14,7 +14,7 @@ if (not a.thisown):
 
 a.thisown = tmp
 if (a.thisown != tmp):
-    raise RuntimeError    
+    raise RuntimeError
 
 
 b = B()
diff --git a/Examples/test-suite/python/dynamic_cast_runme.py b/Examples/test-suite/python/dynamic_cast_runme.py
index 68b06db50..59e86d34c 100644
--- a/Examples/test-suite/python/dynamic_cast_runme.py
+++ b/Examples/test-suite/python/dynamic_cast_runme.py
@@ -9,4 +9,3 @@ y = b.blah()
 a = dynamic_cast.do_test(y)
 if a != "Bar::test":
     print "Failed!!"
-    
diff --git a/Examples/test-suite/python/enum_forward_runme.py b/Examples/test-suite/python/enum_forward_runme.py
index 9af476f97..130ba715b 100644
--- a/Examples/test-suite/python/enum_forward_runme.py
+++ b/Examples/test-suite/python/enum_forward_runme.py
@@ -1,10 +1,10 @@
 import enum_forward
-  
-f1 = enum_forward.get_enum1();
-f1 = enum_forward.test_function1(f1);
 
-f2 = enum_forward.get_enum2();
-f2 = enum_forward.test_function2(f2);
+f1 = enum_forward.get_enum1()
+f1 = enum_forward.test_function1(f1)
 
-f3 = enum_forward.get_enum3();
-f3 = enum_forward.test_function3(f3);
+f2 = enum_forward.get_enum2()
+f2 = enum_forward.test_function2(f2)
+
+f3 = enum_forward.get_enum3()
+f3 = enum_forward.test_function3(f3)
diff --git a/Examples/test-suite/python/enum_template_runme.py b/Examples/test-suite/python/enum_template_runme.py
index 6ad0a8060..64d06ce87 100644
--- a/Examples/test-suite/python/enum_template_runme.py
+++ b/Examples/test-suite/python/enum_template_runme.py
@@ -1,7 +1,6 @@
 import enum_template
 if enum_template.MakeETest() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 if enum_template.TakeETest(0) != None:
-  raise RuntimeError
-  
+    raise RuntimeError
diff --git a/Examples/test-suite/python/enums_runme.py b/Examples/test-suite/python/enums_runme.py
index 8d491baf4..4870d7c52 100644
--- a/Examples/test-suite/python/enums_runme.py
+++ b/Examples/test-suite/python/enums_runme.py
@@ -6,14 +6,13 @@ _enums.bar3(1)
 _enums.bar1(1)
 
 if _enums.cvar.enumInstance != 2:
-  raise RuntimeError
+    raise RuntimeError
 
 if _enums.cvar.Slap != 10:
-  raise RuntimeError
+    raise RuntimeError
 
 if _enums.cvar.Mine != 11:
-  raise RuntimeError
+    raise RuntimeError
 
 if _enums.cvar.Thigh != 12:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/exception_order_runme.py b/Examples/test-suite/python/exception_order_runme.py
index 8f095eb98..c53521e3e 100644
--- a/Examples/test-suite/python/exception_order_runme.py
+++ b/Examples/test-suite/python/exception_order_runme.py
@@ -3,43 +3,42 @@ from exception_order import *
 # This test is expected to fail with -builtin option.
 # Throwing builtin classes as exceptions not supported
 if is_python_builtin():
-  exit(0)
+    exit(0)
 
 a = A()
 
 try:
-  a.foo()
-except E1,e:
-  pass
+    a.foo()
+except E1, e:
+    pass
 except:
-  raise RuntimeError, "bad exception order"
+    raise RuntimeError, "bad exception order"
 
 try:
-  a.bar()
-except E2,e:
-  pass
+    a.bar()
+except E2, e:
+    pass
 except:
-  raise RuntimeError, "bad exception order"
+    raise RuntimeError, "bad exception order"
 
 try:
-  a.foobar()
-except RuntimeError,e:
-  if e.args[0] != "postcatch unknown":
-    print "bad exception order", 
-    raise RuntimeError, e.args
-
+    a.foobar()
+except RuntimeError, e:
+    if e.args[0] != "postcatch unknown":
+        print "bad exception order",
+        raise RuntimeError, e.args
 
 
 try:
-  a.barfoo(1)
-except E1,e:
-  pass
+    a.barfoo(1)
+except E1, e:
+    pass
 except:
-  raise RuntimeError, "bad exception order"
+    raise RuntimeError, "bad exception order"
 
 try:
-  a.barfoo(2)
-except E2,e:
-  pass
+    a.barfoo(2)
+except E2, e:
+    pass
 except:
-  raise RuntimeError, "bad exception order"
+    raise RuntimeError, "bad exception order"
diff --git a/Examples/test-suite/python/extend_placement_runme.py b/Examples/test-suite/python/extend_placement_runme.py
index 97b7b1654..2c0be2c31 100644
--- a/Examples/test-suite/python/extend_placement_runme.py
+++ b/Examples/test-suite/python/extend_placement_runme.py
@@ -2,12 +2,12 @@ import extend_placement
 
 foo = extend_placement.Foo()
 foo = extend_placement.Foo(1)
-foo = extend_placement.Foo(1,1)
+foo = extend_placement.Foo(1, 1)
 foo.spam()
 foo.spam("hello")
 foo.spam(1)
-foo.spam(1,1)
-foo.spam(1,1,1)
+foo.spam(1, 1)
+foo.spam(1, 1, 1)
 foo.spam(extend_placement.Foo())
 foo.spam(extend_placement.Foo(), 1.0)
 
@@ -17,20 +17,20 @@ bar = extend_placement.Bar(1)
 bar.spam()
 bar.spam("hello")
 bar.spam(1)
-bar.spam(1,1)
-bar.spam(1,1,1)
+bar.spam(1, 1)
+bar.spam(1, 1, 1)
 bar.spam(extend_placement.Bar())
 bar.spam(extend_placement.Bar(), 1.0)
 
 
 foo = extend_placement.FooTi()
 foo = extend_placement.FooTi(1)
-foo = extend_placement.FooTi(1,1)
+foo = extend_placement.FooTi(1, 1)
 foo.spam()
 foo.spam("hello")
 foo.spam(1)
-foo.spam(1,1)
-foo.spam(1,1,1)
+foo.spam(1, 1)
+foo.spam(1, 1, 1)
 foo.spam(extend_placement.Foo())
 foo.spam(extend_placement.Foo(), 1.0)
 
@@ -40,7 +40,7 @@ bar = extend_placement.BarTi(1)
 bar.spam()
 bar.spam("hello")
 bar.spam(1)
-bar.spam(1,1)
-bar.spam(1,1,1)
+bar.spam(1, 1)
+bar.spam(1, 1, 1)
 bar.spam(extend_placement.Bar())
 bar.spam(extend_placement.Bar(), 1.0)
diff --git a/Examples/test-suite/python/extern_c_runme.py b/Examples/test-suite/python/extern_c_runme.py
index 1a6d2aa12..91a218a87 100644
--- a/Examples/test-suite/python/extern_c_runme.py
+++ b/Examples/test-suite/python/extern_c_runme.py
@@ -1,4 +1,3 @@
 import extern_c
 
 extern_c.RealFunction(2)
-
diff --git a/Examples/test-suite/python/file_test_runme.py b/Examples/test-suite/python/file_test_runme.py
index 9b94fa3b3..33ada500b 100644
--- a/Examples/test-suite/python/file_test_runme.py
+++ b/Examples/test-suite/python/file_test_runme.py
@@ -2,7 +2,7 @@ import sys
 import file_test
 
 if sys.version_info[0:2] < (3, 0):
-  file_test.nfile(sys.stdout)
+    file_test.nfile(sys.stdout)
 
 cstdout = file_test.GetStdOut()
 
diff --git a/Examples/test-suite/python/friends_runme.py b/Examples/test-suite/python/friends_runme.py
index 04897655a..2d377fdd1 100644
--- a/Examples/test-suite/python/friends_runme.py
+++ b/Examples/test-suite/python/friends_runme.py
@@ -2,27 +2,36 @@ import friends
 
 a = friends.A(2)
 
-if friends.get_val1(a) != 2: raise RuntimeError
-if friends.get_val2(a) != 4: raise RuntimeError
-if friends.get_val3(a) != 6: raise RuntimeError
+if friends.get_val1(a) != 2:
+    raise RuntimeError
+if friends.get_val2(a) != 4:
+    raise RuntimeError
+if friends.get_val3(a) != 6:
+    raise RuntimeError
 
 # nice overload working fine
-if friends.get_val1(1,2,3) != 1: raise RuntimeError
+if friends.get_val1(1, 2, 3) != 1:
+    raise RuntimeError
 
 b = friends.B(3)
 
 # David's case
-if friends.mix(a,b) != 5: raise RuntimeError
+if friends.mix(a, b) != 5:
+    raise RuntimeError
 
 di = friends.D_d(2)
 dd = friends.D_d(3.3)
 
 # incredible template overloading working just fine
-if friends.get_val1(di) != 2: raise RuntimeError
-if friends.get_val1(dd) != 3.3: raise RuntimeError
+if friends.get_val1(di) != 2:
+    raise RuntimeError
+if friends.get_val1(dd) != 3.3:
+    raise RuntimeError
 
 friends.set(di, 4)
 friends.set(dd, 1.3)
 
-if friends.get_val1(di) != 4: raise RuntimeError
-if friends.get_val1(dd) != 1.3: raise RuntimeError
+if friends.get_val1(di) != 4:
+    raise RuntimeError
+if friends.get_val1(dd) != 1.3:
+    raise RuntimeError
diff --git a/Examples/test-suite/python/funcptr_cpp_runme.py b/Examples/test-suite/python/funcptr_cpp_runme.py
index ae8616e94..08e85ad7b 100644
--- a/Examples/test-suite/python/funcptr_cpp_runme.py
+++ b/Examples/test-suite/python/funcptr_cpp_runme.py
@@ -1,9 +1,8 @@
 from funcptr_cpp import *
 
 if call1(ADD_BY_VALUE, 10, 11) != 21:
-  raise RuntimeError
+    raise RuntimeError
 if call2(ADD_BY_POINTER, 12, 13) != 25:
-  raise RuntimeError
+    raise RuntimeError
 if call3(ADD_BY_REFERENCE, 14, 15) != 29:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/fvirtual_runme.py b/Examples/test-suite/python/fvirtual_runme.py
index ada3313de..99f5dc6b0 100644
--- a/Examples/test-suite/python/fvirtual_runme.py
+++ b/Examples/test-suite/python/fvirtual_runme.py
@@ -2,8 +2,7 @@ from fvirtual import *
 
 sw = NodeSwitch()
 n = Node()
-i = sw.addChild(n);
+i = sw.addChild(n)
 
 if i != 2:
-  raise RuntimeError, "addChild"
-
+    raise RuntimeError, "addChild"
diff --git a/Examples/test-suite/python/global_functions_runme.py b/Examples/test-suite/python/global_functions_runme.py
index 17b70b725..f411261b6 100644
--- a/Examples/test-suite/python/global_functions_runme.py
+++ b/Examples/test-suite/python/global_functions_runme.py
@@ -1,52 +1,52 @@
 from global_functions import *
 
+
 def check(a, b):
-  if a != b:
-    raise RuntimeError("Failed: " + str(a) + " != " + str(b))
+    if a != b:
+        raise RuntimeError("Failed: " + str(a) + " != " + str(b))
 global_void()
 check(global_one(1), 1)
 check(global_two(2, 2), 4)
 
 fail = True
 try:
-  global_void(1)
+    global_void(1)
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  global_one()
+    global_one()
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  global_one(2, 2)
+    global_one(2, 2)
 except TypeError, e:
-  fail = False
+    fail = False
 
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  global_two(1)
+    global_two(1)
 except TypeError, e:
-  fail = False
+    fail = False
 
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  global_two(3, 3, 3)
+    global_two(3, 3, 3)
 except TypeError, e:
-  fail = False
+    fail = False
 
 if fail:
-  raise RuntimeError("argument count check failed")
-
+    raise RuntimeError("argument count check failed")
diff --git a/Examples/test-suite/python/global_namespace_runme.py b/Examples/test-suite/python/global_namespace_runme.py
index 8e42e0653..ac12fe2dc 100644
--- a/Examples/test-suite/python/global_namespace_runme.py
+++ b/Examples/test-suite/python/global_namespace_runme.py
@@ -1,7 +1,8 @@
 from global_namespace import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 k1 = Klass1()
 k2 = Klass2()
@@ -12,9 +13,9 @@ k6 = Klass6()
 k7 = Klass7()
 
 if is_new_style_class(KlassMethods):
-  KlassMethods_static = KlassMethods
+    KlassMethods_static = KlassMethods
 else:
-  KlassMethods_static = KlassMethods()
+    KlassMethods_static = KlassMethods()
 KlassMethods_static.methodA(k1, k2, k3, k4, k5, k6, k7)
 KlassMethods_static.methodB(k1, k2, k3, k4, k5, k6, k7)
 
@@ -41,15 +42,17 @@ KlassMethods_static.methodA(k1, k2, k3, k4, k5, k6, k7)
 KlassMethods_static.methodB(k1, k2, k3, k4, k5, k6, k7)
 
 if is_new_style_class(XYZMethods):
-  XYZMethods_static = XYZMethods
+    XYZMethods_static = XYZMethods
 else:
-  XYZMethods_static = XYZMethods()
-XYZMethods_static.methodA(XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
-XYZMethods_static.methodB(XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
+    XYZMethods_static = XYZMethods()
+XYZMethods_static.methodA(
+    XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
+XYZMethods_static.methodB(
+    XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
 
 if is_new_style_class(TheEnumMethods):
-  TheEnumMethods_static = TheEnumMethods
+    TheEnumMethods_static = TheEnumMethods
 else:
-  TheEnumMethods_static = TheEnumMethods()
+    TheEnumMethods_static = TheEnumMethods()
 TheEnumMethods_static.methodA(theenum1, theenum2, theenum3)
 TheEnumMethods_static.methodA(theenum1, theenum2, theenum3)
diff --git a/Examples/test-suite/python/global_ns_arg_runme.py b/Examples/test-suite/python/global_ns_arg_runme.py
index cf1915648..f7fbc7a9e 100644
--- a/Examples/test-suite/python/global_ns_arg_runme.py
+++ b/Examples/test-suite/python/global_ns_arg_runme.py
@@ -2,4 +2,3 @@ from global_ns_arg import *
 
 a = foo(1)
 b = bar_fn()
-
diff --git a/Examples/test-suite/python/global_vars_runme.py b/Examples/test-suite/python/global_vars_runme.py
index 5d520b5ce..3ef0b494f 100644
--- a/Examples/test-suite/python/global_vars_runme.py
+++ b/Examples/test-suite/python/global_vars_runme.py
@@ -3,33 +3,32 @@ import global_vars
 global_vars.init()
 b = global_vars.cvar.b
 if b != "string b":
-  raise RuntimeError("Unexpected string: " + b)
+    raise RuntimeError("Unexpected string: " + b)
 global_vars.cvar.b = "a string value"
 b = global_vars.cvar.b
 if b != "a string value":
-  raise RuntimeError("Unexpected string: " + b)
+    raise RuntimeError("Unexpected string: " + b)
 
 x = global_vars.cvar.x
 if x != 1234:
-  raise RuntimeError("Unexpected x: " + str(x))
+    raise RuntimeError("Unexpected x: " + str(x))
 global_vars.cvar.x = 9876
 x = global_vars.cvar.x
 if x != 9876:
-  raise RuntimeError("Unexpected string: " + str(x))
+    raise RuntimeError("Unexpected string: " + str(x))
 
 fail = True
 try:
-  global_vars.cvar.notexist = "something"
+    global_vars.cvar.notexist = "something"
 except AttributeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("AttributeError should have been thrown")
+    raise RuntimeError("AttributeError should have been thrown")
 
 fail = True
 try:
-  g = global_vars.cvar.notexist
+    g = global_vars.cvar.notexist
 except AttributeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("AttributeError should have been thrown")
-
+    raise RuntimeError("AttributeError should have been thrown")
diff --git a/Examples/test-suite/python/iadd_runme.py b/Examples/test-suite/python/iadd_runme.py
index fbeb0ec3e..ceaa38860 100644
--- a/Examples/test-suite/python/iadd_runme.py
+++ b/Examples/test-suite/python/iadd_runme.py
@@ -3,7 +3,7 @@ import iadd
 f = iadd.Foo()
 
 f.AsA.x = 3
-f.AsA += f.AsA 
+f.AsA += f.AsA
 
 if f.AsA.x != 6:
     raise RuntimeError
diff --git a/Examples/test-suite/python/implicittest_runme.py b/Examples/test-suite/python/implicittest_runme.py
index 4cad1bb5d..4646d08c0 100644
--- a/Examples/test-suite/python/implicittest_runme.py
+++ b/Examples/test-suite/python/implicittest_runme.py
@@ -1,11 +1,13 @@
 from implicittest import *
 
+
 def check(a, b):
     if a != b:
         raise RuntimeError(str(a) + " does not equal " + str(b))
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 #### Class ####
 
@@ -20,7 +22,8 @@ try:
 except ValueError:
     # ValueError: invalid null reference in method 'new_A', argument 1 of type 'B const &'
     # Arguably A(char *) should be chosen, but there is a bug to do with None passed to methods overloaded by value,
-    # references and pointers to different types, where pointers ought to be given a slightly higher precedence.
+    # references and pointers to different types, where pointers ought to be
+    # given a slightly higher precedence.
     pass
 
 check(1, get(1))
@@ -43,9 +46,9 @@ check(3, A_int(B()).get())
 check(4, A_int("hello").get())
 
 if is_new_style_class(A_int):
-  A_int_static = A_int
+    A_int_static = A_int
 else:
-  A_int_static = A_int(0)
+    A_int_static = A_int(0)
 check(1, A_int_static.sget(1))
 check(2, A_int_static.sget(1.0))
 check(3, A_int_static.sget(B()))
@@ -59,10 +62,14 @@ except TypeError:
 
 #### Global variable assignment ####
 
-cvar.foo = Foo(1);          check(cvar.foo.ii, 1)
-cvar.foo = 1;               check(cvar.foo.ii, 1)
-cvar.foo = 1.0;             check(cvar.foo.ii, 2)
-cvar.foo = Foo("hello");    check(cvar.foo.ii, 3)
+cvar.foo = Foo(1)
+check(cvar.foo.ii, 1)
+cvar.foo = 1
+check(cvar.foo.ii, 1)
+cvar.foo = 1.0
+check(cvar.foo.ii, 2)
+cvar.foo = Foo("hello")
+check(cvar.foo.ii, 3)
 
 # explicit constructor:
 try:
@@ -74,10 +81,14 @@ except TypeError:
 #### Member variable assignment ####
 # Note: also needs naturalvar
 
-b = Bar();                  check(b.f.ii, 0)
-b.f = Foo("hello");         check(b.f.ii, 3)
-b.f = 1;                    check(b.f.ii, 1)
-b.f = 1.0;                  check(b.f.ii, 2)
+b = Bar()
+check(b.f.ii, 0)
+b.f = Foo("hello")
+check(b.f.ii, 3)
+b.f = 1
+check(b.f.ii, 1)
+b.f = 1.0
+check(b.f.ii, 2)
 
 # explicit constructor:
 try:
@@ -129,4 +140,3 @@ ccc = CCC(B())
 check(ccc.checkvalue, 10)
 check(ccc.xx(123), 11)
 check(ccc.yy(123, 123), 111)
-
diff --git a/Examples/test-suite/python/import_nomodule_runme.py b/Examples/test-suite/python/import_nomodule_runme.py
index efcff9c48..e43c233b4 100644
--- a/Examples/test-suite/python/import_nomodule_runme.py
+++ b/Examples/test-suite/python/import_nomodule_runme.py
@@ -3,11 +3,11 @@ from import_nomodule import *
 # This test is expected to fail with -builtin option.
 # The base class is needed for the builtin class hierarchy
 if is_python_builtin():
-  exit(0)
+    exit(0)
 
 f = create_Foo()
-test1(f,42)
+test1(f, 42)
 delete_Foo(f)
 
 b = Bar()
-test1(b,37)
+test1(b, 37)
diff --git a/Examples/test-suite/python/import_stl_runme.py b/Examples/test-suite/python/import_stl_runme.py
index 90c411455..69fe812b9 100644
--- a/Examples/test-suite/python/import_stl_runme.py
+++ b/Examples/test-suite/python/import_stl_runme.py
@@ -1,7 +1,6 @@
 import import_stl_b
 import import_stl_a
 
-v_new = import_stl_b.process_vector([1,2,3])
-if v_new != (1,2,3,4):
-  raise RuntimeError, v_new
-
+v_new = import_stl_b.process_vector([1, 2, 3])
+if v_new != (1, 2, 3, 4):
+    raise RuntimeError, v_new
diff --git a/Examples/test-suite/python/imports_runme.py b/Examples/test-suite/python/imports_runme.py
index 50a3ab59f..3eec965a6 100644
--- a/Examples/test-suite/python/imports_runme.py
+++ b/Examples/test-suite/python/imports_runme.py
@@ -14,4 +14,4 @@ a1 = c.get_a(c)
 a2 = c.get_a_type(c)
 
 if a1.hello() != a2.hello():
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/inctest_runme.py b/Examples/test-suite/python/inctest_runme.py
index e10f4544c..fa3492932 100644
--- a/Examples/test-suite/python/inctest_runme.py
+++ b/Examples/test-suite/python/inctest_runme.py
@@ -2,31 +2,30 @@ import inctest
 
 error = 0
 try:
-  a = inctest.A()
+    a = inctest.A()
 except:
-  print "didn't find A"
-  print "therefore, I didn't include 'testdir/subdir1/hello.i'"
-  error = 1
+    print "didn't find A"
+    print "therefore, I didn't include 'testdir/subdir1/hello.i'"
+    error = 1
 pass
 
 
 try:
-  b = inctest.B()
+    b = inctest.B()
 except:
-  print "didn't find B"
-  print "therefore, I didn't include 'testdir/subdir2/hello.i'"
-  error = 1
+    print "didn't find B"
+    print "therefore, I didn't include 'testdir/subdir2/hello.i'"
+    error = 1
 pass
 
 if error == 1:
-  raise RuntimeError
+    raise RuntimeError
 
 # Check the import in subdirectory worked
 if inctest.importtest1(5) != 15:
-  print "import test 1 failed"
-  raise RuntimeError
+    print "import test 1 failed"
+    raise RuntimeError
 
 if inctest.importtest2("black") != "white":
-  print "import test 2 failed"
-  raise RuntimeError
-
+    print "import test 2 failed"
+    raise RuntimeError
diff --git a/Examples/test-suite/python/inout_runme.py b/Examples/test-suite/python/inout_runme.py
index fb290f62f..bb198d774 100644
--- a/Examples/test-suite/python/inout_runme.py
+++ b/Examples/test-suite/python/inout_runme.py
@@ -2,21 +2,20 @@ import inout
 
 a = inout.AddOne1(1)
 if a != 2:
-  raise RuntimeError
+    raise RuntimeError
 
-a = inout.AddOne3(1,1,1)
-if a != [2,2,2]:
-  raise RuntimeError
+a = inout.AddOne3(1, 1, 1)
+if a != [2, 2, 2]:
+    raise RuntimeError
 
-a = inout.AddOne1p((1,1))
-if a != (2,2):
-  raise RuntimeError
+a = inout.AddOne1p((1, 1))
+if a != (2, 2):
+    raise RuntimeError
 
-a = inout.AddOne2p((1,1),1)
-if a != [(2,2),2]:
-  raise RuntimeError
-
-a = inout.AddOne3p(1,(1,1),1)
-if a != [2,(2,2),2]:
-  raise RuntimeError
+a = inout.AddOne2p((1, 1), 1)
+if a != [(2, 2), 2]:
+    raise RuntimeError
 
+a = inout.AddOne3p(1, (1, 1), 1)
+if a != [2, (2, 2), 2]:
+    raise RuntimeError
diff --git a/Examples/test-suite/python/inplaceadd_runme.py b/Examples/test-suite/python/inplaceadd_runme.py
index b703c56c7..7f292cbb5 100644
--- a/Examples/test-suite/python/inplaceadd_runme.py
+++ b/Examples/test-suite/python/inplaceadd_runme.py
@@ -3,18 +3,18 @@ a = inplaceadd.A(7)
 
 a += 5
 if a.val != 12:
-  print a.val
-  raise RuntimeError
+    print a.val
+    raise RuntimeError
 
 a -= 5
 if a.val != 7:
-  raise RuntimeError
+    raise RuntimeError
 
 a *= 2
 
 if a.val != 14:
-  raise RuntimeError
+    raise RuntimeError
 
 a += a
 if a.val != 28:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/input_runme.py b/Examples/test-suite/python/input_runme.py
index f5ef6dc8b..1a06e8b7b 100644
--- a/Examples/test-suite/python/input_runme.py
+++ b/Examples/test-suite/python/input_runme.py
@@ -2,19 +2,19 @@ from input import *
 
 f = Foo()
 if f.foo(2) != 4:
-  raise RuntimeError
-  
-if f.foo(None)!= None:
-  raise RuntimeError
+    raise RuntimeError
 
-if f.foo()!= None:
-  raise RuntimeError
+if f.foo(None) != None:
+    raise RuntimeError
+
+if f.foo() != None:
+    raise RuntimeError
 
 if sfoo("Hello") != "Hello world":
-  raise RuntimeError
+    raise RuntimeError
 
 if sfoo(None) != None:
-  raise RuntimeError
+    raise RuntimeError
 
 if sfoo() != None:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/kwargs_feature_runme.py b/Examples/test-suite/python/kwargs_feature_runme.py
index 37457c976..a2d4731ab 100644
--- a/Examples/test-suite/python/kwargs_feature_runme.py
+++ b/Examples/test-suite/python/kwargs_feature_runme.py
@@ -1,81 +1,81 @@
 from kwargs_feature import *
 
-class MyFoo(Foo):
-  def __init__(self, a , b = 0):
-    Foo.__init__(self, a, b)
 
-    
+class MyFoo(Foo):
+
+    def __init__(self, a, b=0):
+        Foo.__init__(self, a, b)
+
 
 # Simple class
 f1 = MyFoo(2)
 
-f = Foo(b=2,a=1)
+f = Foo(b=2, a=1)
 
-if f.foo(b=1,a=2) != 3:
-  raise RuntimeError
+if f.foo(b=1, a=2) != 3:
+    raise RuntimeError
 
 if Foo_statfoo(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 if f.efoo(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 if Foo_sfoo(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 
 # Templated class
-b = BarInt(b=2,a=1)
+b = BarInt(b=2, a=1)
 
-if b.bar(b=1,a=2) != 3:
-  raise RuntimeError
+if b.bar(b=1, a=2) != 3:
+    raise RuntimeError
 
 if BarInt_statbar(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 if b.ebar(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 if BarInt_sbar(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 
 # Functions
 if templatedfunction(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
-if foo_fn(a=1,b=2) != 3:
-  raise RuntimeError
+if foo_fn(a=1, b=2) != 3:
+    raise RuntimeError
 
 if foo_fn(b=2) != 3:
-  raise RuntimeError
+    raise RuntimeError
 
 
-#Functions with keywords
+# Functions with keywords
 
 if foo_kw(_from=2) != 4:
-  raise RuntimeError
+    raise RuntimeError
 
 if foo_nu(_from=2, arg2=3) != 2:
-  raise RuntimeError
+    raise RuntimeError
 
 if foo_mm(min=2) != 4:
-  raise RuntimeError
+    raise RuntimeError
 
 if foo_mm(max=3) != 4:
-  raise RuntimeError
-  
-#Default args with references
+    raise RuntimeError
+
+# Default args with references
 
 if rfoo(n=123) != 120:
-  raise RuntimeError
+    raise RuntimeError
 
 if rfoo(x=10) != -10:
-  raise RuntimeError
+    raise RuntimeError
 
 if rfoo(n=11, x=22) != -11:
-  raise RuntimeError
+    raise RuntimeError
 
 if rfoo(x=11, n=22) != 11:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/langobj_runme.py b/Examples/test-suite/python/langobj_runme.py
index c10e19303..b32d5a18a 100644
--- a/Examples/test-suite/python/langobj_runme.py
+++ b/Examples/test-suite/python/langobj_runme.py
@@ -2,7 +2,7 @@ import sys
 from langobj import *
 
 
-x ="hello"
+x = "hello"
 rx = sys.getrefcount(x)
 v = identity(x)
 rv = sys.getrefcount(v)
diff --git a/Examples/test-suite/python/li_attribute_runme.py b/Examples/test-suite/python/li_attribute_runme.py
index db40b9b2a..13a01c97d 100644
--- a/Examples/test-suite/python/li_attribute_runme.py
+++ b/Examples/test-suite/python/li_attribute_runme.py
@@ -2,73 +2,72 @@
 
 import li_attribute
 
-aa = li_attribute.A(1,2,3)
+aa = li_attribute.A(1, 2, 3)
 
 if aa.a != 1:
-  raise RuntimeError
+    raise RuntimeError
 aa.a = 3
 if aa.a != 3:
-  print aa.a
-  raise RuntimeError
+    print aa.a
+    raise RuntimeError
 
 if aa.b != 2:
-  print aa.b
-  raise RuntimeError
+    print aa.b
+    raise RuntimeError
 aa.b = 5
 if aa.b != 5:
-  raise RuntimeError
+    raise RuntimeError
 
 if aa.d != aa.b:
-  raise RuntimeError
+    raise RuntimeError
 
 if aa.c != 3:
-  raise RuntimeError
+    raise RuntimeError
 #aa.c = 5
-#if aa.c != 3:
+# if aa.c != 3:
 #  raise RuntimeError
 
 pi = li_attribute.Param_i(7)
 if pi.value != 7:
- raise RuntimeError
+    raise RuntimeError
 
-pi.value=3
+pi.value = 3
 if pi.value != 3:
- raise RuntimeError
+    raise RuntimeError
 
 b = li_attribute.B(aa)
 
 if b.a.c != 3:
- raise RuntimeError
-  
+    raise RuntimeError
+
 # class/struct attribute with get/set methods using return/pass by reference
 myFoo = li_attribute.MyFoo()
 myFoo.x = 8
 myClass = li_attribute.MyClass()
 myClass.Foo = myFoo
 if myClass.Foo.x != 8:
-  raise RuntimeError
+    raise RuntimeError
 
 # class/struct attribute with get/set methods using return/pass by value
 myClassVal = li_attribute.MyClassVal()
 if myClassVal.ReadWriteFoo.x != -1:
-  raise RuntimeError
+    raise RuntimeError
 if myClassVal.ReadOnlyFoo.x != -1:
-  raise RuntimeError
+    raise RuntimeError
 myClassVal.ReadWriteFoo = myFoo
 if myClassVal.ReadWriteFoo.x != 8:
-  raise RuntimeError
+    raise RuntimeError
 if myClassVal.ReadOnlyFoo.x != 8:
-  raise RuntimeError
+    raise RuntimeError
 
 # string attribute with get/set methods using return/pass by value
 myStringyClass = li_attribute.MyStringyClass("initial string")
 if myStringyClass.ReadWriteString != "initial string":
-  raise RuntimeError
+    raise RuntimeError
 if myStringyClass.ReadOnlyString != "initial string":
-  raise RuntimeError
+    raise RuntimeError
 myStringyClass.ReadWriteString = "changed string"
 if myStringyClass.ReadWriteString != "changed string":
-  raise RuntimeError
+    raise RuntimeError
 if myStringyClass.ReadOnlyString != "changed string":
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_attribute_template_runme.py b/Examples/test-suite/python/li_attribute_template_runme.py
index 7423053f9..d33b12309 100644
--- a/Examples/test-suite/python/li_attribute_template_runme.py
+++ b/Examples/test-suite/python/li_attribute_template_runme.py
@@ -2,66 +2,67 @@
 
 import li_attribute_template
 
-chell = li_attribute_template.Cintint(1,2,3)
+chell = li_attribute_template.Cintint(1, 2, 3)
 
-def rassert( what, master ):
+
+def rassert(what, master):
     if what != master:
         print what
         raise RuntimeError
 
-## Testing primitive by value attribute
-rassert( chell.a, 1 )
+# Testing primitive by value attribute
+rassert(chell.a, 1)
 
 chell.a = 3
-rassert( chell.a, 3 )
+rassert(chell.a, 3)
 
-## Testing primitive by ref attribute
+# Testing primitive by ref attribute
 
-rassert( chell.b, 2 )
+rassert(chell.b, 2)
 
 chell.b = 5
-rassert( chell.b,5 )
+rassert(chell.b, 5)
 
-## Testing string
+# Testing string
 chell.str = "abc"
-rassert( chell.str, "abc" )
+rassert(chell.str, "abc")
 
 # Testing class by value
 
-rassert( chell.d.value, 1 )
+rassert(chell.d.value, 1)
 
 chell.d = li_attribute_template.Foo(2)
-rassert( chell.d.value, 2 )
+rassert(chell.d.value, 2)
 
 # Testing class by reference
 
-rassert( chell.e.value, 2 )
+rassert(chell.e.value, 2)
 
-chell.e= li_attribute_template.Foo(3)
-rassert( chell.e.value, 3 )
+chell.e = li_attribute_template.Foo(3)
+rassert(chell.e.value, 3)
 
 chell.e.value = 4
-rassert( chell.e.value, 4 )
+rassert(chell.e.value, 4)
 
 # Testing moderately complex template by value
-rassert( chell.f.first, 1 )
-rassert( chell.f.second, 2 )
+rassert(chell.f.first, 1)
+rassert(chell.f.second, 2)
 
-pair = li_attribute_template.pair_intint(3,4)
+pair = li_attribute_template.pair_intint(3, 4)
 chell.f = pair
-rassert( chell.f.first, 3 )
-rassert( chell.f.second, 4 )
+rassert(chell.f.first, 3)
+rassert(chell.f.second, 4)
 
 # Testing moderately complex template by ref
-rassert( chell.g.first, 2 )
-rassert( chell.g.second, 3 )
+rassert(chell.g.first, 2)
+rassert(chell.g.second, 3)
 
-pair = li_attribute_template.pair_intint(4,5)
+pair = li_attribute_template.pair_intint(4, 5)
 chell.g = pair
-rassert( chell.g.first, 4 )
-rassert( chell.g.second, 5 )
+rassert(chell.g.first, 4)
+rassert(chell.g.second, 5)
 
 chell.g.first = 6
 chell.g.second = 7
-rassert( chell.g.first, 6 )
-rassert( chell.g.second, 7 )
+rassert(chell.g.first, 6)
+rassert(chell.g.second, 7)
diff --git a/Examples/test-suite/python/li_boost_shared_ptr_bits_runme.py b/Examples/test-suite/python/li_boost_shared_ptr_bits_runme.py
index a05432925..9b9c7d683 100644
--- a/Examples/test-suite/python/li_boost_shared_ptr_bits_runme.py
+++ b/Examples/test-suite/python/li_boost_shared_ptr_bits_runme.py
@@ -1,20 +1,22 @@
 from li_boost_shared_ptr_bits import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
+
 
 def check(nd):
-  nd.i = 200
-  i = nd.i
+    nd.i = 200
+    i = nd.i
 
-  try:
-    nd.notexist = 100
-    passed = 0
-  except:
-    passed = 1
+    try:
+        nd.notexist = 100
+        passed = 0
+    except:
+        passed = 1
 
-  if not passed:
-    raise "Test failed"
+    if not passed:
+        raise "Test failed"
 
 nd = NonDynamic()
 check(nd)
@@ -30,11 +32,10 @@ v.push_back(IntHolder(33))
 
 sum = sum(v)
 if sum != 66:
-  raise "sum is wrong"
+    raise "sum is wrong"
 
 ################################
 if is_new_style_class(HiddenDestructor):
-  p = HiddenDestructor.create()
+    p = HiddenDestructor.create()
 else:
-  p = HiddenDestructor_create()
-
+    p = HiddenDestructor_create()
diff --git a/Examples/test-suite/python/li_boost_shared_ptr_runme.py b/Examples/test-suite/python/li_boost_shared_ptr_runme.py
index 0e025d546..7214add3e 100644
--- a/Examples/test-suite/python/li_boost_shared_ptr_runme.py
+++ b/Examples/test-suite/python/li_boost_shared_ptr_runme.py
@@ -4,541 +4,559 @@ import gc
 debug = False
 
 # simple shared_ptr usage - created in C++
+
+
 class li_boost_shared_ptr_runme:
-  def main(self):
-    if (debug):
-      print "Started"
-
-    li_boost_shared_ptr.cvar.debug_shared = debug
-
-    # Change loop count to run for a long time to monitor memory
-    loopCount = 1 #5000
-    for i in range (0,loopCount):
-      self.runtest()
-
-    # Expect 1 instance - the one global variable (GlobalValue)
-    if (li_boost_shared_ptr.Klass_getTotal_count() != 1):
-      raise RuntimeError("Klass.total_count=%s" % li_boost_shared_ptr.Klass.getTotal_count())
-
-    wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count() 
-    if (wrapper_count != li_boost_shared_ptr.NOT_COUNTING):
-      # Expect 1 instance - the one global variable (GlobalSmartValue)
-      if (wrapper_count != 1):
-        raise RuntimeError("shared_ptr wrapper count=%s" % wrapper_count)
-
-    if (debug):
-      print "Finished"
-
-  def runtest(self):
-    # simple shared_ptr usage - created in C++
-    k = li_boost_shared_ptr.Klass("me oh my")
-    val = k.getValue()
-    self.verifyValue("me oh my", val)
-    self.verifyCount(1, k)
-
-    # simple shared_ptr usage - not created in C++
-    k = li_boost_shared_ptr.factorycreate()
-    val = k.getValue()
-    self.verifyValue("factorycreate", val)
-    self.verifyCount(1, k)
-
-    # pass by shared_ptr
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.smartpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointertest", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr pointer
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.smartpointerpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerpointertest", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr reference
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.smartpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerreftest", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr pointer reference
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.smartpointerpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerpointerreftest", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # const pass by shared_ptr
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.constsmartpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # const pass by shared_ptr pointer
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.constsmartpointerpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # const pass by shared_ptr reference
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.constsmartpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by value
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.valuetest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my valuetest", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # pass by pointer
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.pointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my pointertest", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # pass by reference
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.reftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my reftest", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # pass by pointer reference
-    k = li_boost_shared_ptr.Klass("me oh my")
-    kret = li_boost_shared_ptr.pointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my pointerreftest", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # null tests
-    k = None
-
-    if (li_boost_shared_ptr.smartpointertest(k) != None):
-      raise RuntimeError("return was not null")
-
-    if (li_boost_shared_ptr.smartpointerpointertest(k) != None):
-      raise RuntimeError("return was not null")
-
-    if (li_boost_shared_ptr.smartpointerreftest(k) != None):
-      raise RuntimeError("return was not null")
-
-    if (li_boost_shared_ptr.smartpointerpointerreftest(k) != None):
-      raise RuntimeError("return was not null")
-
-    if (li_boost_shared_ptr.nullsmartpointerpointertest(None) != "null pointer"):
-      raise RuntimeError("not null smartpointer pointer")
-
-    try:
-      li_boost_shared_ptr.valuetest(k)
-      raise RuntimeError("Failed to catch null pointer")
-    except ValueError:
-      pass
-
-    if (li_boost_shared_ptr.pointertest(k) != None):
-      raise RuntimeError("return was not null")
-
-    try:
-      li_boost_shared_ptr.reftest(k)
-      raise RuntimeError("Failed to catch null pointer")
-    except ValueError:
-      pass
-
-    # $owner
-    k = li_boost_shared_ptr.pointerownertest()
-    val = k.getValue()
-    self.verifyValue("pointerownertest", val)
-    self.verifyCount(1, k)
-    k = li_boost_shared_ptr.smartpointerpointerownertest()
-    val = k.getValue()
-    self.verifyValue("smartpointerpointerownertest", val)
-    self.verifyCount(1, k)
-
-    # //////////////////////////////// Derived class ////////////////////////////////////////
-    # derived pass by shared_ptr
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedsmartptrtest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedsmartptrtest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # derived pass by shared_ptr pointer
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedsmartptrpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedsmartptrpointertest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # derived pass by shared_ptr ref
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedsmartptrreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedsmartptrreftest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # derived pass by shared_ptr pointer ref
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedsmartptrpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedsmartptrpointerreftest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # derived pass by pointer
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedpointertest-Derived", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # derived pass by ref
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.derivedreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my derivedreftest-Derived", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # //////////////////////////////// Derived and base class mixed ////////////////////////////////////////
-    # pass by shared_ptr (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.smartpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointertest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr pointer (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.smartpointerpointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerpointertest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr reference (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.smartpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerreftest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by shared_ptr pointer reference (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.smartpointerpointerreftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my smartpointerpointerreftest-Derived", val)
-    self.verifyCount(2, k)
-    self.verifyCount(2, kret)
-
-    # pass by value (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.valuetest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my valuetest", val) # note slicing
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # pass by pointer (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.pointertest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my pointertest-Derived", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # pass by ref (mixed)
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    kret = li_boost_shared_ptr.reftest(k)
-    val = kret.getValue()
-    self.verifyValue("me oh my reftest-Derived", val)
-    self.verifyCount(1, k)
-    self.verifyCount(1, kret)
-
-    # //////////////////////////////// Overloading tests ////////////////////////////////////////
-    # Base class
-    k = li_boost_shared_ptr.Klass("me oh my")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
-
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
-
-    # Derived class
-    k = li_boost_shared_ptr.KlassDerived("me oh my")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
-    self.verifyValue(li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
-
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
-    self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
-
-    # 3rd derived class
-    k = li_boost_shared_ptr.Klass3rdDerived("me oh my")
-    val = k.getValue()
-    self.verifyValue("me oh my-3rdDerived", val)
-    self.verifyCount(1, k)
-    val = li_boost_shared_ptr.test3rdupcast(k)
-    self.verifyValue("me oh my-3rdDerived", val)
-    self.verifyCount(1, k)
-
-    # //////////////////////////////// Member variables ////////////////////////////////////////
-    # smart pointer by value
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("smart member value")
-    m.SmartMemberValue = k
-    val = k.getValue()
-    self.verifyValue("smart member value", val)
-    self.verifyCount(2, k)
-
-    kmember = m.SmartMemberValue
-    val = kmember.getValue()
-    self.verifyValue("smart member value", val)
-    self.verifyCount(3, kmember)
-    self.verifyCount(3, k)
-
-    del m
-    self.verifyCount(2, kmember)
-    self.verifyCount(2, k)
-
-    # smart pointer by pointer
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("smart member pointer")
-    m.SmartMemberPointer = k
-    val = k.getValue()
-    self.verifyValue("smart member pointer", val)
-    self.verifyCount(1, k)
-
-    kmember = m.SmartMemberPointer
-    val = kmember.getValue()
-    self.verifyValue("smart member pointer", val)
-    self.verifyCount(2, kmember)
-    self.verifyCount(2, k)
-
-    del m
-    self.verifyCount(2, kmember)
-    self.verifyCount(2, k)
-
-    # smart pointer by reference
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("smart member reference")
-    m.SmartMemberReference = k
-    val = k.getValue()
-    self.verifyValue("smart member reference", val)
-    self.verifyCount(2, k)
-
-    kmember = m.SmartMemberReference
-    val = kmember.getValue()
-    self.verifyValue("smart member reference", val)
-    self.verifyCount(3, kmember)
-    self.verifyCount(3, k)
-
-    # The C++ reference refers to SmartMemberValue...
-    kmemberVal = m.SmartMemberValue
-    val = kmember.getValue()
-    self.verifyValue("smart member reference", val)
-    self.verifyCount(4, kmemberVal)
-    self.verifyCount(4, kmember)
-    self.verifyCount(4, k)
-
-    del m
-    self.verifyCount(3, kmemberVal)
-    self.verifyCount(3, kmember)
-    self.verifyCount(3, k)
-
-    # plain by value
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("plain member value")
-    m.MemberValue = k
-    val = k.getValue()
-    self.verifyValue("plain member value", val)
-    self.verifyCount(1, k)
-
-    kmember = m.MemberValue
-    val = kmember.getValue()
-    self.verifyValue("plain member value", val)
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    del m
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    # plain by pointer
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("plain member pointer")
-    m.MemberPointer = k
-    val = k.getValue()
-    self.verifyValue("plain member pointer", val)
-    self.verifyCount(1, k)
-
-    kmember = m.MemberPointer
-    val = kmember.getValue()
-    self.verifyValue("plain member pointer", val)
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    del m
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    # plain by reference
-    m = li_boost_shared_ptr.MemberVariables()
-    k = li_boost_shared_ptr.Klass("plain member reference")
-    m.MemberReference = k
-    val = k.getValue()
-    self.verifyValue("plain member reference", val)
-    self.verifyCount(1, k)
-
-    kmember = m.MemberReference
-    val = kmember.getValue()
-    self.verifyValue("plain member reference", val)
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    del m
-    self.verifyCount(1, kmember)
-    self.verifyCount(1, k)
-
-    # null member variables
-    m = li_boost_shared_ptr.MemberVariables()
-
-    # shared_ptr by value
-    k = m.SmartMemberValue
-    if (k != None):
-      raise RuntimeError("expected null")
-    m.SmartMemberValue = None
-    k = m.SmartMemberValue
-    if (k != None):
-      raise RuntimeError("expected null")
-    self.verifyCount(0, k)
-
-    # plain by value
-    try:
-      m.MemberValue = None
-      raise RuntimeError("Failed to catch null pointer")
-    except ValueError:
-      pass
-
-    # ////////////////////////////////// Global variables ////////////////////////////////////////
-    # smart pointer
-    kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue
-    if (kglobal != None):
-      raise RuntimeError("expected null")
-
-    k = li_boost_shared_ptr.Klass("smart global value")
-    li_boost_shared_ptr.cvar.GlobalSmartValue = k
-    self.verifyCount(2, k)
-
-    kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue
-    val = kglobal.getValue()
-    self.verifyValue("smart global value", val)
-    self.verifyCount(3, kglobal)
-    self.verifyCount(3, k)
-    self.verifyValue("smart global value", li_boost_shared_ptr.cvar.GlobalSmartValue.getValue())
-    li_boost_shared_ptr.cvar.GlobalSmartValue = None
-
-    # plain value
-    k = li_boost_shared_ptr.Klass("global value")
-    li_boost_shared_ptr.cvar.GlobalValue = k
-    self.verifyCount(1, k)
-
-    kglobal = li_boost_shared_ptr.cvar.GlobalValue
-    val = kglobal.getValue()
-    self.verifyValue("global value", val)
-    self.verifyCount(1, kglobal)
-    self.verifyCount(1, k)
-    self.verifyValue("global value", li_boost_shared_ptr.cvar.GlobalValue.getValue())
-
-    try:
-      li_boost_shared_ptr.cvar.GlobalValue = None
-      raise RuntimeError("Failed to catch null pointer")
-    except ValueError:
-      pass
-
-    # plain pointer
-    kglobal = li_boost_shared_ptr.cvar.GlobalPointer
-    if (kglobal != None):
-      raise RuntimeError("expected null")
-
-    k = li_boost_shared_ptr.Klass("global pointer")
-    li_boost_shared_ptr.cvar.GlobalPointer = k
-    self.verifyCount(1, k)
-
-    kglobal = li_boost_shared_ptr.cvar.GlobalPointer
-    val = kglobal.getValue()
-    self.verifyValue("global pointer", val)
-    self.verifyCount(1, kglobal)
-    self.verifyCount(1, k)
-    li_boost_shared_ptr.cvar.GlobalPointer = None
-
-    # plain reference
-    kglobal
-
-    k = li_boost_shared_ptr.Klass("global reference")
-    li_boost_shared_ptr.cvar.GlobalReference = k
-    self.verifyCount(1, k)
-
-    kglobal = li_boost_shared_ptr.cvar.GlobalReference
-    val = kglobal.getValue()
-    self.verifyValue("global reference", val)
-    self.verifyCount(1, kglobal)
-    self.verifyCount(1, k)
-
-    try:
-      li_boost_shared_ptr.cvar.GlobalReference = None 
-      raise RuntimeError("Failed to catch null pointer")
-    except ValueError:
-      pass
-
-    # ////////////////////////////////// Templates ////////////////////////////////////////
-    pid = li_boost_shared_ptr.PairIntDouble(10, 20.2)
-    if (pid.baseVal1 != 20 or pid.baseVal2 != 40.4):
-      raise RuntimeError("Base values wrong")
-    if (pid.val1 != 10 or pid.val2 != 20.2):
-      raise RuntimeError("Derived Values wrong")
-
-  def verifyValue(self, expected, got):
-    if (expected != got):
-      raise RuntimeError("verify value failed. Expected: ", expected, " Got: ", got)
-
-  def verifyCount(self, expected, k):
-    got = li_boost_shared_ptr.use_count(k)
-    if (expected != got):
-      raise RuntimeError("verify use_count failed. Expected: ", expected, " Got: ", got)
+
+    def main(self):
+        if (debug):
+            print "Started"
+
+        li_boost_shared_ptr.cvar.debug_shared = debug
+
+        # Change loop count to run for a long time to monitor memory
+        loopCount = 1  # 5000
+        for i in range(0, loopCount):
+            self.runtest()
+
+        # Expect 1 instance - the one global variable (GlobalValue)
+        if (li_boost_shared_ptr.Klass_getTotal_count() != 1):
+            raise RuntimeError("Klass.total_count=%s" %
+                               li_boost_shared_ptr.Klass.getTotal_count())
+
+        wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count()
+        if (wrapper_count != li_boost_shared_ptr.NOT_COUNTING):
+            # Expect 1 instance - the one global variable (GlobalSmartValue)
+            if (wrapper_count != 1):
+                raise RuntimeError(
+                    "shared_ptr wrapper count=%s" % wrapper_count)
+
+        if (debug):
+            print "Finished"
+
+    def runtest(self):
+        # simple shared_ptr usage - created in C++
+        k = li_boost_shared_ptr.Klass("me oh my")
+        val = k.getValue()
+        self.verifyValue("me oh my", val)
+        self.verifyCount(1, k)
+
+        # simple shared_ptr usage - not created in C++
+        k = li_boost_shared_ptr.factorycreate()
+        val = k.getValue()
+        self.verifyValue("factorycreate", val)
+        self.verifyCount(1, k)
+
+        # pass by shared_ptr
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.smartpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointertest", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr pointer
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.smartpointerpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerpointertest", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr reference
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.smartpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerreftest", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr pointer reference
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.smartpointerpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerpointerreftest", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # const pass by shared_ptr
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.constsmartpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # const pass by shared_ptr pointer
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.constsmartpointerpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # const pass by shared_ptr reference
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.constsmartpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by value
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.valuetest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my valuetest", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # pass by pointer
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.pointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my pointertest", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # pass by reference
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.reftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my reftest", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # pass by pointer reference
+        k = li_boost_shared_ptr.Klass("me oh my")
+        kret = li_boost_shared_ptr.pointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my pointerreftest", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # null tests
+        k = None
+
+        if (li_boost_shared_ptr.smartpointertest(k) != None):
+            raise RuntimeError("return was not null")
+
+        if (li_boost_shared_ptr.smartpointerpointertest(k) != None):
+            raise RuntimeError("return was not null")
+
+        if (li_boost_shared_ptr.smartpointerreftest(k) != None):
+            raise RuntimeError("return was not null")
+
+        if (li_boost_shared_ptr.smartpointerpointerreftest(k) != None):
+            raise RuntimeError("return was not null")
+
+        if (li_boost_shared_ptr.nullsmartpointerpointertest(None) != "null pointer"):
+            raise RuntimeError("not null smartpointer pointer")
+
+        try:
+            li_boost_shared_ptr.valuetest(k)
+            raise RuntimeError("Failed to catch null pointer")
+        except ValueError:
+            pass
+
+        if (li_boost_shared_ptr.pointertest(k) != None):
+            raise RuntimeError("return was not null")
+
+        try:
+            li_boost_shared_ptr.reftest(k)
+            raise RuntimeError("Failed to catch null pointer")
+        except ValueError:
+            pass
+
+        # $owner
+        k = li_boost_shared_ptr.pointerownertest()
+        val = k.getValue()
+        self.verifyValue("pointerownertest", val)
+        self.verifyCount(1, k)
+        k = li_boost_shared_ptr.smartpointerpointerownertest()
+        val = k.getValue()
+        self.verifyValue("smartpointerpointerownertest", val)
+        self.verifyCount(1, k)
+
+        # //////////////////////////////// Derived class //////////////////////
+        # derived pass by shared_ptr
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedsmartptrtest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedsmartptrtest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # derived pass by shared_ptr pointer
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedsmartptrpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedsmartptrpointertest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # derived pass by shared_ptr ref
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedsmartptrreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedsmartptrreftest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # derived pass by shared_ptr pointer ref
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedsmartptrpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedsmartptrpointerreftest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # derived pass by pointer
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedpointertest-Derived", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # derived pass by ref
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.derivedreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my derivedreftest-Derived", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # //////////////////////////////// Derived and base class mixed ///////
+        # pass by shared_ptr (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.smartpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointertest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr pointer (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.smartpointerpointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerpointertest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr reference (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.smartpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerreftest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by shared_ptr pointer reference (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.smartpointerpointerreftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my smartpointerpointerreftest-Derived", val)
+        self.verifyCount(2, k)
+        self.verifyCount(2, kret)
+
+        # pass by value (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.valuetest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my valuetest", val)  # note slicing
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # pass by pointer (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.pointertest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my pointertest-Derived", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # pass by ref (mixed)
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        kret = li_boost_shared_ptr.reftest(k)
+        val = kret.getValue()
+        self.verifyValue("me oh my reftest-Derived", val)
+        self.verifyCount(1, k)
+        self.verifyCount(1, kret)
+
+        # //////////////////////////////// Overloading tests //////////////////
+        # Base class
+        k = li_boost_shared_ptr.Klass("me oh my")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
+
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
+
+        # Derived class
+        k = li_boost_shared_ptr.KlassDerived("me oh my")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
+        self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
+
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
+        self.verifyValue(
+            li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
+
+        # 3rd derived class
+        k = li_boost_shared_ptr.Klass3rdDerived("me oh my")
+        val = k.getValue()
+        self.verifyValue("me oh my-3rdDerived", val)
+        self.verifyCount(1, k)
+        val = li_boost_shared_ptr.test3rdupcast(k)
+        self.verifyValue("me oh my-3rdDerived", val)
+        self.verifyCount(1, k)
+
+        # //////////////////////////////// Member variables ///////////////////
+        # smart pointer by value
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("smart member value")
+        m.SmartMemberValue = k
+        val = k.getValue()
+        self.verifyValue("smart member value", val)
+        self.verifyCount(2, k)
+
+        kmember = m.SmartMemberValue
+        val = kmember.getValue()
+        self.verifyValue("smart member value", val)
+        self.verifyCount(3, kmember)
+        self.verifyCount(3, k)
+
+        del m
+        self.verifyCount(2, kmember)
+        self.verifyCount(2, k)
+
+        # smart pointer by pointer
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("smart member pointer")
+        m.SmartMemberPointer = k
+        val = k.getValue()
+        self.verifyValue("smart member pointer", val)
+        self.verifyCount(1, k)
+
+        kmember = m.SmartMemberPointer
+        val = kmember.getValue()
+        self.verifyValue("smart member pointer", val)
+        self.verifyCount(2, kmember)
+        self.verifyCount(2, k)
+
+        del m
+        self.verifyCount(2, kmember)
+        self.verifyCount(2, k)
+
+        # smart pointer by reference
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("smart member reference")
+        m.SmartMemberReference = k
+        val = k.getValue()
+        self.verifyValue("smart member reference", val)
+        self.verifyCount(2, k)
+
+        kmember = m.SmartMemberReference
+        val = kmember.getValue()
+        self.verifyValue("smart member reference", val)
+        self.verifyCount(3, kmember)
+        self.verifyCount(3, k)
+
+        # The C++ reference refers to SmartMemberValue...
+        kmemberVal = m.SmartMemberValue
+        val = kmember.getValue()
+        self.verifyValue("smart member reference", val)
+        self.verifyCount(4, kmemberVal)
+        self.verifyCount(4, kmember)
+        self.verifyCount(4, k)
+
+        del m
+        self.verifyCount(3, kmemberVal)
+        self.verifyCount(3, kmember)
+        self.verifyCount(3, k)
+
+        # plain by value
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("plain member value")
+        m.MemberValue = k
+        val = k.getValue()
+        self.verifyValue("plain member value", val)
+        self.verifyCount(1, k)
+
+        kmember = m.MemberValue
+        val = kmember.getValue()
+        self.verifyValue("plain member value", val)
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        del m
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        # plain by pointer
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("plain member pointer")
+        m.MemberPointer = k
+        val = k.getValue()
+        self.verifyValue("plain member pointer", val)
+        self.verifyCount(1, k)
+
+        kmember = m.MemberPointer
+        val = kmember.getValue()
+        self.verifyValue("plain member pointer", val)
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        del m
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        # plain by reference
+        m = li_boost_shared_ptr.MemberVariables()
+        k = li_boost_shared_ptr.Klass("plain member reference")
+        m.MemberReference = k
+        val = k.getValue()
+        self.verifyValue("plain member reference", val)
+        self.verifyCount(1, k)
+
+        kmember = m.MemberReference
+        val = kmember.getValue()
+        self.verifyValue("plain member reference", val)
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        del m
+        self.verifyCount(1, kmember)
+        self.verifyCount(1, k)
+
+        # null member variables
+        m = li_boost_shared_ptr.MemberVariables()
+
+        # shared_ptr by value
+        k = m.SmartMemberValue
+        if (k != None):
+            raise RuntimeError("expected null")
+        m.SmartMemberValue = None
+        k = m.SmartMemberValue
+        if (k != None):
+            raise RuntimeError("expected null")
+        self.verifyCount(0, k)
+
+        # plain by value
+        try:
+            m.MemberValue = None
+            raise RuntimeError("Failed to catch null pointer")
+        except ValueError:
+            pass
+
+        # ////////////////////////////////// Global variables /////////////////
+        # smart pointer
+        kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue
+        if (kglobal != None):
+            raise RuntimeError("expected null")
+
+        k = li_boost_shared_ptr.Klass("smart global value")
+        li_boost_shared_ptr.cvar.GlobalSmartValue = k
+        self.verifyCount(2, k)
+
+        kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue
+        val = kglobal.getValue()
+        self.verifyValue("smart global value", val)
+        self.verifyCount(3, kglobal)
+        self.verifyCount(3, k)
+        self.verifyValue(
+            "smart global value", li_boost_shared_ptr.cvar.GlobalSmartValue.getValue())
+        li_boost_shared_ptr.cvar.GlobalSmartValue = None
+
+        # plain value
+        k = li_boost_shared_ptr.Klass("global value")
+        li_boost_shared_ptr.cvar.GlobalValue = k
+        self.verifyCount(1, k)
+
+        kglobal = li_boost_shared_ptr.cvar.GlobalValue
+        val = kglobal.getValue()
+        self.verifyValue("global value", val)
+        self.verifyCount(1, kglobal)
+        self.verifyCount(1, k)
+        self.verifyValue(
+            "global value", li_boost_shared_ptr.cvar.GlobalValue.getValue())
+
+        try:
+            li_boost_shared_ptr.cvar.GlobalValue = None
+            raise RuntimeError("Failed to catch null pointer")
+        except ValueError:
+            pass
+
+        # plain pointer
+        kglobal = li_boost_shared_ptr.cvar.GlobalPointer
+        if (kglobal != None):
+            raise RuntimeError("expected null")
+
+        k = li_boost_shared_ptr.Klass("global pointer")
+        li_boost_shared_ptr.cvar.GlobalPointer = k
+        self.verifyCount(1, k)
+
+        kglobal = li_boost_shared_ptr.cvar.GlobalPointer
+        val = kglobal.getValue()
+        self.verifyValue("global pointer", val)
+        self.verifyCount(1, kglobal)
+        self.verifyCount(1, k)
+        li_boost_shared_ptr.cvar.GlobalPointer = None
+
+        # plain reference
+        kglobal
+
+        k = li_boost_shared_ptr.Klass("global reference")
+        li_boost_shared_ptr.cvar.GlobalReference = k
+        self.verifyCount(1, k)
+
+        kglobal = li_boost_shared_ptr.cvar.GlobalReference
+        val = kglobal.getValue()
+        self.verifyValue("global reference", val)
+        self.verifyCount(1, kglobal)
+        self.verifyCount(1, k)
+
+        try:
+            li_boost_shared_ptr.cvar.GlobalReference = None
+            raise RuntimeError("Failed to catch null pointer")
+        except ValueError:
+            pass
+
+        # ////////////////////////////////// Templates ////////////////////////
+        pid = li_boost_shared_ptr.PairIntDouble(10, 20.2)
+        if (pid.baseVal1 != 20 or pid.baseVal2 != 40.4):
+            raise RuntimeError("Base values wrong")
+        if (pid.val1 != 10 or pid.val2 != 20.2):
+            raise RuntimeError("Derived Values wrong")
+
+    def verifyValue(self, expected, got):
+        if (expected != got):
+            raise RuntimeError(
+                "verify value failed. Expected: ", expected, " Got: ", got)
+
+    def verifyCount(self, expected, k):
+        got = li_boost_shared_ptr.use_count(k)
+        if (expected != got):
+            raise RuntimeError(
+                "verify use_count failed. Expected: ", expected, " Got: ", got)
 
 
 runme = li_boost_shared_ptr_runme()
 runme.main()
-
diff --git a/Examples/test-suite/python/li_boost_shared_ptr_template_runme.py b/Examples/test-suite/python/li_boost_shared_ptr_template_runme.py
index c10627f36..6b56ec479 100644
--- a/Examples/test-suite/python/li_boost_shared_ptr_template_runme.py
+++ b/Examples/test-suite/python/li_boost_shared_ptr_template_runme.py
@@ -3,28 +3,28 @@ from li_boost_shared_ptr_template import *
 b = BaseINTEGER()
 d = DerivedINTEGER()
 if b.bar() != 1:
-  raise RuntimeError
+    raise RuntimeError
 if d.bar() != 2:
-  raise RuntimeError
+    raise RuntimeError
 if bar_getter(b) != 1:
-  raise RuntimeError
+    raise RuntimeError
 # Fix reverted in rev 12953
-#if bar_getter(d) != 2:
+# if bar_getter(d) != 2:
 #  raise RuntimeError
 
 b = BaseDefaultInt()
 d = DerivedDefaultInt()
 d2 = DerivedDefaultInt2()
 if b.bar2() != 3:
-  raise RuntimeError
+    raise RuntimeError
 if d.bar2() != 4:
-  raise RuntimeError
+    raise RuntimeError
 if d2.bar2() != 4:
-  raise RuntimeError
+    raise RuntimeError
 if bar2_getter(b) != 3:
-  raise RuntimeError
+    raise RuntimeError
 # Fix reverted in rev 12953
-#if bar2_getter(d) != 4:
+# if bar2_getter(d) != 4:
 #  raise RuntimeError
-#if bar2_getter(d2) != 4:
+# if bar2_getter(d2) != 4:
 #  raise RuntimeError
diff --git a/Examples/test-suite/python/li_cdata_runme.py b/Examples/test-suite/python/li_cdata_runme.py
index 061ca6f68..8a132e7dd 100644
--- a/Examples/test-suite/python/li_cdata_runme.py
+++ b/Examples/test-suite/python/li_cdata_runme.py
@@ -6,5 +6,4 @@ m = malloc(256)
 memmove(m, s)
 ss = cdata(m, 7)
 if ss != "ABC abc":
-  raise "failed"
-
+    raise "failed"
diff --git a/Examples/test-suite/python/li_cpointer_runme.py b/Examples/test-suite/python/li_cpointer_runme.py
index ac95ff4b9..1565069cf 100644
--- a/Examples/test-suite/python/li_cpointer_runme.py
+++ b/Examples/test-suite/python/li_cpointer_runme.py
@@ -2,7 +2,7 @@ from li_cpointer import *
 
 
 p = new_intp()
-intp_assign(p,3)
+intp_assign(p, 3)
 
 if intp_value(p) != 3:
     raise RuntimeError
diff --git a/Examples/test-suite/python/li_cstring_runme.py b/Examples/test-suite/python/li_cstring_runme.py
index 6503744bd..55b51d1c7 100644
--- a/Examples/test-suite/python/li_cstring_runme.py
+++ b/Examples/test-suite/python/li_cstring_runme.py
@@ -2,7 +2,7 @@ from li_cstring import *
 
 
 if count("ab\0ab\0ab\0", 0) != 3:
-    raise RuntimeError    
+    raise RuntimeError
 
 if test1() != "Hello World":
     raise RuntimeError
@@ -17,16 +17,15 @@ if test3("hello") != "hello-suffix":
 if test4("hello") != "hello-suffix":
     print test4("hello")
     raise RuntimeError
-    
+
 if test5(4) != 'xxxx':
     raise RuntimeError
 
 if test6(10) != 'xxxxx':
     raise RuntimeError
-    
-if test7() !="Hello world!":
+
+if test7() != "Hello world!":
     raise RuntimeError
 
 if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/li_cwstring_runme.py b/Examples/test-suite/python/li_cwstring_runme.py
index 4ab590882..aaa5b6e62 100644
--- a/Examples/test-suite/python/li_cwstring_runme.py
+++ b/Examples/test-suite/python/li_cwstring_runme.py
@@ -1,7 +1,7 @@
 from li_cwstring import *
 
 if count(u"ab\0ab\0ab\0", 0) != 3:
-    raise RuntimeError    
+    raise RuntimeError
 
 if test1() != u"Hello World":
     raise RuntimeError
@@ -14,16 +14,15 @@ if test3("hello") != u"hello-suffix":
 
 if test4("hello") != u"hello-suffix":
     raise RuntimeError
-    
+
 if test5(4) != u'xxxx':
     raise RuntimeError
 
 if test6(10) != u'xxxxx':
     raise RuntimeError
-    
+
 if test7() != u"Hello world!":
     raise RuntimeError
 
 if test8() != u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/li_implicit_runme.py b/Examples/test-suite/python/li_implicit_runme.py
index a0672e016..d8dd0fdcc 100644
--- a/Examples/test-suite/python/li_implicit_runme.py
+++ b/Examples/test-suite/python/li_implicit_runme.py
@@ -9,9 +9,8 @@ ad, get(ad)
 ab, get(ab)
 
 if get(ai) != get(1):
-  raise RuntimeError,"bad implicit type"
+    raise RuntimeError, "bad implicit type"
 if get(ad) != get(2.0):
-  raise RuntimeError,"bad implicit type"
+    raise RuntimeError, "bad implicit type"
 if get(ab) != get(b):
-  raise RuntimeError,"bad implicit type"
-
+    raise RuntimeError, "bad implicit type"
diff --git a/Examples/test-suite/python/li_std_auto_ptr_runme.py b/Examples/test-suite/python/li_std_auto_ptr_runme.py
index d82a89f42..6d2479f87 100644
--- a/Examples/test-suite/python/li_std_auto_ptr_runme.py
+++ b/Examples/test-suite/python/li_std_auto_ptr_runme.py
@@ -3,15 +3,15 @@ from li_std_auto_ptr import *
 k1 = makeKlassAutoPtr("first")
 k2 = makeKlassAutoPtr("second")
 if Klass_getTotal_count() != 2:
-  raise "number of objects should be 2"
+    raise "number of objects should be 2"
 
 del k1
 if Klass_getTotal_count() != 1:
-  raise "number of objects should be 1"
+    raise "number of objects should be 1"
 
 if k2.getLabel() != "second":
-  raise "wrong object label"
+    raise "wrong object label"
 
 del k2
 if Klass_getTotal_count() != 0:
-  raise "no objects should be left"
+    raise "no objects should be left"
diff --git a/Examples/test-suite/python/li_std_carray_runme.py b/Examples/test-suite/python/li_std_carray_runme.py
index 803bc96c5..36eeaf173 100644
--- a/Examples/test-suite/python/li_std_carray_runme.py
+++ b/Examples/test-suite/python/li_std_carray_runme.py
@@ -2,7 +2,7 @@ from li_std_carray import *
 
 
 v3 = Vector3()
-for i in range(0,len(v3)):
+for i in range(0, len(v3)):
     v3[i] = i
 
 i = 0
@@ -14,9 +14,9 @@ for d in v3:
 
 m3 = Matrix3()
 
-for i in range(0,len(m3)):
+for i in range(0, len(m3)):
     v3 = m3[i]
-    for j in range(0,len(v3)):
+    for j in range(0, len(v3)):
         v3[j] = i + j
 
 i = 0
@@ -30,12 +30,10 @@ for v3 in m3:
     i = i + 1
     pass
 
-for i in range(0,len(m3)):
-    for j in range(0,len(m3)):
+for i in range(0, len(m3)):
+    for j in range(0, len(m3)):
         if m3[i][j] != i + j:
             raise RuntimeError
 
-da = Vector3((1,2,3))
-ma = Matrix3(((1,2,3),(4,5,6),(7,8,9)))
-
-
+da = Vector3((1, 2, 3))
+ma = Matrix3(((1, 2, 3), (4, 5, 6), (7, 8, 9)))
diff --git a/Examples/test-suite/python/li_std_containers_int_runme.py b/Examples/test-suite/python/li_std_containers_int_runme.py
index 3cbbb2862..c7d262f60 100644
--- a/Examples/test-suite/python/li_std_containers_int_runme.py
+++ b/Examples/test-suite/python/li_std_containers_int_runme.py
@@ -1,158 +1,170 @@
-# Check std::vector and std::list behaves the same as Python iterable types (list)
+# Check std::vector and std::list behaves the same as Python iterable
+# types (list)
 
 from li_std_containers_int import *
 import sys
 
+
 def failed(a, b, msg):
-  raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b))
+    raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b))
+
 
 def compare_sequences(a, b):
-  if len(a) != len(b):
-    failed(a, b, "different sizes")
-  for i in range(len(a)):
-    if a[i] != b[i]:
-      failed(a, b, "elements are different")
+    if len(a) != len(b):
+        failed(a, b, "different sizes")
+    for i in range(len(a)):
+        if a[i] != b[i]:
+            failed(a, b, "elements are different")
+
 
 def compare_containers(pythonlist, swigvector, swiglist):
-  compare_sequences(pythonlist, swigvector)
-  compare_sequences(pythonlist, swiglist)
+    compare_sequences(pythonlist, swigvector)
+    compare_sequences(pythonlist, swiglist)
+
+# Check std::vector and std::list assignment behaves same as Python list
+# assignment including exceptions
+
 
-# Check std::vector and std::list assignment behaves same as Python list assignment including exceptions
 def container_insert_step(i, j, step, newval):
-  ps = range(6)
-  iv = vector_int(ps)
-  il = list_int(ps)
+    ps = range(6)
+    iv = vector_int(ps)
+    il = list_int(ps)
 
-  # Python slice
-  try:
-    if step == None:
-      if j == None:
-        ps[i] = newval
-      else:
-        ps[i:j] = newval
-    else:
-      if j == None:
-        ps[i::step] = newval
-      else:
-        ps[i:j:step] = newval
-    ps_error = None
-  except ValueError, e:
-    ps_error = e
-  except IndexError, e:
-    ps_error = e
+    # Python slice
+    try:
+        if step == None:
+            if j == None:
+                ps[i] = newval
+            else:
+                ps[i:j] = newval
+        else:
+            if j == None:
+                ps[i::step] = newval
+            else:
+                ps[i:j:step] = newval
+        ps_error = None
+    except ValueError, e:
+        ps_error = e
+    except IndexError, e:
+        ps_error = e
 
-  # std::vector<int>
-  try:
-    if step == None:
-      if j == None:
-        iv[i] = newval
-      else:
-        iv[i:j] = newval
-    else:
-      if j == None:
-        iv[i::step] = newval
-      else:
-        iv[i:j:step] = newval
-    iv_error = None
-  except ValueError, e:
-    iv_error = e
-  except IndexError, e:
-    iv_error = e
+    # std::vector<int>
+    try:
+        if step == None:
+            if j == None:
+                iv[i] = newval
+            else:
+                iv[i:j] = newval
+        else:
+            if j == None:
+                iv[i::step] = newval
+            else:
+                iv[i:j:step] = newval
+        iv_error = None
+    except ValueError, e:
+        iv_error = e
+    except IndexError, e:
+        iv_error = e
 
-  # std::list<int>
-  try:
-    if step == None:
-      if j == None:
-        il[i] = newval
-      else:
-        il[i:j] = newval
-    else:
-      if j == None:
-        il[i::step] = newval
-      else:
-        il[i:j:step] = newval
-    il_error = None
-  except ValueError, e:
-    il_error = e
-  except IndexError, e:
-    il_error = e
+    # std::list<int>
+    try:
+        if step == None:
+            if j == None:
+                il[i] = newval
+            else:
+                il[i:j] = newval
+        else:
+            if j == None:
+                il[i::step] = newval
+            else:
+                il[i:j:step] = newval
+        il_error = None
+    except ValueError, e:
+        il_error = e
+    except IndexError, e:
+        il_error = e
+
+    # Python 2.6 contains bug fixes in extended slicing syntax:
+    # http://docs.python.org/2/whatsnew/2.6.html
+    skip_check = ps_error != None and(
+        iv_error == il_error == None) and step > 0 and (sys.version_info[0:2] < (2, 6))
+    if not(skip_check):
+        if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
+            raise RuntimeError, "ValueError exception not consistently thrown: " + \
+                str(ps_error) + " " + str(iv_error) + " " + str(il_error)
+
+        compare_containers(ps, iv, il)
+
+
+# Check std::vector and std::list delete behaves same as Python list
+# delete including exceptions
+def container_delete_step(i, j, step):
+    ps = range(6)
+    iv = vector_int(ps)
+    il = list_int(ps)
+
+    # Python slice
+    try:
+        if step == None:
+            if j == None:
+                del ps[i]
+            else:
+                del ps[i:j]
+        else:
+            if j == None:
+                del ps[i::step]
+            else:
+                del ps[i:j:step]
+        ps_error = None
+    except ValueError, e:
+        ps_error = e
+    except IndexError, e:
+        ps_error = e
+
+    # std::vector<int>
+    try:
+        if step == None:
+            if j == None:
+                del iv[i]
+            else:
+                del iv[i:j]
+        else:
+            if j == None:
+                del iv[i::step]
+            else:
+                del iv[i:j:step]
+        iv_error = None
+    except ValueError, e:
+        iv_error = e
+    except IndexError, e:
+        iv_error = e
+
+    # std::list<int>
+    try:
+        if step == None:
+            if j == None:
+                del il[i]
+            else:
+                del il[i:j]
+        else:
+            if j == None:
+                del il[i::step]
+            else:
+                del il[i:j:step]
+        il_error = None
+    except ValueError, e:
+        il_error = e
+    except IndexError, e:
+        il_error = e
 
-  # Python 2.6 contains bug fixes in extended slicing syntax: http://docs.python.org/2/whatsnew/2.6.html
-  skip_check = ps_error != None and(iv_error == il_error == None) and step > 0 and (sys.version_info[0:2] < (2, 6))
-  if not(skip_check):
     if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
-      raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error)
+        raise RuntimeError, "ValueError exception not consistently thrown: " + \
+            str(ps_error) + " " + str(iv_error) + " " + str(il_error)
 
     compare_containers(ps, iv, il)
 
 
-# Check std::vector and std::list delete behaves same as Python list delete including exceptions
-def container_delete_step(i, j, step):
-  ps = range(6)
-  iv = vector_int(ps)
-  il = list_int(ps)
-
-  # Python slice
-  try:
-    if step == None:
-      if j == None:
-        del ps[i]
-      else:
-        del ps[i:j]
-    else:
-      if j == None:
-        del ps[i::step]
-      else:
-        del ps[i:j:step]
-    ps_error = None
-  except ValueError, e:
-    ps_error = e
-  except IndexError, e:
-    ps_error = e
-
-  # std::vector<int>
-  try:
-    if step == None:
-      if j == None:
-        del iv[i]
-      else:
-        del iv[i:j]
-    else:
-      if j == None:
-        del iv[i::step]
-      else:
-        del iv[i:j:step]
-    iv_error = None
-  except ValueError, e:
-    iv_error = e
-  except IndexError, e:
-    iv_error = e
-
-  # std::list<int>
-  try:
-    if step == None:
-      if j == None:
-        del il[i]
-      else:
-        del il[i:j]
-    else:
-      if j == None:
-        del il[i::step]
-      else:
-        del il[i:j:step]
-    il_error = None
-  except ValueError, e:
-    il_error = e
-  except IndexError, e:
-    il_error = e
-
-  if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
-    raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error)
-
-  compare_containers(ps, iv, il)
-
-
-ps = [0,1,2,3,4,5]
+ps = [0, 1, 2, 3, 4, 5]
 
 iv = vector_int(ps)
 il = list_int(ps)
@@ -164,7 +176,7 @@ compare_containers(ps[1:3], iv[1:3], il[1:3])
 compare_containers(ps[2:4], iv[2:4], il[2:4])
 compare_containers(ps[0:3], iv[0:3], il[0:3])
 compare_containers(ps[3:6], iv[3:6], il[3:6])
-compare_containers(ps[3:10], iv[3:10], il[3:10]) # beyond end of range
+compare_containers(ps[3:10], iv[3:10], il[3:10])  # beyond end of range
 
 # before beginning of range (negative indexing)
 compare_containers(ps[-1:7], iv[-1:7], il[-1:7])
@@ -172,7 +184,8 @@ compare_containers(ps[-2:7], iv[-2:7], il[-2:7])
 compare_containers(ps[-5:7], iv[-5:7], il[-5:7])
 compare_containers(ps[-6:7], iv[-6:7], il[-6:7])
 
-# before beginning of range (negative indexing, negative index is > container size)
+# before beginning of range (negative indexing, negative index is >
+# container size)
 compare_containers(ps[-7:7], iv[-7:7], il[-7:7])
 compare_containers(ps[-100:7], iv[-100:7], il[-100:7])
 
@@ -222,48 +235,52 @@ compare_containers(ps[::-5], iv[::-5], il[::-5])
 
 # insert sequences (growing, shrinking and staying same size)
 for start in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
-  # single element set/replace
-  container_insert_step(start, None, None, 111)
-  for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
-    container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666, 777])
-    container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666])
-    container_insert_step(start, end, None, [111, 222, 333, 444, 555])
-    container_insert_step(start, end, None, [111, 222, 333, 444])
-    container_insert_step(start, end, None, [111, 222, 333])
-    container_insert_step(start, end, None, [111, 222])
-    container_insert_step(start, end, None, [111])
-    container_insert_step(start, end, None, [])
+    # single element set/replace
+    container_insert_step(start, None, None, 111)
+    for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
+        container_insert_step(
+            start, end, None, [111, 222, 333, 444, 555, 666, 777])
+        container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666])
+        container_insert_step(start, end, None, [111, 222, 333, 444, 555])
+        container_insert_step(start, end, None, [111, 222, 333, 444])
+        container_insert_step(start, end, None, [111, 222, 333])
+        container_insert_step(start, end, None, [111, 222])
+        container_insert_step(start, end, None, [111])
+        container_insert_step(start, end, None, [])
 
 # delete sequences (growing, shrinking and staying same size)
 for start in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
-  # single element delete
-  container_delete_step(start, None, None)
-  for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
-    container_delete_step(start, end, None)
-    for step in range(-7,7):
-      container_delete_step(start, end, step)
+    # single element delete
+    container_delete_step(start, None, None)
+    for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
+        container_delete_step(start, end, None)
+        for step in range(-7, 7):
+            container_delete_step(start, end, step)
 
 ps = range(6)
 iv = vector_int(ps)
 il = list_int(ps)
-del ps[:]; del iv[:]; del il[:]
+del ps[:]
+del iv[:]
+del il[:]
 compare_containers(ps, iv, il)
 
 for end in range(7):
-  for step in range(-7,7):
-    for start in range(7):
-      container_insert_step(start, end, step, [111, 222, 333, 444, 555, 666, 777])
-      container_insert_step(start, end, step, [111, 222, 333, 444, 555, 666])
-      container_insert_step(start, end, step, [111, 222, 333, 444, 555])
-      container_insert_step(start, end, step, [111, 222, 333, 444])
-      container_insert_step(start, end, step, [111, 222, 333])
-      container_insert_step(start, end, step, [111, 222])
-      container_insert_step(start, end, step, [111])
-      container_insert_step(start, end, step, [])
+    for step in range(-7, 7):
+        for start in range(7):
+            container_insert_step(
+                start, end, step, [111, 222, 333, 444, 555, 666, 777])
+            container_insert_step(
+                start, end, step, [111, 222, 333, 444, 555, 666])
+            container_insert_step(start, end, step, [111, 222, 333, 444, 555])
+            container_insert_step(start, end, step, [111, 222, 333, 444])
+            container_insert_step(start, end, step, [111, 222, 333])
+            container_insert_step(start, end, step, [111, 222])
+            container_insert_step(start, end, step, [111])
+            container_insert_step(start, end, step, [])
 
 try:
-  x = iv[::0]
-  raise RuntimeError("Zero step not caught")
+    x = iv[::0]
+    raise RuntimeError("Zero step not caught")
 except ValueError:
-  pass
-
+    pass
diff --git a/Examples/test-suite/python/li_std_except_as_class_runme.py b/Examples/test-suite/python/li_std_except_as_class_runme.py
index a86e7a562..36abb33f4 100644
--- a/Examples/test-suite/python/li_std_except_as_class_runme.py
+++ b/Examples/test-suite/python/li_std_except_as_class_runme.py
@@ -3,17 +3,29 @@ from li_std_except_as_class import *
 # This test is expected to fail with -builtin option.
 # Throwing builtin classes as exceptions not supported
 if is_python_builtin():
-  try: test_domain_error()
-  except RuntimeError: pass
-  try: test_domain_error()
-  except RuntimeError: pass
-  try: test_domain_error()
-  except RuntimeError: pass
+    try:
+        test_domain_error()
+    except RuntimeError:
+        pass
+    try:
+        test_domain_error()
+    except RuntimeError:
+        pass
+    try:
+        test_domain_error()
+    except RuntimeError:
+        pass
 else:
-  # std::domain_error hierarchy
-  try: test_domain_error()
-  except domain_error: pass
-  try: test_domain_error()
-  except logic_error: pass
-  try: test_domain_error()
-  except exception: pass
+    # std::domain_error hierarchy
+    try:
+        test_domain_error()
+    except domain_error:
+        pass
+    try:
+        test_domain_error()
+    except logic_error:
+        pass
+    try:
+        test_domain_error()
+    except exception:
+        pass
diff --git a/Examples/test-suite/python/li_std_map_member_runme.py b/Examples/test-suite/python/li_std_map_member_runme.py
index 8b5877dae..d20442472 100644
--- a/Examples/test-suite/python/li_std_map_member_runme.py
+++ b/Examples/test-suite/python/li_std_map_member_runme.py
@@ -3,9 +3,9 @@ import li_std_map_member
 a = li_std_map_member.mapita()
 a[1] = li_std_map_member.TestA()
 
-if (a[1].i != 1) :
+if (a[1].i != 1):
     raise RuntimeError("a[1] != 1")
 
 a[1].i = 2
-if (a[1].i != 2) :
+if (a[1].i != 2):
     raise RuntimeError("a[1] != 2")
diff --git a/Examples/test-suite/python/li_std_map_runme.py b/Examples/test-suite/python/li_std_map_runme.py
index ae75bdda0..af3e1d989 100644
--- a/Examples/test-suite/python/li_std_map_runme.py
+++ b/Examples/test-suite/python/li_std_map_runme.py
@@ -4,8 +4,8 @@ a1 = li_std_map.A(3)
 a2 = li_std_map.A(7)
 
 
-p0 = li_std_map.pairii(1,2)
-p1 = li_std_map.pairA(1,a1.this)
+p0 = li_std_map.pairii(1, 2)
+p1 = li_std_map.pairA(1, a1.this)
 m = {}
 m[1] = a1
 m[2] = a2
@@ -14,38 +14,33 @@ pp1 = li_std_map.p_identa(p1)
 mm = li_std_map.m_identa(m)
 
 
-
 m = li_std_map.mapA()
 m[1] = a1
 m[2] = a2
 
 
-pm ={}
+pm = {}
 for k in m:
-  pm[k] = m[k]
-
-for k in m:  
-  if pm[k].this != m[k].this:
-    print pm[k], m[k]
-    raise RuntimeError
-
-  
+    pm[k] = m[k]
 
+for k in m:
+    if pm[k].this != m[k].this:
+        print pm[k], m[k]
+        raise RuntimeError
 
 
 m = {}
-m[1] = (1,2)
+m[1] = (1, 2)
 m["foo"] = "hello"
 
 pm = li_std_map.pymap()
 
-for k in m:  
-  pm[k] = m[k]
-
-for k in pm:  
-  if (pm[k] != m[k]):
-    raise RuntimeError
+for k in m:
+    pm[k] = m[k]
 
+for k in pm:
+    if (pm[k] != m[k]):
+        raise RuntimeError
 
 
 mii = li_std_map.IntIntMap()
@@ -54,5 +49,4 @@ mii[1] = 1
 mii[1] = 2
 
 if mii[1] != 2:
-  raise RuntimeError
-  
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_pair_extra_runme.py b/Examples/test-suite/python/li_std_pair_extra_runme.py
index dc6e31b76..f26badf08 100644
--- a/Examples/test-suite/python/li_std_pair_extra_runme.py
+++ b/Examples/test-suite/python/li_std_pair_extra_runme.py
@@ -1,59 +1,58 @@
 import li_std_pair_extra
 
-p = (1,2)
+p = (1, 2)
 p1 = li_std_pair_extra.p_inout(p)
 p2 = li_std_pair_extra.p_inoutd(p1)
 
 d1 = li_std_pair_extra.d_inout(2)
 
-i,d2 = li_std_pair_extra.d_inout2(2)
+i, d2 = li_std_pair_extra.d_inout2(2)
 
-i,p = li_std_pair_extra.p_inout2(p)
-p3,p4 = li_std_pair_extra.p_inout3(p1,p1)
+i, p = li_std_pair_extra.p_inout2(p)
+p3, p4 = li_std_pair_extra.p_inout3(p1, p1)
 
-psi = li_std_pair_extra.SIPair("hello",1)
-pci = li_std_pair_extra.CIPair(1,1)
+psi = li_std_pair_extra.SIPair("hello", 1)
+pci = li_std_pair_extra.CIPair(1, 1)
 
 
 #psi.first = "hi"
 
 
-psi = li_std_pair_extra.SIPair("hi",1)
-if psi != ("hi",1):
-  raise RuntimeError
+psi = li_std_pair_extra.SIPair("hi", 1)
+if psi != ("hi", 1):
+    raise RuntimeError
 
-psii = li_std_pair_extra.SIIPair(psi,1)
+psii = li_std_pair_extra.SIIPair(psi, 1)
 
 a = li_std_pair_extra.A()
 b = li_std_pair_extra.B()
 
-pab = li_std_pair_extra.ABPair(a,b);
+pab = li_std_pair_extra.ABPair(a, b)
 
 pab.first = a
 pab.first.val = 2
 
 if pab.first.val != 2:
-  raise RuntimeError
-  
+    raise RuntimeError
 
-pci = li_std_pair_extra.CIntPair(1,0)
+
+pci = li_std_pair_extra.CIntPair(1, 0)
 
 a = li_std_pair_extra.A(5)
-p1 = li_std_pair_extra.pairP1(1,a.this)
-p2 = li_std_pair_extra.pairP2(a,1)
-p3 = li_std_pair_extra.pairP3(a,a)
+p1 = li_std_pair_extra.pairP1(1, a.this)
+p2 = li_std_pair_extra.pairP2(a, 1)
+p3 = li_std_pair_extra.pairP3(a, a)
 
 
 if a.val != li_std_pair_extra.p_identa(p1.this)[1].val:
-  raise RuntimeError
-  
-p = li_std_pair_extra.IntPair(1,10)
+    raise RuntimeError
+
+p = li_std_pair_extra.IntPair(1, 10)
 p.first = 1
 
-p = li_std_pair_extra.paircA1(1,a)
+p = li_std_pair_extra.paircA1(1, a)
 p.first
 p.second
 
-p = li_std_pair_extra.paircA2(1,a)
-pp = li_std_pair_extra.pairiiA(1,p)
-
+p = li_std_pair_extra.paircA2(1, a)
+pp = li_std_pair_extra.pairiiA(1, p)
diff --git a/Examples/test-suite/python/li_std_pair_using_runme.py b/Examples/test-suite/python/li_std_pair_using_runme.py
index a8b261035..18f962235 100644
--- a/Examples/test-suite/python/li_std_pair_using_runme.py
+++ b/Examples/test-suite/python/li_std_pair_using_runme.py
@@ -6,5 +6,4 @@ two_tuple = ("two", 2)
 two = StringIntPair(two_tuple)
 
 if bounce(one) != one_tuple:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_set_runme.py b/Examples/test-suite/python/li_std_set_runme.py
index 449333e73..ad3c6d881 100644
--- a/Examples/test-suite/python/li_std_set_runme.py
+++ b/Examples/test-suite/python/li_std_set_runme.py
@@ -25,7 +25,7 @@ if i.next() != "c":
 b = s.begin()
 e = s.end()
 sum = ""
-while (b != e):    
+while (b != e):
     sum = sum + b.next()
 if sum != "abc":
     raise RuntimeError
@@ -33,14 +33,13 @@ if sum != "abc":
 b = s.rbegin()
 e = s.rend()
 sum = ""
-while (b != e):    
-    sum = sum  + b.next()
+while (b != e):
+    sum = sum + b.next()
 
 if sum != "cba":
     raise RuntimeError
 
 
-
 si = set_int()
 
 si.append(1)
@@ -56,8 +55,6 @@ if i.next() != 3:
     raise RuntimeError
 
 
-
-
 i = s.begin()
 i.next()
 s.erase(i)
@@ -65,7 +62,7 @@ s.erase(i)
 b = s.begin()
 e = s.end()
 sum = ""
-while (b != e):    
+while (b != e):
     sum = sum + b.next()
 if sum != "ac":
     raise RuntimeError
@@ -75,22 +72,21 @@ b = s.begin()
 e = s.end()
 if e - b != 2:
     raise RuntimeError
-    
+
 m = b + 1
 if m.value() != "c":
     raise RuntimeError
 
 
-
 s = pyset()
-s.insert((1,2))
+s.insert((1, 2))
 s.insert(1)
 s.insert("hello")
 
 
 sum = ()
 for i in s:
-    sum = sum  + (i,)
+    sum = sum + (i,)
 
-if (len(sum) != 3 or (not 1 in sum) or (not 'hello' in sum) or (not (1, 2) in sum)) :
+if (len(sum) != 3 or (not 1 in sum) or (not 'hello' in sum) or (not (1, 2) in sum)):
     raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_stream_runme.py b/Examples/test-suite/python/li_std_stream_runme.py
index d41e41f4a..08c308856 100644
--- a/Examples/test-suite/python/li_std_stream_runme.py
+++ b/Examples/test-suite/python/li_std_stream_runme.py
@@ -1,7 +1,6 @@
 from li_std_stream import *
 
 
-
 a = A()
 
 o = ostringstream()
@@ -9,6 +8,6 @@ o = ostringstream()
 o << a << " " << 2345 << " " << 1.435
 
 
-if o.str() !=  "A class 2345 1.435":
-  print "\"%s\"" % (o.str(),)
-  raise RuntimeError
+if o.str() != "A class 2345 1.435":
+    print "\"%s\"" % (o.str(),)
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_string_extra_runme.py b/Examples/test-suite/python/li_std_string_extra_runme.py
index 503d09eb5..b65f0774a 100644
--- a/Examples/test-suite/python/li_std_string_extra_runme.py
+++ b/Examples/test-suite/python/li_std_string_extra_runme.py
@@ -1,135 +1,134 @@
 import li_std_string_extra
 
-x="hello"
-
+x = "hello"
 
 
 if li_std_string_extra.test_ccvalue(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_cvalue(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_value(x) != x:
-  print x, li_std_string_extra.test_value(x)
-  raise RuntimeError, "bad string mapping"
+    print x, li_std_string_extra.test_value(x)
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_const_reference(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 
 s = li_std_string_extra.string("he")
 #s += "ll"
-#s.append('o')
+# s.append('o')
 s = s + "llo"
 
 if s != x:
-  print s, x
-  raise RuntimeError, "bad string mapping"
+    print s, x
+    raise RuntimeError, "bad string mapping"
 
 if s[1:4] != x[1:4]:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_value(s) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_const_reference(s) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 a = li_std_string_extra.A(s)
 
 if li_std_string_extra.test_value(a) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_const_reference(a) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 b = li_std_string_extra.string(" world")
 
 s = a + b
 if a + b != "hello world":
-  print a + b
-  raise RuntimeError, "bad string mapping"
-  
+    print a + b
+    raise RuntimeError, "bad string mapping"
+
 if a + " world" != "hello world":
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 # This is expected to fail with -builtin option
 # Reverse operators not supported in builtin types
 if not li_std_string_extra.is_python_builtin():
-  if "hello" + b != "hello world":
-    raise RuntimeError, "bad string mapping"
+    if "hello" + b != "hello world":
+        raise RuntimeError, "bad string mapping"
+
+    c = "hello" + b
+    if c.find_last_of("l") != 9:
+        raise RuntimeError, "bad string mapping"
 
-  c = "hello" + b
-  if c.find_last_of("l") != 9:
-    raise RuntimeError, "bad string mapping"
-  
 s = "hello world"
 
 b = li_std_string_extra.B("hi")
 
 b.name = li_std_string_extra.string("hello")
 if b.name != "hello":
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 
 b.a = li_std_string_extra.A("hello")
 if b.a != "hello":
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 
 if li_std_string_extra.test_value_basic1(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 if li_std_string_extra.test_value_basic2(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 
 if li_std_string_extra.test_value_basic3(x) != x:
-  raise RuntimeError, "bad string mapping"
+    raise RuntimeError, "bad string mapping"
 
 # Global variables
 s = "initial string"
 if li_std_string_extra.cvar.GlobalString2 != "global string 2":
-  raise RuntimeError, "GlobalString2 test 1"
+    raise RuntimeError, "GlobalString2 test 1"
 li_std_string_extra.cvar.GlobalString2 = s
 if li_std_string_extra.cvar.GlobalString2 != s:
-  raise RuntimeError, "GlobalString2 test 2"
+    raise RuntimeError, "GlobalString2 test 2"
 if li_std_string_extra.cvar.ConstGlobalString != "const global string":
-  raise RuntimeError, "ConstGlobalString test"
+    raise RuntimeError, "ConstGlobalString test"
 
 # Member variables
 myStructure = li_std_string_extra.Structure()
 if myStructure.MemberString2 != "member string 2":
-  raise RuntimeError, "MemberString2 test 1"
+    raise RuntimeError, "MemberString2 test 1"
 myStructure.MemberString2 = s
 if myStructure.MemberString2 != s:
-  raise RuntimeError, "MemberString2 test 2"
+    raise RuntimeError, "MemberString2 test 2"
 if myStructure.ConstMemberString != "const member string":
-  raise RuntimeError, "ConstMemberString test"
+    raise RuntimeError, "ConstMemberString test"
 
 if li_std_string_extra.cvar.Structure_StaticMemberString2 != "static member string 2":
-  raise RuntimeError, "StaticMemberString2 test 1"
+    raise RuntimeError, "StaticMemberString2 test 1"
 li_std_string_extra.cvar.Structure_StaticMemberString2 = s
 if li_std_string_extra.cvar.Structure_StaticMemberString2 != s:
-  raise RuntimeError, "StaticMemberString2 test 2"
+    raise RuntimeError, "StaticMemberString2 test 2"
 if li_std_string_extra.cvar.Structure_ConstStaticMemberString != "const static member string":
-  raise RuntimeError, "ConstStaticMemberString test"
+    raise RuntimeError, "ConstStaticMemberString test"
 
 
 if li_std_string_extra.test_reference_input("hello") != "hello":
-  raise RuntimeError
+    raise RuntimeError
 s = li_std_string_extra.test_reference_inout("hello")
 if s != "hellohello":
-  raise RuntimeError
+    raise RuntimeError
 
 
 if li_std_string_extra.stdstring_empty() != "":
-  raise RuntimeError
-  
+    raise RuntimeError
+
 
 if li_std_string_extra.c_empty() != "":
-  raise RuntimeError
+    raise RuntimeError
 
 if li_std_string_extra.c_null() != None:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_vector_enum_runme.py b/Examples/test-suite/python/li_std_vector_enum_runme.py
index a2c8534f3..318d1bff6 100644
--- a/Examples/test-suite/python/li_std_vector_enum_runme.py
+++ b/Examples/test-suite/python/li_std_vector_enum_runme.py
@@ -1,8 +1,9 @@
 import li_std_vector_enum
 
+
 def check(a, b):
-  if (a != b):
-    raise RuntimeError("Not equal: ", a, b)
+    if (a != b):
+        raise RuntimeError("Not equal: ", a, b)
 
 ev = li_std_vector_enum.EnumVector()
 
@@ -17,8 +18,7 @@ it.next()
 v = it.value()
 check(v, 20)
 
-expected = 10 
+expected = 10
 for val in ev.nums:
-  check(val, expected)
-  expected += 10
-
+    check(val, expected)
+    expected += 10
diff --git a/Examples/test-suite/python/li_std_vector_extra_runme.py b/Examples/test-suite/python/li_std_vector_extra_runme.py
index d24d36cb6..d541de6db 100644
--- a/Examples/test-suite/python/li_std_vector_extra_runme.py
+++ b/Examples/test-suite/python/li_std_vector_extra_runme.py
@@ -1,110 +1,108 @@
 from li_std_vector_extra import *
 
 iv = IntVector(4)
-for i in range(0,4):
+for i in range(0, 4):
     iv[i] = i
 
 x = average(iv)
-y = average([1,2,3,4])
+y = average([1, 2, 3, 4])
 
-a = half([10,10.5,11,11.5])
+a = half([10, 10.5, 11, 11.5])
 
 dv = DoubleVector(10)
-for i in range(0,10):
-    dv[i] = i/2.0
+for i in range(0, 10):
+    dv[i] = i / 2.0
 
 halve_in_place(dv)
 
 
 bv = BoolVector(4)
-bv[0]= bool(1)
-bv[1]= bool(0)
-bv[2]= bool(4)
-bv[3]= bool(0)
+bv[0] = bool(1)
+bv[1] = bool(0)
+bv[2] = bool(4)
+bv[3] = bool(0)
 
 if bv[0] != bv[2]:
-    raise RuntimeError,"bad std::vector<bool> mapping"
+    raise RuntimeError, "bad std::vector<bool> mapping"
 
 b = B(5)
-va = VecA([b,None,b,b])
+va = VecA([b, None, b, b])
 
 if va[0].f(1) != 6:
-    raise RuntimeError,"bad std::vector<A*> mapping"
+    raise RuntimeError, "bad std::vector<A*> mapping"
 
 if vecAptr(va) != 6:
-    raise RuntimeError,"bad std::vector<A*> mapping"
+    raise RuntimeError, "bad std::vector<A*> mapping"
 
 b.val = 7
 if va[3].f(1) != 8:
-    raise RuntimeError,"bad std::vector<A*> mapping"
+    raise RuntimeError, "bad std::vector<A*> mapping"
 
 
 ip = PtrInt()
 ap = new_ArrInt(10)
 
-ArrInt_setitem(ip,0,123)
-ArrInt_setitem(ap,2,123)
+ArrInt_setitem(ip, 0, 123)
+ArrInt_setitem(ap, 2, 123)
 
-vi = IntPtrVector((ip,ap,None))
-if ArrInt_getitem(vi[0],0) != ArrInt_getitem(vi[1],2):
-    raise RuntimeError,"bad std::vector<int*> mapping"
+vi = IntPtrVector((ip, ap, None))
+if ArrInt_getitem(vi[0], 0) != ArrInt_getitem(vi[1], 2):
+    raise RuntimeError, "bad std::vector<int*> mapping"
 
-delete_ArrInt(ap)    
+delete_ArrInt(ap)
 
 
-a = halfs([10,8,4,3])
+a = halfs([10, 8, 4, 3])
 
 v = IntVector()
-v[0:2] = [1,2]
+v[0:2] = [1, 2]
 if v[0] != 1 or v[1] != 2:
-    raise RuntimeError,"bad setslice"
+    raise RuntimeError, "bad setslice"
 
 if v[0:-1][0] != 1:
-    raise RuntimeError,"bad getslice"
+    raise RuntimeError, "bad getslice"
 
 if v[0:-2].size() != 0:
-    raise RuntimeError,"bad getslice"
+    raise RuntimeError, "bad getslice"
 
 v[0:1] = [2]
 if v[0] != 2:
-    raise RuntimeError,"bad setslice"
+    raise RuntimeError, "bad setslice"
 
 v[1:] = [3]
 if v[1] != 3:
-    raise RuntimeError,"bad setslice"
+    raise RuntimeError, "bad setslice"
 
 v[2:] = [3]
 if v[2] != 3:
-    raise RuntimeError,"bad setslice"
+    raise RuntimeError, "bad setslice"
 
 if v[0:][0] != v[0]:
-    raise RuntimeError,"bad getslice"
+    raise RuntimeError, "bad getslice"
 
 
 del v[:]
 if v.size() != 0:
-    raise RuntimeError,"bad getslice"    
+    raise RuntimeError, "bad getslice"
 
 del v[:]
 if v.size() != 0:
-    raise RuntimeError,"bad getslice"    
-
+    raise RuntimeError, "bad getslice"
 
 
 v = vecStr(["hello ", "world"])
 if v[0] != 'hello world':
-    raise RuntimeError,"bad std::string+std::vector"
-    
+    raise RuntimeError, "bad std::string+std::vector"
 
 
-pv = pyvector([1, "hello", (1,2)])
+pv = pyvector([1, "hello", (1, 2)])
 
 if pv[1] != "hello":
     raise RuntimeError
 
 
 iv = IntVector(5)
-for i in range(0,5):
+for i in range(0, 5):
     iv[i] = i
 
 iv[1:3] = []
@@ -113,25 +111,25 @@ if iv[1] != 3:
 
 # Overloading checks
 if overloaded1(iv) != "vector<int>":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded1(dv) != "vector<double>":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded2(iv) != "vector<int>":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded2(dv) != "vector<double>":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded3(iv) != "vector<int> *":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded3(None) != "vector<int> *":
-  raise RuntimeError
+    raise RuntimeError
 
 if overloaded3(100) != "int":
-  raise RuntimeError
+    raise RuntimeError
 
 
 # vector pointer checks
@@ -139,38 +137,39 @@ ip = makeIntPtr(11)
 dp = makeDoublePtr(33.3)
 error = 0
 try:
-  vi = IntPtrVector((ip, dp)) # check vector<int *> does not accept double * element
-  error = 1
+    # check vector<int *> does not accept double * element
+    vi = IntPtrVector((ip, dp))
+    error = 1
 except:
-  pass
+    pass
 
 if error:
-  raise RuntimeError
+    raise RuntimeError
 
 vi = IntPtrVector((ip, makeIntPtr(22)))
 if extractInt(vi[0]) != 11:
-  raise RuntimeError
+    raise RuntimeError
 
 if extractInt(vi[1]) != 22:
-  raise RuntimeError
+    raise RuntimeError
 
 # vector const pointer checks
 csp = makeConstShortPtr(111)
 
 error = 0
 try:
-  vcs = ConstShortPtrVector((csp, dp)) # check vector<const unsigned short *> does not accept double * element
-  error = 1
+    # check vector<const unsigned short *> does not accept double * element
+    vcs = ConstShortPtrVector((csp, dp))
+    error = 1
 except:
-  pass
+    pass
 
 if error:
-  raise RuntimeError
+    raise RuntimeError
 
 vcs = ConstShortPtrVector((csp, makeConstShortPtr(222)))
 if extractConstShort(vcs[0]) != 111:
-  raise RuntimeError
+    raise RuntimeError
 
 if extractConstShort(vcs[1]) != 222:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_vector_ptr_runme.py b/Examples/test-suite/python/li_std_vector_ptr_runme.py
index c5f72fde4..01c654109 100644
--- a/Examples/test-suite/python/li_std_vector_ptr_runme.py
+++ b/Examples/test-suite/python/li_std_vector_ptr_runme.py
@@ -5,4 +5,3 @@ ip2 = makeIntPtr(22)
 
 vi = IntPtrVector((ip1, ip2))
 displayVector(vi)
-
diff --git a/Examples/test-suite/python/li_std_wstream_runme.py b/Examples/test-suite/python/li_std_wstream_runme.py
index f7379bdf8..045645b61 100644
--- a/Examples/test-suite/python/li_std_wstream_runme.py
+++ b/Examples/test-suite/python/li_std_wstream_runme.py
@@ -1,13 +1,12 @@
 from li_std_wstream import *
 
 
-
 a = A()
 
 o = wostringstream()
 
 o << a << u" " << 2345 << u" " << 1.435 << wends
 
-if o.str() !=  "A class 2345 1.435\0":
-  print "\"%s\"" % (o.str(),)
-  raise RuntimeError
+if o.str() != "A class 2345 1.435\0":
+    print "\"%s\"" % (o.str(),)
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_wstring_runme.py b/Examples/test-suite/python/li_std_wstring_runme.py
index a467ae8bc..e93196b80 100644
--- a/Examples/test-suite/python/li_std_wstring_runme.py
+++ b/Examples/test-suite/python/li_std_wstring_runme.py
@@ -1,85 +1,83 @@
 import li_std_wstring
 
-x=u"h"
+x = u"h"
 
 if li_std_wstring.test_wcvalue(x) != x:
-  print li_std_wstring.test_wcvalue(x)
-  raise RuntimeError("bad string mapping")
+    print li_std_wstring.test_wcvalue(x)
+    raise RuntimeError("bad string mapping")
 
-x=u"hello"
+x = u"hello"
 if li_std_wstring.test_ccvalue(x) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_cvalue(x) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_wchar_overload(x) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_wchar_overload("not unicode") != "not unicode":
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_value(x) != x:
-  print x, li_std_wstring.test_value(x)
-  raise RuntimeError("bad string mapping")
+    print x, li_std_wstring.test_value(x)
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_const_reference(x) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 
 s = li_std_wstring.wstring(u"he")
 s = s + u"llo"
 
 if s != x:
-  print s, x
-  raise RuntimeError("bad string mapping")
+    print s, x
+    raise RuntimeError("bad string mapping")
 
 if s[1:4] != x[1:4]:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_value(s) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_const_reference(s) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 a = li_std_wstring.A(s)
 
 if li_std_wstring.test_value(a) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 if li_std_wstring.test_const_reference(a) != x:
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 b = li_std_wstring.wstring(" world")
 
 if a + b != "hello world":
-  raise RuntimeError("bad string mapping")
-  
+    raise RuntimeError("bad string mapping")
+
 if a + " world" != "hello world":
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 # This is expected to fail if -builtin is used
 # Reverse operators not supported in builtin types
 if not li_std_wstring.is_python_builtin():
-  if "hello" + b != "hello world":
-    raise RuntimeError("bad string mapping")
+    if "hello" + b != "hello world":
+        raise RuntimeError("bad string mapping")
+
+    c = "hello" + b
+    if c.find_last_of("l") != 9:
+        raise RuntimeError("bad string mapping")
 
-  c = "hello" + b
-  if c.find_last_of("l") != 9:
-    raise RuntimeError("bad string mapping")
-  
 s = "hello world"
 
 b = li_std_wstring.B("hi")
 
 b.name = li_std_wstring.wstring(u"hello")
 if b.name != "hello":
-  raise RuntimeError("bad string mapping")
+    raise RuntimeError("bad string mapping")
 
 
 b.a = li_std_wstring.A("hello")
 if b.a != u"hello":
-  raise RuntimeError("bad string mapping")
-
-
+    raise RuntimeError("bad string mapping")
diff --git a/Examples/test-suite/python/member_pointer_runme.py b/Examples/test-suite/python/member_pointer_runme.py
index 3d68e916d..5ae7ab9a4 100644
--- a/Examples/test-suite/python/member_pointer_runme.py
+++ b/Examples/test-suite/python/member_pointer_runme.py
@@ -2,9 +2,11 @@
 
 from member_pointer import *
 
+
 def check(what, expected, actual):
-  if expected != actual:
-    raise RuntimeError ("Failed: " , what , " Expected: " , expected , " Actual: " , actual)
+    if expected != actual:
+        raise RuntimeError(
+            "Failed: ", what, " Expected: ", expected, " Actual: ", actual)
 
 # Get the pointers
 
@@ -17,20 +19,20 @@ s = Square(10)
 
 # Do some calculations
 
-check ("Square area ", 100.0, do_op(s,area_pt))
-check ("Square perim", 40.0, do_op(s,perim_pt))
+check("Square area ", 100.0, do_op(s, area_pt))
+check("Square perim", 40.0, do_op(s, perim_pt))
 
 memberPtr = cvar.areavar
 memberPtr = cvar.perimetervar
 
 # Try the variables
-check ("Square area ", 100.0, do_op(s,cvar.areavar))
-check ("Square perim", 40.0, do_op(s,cvar.perimetervar))
+check("Square area ", 100.0, do_op(s, cvar.areavar))
+check("Square perim", 40.0, do_op(s, cvar.perimetervar))
 
 # Modify one of the variables
 cvar.areavar = perim_pt
 
-check ("Square perimeter", 40.0, do_op(s,cvar.areavar))
+check("Square perimeter", 40.0, do_op(s, cvar.areavar))
 
 # Try the constants
 
@@ -38,9 +40,9 @@ memberPtr = AREAPT
 memberPtr = PERIMPT
 memberPtr = NULLPT
 
-check ("Square area ", 100.0, do_op(s,AREAPT))
-check ("Square perim", 40.0, do_op(s,PERIMPT))
+check("Square area ", 100.0, do_op(s, AREAPT))
+check("Square perim", 40.0, do_op(s, PERIMPT))
 
-check ("Add by value", 3, call1(ADD_BY_VALUE, 1, 2))
-check ("Add by pointer", 7, call2(ADD_BY_POINTER, 3, 4))
-check ("Add by reference", 11, call3(ADD_BY_REFERENCE, 5, 6))
+check("Add by value", 3, call1(ADD_BY_VALUE, 1, 2))
+check("Add by pointer", 7, call2(ADD_BY_POINTER, 3, 4))
+check("Add by reference", 11, call3(ADD_BY_REFERENCE, 5, 6))
diff --git a/Examples/test-suite/python/memberin_extend_c_runme.py b/Examples/test-suite/python/memberin_extend_c_runme.py
index 314761f89..da601ae2a 100644
--- a/Examples/test-suite/python/memberin_extend_c_runme.py
+++ b/Examples/test-suite/python/memberin_extend_c_runme.py
@@ -3,4 +3,4 @@ import memberin_extend_c
 t = memberin_extend_c.Person()
 t.name = "Fred Bloggs"
 if t.name != "FRED BLOGGS":
-  raise RuntimeError("name wrong")
+    raise RuntimeError("name wrong")
diff --git a/Examples/test-suite/python/minherit_runme.py b/Examples/test-suite/python/minherit_runme.py
index d7ad0b36b..b7e7d019c 100644
--- a/Examples/test-suite/python/minherit_runme.py
+++ b/Examples/test-suite/python/minherit_runme.py
@@ -10,26 +10,28 @@ if a.xget() != 1:
     raise RuntimeError, "Bad attribute value"
 
 if b.yget() != 2:
-    raise RuntimeError, "Bad attribute value"    
+    raise RuntimeError, "Bad attribute value"
 
 if c.xget() != 1 or c.yget() != 2 or c.zget() != 3:
-    raise RuntimeError, "Bad attribute value"    
+    raise RuntimeError, "Bad attribute value"
 
 if d.xget() != 1 or d.yget() != 2 or d.zget() != 3 or d.wget() != 4:
-    raise RuntimeError, "Bad attribute value"        
+    raise RuntimeError, "Bad attribute value"
 
 
 if minherit.xget(a) != 1:
-    raise RuntimeError, "Bad attribute value %d" % (minherit.xget(a))     
+    raise RuntimeError, "Bad attribute value %d" % (minherit.xget(a))
 
 if minherit.yget(b) != 2:
-    raise RuntimeError, "Bad attribute value %d" % (minherit.yget(b)) 
+    raise RuntimeError, "Bad attribute value %d" % (minherit.yget(b))
 
 if minherit.xget(c) != 1 or minherit.yget(c) != 2 or minherit.zget(c) != 3:
-    raise RuntimeError, "Bad attribute value %d %d %d" % (minherit.xget(c), minherit.yget(c), minherit.zget(c))    
+    raise RuntimeError, "Bad attribute value %d %d %d" % (
+        minherit.xget(c), minherit.yget(c), minherit.zget(c))
 
 if minherit.xget(d) != 1 or minherit.yget(d) != 2 or minherit.zget(d) != 3 or minherit.wget(d) != 4:
-    raise RuntimeError, "Bad attribute value %d %d %d %d" % (minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d))
+    raise RuntimeError, "Bad attribute value %d %d %d %d" % (
+        minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d))
 
 # Cleanse all of the pointers and see what happens
 
@@ -42,30 +44,24 @@ if aa.xget() != 1:
     raise RuntimeError, "Bad attribute value"
 
 if bb.yget() != 2:
-    raise RuntimeError, "Bad attribute value"    
+    raise RuntimeError, "Bad attribute value"
 
 if cc.xget() != 1 or cc.yget() != 2 or cc.zget() != 3:
-    raise RuntimeError, "Bad attribute value"    
+    raise RuntimeError, "Bad attribute value"
 
 if dd.xget() != 1 or dd.yget() != 2 or dd.zget() != 3 or dd.wget() != 4:
-    raise RuntimeError, "Bad attribute value"        
+    raise RuntimeError, "Bad attribute value"
 
 if minherit.xget(aa) != 1:
-    raise RuntimeError, "Bad attribute value %d" % (minherit.xget(aa))     
+    raise RuntimeError, "Bad attribute value %d" % (minherit.xget(aa))
 
 if minherit.yget(bb) != 2:
-    raise RuntimeError, "Bad attribute value %d" % (minherit.yget(bb)) 
+    raise RuntimeError, "Bad attribute value %d" % (minherit.yget(bb))
 
 if minherit.xget(cc) != 1 or minherit.yget(cc) != 2 or minherit.zget(cc) != 3:
-    raise RuntimeError, "Bad attribute value %d %d %d" % (minherit.xget(cc), minherit.yget(cc), minherit.zget(cc))    
+    raise RuntimeError, "Bad attribute value %d %d %d" % (
+        minherit.xget(cc), minherit.yget(cc), minherit.zget(cc))
 
 if minherit.xget(dd) != 1 or minherit.yget(dd) != 2 or minherit.zget(dd) != 3 or minherit.wget(dd) != 4:
-    raise RuntimeError, "Bad attribute value %d %d %d %d" % (minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd))
-
-
-
-
-
-
-
-
+    raise RuntimeError, "Bad attribute value %d %d %d %d" % (
+        minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd))
diff --git a/Examples/test-suite/python/multi_import_runme.py b/Examples/test-suite/python/multi_import_runme.py
index f8a2f19c7..27f86a9ef 100644
--- a/Examples/test-suite/python/multi_import_runme.py
+++ b/Examples/test-suite/python/multi_import_runme.py
@@ -3,16 +3,16 @@ import multi_import_b
 
 x = multi_import_b.XXX()
 if x.testx() != 0:
-	raise RuntimeError
+    raise RuntimeError
 
 y = multi_import_b.YYY()
 if y.testx() != 0:
-	raise RuntimeError
+    raise RuntimeError
 if y.testy() != 1:
-	raise RuntimeError
+    raise RuntimeError
 
 z = multi_import_a.ZZZ()
 if z.testx() != 0:
-	raise RuntimeError
+    raise RuntimeError
 if z.testz() != 2:
-	raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/namespace_class_runme.py b/Examples/test-suite/python/namespace_class_runme.py
index e009f9515..e0bd3ca09 100644
--- a/Examples/test-suite/python/namespace_class_runme.py
+++ b/Examples/test-suite/python/namespace_class_runme.py
@@ -1,30 +1,31 @@
 from namespace_class import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 try:
-  p = Private1()
-  error = 1
+    p = Private1()
+    error = 1
 except:
-  error = 0
+    error = 0
 
 if (error):
-  raise RuntimeError, "Private1 is private"
+    raise RuntimeError, "Private1 is private"
 
 try:
-  p = Private2()
-  error = 1
+    p = Private2()
+    error = 1
 except:
-  error = 0
+    error = 0
 
 if (error):
-  raise RuntimeError, "Private2 is private"
+    raise RuntimeError, "Private2 is private"
 
 if is_new_style_class(EulerT3D):
-  EulerT3D.toFrame(1,1,1)
+    EulerT3D.toFrame(1, 1, 1)
 else:
-  EulerT3D().toFrame(1,1,1)
+    EulerT3D().toFrame(1, 1, 1)
 
 b = BooT_i()
 b = BooT_H()
@@ -40,6 +41,6 @@ f = FooT_H()
 f.foo(Hi)
 
 if is_new_style_class(FooT_H):
-  f_type = str(type(f))
-  if f_type.find("'namespace_class.FooT_H'") == -1:
-    raise RuntimeError("Incorrect type: " + f_type)
+    f_type = str(type(f))
+    if f_type.find("'namespace_class.FooT_H'") == -1:
+        raise RuntimeError("Incorrect type: " + f_type)
diff --git a/Examples/test-suite/python/namespace_typemap_runme.py b/Examples/test-suite/python/namespace_typemap_runme.py
index 682ad3bb1..14379496d 100644
--- a/Examples/test-suite/python/namespace_typemap_runme.py
+++ b/Examples/test-suite/python/namespace_typemap_runme.py
@@ -36,7 +36,7 @@ if stest11("hello") != "hello":
 if stest12("hello") != "hello":
     raise RuntimeError
 
-c = complex(2,3)
+c = complex(2, 3)
 r = c.real
 
 if ctest1(c) != r:
diff --git a/Examples/test-suite/python/nested_template_base_runme.py b/Examples/test-suite/python/nested_template_base_runme.py
index 3d54b8391..fc5844300 100644
--- a/Examples/test-suite/python/nested_template_base_runme.py
+++ b/Examples/test-suite/python/nested_template_base_runme.py
@@ -1,13 +1,13 @@
 from nested_template_base import *
 
 
-ois = InnerS(123);
-oic = InnerC();
+ois = InnerS(123)
+oic = InnerC()
 
 # Check base method is available
 if (oic.outer(ois).val != 123):
-  raise RuntimeError("Wrong value calling outer");
+    raise RuntimeError("Wrong value calling outer")
 
 # Check non-derived class using base class
 if (oic.innerc().outer(ois).val != 123):
-  raise RuntimeError("Wrong value calling innerc");
+    raise RuntimeError("Wrong value calling innerc")
diff --git a/Examples/test-suite/python/nested_workaround_runme.py b/Examples/test-suite/python/nested_workaround_runme.py
index a8a75d370..c11299ed4 100644
--- a/Examples/test-suite/python/nested_workaround_runme.py
+++ b/Examples/test-suite/python/nested_workaround_runme.py
@@ -4,10 +4,10 @@ inner = Inner(5)
 outer = Outer()
 newInner = outer.doubleInnerValue(inner)
 if newInner.getValue() != 10:
-  raise RuntimeError
+    raise RuntimeError
 
 outer = Outer()
 inner = outer.createInner(3)
 newInner = outer.doubleInnerValue(inner)
 if outer.getInnerValue(newInner) != 6:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/operbool_runme.py b/Examples/test-suite/python/operbool_runme.py
index 4218b5dd4..708dea786 100644
--- a/Examples/test-suite/python/operbool_runme.py
+++ b/Examples/test-suite/python/operbool_runme.py
@@ -1,4 +1,3 @@
 #!/usr/bin/env python
 import operbool
 assert not operbool.Test()
-
diff --git a/Examples/test-suite/python/overload_bool_runme.py b/Examples/test-suite/python/overload_bool_runme.py
index ed7d1b5a1..8192b37ce 100644
--- a/Examples/test-suite/python/overload_bool_runme.py
+++ b/Examples/test-suite/python/overload_bool_runme.py
@@ -2,25 +2,25 @@ import overload_bool
 
 # Overloading bool, int, string
 if overload_bool.overloaded(True) != "bool":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded(False) != "bool":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 if overload_bool.overloaded(0) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded(1) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded(2) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 if overload_bool.overloaded("1234") != "string":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 # Test bool masquerading as int
 if overload_bool.intfunction(True) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.intfunction(False) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 # Test int masquerading as bool
 # Not possible
@@ -30,26 +30,25 @@ if overload_bool.intfunction(False) != "int":
 
 # Overloading bool, int, string
 if overload_bool.overloaded_ref(True) != "bool":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded_ref(False) != "bool":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 if overload_bool.overloaded_ref(0) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded_ref(1) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.overloaded_ref(2) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 if overload_bool.overloaded_ref("1234") != "string":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 # Test bool masquerading as int
 if overload_bool.intfunction_ref(True) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 if overload_bool.intfunction_ref(False) != "int":
-  raise RuntimeError("wrong!")
+    raise RuntimeError("wrong!")
 
 # Test int masquerading as bool
 # Not possible
-
diff --git a/Examples/test-suite/python/overload_complicated_runme.py b/Examples/test-suite/python/overload_complicated_runme.py
index 2b7467d4d..9c039a0a5 100644
--- a/Examples/test-suite/python/overload_complicated_runme.py
+++ b/Examples/test-suite/python/overload_complicated_runme.py
@@ -7,41 +7,41 @@ p = Pop(pInt)
 
 p = Pop(pInt, 0)
 
-# Check overloaded in const only and pointers/references which target languages cannot disambiguate
+# Check overloaded in const only and pointers/references which target
+# languages cannot disambiguate
 if p.hip(0) != 701:
-  raise RuntimeError,"Test 1 failed"
+    raise RuntimeError, "Test 1 failed"
 
 if p.hip(pInt) != 702:
-  raise RuntimeError,"Test 2 failed"
+    raise RuntimeError, "Test 2 failed"
 
 # Reverse the order for the above
 if p.hop(pInt) != 805:
-  raise RuntimeError,"Test 3 failed"
+    raise RuntimeError, "Test 3 failed"
 
 if p.hop(0) != 801:
-  raise RuntimeError,"Test 4 failed"
+    raise RuntimeError, "Test 4 failed"
 
 # Few more variations and order shuffled
 if p.pop(0) != 901:
-  raise RuntimeError,"Test 5 failed"
+    raise RuntimeError, "Test 5 failed"
 
 if p.pop(pInt) != 902:
-  raise RuntimeError,"Test 6 failed"
+    raise RuntimeError, "Test 6 failed"
 
 if p.pop() != 905:
-  raise RuntimeError,"Test 7 failed"
+    raise RuntimeError, "Test 7 failed"
 
 # Overload on const only
 if p.bop(pInt) != 1001:
-  raise RuntimeError,"Test 8 failed"
+    raise RuntimeError, "Test 8 failed"
 
 if p.bip(pInt) != 2001:
-  raise RuntimeError,"Test 9 failed"
+    raise RuntimeError, "Test 9 failed"
 
 # Globals
 if muzak(0) != 3001:
-  raise RuntimeError,"Test 10 failed"
+    raise RuntimeError, "Test 10 failed"
 
 if muzak(pInt) != 3002:
-  raise RuntimeError,"Test 11 failed"
-
+    raise RuntimeError, "Test 11 failed"
diff --git a/Examples/test-suite/python/overload_extend_runme.py b/Examples/test-suite/python/overload_extend_runme.py
index 7d08d482b..4a8a0165e 100644
--- a/Examples/test-suite/python/overload_extend_runme.py
+++ b/Examples/test-suite/python/overload_extend_runme.py
@@ -7,8 +7,7 @@ if f.test(3) != 1:
     raise RuntimeError
 if f.test("hello") != 2:
     raise RuntimeError
-if f.test(3,2) != 5:
+if f.test(3, 2) != 5:
     raise RuntimeError
 if f.test(3.0) != 1003:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/overload_extendc_runme.py b/Examples/test-suite/python/overload_extendc_runme.py
index cea3ea618..ffd074a9d 100644
--- a/Examples/test-suite/python/overload_extendc_runme.py
+++ b/Examples/test-suite/python/overload_extendc_runme.py
@@ -5,18 +5,17 @@ if f.test(3) != 1:
     raise RuntimeError
 if f.test("hello") != 2:
     raise RuntimeError
-if f.test(3.5,2.5) != 3:
+if f.test(3.5, 2.5) != 3:
     raise RuntimeError
-if f.test("hello",20) != 1020:
+if f.test("hello", 20) != 1020:
     raise RuntimeError
-if f.test("hello",20,100) != 120:
+if f.test("hello", 20, 100) != 120:
     raise RuntimeError
 
 # C default args
 if f.test(f) != 30:
     raise RuntimeError
-if f.test(f,100) != 120:
+if f.test(f, 100) != 120:
     raise RuntimeError
-if f.test(f,100,200) != 300:
+if f.test(f, 100, 200) != 300:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/overload_numeric_runme.py b/Examples/test-suite/python/overload_numeric_runme.py
index 639fb5e5d..9f3382d86 100644
--- a/Examples/test-suite/python/overload_numeric_runme.py
+++ b/Examples/test-suite/python/overload_numeric_runme.py
@@ -5,9 +5,10 @@ import math
 nums = Nums()
 limits = Limits()
 
+
 def check(got, expected):
-  if got != expected:
-    raise RuntimeError("got: " + got + " expected: " + expected)
+    if got != expected:
+        raise RuntimeError("got: " + got + " expected: " + expected)
 
 check(nums.over(0), "signed char")
 check(nums.over(0.0), "float")
@@ -15,21 +16,21 @@ check(nums.over(0.0), "float")
 check(nums.over(limits.schar_min()), "signed char")
 check(nums.over(limits.schar_max()), "signed char")
 
-check(nums.over(limits.schar_min()-1), "short")
-check(nums.over(limits.schar_max()+1), "short")
+check(nums.over(limits.schar_min() - 1), "short")
+check(nums.over(limits.schar_max() + 1), "short")
 check(nums.over(limits.shrt_min()), "short")
 check(nums.over(limits.shrt_max()), "short")
 
-check(nums.over(limits.shrt_min()-1), "int")
-check(nums.over(limits.shrt_max()+1), "int")
+check(nums.over(limits.shrt_min() - 1), "int")
+check(nums.over(limits.shrt_max() + 1), "int")
 check(nums.over(limits.int_min()), "int")
 check(nums.over(limits.int_max()), "int")
 
 check(nums.over(limits.flt_min()), "float")
 check(nums.over(limits.flt_max()), "float")
 
-check(nums.over(limits.flt_max()*10), "double")
-check(nums.over(-limits.flt_max()*10), "double")
+check(nums.over(limits.flt_max() * 10), "double")
+check(nums.over(-limits.flt_max() * 10), "double")
 check(nums.over(limits.dbl_max()), "double")
 check(nums.over(-limits.dbl_max()), "double")
 
diff --git a/Examples/test-suite/python/overload_rename_runme.py b/Examples/test-suite/python/overload_rename_runme.py
index b192f7d5d..dcad1b95a 100644
--- a/Examples/test-suite/python/overload_rename_runme.py
+++ b/Examples/test-suite/python/overload_rename_runme.py
@@ -2,7 +2,6 @@ import overload_rename
 
 
 f = overload_rename.Foo(1)
-f = overload_rename.Foo(1,1)
-f = overload_rename.Foo_int(1,1)
-f = overload_rename.Foo_int(1,1,1)
-
+f = overload_rename.Foo(1, 1)
+f = overload_rename.Foo_int(1, 1)
+f = overload_rename.Foo_int(1, 1, 1)
diff --git a/Examples/test-suite/python/overload_simple_runme.py b/Examples/test-suite/python/overload_simple_runme.py
index a78f3720a..6d72ec081 100644
--- a/Examples/test-suite/python/overload_simple_runme.py
+++ b/Examples/test-suite/python/overload_simple_runme.py
@@ -70,7 +70,7 @@ if s.type != "none":
 s = Spam(3)
 if s.type != "int":
     raise RuntimeError, "Spam(int)"
-    
+
 s = Spam(3.4)
 if s.type != "double":
     raise RuntimeError, "Spam(double)"
@@ -92,9 +92,6 @@ if s.type != "void *":
     raise RuntimeError, "Spam(void *)"
 
 
-
-
-
 free_void(v)
 
 
diff --git a/Examples/test-suite/python/overload_subtype_runme.py b/Examples/test-suite/python/overload_subtype_runme.py
index 6bf77dc59..3f32a5583 100644
--- a/Examples/test-suite/python/overload_subtype_runme.py
+++ b/Examples/test-suite/python/overload_subtype_runme.py
@@ -8,4 +8,3 @@ if spam(f) != 1:
 
 if spam(b) != 2:
     raise RuntimeError, "bar"
-
diff --git a/Examples/test-suite/python/overload_template_fast_runme.py b/Examples/test-suite/python/overload_template_fast_runme.py
index 299b91db8..95349a9b1 100644
--- a/Examples/test-suite/python/overload_template_fast_runme.py
+++ b/Examples/test-suite/python/overload_template_fast_runme.py
@@ -1,83 +1,84 @@
 from overload_template_fast import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 f = foo()
 
-a = maximum(3,4)
-b = maximum(3.4,5.2)
+a = maximum(3, 4)
+b = maximum(3.4, 5.2)
 
 # mix 1
 if (mix1("hi") != 101):
-  raise RuntimeError, ("mix1(const char*)")
+    raise RuntimeError, ("mix1(const char*)")
 
 if (mix1(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix1(double, const double &)")
+    raise RuntimeError, ("mix1(double, const double &)")
 
 if (mix1(1.0) != 103):
-  raise RuntimeError, ("mix1(double)")
+    raise RuntimeError, ("mix1(double)")
 
 # mix 2
 if (mix2("hi") != 101):
-  raise RuntimeError, ("mix2(const char*)")
+    raise RuntimeError, ("mix2(const char*)")
 
 if (mix2(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix2(double, const double &)")
+    raise RuntimeError, ("mix2(double, const double &)")
 
 if (mix2(1.0) != 103):
-  raise RuntimeError, ("mix2(double)")
+    raise RuntimeError, ("mix2(double)")
 
 # mix 3
 if (mix3("hi") != 101):
-  raise RuntimeError, ("mix3(const char*)")
+    raise RuntimeError, ("mix3(const char*)")
 
 if (mix3(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix3(double, const double &)")
+    raise RuntimeError, ("mix3(double, const double &)")
 
 if (mix3(1.0) != 103):
-  raise RuntimeError, ("mix3(double)")
+    raise RuntimeError, ("mix3(double)")
 
 # Combination 1
 if (overtparams1(100) != 10):
-  raise RuntimeError, ("overtparams1(int)")
+    raise RuntimeError, ("overtparams1(int)")
 
 if (overtparams1(100.0, 100) != 20):
-  raise RuntimeError, ("overtparams1(double, int)")
+    raise RuntimeError, ("overtparams1(double, int)")
 
 # Combination 2
 if (overtparams2(100.0, 100) != 40):
-  raise RuntimeError, ("overtparams2(double, int)")
+    raise RuntimeError, ("overtparams2(double, int)")
 
 # Combination 3
 if (overloaded() != 60):
-  raise RuntimeError, ("overloaded()")
+    raise RuntimeError, ("overloaded()")
 
 if (overloaded(100.0, 100) != 70):
-  raise RuntimeError, ("overloaded(double, int)")
+    raise RuntimeError, ("overloaded(double, int)")
 
 # Combination 4
 if (overloadedagain("hello") != 80):
-  raise RuntimeError, ("overloadedagain(const char *)")
+    raise RuntimeError, ("overloadedagain(const char *)")
 
 if (overloadedagain() != 90):
-  raise RuntimeError, ("overloadedagain(double)")
+    raise RuntimeError, ("overloadedagain(double)")
 
 # specializations
 if (specialization(10) != 202):
-  raise RuntimeError, ("specialization(int)")
+    raise RuntimeError, ("specialization(int)")
 
 if (specialization(10.0) != 203):
-  raise RuntimeError, ("specialization(double)")
+    raise RuntimeError, ("specialization(double)")
 
 if (specialization(10, 10) != 204):
-  raise RuntimeError, ("specialization(int, int)")
+    raise RuntimeError, ("specialization(int, int)")
 
 if (specialization(10.0, 10.0) != 205):
-  raise RuntimeError, ("specialization(double, double)")
+    raise RuntimeError, ("specialization(double, double)")
 
 if (specialization("hi", "hi") != 201):
-  raise RuntimeError, ("specialization(const char *, const char *)")
+    raise RuntimeError, ("specialization(const char *, const char *)")
 
 
 # simple specialization
@@ -87,66 +88,66 @@ xyz_double()
 
 # a bit of everything
 if (overload("hi") != 0):
-  raise RuntimeError, ("overload()")
+    raise RuntimeError, ("overload()")
 
 if (overload(1) != 10):
-  raise RuntimeError, ("overload(int t)")
+    raise RuntimeError, ("overload(int t)")
 
 if (overload(1, 1) != 20):
-  raise RuntimeError, ("overload(int t, const int &)")
+    raise RuntimeError, ("overload(int t, const int &)")
 
 if (overload(1, "hello") != 30):
-  raise RuntimeError, ("overload(int t, const char *)")
+    raise RuntimeError, ("overload(int t, const char *)")
 
 k = Klass()
 if (overload(k) != 10):
-  raise RuntimeError, ("overload(Klass t)")
+    raise RuntimeError, ("overload(Klass t)")
 
 if (overload(k, k) != 20):
-  raise RuntimeError, ("overload(Klass t, const Klass &)")
+    raise RuntimeError, ("overload(Klass t, const Klass &)")
 
 if (overload(k, "hello") != 30):
-  raise RuntimeError, ("overload(Klass t, const char *)")
+    raise RuntimeError, ("overload(Klass t, const char *)")
 
 if (overload(10.0, "hi") != 40):
-  raise RuntimeError, ("overload(double t, const char *)")
+    raise RuntimeError, ("overload(double t, const char *)")
 
 if (overload() != 50):
-  raise RuntimeError, ("overload(const char *)")
+    raise RuntimeError, ("overload(const char *)")
 
 
 # everything put in a namespace
 if (nsoverload("hi") != 1000):
-  raise RuntimeError, ("nsoverload()")
+    raise RuntimeError, ("nsoverload()")
 
 if (nsoverload(1) != 1010):
-  raise RuntimeError, ("nsoverload(int t)")
+    raise RuntimeError, ("nsoverload(int t)")
 
 if (nsoverload(1, 1) != 1020):
-  raise RuntimeError, ("nsoverload(int t, const int &)")
+    raise RuntimeError, ("nsoverload(int t, const int &)")
 
 if (nsoverload(1, "hello") != 1030):
-  raise RuntimeError, ("nsoverload(int t, const char *)")
+    raise RuntimeError, ("nsoverload(int t, const char *)")
 
 if (nsoverload(k) != 1010):
-  raise RuntimeError, ("nsoverload(Klass t)")
+    raise RuntimeError, ("nsoverload(Klass t)")
 
 if (nsoverload(k, k) != 1020):
-  raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
+    raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
 
 if (nsoverload(k, "hello") != 1030):
-  raise RuntimeError, ("nsoverload(Klass t, const char *)")
+    raise RuntimeError, ("nsoverload(Klass t, const char *)")
 
 if (nsoverload(10.0, "hi") != 1040):
-  raise RuntimeError, ("nsoverload(double t, const char *)")
+    raise RuntimeError, ("nsoverload(double t, const char *)")
 
 if (nsoverload() != 1050):
-  raise RuntimeError, ("nsoverload(const char *)")
+    raise RuntimeError, ("nsoverload(const char *)")
 
 
 if is_new_style_class(A):
-  A.foo(1)
+    A.foo(1)
 else:
-  A_foo(1)
+    A_foo(1)
 b = B()
 b.foo(1)
diff --git a/Examples/test-suite/python/overload_template_runme.py b/Examples/test-suite/python/overload_template_runme.py
index c1337ba6a..014ec71cb 100644
--- a/Examples/test-suite/python/overload_template_runme.py
+++ b/Examples/test-suite/python/overload_template_runme.py
@@ -1,79 +1,79 @@
 from overload_template import *
 f = foo()
 
-a = maximum(3,4)
-b = maximum(3.4,5.2)
+a = maximum(3, 4)
+b = maximum(3.4, 5.2)
 
 # mix 1
 if (mix1("hi") != 101):
-  raise RuntimeError, ("mix1(const char*)")
+    raise RuntimeError, ("mix1(const char*)")
 
 if (mix1(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix1(double, const double &)")
+    raise RuntimeError, ("mix1(double, const double &)")
 
 if (mix1(1.0) != 103):
-  raise RuntimeError, ("mix1(double)")
+    raise RuntimeError, ("mix1(double)")
 
 # mix 2
 if (mix2("hi") != 101):
-  raise RuntimeError, ("mix2(const char*)")
+    raise RuntimeError, ("mix2(const char*)")
 
 if (mix2(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix2(double, const double &)")
+    raise RuntimeError, ("mix2(double, const double &)")
 
 if (mix2(1.0) != 103):
-  raise RuntimeError, ("mix2(double)")
+    raise RuntimeError, ("mix2(double)")
 
 # mix 3
 if (mix3("hi") != 101):
-  raise RuntimeError, ("mix3(const char*)")
+    raise RuntimeError, ("mix3(const char*)")
 
 if (mix3(1.0, 1.0) != 102):
-  raise RuntimeError, ("mix3(double, const double &)")
+    raise RuntimeError, ("mix3(double, const double &)")
 
 if (mix3(1.0) != 103):
-  raise RuntimeError, ("mix3(double)")
+    raise RuntimeError, ("mix3(double)")
 
 # Combination 1
 if (overtparams1(100) != 10):
-  raise RuntimeError, ("overtparams1(int)")
+    raise RuntimeError, ("overtparams1(int)")
 
 if (overtparams1(100.0, 100) != 20):
-  raise RuntimeError, ("overtparams1(double, int)")
+    raise RuntimeError, ("overtparams1(double, int)")
 
 # Combination 2
 if (overtparams2(100.0, 100) != 40):
-  raise RuntimeError, ("overtparams2(double, int)")
+    raise RuntimeError, ("overtparams2(double, int)")
 
 # Combination 3
 if (overloaded() != 60):
-  raise RuntimeError, ("overloaded()")
+    raise RuntimeError, ("overloaded()")
 
 if (overloaded(100.0, 100) != 70):
-  raise RuntimeError, ("overloaded(double, int)")
+    raise RuntimeError, ("overloaded(double, int)")
 
 # Combination 4
 if (overloadedagain("hello") != 80):
-  raise RuntimeError, ("overloadedagain(const char *)")
+    raise RuntimeError, ("overloadedagain(const char *)")
 
 if (overloadedagain() != 90):
-  raise RuntimeError, ("overloadedagain(double)")
+    raise RuntimeError, ("overloadedagain(double)")
 
 # specializations
 if (specialization(10) != 202):
-  raise RuntimeError, ("specialization(int)")
+    raise RuntimeError, ("specialization(int)")
 
 if (specialization(10.0) != 203):
-  raise RuntimeError, ("specialization(double)")
+    raise RuntimeError, ("specialization(double)")
 
 if (specialization(10, 10) != 204):
-  raise RuntimeError, ("specialization(int, int)")
+    raise RuntimeError, ("specialization(int, int)")
 
 if (specialization(10.0, 10.0) != 205):
-  raise RuntimeError, ("specialization(double, double)")
+    raise RuntimeError, ("specialization(double, double)")
 
 if (specialization("hi", "hi") != 201):
-  raise RuntimeError, ("specialization(const char *, const char *)")
+    raise RuntimeError, ("specialization(const char *, const char *)")
 
 
 # simple specialization
@@ -83,61 +83,61 @@ xyz_double()
 
 # a bit of everything
 if (overload("hi") != 0):
-  raise RuntimeError, ("overload()")
+    raise RuntimeError, ("overload()")
 
 if (overload(1) != 10):
-  raise RuntimeError, ("overload(int t)")
+    raise RuntimeError, ("overload(int t)")
 
 if (overload(1, 1) != 20):
-  raise RuntimeError, ("overload(int t, const int &)")
+    raise RuntimeError, ("overload(int t, const int &)")
 
 if (overload(1, "hello") != 30):
-  raise RuntimeError, ("overload(int t, const char *)")
+    raise RuntimeError, ("overload(int t, const char *)")
 
 k = Klass()
 if (overload(k) != 10):
-  raise RuntimeError, ("overload(Klass t)")
+    raise RuntimeError, ("overload(Klass t)")
 
 if (overload(k, k) != 20):
-  raise RuntimeError, ("overload(Klass t, const Klass &)")
+    raise RuntimeError, ("overload(Klass t, const Klass &)")
 
 if (overload(k, "hello") != 30):
-  raise RuntimeError, ("overload(Klass t, const char *)")
+    raise RuntimeError, ("overload(Klass t, const char *)")
 
 if (overload(10.0, "hi") != 40):
-  raise RuntimeError, ("overload(double t, const char *)")
+    raise RuntimeError, ("overload(double t, const char *)")
 
 if (overload() != 50):
-  raise RuntimeError, ("overload(const char *)")
+    raise RuntimeError, ("overload(const char *)")
 
 
 # everything put in a namespace
 if (nsoverload("hi") != 1000):
-  raise RuntimeError, ("nsoverload()")
+    raise RuntimeError, ("nsoverload()")
 
 if (nsoverload(1) != 1010):
-  raise RuntimeError, ("nsoverload(int t)")
+    raise RuntimeError, ("nsoverload(int t)")
 
 if (nsoverload(1, 1) != 1020):
-  raise RuntimeError, ("nsoverload(int t, const int &)")
+    raise RuntimeError, ("nsoverload(int t, const int &)")
 
 if (nsoverload(1, "hello") != 1030):
-  raise RuntimeError, ("nsoverload(int t, const char *)")
+    raise RuntimeError, ("nsoverload(int t, const char *)")
 
 if (nsoverload(k) != 1010):
-  raise RuntimeError, ("nsoverload(Klass t)")
+    raise RuntimeError, ("nsoverload(Klass t)")
 
 if (nsoverload(k, k) != 1020):
-  raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
+    raise RuntimeError, ("nsoverload(Klass t, const Klass &)")
 
 if (nsoverload(k, "hello") != 1030):
-  raise RuntimeError, ("nsoverload(Klass t, const char *)")
+    raise RuntimeError, ("nsoverload(Klass t, const char *)")
 
 if (nsoverload(10.0, "hi") != 1040):
-  raise RuntimeError, ("nsoverload(double t, const char *)")
+    raise RuntimeError, ("nsoverload(double t, const char *)")
 
 if (nsoverload() != 1050):
-  raise RuntimeError, ("nsoverload(const char *)")
+    raise RuntimeError, ("nsoverload(const char *)")
 
 
 A_foo(1)
diff --git a/Examples/test-suite/python/pointer_reference_runme.py b/Examples/test-suite/python/pointer_reference_runme.py
index e1a1a1f4b..b9b47881d 100644
--- a/Examples/test-suite/python/pointer_reference_runme.py
+++ b/Examples/test-suite/python/pointer_reference_runme.py
@@ -2,15 +2,15 @@ import pointer_reference
 
 s = pointer_reference.get()
 if s.value != 10:
-  raise RuntimeError, "get test failed"
+    raise RuntimeError, "get test failed"
 
 ss = pointer_reference.Struct(20)
 pointer_reference.set(ss)
 if pointer_reference.cvar.Struct_instance.value != 20:
-  raise RuntimeError, "set test failed"
+    raise RuntimeError, "set test failed"
 
 if pointer_reference.overloading(1) != 111:
-  raise RuntimeError, "overload test 1 failed"
+    raise RuntimeError, "overload test 1 failed"
 
 if pointer_reference.overloading(ss) != 222:
-  raise RuntimeError, "overload test 2 failed"
+    raise RuntimeError, "overload test 2 failed"
diff --git a/Examples/test-suite/python/preproc_defined_runme.py b/Examples/test-suite/python/preproc_defined_runme.py
index 9a295533a..af46816be 100644
--- a/Examples/test-suite/python/preproc_defined_runme.py
+++ b/Examples/test-suite/python/preproc_defined_runme.py
@@ -1,7 +1,7 @@
 import preproc_defined
 
 if preproc_defined.call_checking() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 d = preproc_defined.Defined()
 d.defined = 10
diff --git a/Examples/test-suite/python/preproc_include_runme.py b/Examples/test-suite/python/preproc_include_runme.py
index 778de3c87..7c3a360ce 100644
--- a/Examples/test-suite/python/preproc_include_runme.py
+++ b/Examples/test-suite/python/preproc_include_runme.py
@@ -1,23 +1,22 @@
 import preproc_include
 
 if preproc_include.multiply10(10) != 100:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply20(10) != 200:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply30(10) != 300:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply40(10) != 400:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply50(10) != 500:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply60(10) != 600:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc_include.multiply70(10) != 700:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/preproc_runme.py b/Examples/test-suite/python/preproc_runme.py
index 3049f00ab..99a6d0307 100644
--- a/Examples/test-suite/python/preproc_runme.py
+++ b/Examples/test-suite/python/preproc_runme.py
@@ -1,16 +1,16 @@
 import preproc
 
 if preproc.endif != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc.define != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 if preproc.defined != 1:
-  raise RuntimeError
+    raise RuntimeError
 
-if 2*preproc.one != preproc.two:
-  raise RuntimeError
+if 2 * preproc.one != preproc.two:
+    raise RuntimeError
 
 if preproc.methodX(99) != 199:
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/primitive_types_runme.py b/Examples/test-suite/python/primitive_types_runme.py
index d4173b7d3..2e7ed7db7 100644
--- a/Examples/test-suite/python/primitive_types_runme.py
+++ b/Examples/test-suite/python/primitive_types_runme.py
@@ -28,81 +28,142 @@ cvar.var_paramc = sct_paramc
 
 v_check()
 
-def pyerror(name, val, cte):
-  print "bad val/cte", name, val, cte
-  raise RuntimeError
-  pass
 
-if cvar.var_bool != cct_bool: pyerror("bool", cvar.var_bool, cct_bool)
-if cvar.var_schar != cct_schar: pyerror("schar", cvar.var_schar, cct_schar)
-if cvar.var_uchar != cct_uchar: pyerror("uchar", cvar.var_uchar, cct_uchar)
-if cvar.var_int != cct_int: pyerror("int", cvar.var_int, cct_int)
-if cvar.var_uint != cct_uint: pyerror("uint", cvar.var_uint, cct_uint)
-if cvar.var_short != cct_short: pyerror("short", cvar.var_short, cct_short)
-if cvar.var_ushort != cct_ushort: pyerror("ushort", cvar.var_ushort, cct_ushort)
-if cvar.var_long != cct_long: pyerror("long", cvar.var_long, cct_long)
-if cvar.var_ulong != cct_ulong: pyerror("ulong", cvar.var_ulong, cct_ulong)
-if cvar.var_llong != cct_llong: pyerror("llong", cvar.var_llong, cct_llong)
-if cvar.var_ullong != cct_ullong: pyerror("ullong", cvar.var_ullong, cct_ullong)
-if cvar.var_char != cct_char: pyerror("char", cvar.var_char, cct_char)
-if cvar.var_pchar != cct_pchar: pyerror("pchar", cvar.var_pchar, cct_pchar)
-if cvar.var_pcharc != cct_pcharc: pyerror("pchar", cvar.var_pcharc, cct_pcharc)
-if cvar.var_pint != cct_pint: pyerror("pint", cvar.var_pint, cct_pint)
-if cvar.var_sizet != cct_sizet: pyerror("sizet", cvar.var_sizet, cct_sizet)
-if cvar.var_hello != cct_hello: pyerror("hello", cvar.var_hello, cct_hello)
-if cvar.var_myint != cct_myint: pyerror("myint", cvar.var_myint, cct_myint)
-if cvar.var_namet != def_namet: pyerror("name", cvar.var_namet, def_namet)
+def pyerror(name, val, cte):
+    print "bad val/cte", name, val, cte
+    raise RuntimeError
+    pass
+
+if cvar.var_bool != cct_bool:
+    pyerror("bool", cvar.var_bool, cct_bool)
+if cvar.var_schar != cct_schar:
+    pyerror("schar", cvar.var_schar, cct_schar)
+if cvar.var_uchar != cct_uchar:
+    pyerror("uchar", cvar.var_uchar, cct_uchar)
+if cvar.var_int != cct_int:
+    pyerror("int", cvar.var_int, cct_int)
+if cvar.var_uint != cct_uint:
+    pyerror("uint", cvar.var_uint, cct_uint)
+if cvar.var_short != cct_short:
+    pyerror("short", cvar.var_short, cct_short)
+if cvar.var_ushort != cct_ushort:
+    pyerror("ushort", cvar.var_ushort, cct_ushort)
+if cvar.var_long != cct_long:
+    pyerror("long", cvar.var_long, cct_long)
+if cvar.var_ulong != cct_ulong:
+    pyerror("ulong", cvar.var_ulong, cct_ulong)
+if cvar.var_llong != cct_llong:
+    pyerror("llong", cvar.var_llong, cct_llong)
+if cvar.var_ullong != cct_ullong:
+    pyerror("ullong", cvar.var_ullong, cct_ullong)
+if cvar.var_char != cct_char:
+    pyerror("char", cvar.var_char, cct_char)
+if cvar.var_pchar != cct_pchar:
+    pyerror("pchar", cvar.var_pchar, cct_pchar)
+if cvar.var_pcharc != cct_pcharc:
+    pyerror("pchar", cvar.var_pcharc, cct_pcharc)
+if cvar.var_pint != cct_pint:
+    pyerror("pint", cvar.var_pint, cct_pint)
+if cvar.var_sizet != cct_sizet:
+    pyerror("sizet", cvar.var_sizet, cct_sizet)
+if cvar.var_hello != cct_hello:
+    pyerror("hello", cvar.var_hello, cct_hello)
+if cvar.var_myint != cct_myint:
+    pyerror("myint", cvar.var_myint, cct_myint)
+if cvar.var_namet != def_namet:
+    pyerror("name", cvar.var_namet, def_namet)
+
 
 class PyTest (TestDirector):
-  def __init__(self):
-    TestDirector.__init__(self)
+
+    def __init__(self):
+        TestDirector.__init__(self)
+        pass
+
+    def ident(self, x):
+        return x
+
+    def vval_bool(self, x): return self.ident(x)
+
+    def vval_schar(self, x): return self.ident(x)
+
+    def vval_uchar(self, x): return self.ident(x)
+
+    def vval_int(self, x): return self.ident(x)
+
+    def vval_uint(self, x): return self.ident(x)
+
+    def vval_short(self, x): return self.ident(x)
+
+    def vval_ushort(self, x): return self.ident(x)
+
+    def vval_long(self, x): return self.ident(x)
+
+    def vval_ulong(self, x): return self.ident(x)
+
+    def vval_llong(self, x): return self.ident(x)
+
+    def vval_ullong(self, x): return self.ident(x)
+
+    def vval_float(self, x): return self.ident(x)
+
+    def vval_double(self, x): return self.ident(x)
+
+    def vval_char(self, x): return self.ident(x)
+
+    def vval_pchar(self, x): return self.ident(x)
+
+    def vval_pcharc(self, x): return self.ident(x)
+
+    def vval_pint(self, x): return self.ident(x)
+
+    def vval_sizet(self, x): return self.ident(x)
+
+    def vval_hello(self, x): return self.ident(x)
+
+    def vval_myint(self, x): return self.ident(x)
+
+    def vref_bool(self, x): return self.ident(x)
+
+    def vref_schar(self, x): return self.ident(x)
+
+    def vref_uchar(self, x): return self.ident(x)
+
+    def vref_int(self, x): return self.ident(x)
+
+    def vref_uint(self, x): return self.ident(x)
+
+    def vref_short(self, x): return self.ident(x)
+
+    def vref_ushort(self, x): return self.ident(x)
+
+    def vref_long(self, x): return self.ident(x)
+
+    def vref_ulong(self, x): return self.ident(x)
+
+    def vref_llong(self, x): return self.ident(x)
+
+    def vref_ullong(self, x): return self.ident(x)
+
+    def vref_float(self, x): return self.ident(x)
+
+    def vref_double(self, x): return self.ident(x)
+
+    def vref_char(self, x): return self.ident(x)
+
+    def vref_pchar(self, x): return self.ident(x)
+
+    def vref_pcharc(self, x): return self.ident(x)
+
+    def vref_pint(self, x): return self.ident(x)
+
+    def vref_sizet(self, x): return self.ident(x)
+
+    def vref_hello(self, x): return self.ident(x)
+
+    def vref_myint(self, x): return self.ident(x)
+
     pass
-  def ident(self, x):
-    return x
-  
-  def vval_bool(self, x): return self.ident(x)
-  def vval_schar(self, x): return self.ident(x)
-  def vval_uchar(self, x): return self.ident(x)
-  def vval_int(self, x): return self.ident(x)
-  def vval_uint(self, x): return self.ident(x)
-  def vval_short(self, x): return self.ident(x)
-  def vval_ushort(self, x): return self.ident(x)
-  def vval_long(self, x): return self.ident(x)
-  def vval_ulong(self, x): return self.ident(x)
-  def vval_llong(self, x): return self.ident(x)
-  def vval_ullong(self, x): return self.ident(x)
-  def vval_float(self, x): return self.ident(x)
-  def vval_double(self, x): return self.ident(x)
-  def vval_char(self, x): return self.ident(x)
-  def vval_pchar(self, x): return self.ident(x)
-  def vval_pcharc(self, x): return self.ident(x)
-  def vval_pint(self, x): return self.ident(x)
-  def vval_sizet(self, x): return self.ident(x)
-  def vval_hello(self, x): return self.ident(x)
-  def vval_myint(self, x): return self.ident(x)
-
-  def vref_bool(self, x): return self.ident(x)
-  def vref_schar(self, x): return self.ident(x)
-  def vref_uchar(self, x): return self.ident(x)
-  def vref_int(self, x): return self.ident(x)
-  def vref_uint(self, x): return self.ident(x)
-  def vref_short(self, x): return self.ident(x)
-  def vref_ushort(self, x): return self.ident(x)
-  def vref_long(self, x): return self.ident(x)
-  def vref_ulong(self, x): return self.ident(x)
-  def vref_llong(self, x): return self.ident(x)
-  def vref_ullong(self, x): return self.ident(x)
-  def vref_float(self, x): return self.ident(x)
-  def vref_double(self, x): return self.ident(x)
-  def vref_char(self, x): return self.ident(x)
-  def vref_pchar(self, x): return self.ident(x)
-  def vref_pcharc(self, x): return self.ident(x)
-  def vref_pint(self, x): return self.ident(x)
-  def vref_sizet(self, x): return self.ident(x)
-  def vref_hello(self, x): return self.ident(x)
-  def vref_myint(self, x): return self.ident(x)
-
-  pass
 
 
 t = Test()
@@ -111,7 +172,7 @@ p = PyTest()
 
 # internal call check
 if t.c_check() != p.c_check():
-  raise RuntimeError, "bad director"
+    raise RuntimeError, "bad director"
 
 p.var_bool = p.stc_bool
 p.var_schar = p.stc_schar
@@ -166,63 +227,63 @@ t.v_check()
 
 # this value contains a '0' char!
 if def_namet != 'hola':
-  print "bad namet", def_namet
-  raise RuntimeError
+    print "bad namet", def_namet
+    raise RuntimeError
 
 t.var_namet = def_namet
 if t.var_namet != def_namet:
-  print "bad namet", t.var_namet, def_namet
-  raise RuntimeError
+    print "bad namet", t.var_namet, def_namet
+    raise RuntimeError
 
 t.var_namet = 'hola'
 
 if t.var_namet != 'hola':
-  print "bad namet", t.var_namet
-  raise RuntimeError
+    print "bad namet", t.var_namet
+    raise RuntimeError
 
 t.var_namet = 'hol'
 
 if t.var_namet != 'hol':
-#if t.var_namet != 'hol\0\0':
-  print "bad namet", t.var_namet
-  raise RuntimeError
+    # if t.var_namet != 'hol\0\0':
+    print "bad namet", t.var_namet
+    raise RuntimeError
 
 
 cvar.var_char = '\0'
 if cvar.var_char != '\0':
-  raise RuntimeError, "bad char '0' case"
-  
+    raise RuntimeError, "bad char '0' case"
+
 cvar.var_char = 0
 if cvar.var_char != '\0':
-  raise RuntimeError, "bad char '0' case"
+    raise RuntimeError, "bad char '0' case"
 
 cvar.var_namet = '\0'
-#if cvar.var_namet != '\0\0\0\0\0':
+# if cvar.var_namet != '\0\0\0\0\0':
 if cvar.var_namet != '':
-  print 'hola', '', cvar.var_namet
-  raise RuntimeError, "bad char '\0' case"
+    print 'hola', '', cvar.var_namet
+    raise RuntimeError, "bad char '\0' case"
 
 cvar.var_namet = ''
-#if cvar.var_namet != '\0\0\0\0\0':
+# if cvar.var_namet != '\0\0\0\0\0':
 if cvar.var_namet != '':
-  raise RuntimeError, "bad char empty case"
+    raise RuntimeError, "bad char empty case"
 
 cvar.var_pchar = None
 if cvar.var_pchar != None:
-  raise RuntimeError, "bad None case"
+    raise RuntimeError, "bad None case"
 
 cvar.var_pchar = ''
 if cvar.var_pchar != '':
-  print '%c' % (cvar.var_pchar[0],)
-  raise RuntimeError, "bad char empty case"
+    print '%c' % (cvar.var_pchar[0],)
+    raise RuntimeError, "bad char empty case"
 
 cvar.var_pcharc = None
 if cvar.var_pcharc != None:
-  raise RuntimeError, "bad None case"
+    raise RuntimeError, "bad None case"
 
 cvar.var_pcharc = ''
 if cvar.var_pcharc != '':
-  raise RuntimeError, "bad char empty case"
+    raise RuntimeError, "bad char empty case"
 
 
 #
@@ -238,13 +299,13 @@ pchar_setitem(pc, 4, 0)
 
 cvar.var_pchar = pc
 if cvar.var_pchar != "hola":
-  print cvar.var_pchar
-  raise RuntimeError, "bad pointer case"
+    print cvar.var_pchar
+    raise RuntimeError, "bad pointer case"
 
 cvar.var_namet = pc
-#if cvar.var_namet != "hola\0":
+# if cvar.var_namet != "hola\0":
 if cvar.var_namet != "hola":
-  raise RuntimeError, "bad pointer case"
+    raise RuntimeError, "bad pointer case"
 
 delete_pchar(pc)
 
@@ -254,125 +315,124 @@ delete_pchar(pc)
 
 
 try:
-  error = 0
-  a = t.var_uchar
-  t.var_uchar = 10000
-  error = 1
-except OverflowError:
-  if a != t.var_uchar:
+    error = 0
+    a = t.var_uchar
+    t.var_uchar = 10000
     error = 1
-  pass
+except OverflowError:
+    if a != t.var_uchar:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad uchar typemap"
-
+    raise RuntimeError, "bad uchar typemap"
 
 
 try:
-  error = 0
-  a = t.var_char
-  t.var_char = '23'
-  error = 1
+    error = 0
+    a = t.var_char
+    t.var_char = '23'
+    error = 1
 except TypeError:
-  if a != t.var_char:
-    error = 1
-  pass
+    if a != t.var_char:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad char typemap"
+    raise RuntimeError, "bad char typemap"
 
 try:
-  error = 0
-  a = t.var_ushort
-  t.var_ushort = -1
-  error = 1
-except OverflowError:
-  if a != t.var_ushort:
+    error = 0
+    a = t.var_ushort
+    t.var_ushort = -1
     error = 1
-  pass
+except OverflowError:
+    if a != t.var_ushort:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad ushort typemap"
+    raise RuntimeError, "bad ushort typemap"
 
 try:
-  error = 0
-  a = t.var_uint
-  t.var_uint = -1
-  error = 1
-except OverflowError:
-  if a != t.var_uint:
+    error = 0
+    a = t.var_uint
+    t.var_uint = -1
     error = 1
-  pass
+except OverflowError:
+    if a != t.var_uint:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad uint typemap"
+    raise RuntimeError, "bad uint typemap"
 
 try:
-  error = 0
-  a = t.var_sizet
-  t.var_sizet = -1
-  error = 1
-except OverflowError:
-  if a != t.var_sizet:
+    error = 0
+    a = t.var_sizet
+    t.var_sizet = -1
     error = 1
-  pass
+except OverflowError:
+    if a != t.var_sizet:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad sizet typemap"
+    raise RuntimeError, "bad sizet typemap"
 
 try:
-  error = 0
-  a = t.var_ulong
-  t.var_ulong = -1
-  error = 1
-except OverflowError:
-  if a != t.var_ulong:
+    error = 0
+    a = t.var_ulong
+    t.var_ulong = -1
     error = 1
-  pass
+except OverflowError:
+    if a != t.var_ulong:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad ulong typemap"
+    raise RuntimeError, "bad ulong typemap"
 
 #
 #
 try:
-  error = 0
-  a = t.var_namet
-  t.var_namet = '123456'
-  error = 1
-except TypeError:
-  if a != t.var_namet:
+    error = 0
+    a = t.var_namet
+    t.var_namet = '123456'
     error = 1
-  pass
+except TypeError:
+    if a != t.var_namet:
+        error = 1
+    pass
 if error:
-  raise RuntimeError, "bad namet typemap"
+    raise RuntimeError, "bad namet typemap"
 
 #
 #
 #
 t2 = p.vtest(t)
-if t.var_namet !=  t2.var_namet:
-  raise RuntimeError, "bad SWIGTYPE* typemap"
-  
+if t.var_namet != t2.var_namet:
+    raise RuntimeError, "bad SWIGTYPE* typemap"
+
 
 if cvar.fixsize != 'ho\0la\0\0\0':
-  raise RuntimeError, "bad FIXSIZE typemap"
+    raise RuntimeError, "bad FIXSIZE typemap"
 
 cvar.fixsize = 'ho'
 if cvar.fixsize != 'ho\0\0\0\0\0\0':
-  raise RuntimeError, "bad FIXSIZE typemap"
+    raise RuntimeError, "bad FIXSIZE typemap"
 
 
 f = Foo(3)
 f1 = fptr_val(f)
 f2 = fptr_ref(f)
 if f1._a != f2._a:
-  raise RuntimeError, "bad const ptr& typemap"
-  
+    raise RuntimeError, "bad const ptr& typemap"
 
-v = char_foo(1,3)
-if v !=3:
-  raise RuntimeError, "bad int typemap"
 
-s = char_foo(1,"hello")
-if s !="hello":
-  raise RuntimeError, "bad char* typemap"
-  
+v = char_foo(1, 3)
+if v != 3:
+    raise RuntimeError, "bad int typemap"
 
-v = SetPos(1,3)
-if v !=4:
-  raise RuntimeError, "bad int typemap"
+s = char_foo(1, "hello")
+if s != "hello":
+    raise RuntimeError, "bad char* typemap"
+
+
+v = SetPos(1, 3)
+if v != 4:
+    raise RuntimeError, "bad int typemap"
diff --git a/Examples/test-suite/python/profiletest_runme.py b/Examples/test-suite/python/profiletest_runme.py
index d4f07dc11..1e5851e88 100644
--- a/Examples/test-suite/python/profiletest_runme.py
+++ b/Examples/test-suite/python/profiletest_runme.py
@@ -1,5 +1,5 @@
-import _profiletest       
-import profiletest       
+import _profiletest
+import profiletest
 
 a = profiletest.A()
 print a
@@ -9,24 +9,24 @@ b = profiletest.B()
 fn = b.fn
 i = 50000
 while i:
-  a = fn(a) #1
-  a = fn(a) #2
-  a = fn(a) #3
-  a = fn(a) #4
-  a = fn(a) #5
-  a = fn(a) #6
-  a = fn(a) #7
-  a = fn(a) #8
-  a = fn(a) #9
-  a = fn(a) #10
-  a = fn(a) #1
-  a = fn(a) #2
-  a = fn(a) #3
-  a = fn(a) #4
-  a = fn(a) #5
-  a = fn(a) #6
-  a = fn(a) #7
-  a = fn(a) #8
-  a = fn(a) #9
-  a = fn(a) #20
-  i -= 1
+    a = fn(a)  # 1
+    a = fn(a)  # 2
+    a = fn(a)  # 3
+    a = fn(a)  # 4
+    a = fn(a)  # 5
+    a = fn(a)  # 6
+    a = fn(a)  # 7
+    a = fn(a)  # 8
+    a = fn(a)  # 9
+    a = fn(a)  # 10
+    a = fn(a)  # 1
+    a = fn(a)  # 2
+    a = fn(a)  # 3
+    a = fn(a)  # 4
+    a = fn(a)  # 5
+    a = fn(a)  # 6
+    a = fn(a)  # 7
+    a = fn(a)  # 8
+    a = fn(a)  # 9
+    a = fn(a)  # 20
+    i -= 1
diff --git a/Examples/test-suite/python/profiletestc_runme.py b/Examples/test-suite/python/profiletestc_runme.py
index 33461e484..fe64f969a 100644
--- a/Examples/test-suite/python/profiletestc_runme.py
+++ b/Examples/test-suite/python/profiletestc_runme.py
@@ -1,54 +1,54 @@
-import _profiletest       
-#import profiletest       
+import _profiletest
+#import profiletest
 
 pa = _profiletest.new_A()
-pb  = _profiletest.new_B()
+pb = _profiletest.new_B()
 fn = _profiletest.B_fn
 destroy = _profiletest.delete_A
 i = 50000
 a = pa
 while i:
-  a = fn(pb,a) #1
-  destroy(a)
-  a = fn(pb,a) #2
-  destroy(a)
-  a = fn(pb,a) #3
-  destroy(a)
-  a = fn(pb,a) #4
-  destroy(a)
-  a = fn(pb,a) #5
-  destroy(a)
-  a = fn(pb,a) #6
-  destroy(a)
-  a = fn(pb,a) #7
-  destroy(a)
-  a = fn(pb,a) #8
-  destroy(a)
-  a = fn(pb,a) #9
-  destroy(a)
-  a = fn(pb,a) #10
-  destroy(a)
-  a = fn(pb,a) #1
-  destroy(a)
-  a = fn(pb,a) #2
-  destroy(a)
-  a = fn(pb,a) #3
-  destroy(a)
-  a = fn(pb,a) #4
-  destroy(a)
-  a = fn(pb,a) #5
-  destroy(a)
-  a = fn(pb,a) #6
-  destroy(a)
-  a = fn(pb,a) #7
-  destroy(a)
-  a = fn(pb,a) #8
-  destroy(a)
-  a = fn(pb,a) #9
-  destroy(a)
-  a = fn(pb,a) #20
-  destroy(a)
-  i -= 1
+    a = fn(pb, a)  # 1
+    destroy(a)
+    a = fn(pb, a)  # 2
+    destroy(a)
+    a = fn(pb, a)  # 3
+    destroy(a)
+    a = fn(pb, a)  # 4
+    destroy(a)
+    a = fn(pb, a)  # 5
+    destroy(a)
+    a = fn(pb, a)  # 6
+    destroy(a)
+    a = fn(pb, a)  # 7
+    destroy(a)
+    a = fn(pb, a)  # 8
+    destroy(a)
+    a = fn(pb, a)  # 9
+    destroy(a)
+    a = fn(pb, a)  # 10
+    destroy(a)
+    a = fn(pb, a)  # 1
+    destroy(a)
+    a = fn(pb, a)  # 2
+    destroy(a)
+    a = fn(pb, a)  # 3
+    destroy(a)
+    a = fn(pb, a)  # 4
+    destroy(a)
+    a = fn(pb, a)  # 5
+    destroy(a)
+    a = fn(pb, a)  # 6
+    destroy(a)
+    a = fn(pb, a)  # 7
+    destroy(a)
+    a = fn(pb, a)  # 8
+    destroy(a)
+    a = fn(pb, a)  # 9
+    destroy(a)
+    a = fn(pb, a)  # 20
+    destroy(a)
+    i -= 1
 
 _profiletest.delete_A(pa)
 _profiletest.delete_B(pb)
diff --git a/Examples/test-suite/python/python_abstractbase_runme3.py b/Examples/test-suite/python/python_abstractbase_runme3.py
index 9b189964d..b4a20f085 100644
--- a/Examples/test-suite/python/python_abstractbase_runme3.py
+++ b/Examples/test-suite/python/python_abstractbase_runme3.py
@@ -4,7 +4,7 @@ from collections import *
 # This is expected to fail with -builtin option
 # Builtin types can't inherit from pure-python abstract bases
 if is_python_builtin():
-  exit(0)
+    exit(0)
 
 assert issubclass(Mapii, MutableMapping)
 assert issubclass(Multimapii, MutableMapping)
@@ -19,4 +19,3 @@ intset = IntSet()
 intmultiset = IntMultiset()
 intvector = IntVector()
 intlist = IntList()
-
diff --git a/Examples/test-suite/python/python_append_runme.py b/Examples/test-suite/python/python_append_runme.py
index 15b0297e9..2f6d94d9c 100644
--- a/Examples/test-suite/python/python_append_runme.py
+++ b/Examples/test-suite/python/python_append_runme.py
@@ -1,22 +1,22 @@
 from python_append import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 # test not relevant for -builtin
 if is_python_builtin():
-  exit(0)
+    exit(0)
 
-t=Test()
+t = Test()
 t.func()
 if is_new_style_class(Test):
-  t.static_func()
+    t.static_func()
 else:
-  Test_static_func()
+    Test_static_func()
 
 if grabpath() != os.path.dirname(mypath):
-  raise RuntimeError("grabpath failed")
+    raise RuntimeError("grabpath failed")
 
 if grabstaticpath() != os.path.basename(mypath):
-  raise RuntimeError("grabstaticpath failed")
-
+    raise RuntimeError("grabstaticpath failed")
diff --git a/Examples/test-suite/python/python_nondynamic_runme.py b/Examples/test-suite/python/python_nondynamic_runme.py
index b860ba0d7..6a430961e 100644
--- a/Examples/test-suite/python/python_nondynamic_runme.py
+++ b/Examples/test-suite/python/python_nondynamic_runme.py
@@ -5,42 +5,44 @@ aa = python_nondynamic.A()
 aa.a = 1
 aa.b = 2
 try:
-  aa.c = 2
-  err = 0
+    aa.c = 2
+    err = 0
 except:
-  err = 1
+    err = 1
+
+if not err:
+    raise RuntimeError, "A is not static"
 
-if not err:  
-  raise RuntimeError, "A is not static"  
 
 class B(python_nondynamic.A):
-  c = 4
-  def __init__(self):
-    python_nondynamic.A.__init__(self)
+    c = 4
+
+    def __init__(self):
+        python_nondynamic.A.__init__(self)
+        pass
     pass
-  pass
 
 bb = B()
 
 try:
-  bb.c = 3
-  err = 0
+    bb.c = 3
+    err = 0
 except:
-  err = 1
+    err = 1
 
 if not err:
-  print "bb.c = %d" % bb.c
-  print "B.c = %d" % B.c
-  raise RuntimeError, "B.c class variable messes up nondynamic-ness of B"
+    print "bb.c = %d" % bb.c
+    print "B.c = %d" % B.c
+    raise RuntimeError, "B.c class variable messes up nondynamic-ness of B"
 
 try:
-  bb.d = 2
-  err = 0
+    bb.d = 2
+    err = 0
 except:
-  err = 1
+    err = 1
+
+if not err:
+    raise RuntimeError, "B is not static"
 
-if not err:  
-  raise RuntimeError, "B is not static"  
-      
 cc = python_nondynamic.C()
 cc.d = 3
diff --git a/Examples/test-suite/python/python_overload_simple_cast_runme.py b/Examples/test-suite/python/python_overload_simple_cast_runme.py
index 1b3a5482c..79ef6cd2e 100644
--- a/Examples/test-suite/python/python_overload_simple_cast_runme.py
+++ b/Examples/test-suite/python/python_overload_simple_cast_runme.py
@@ -1,16 +1,20 @@
 from python_overload_simple_cast import *
 
+
 class Ai:
-    def __init__(self,x):
+
+    def __init__(self, x):
         self.x = x
-        
+
     def __int__(self):
         return self.x
 
+
 class Ad:
-    def __init__(self,x):
+
+    def __init__(self, x):
         self.x = x
-        
+
     def __float__(self):
         return self.x
 
@@ -26,7 +30,7 @@ except:
     good = 1
 
 if not good:
-    raise RuntimeError, "fint(int)"    
+    raise RuntimeError, "fint(int)"
 
 
 if fint(ad) != "fint:int":
@@ -40,7 +44,7 @@ if fint(ai) != "fint:int":
 
 if fint(5.0) != "fint:int":
     raise RuntimeError, "fint(int)"
-    
+
 if fint(3) != "fint:int":
     raise RuntimeError, "fint(int)"
 if fint(3.0) != "fint:int":
@@ -53,20 +57,19 @@ if fdouble(3) != "fdouble:double":
 if fdouble(3.0) != "fdouble:double":
     raise RuntimeError, "fdouble(double)"
 
-if fid(3,3.0) != "fid:intdouble":
+if fid(3, 3.0) != "fid:intdouble":
     raise RuntimeError, "fid:intdouble"
 
-if fid(3.0,3) != "fid:doubleint":
+if fid(3.0, 3) != "fid:doubleint":
     raise RuntimeError, "fid:doubleint"
 
-if fid(ad,ai) != "fid:doubleint":
+if fid(ad, ai) != "fid:doubleint":
     raise RuntimeError, "fid:doubleint"
 
-if fid(ai,ad) != "fid:intdouble":
+if fid(ai, ad) != "fid:intdouble":
     raise RuntimeError, "fid:intdouble"
 
 
-
 if foo(3) != "foo:int":
     raise RuntimeError, "foo(int)"
 
@@ -137,7 +140,7 @@ if s.type != "none":
 s = Spam(3)
 if s.type != "int":
     raise RuntimeError, "Spam(int)"
-    
+
 s = Spam(3.4)
 if s.type != "double":
     raise RuntimeError, "Spam(double)"
@@ -160,7 +163,7 @@ if s.type != "void *":
 
 
 # unsigned long long
-ullmax = 9223372036854775807 #0xffffffffffffffff
+ullmax = 9223372036854775807  # 0xffffffffffffffff
 ullmaxd = 9007199254740992.0
 ullmin = 0
 ullmind = 0.0
@@ -174,7 +177,7 @@ if ull(ullmaxd) != ullmaxd:
     raise RuntimeError, "ull(ullmaxd)"
 
 # long long
-llmax = 9223372036854775807 #0x7fffffffffffffff
+llmax = 9223372036854775807  # 0x7fffffffffffffff
 llmin = -9223372036854775808
 # these are near the largest  floats we can still convert into long long
 llmaxd = 9007199254740992.0
diff --git a/Examples/test-suite/python/python_pybuf_runme3.py b/Examples/test-suite/python/python_pybuf_runme3.py
index 152aecdc0..4e57b69e8 100644
--- a/Examples/test-suite/python/python_pybuf_runme3.py
+++ b/Examples/test-suite/python/python_pybuf_runme3.py
@@ -1,42 +1,41 @@
-#run: 
+# run:
 #  python python_pybuf_runme3.py benchmark
-#for the benchmark, other wise the test case will be run
+# for the benchmark, other wise the test case will be run
 import python_pybuf
 import sys
-if len(sys.argv)>=2 and sys.argv[1]=="benchmark":
-    #run the benchmark
+if len(sys.argv) >= 2 and sys.argv[1] == "benchmark":
+    # run the benchmark
     import time
-    k=1000000 #number of times to excute the functions
+    k = 1000000  # number of times to excute the functions
 
-    t=time.time()
+    t = time.time()
     a = bytearray(b'hello world')
     for i in range(k):
-      pybuf.title1(a)
-    print("Time used by bytearray:",time.time()-t)
+        pybuf.title1(a)
+    print("Time used by bytearray:", time.time() - t)
 
-    t=time.time()
+    t = time.time()
     b = 'hello world'
     for i in range(k):
-      pybuf.title2(b)
-    print("Time used by string:",time.time()-t)
+        pybuf.title2(b)
+    print("Time used by string:", time.time() - t)
 else:
-    #run the test case
+    # run the test case
     buf1 = bytearray(10)
     buf2 = bytearray(50)
 
     pybuf.func1(buf1)
-    assert buf1 == b'a'*10
+    assert buf1 == b'a' * 10
 
     pybuf.func2(buf2)
     assert buf2.startswith(b"Hello world!\x00")
 
     count = pybuf.func3(buf2)
-    assert count==10 #number of alpha and number in 'Hello world!'
+    assert count == 10  # number of alpha and number in 'Hello world!'
 
     length = pybuf.func4(buf2)
-    assert length==12
+    assert length == 12
 
     buf3 = bytearray(b"hello")
     pybuf.title1(buf3)
-    assert buf3==b'Hello'
-    
+    assert buf3 == b'Hello'
diff --git a/Examples/test-suite/python/python_richcompare_runme.py b/Examples/test-suite/python/python_richcompare_runme.py
index e077989cc..a68da2f98 100644
--- a/Examples/test-suite/python/python_richcompare_runme.py
+++ b/Examples/test-suite/python/python_richcompare_runme.py
@@ -11,90 +11,96 @@ b2 = python_richcompare.SubClassB(2)
 b3 = python_richcompare.SubClassB(3)
 
 # Check == and != within a single type
-#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
 
-if not (base1 == base1) :
+if not (base1 == base1):
     raise RuntimeError("Object not == to itself")
 
-if not (base1 == python_richcompare.BaseClass(1)) :
+if not (base1 == python_richcompare.BaseClass(1)):
     raise RuntimeError("Object not == to an equivalent object")
 
-if (base1 == base2) :
-    raise RuntimeError("Comparing non-equivalent objects of the same type, == returned True")
+if (base1 == base2):
+    raise RuntimeError(
+        "Comparing non-equivalent objects of the same type, == returned True")
 
-if (base1 != base1) :
+if (base1 != base1):
     raise RuntimeError("Object is != itself")
 
-if (base1 != python_richcompare.BaseClass(1)) :
+if (base1 != python_richcompare.BaseClass(1)):
     raise RuntimeError("Object is != an equivalent object")
 
-if not (base1 != base2) :
-    raise RuntimeError("Comparing non-equivalent objects of the same type, != returned False")
+if not (base1 != base2):
+    raise RuntimeError(
+        "Comparing non-equivalent objects of the same type, != returned False")
 
 
 # Check redefined operator== in SubClassA
-#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
 
-if (a2 == base2) :
+if (a2 == base2):
     raise RuntimeError("Redefined operator== in SubClassA failed")
 
-if (a2 == b2) :
+if (a2 == b2):
     raise RuntimeError("Redefined operator== in SubClassA failed")
 
-if not (a1 == a2) :
+if not (a1 == a2):
     raise RuntimeError("Redefined operator== in SubClassA failed")
 
 # Check up-casting of subclasses
-#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
 
-if (base2 != a2) :
-    raise RuntimeError("Comparing equivalent base and subclass instances, != returned True")
+if (base2 != a2):
+    raise RuntimeError(
+        "Comparing equivalent base and subclass instances, != returned True")
 
-if (a2 == base2) :
-    raise RuntimeError("Comparing non-equivalent base and subclass instances, == returned True")
+if (a2 == base2):
+    raise RuntimeError(
+        "Comparing non-equivalent base and subclass instances, == returned True")
 
-if (a1 == b1) :
-    raise RuntimeError("Comparing equivalent instances of different subclasses, == returned True")
+if (a1 == b1):
+    raise RuntimeError(
+        "Comparing equivalent instances of different subclasses, == returned True")
+
+if (b1 == a1):
+    raise RuntimeError(
+        "Comparing equivalent instances of different subclasses, == returned True")
 
-if (b1 == a1) :
-    raise RuntimeError("Comparing equivalent instances of different subclasses, == returned True")
-    
 # Check inequalities
-#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
 
-if (a2 > b2) :
+if (a2 > b2):
     raise RuntimeError("operator> failed")
 
-if (a2 < b2) :
+if (a2 < b2):
     raise RuntimeError("operator< failed")
 
-if not (a2 >= b2) :
+if not (a2 >= b2):
     raise RuntimeError("operator>= failed")
 
-if not (a2 <= b2) :
+if not (a2 <= b2):
     raise RuntimeError("operator<= failed")
 
 # Check inequalities used for ordering
-#-------------------------------------------------------------------------------
+#-------------------------------------------------------------------------
 
 x = sorted([a2, a3, a1])
 
-if not (x[0] is a1) :
+if not (x[0] is a1):
     raise RuntimeError("Ordering failed")
 
-if not (x[1] is a2) :
+if not (x[1] is a2):
     raise RuntimeError("Ordering failed")
 
-if not (x[2] is a3) :
+if not (x[2] is a3):
     raise RuntimeError("Ordering failed")
 
 x = sorted([base2, a3, b1])
 
-if not (x[0] is b1) :
+if not (x[0] is b1):
     raise RuntimeError("Ordering failed")
 
-if not (x[1] is base2) :
+if not (x[1] is base2):
     raise RuntimeError("Ordering failed")
 
-if not (x[2] is a3) :
+if not (x[2] is a3):
     raise RuntimeError("Ordering failed")
diff --git a/Examples/test-suite/python/python_threads_runme.py b/Examples/test-suite/python/python_threads_runme.py
index d00e2458f..74cd0552b 100644
--- a/Examples/test-suite/python/python_threads_runme.py
+++ b/Examples/test-suite/python/python_threads_runme.py
@@ -3,8 +3,9 @@ from python_threads import *
 action = ActionGroup()
 count = 1
 for child in action.GetActionList():
-  if child.val != count:
-    raise RuntimeError("Expected: " + str(count) + " got: " + str(child.val))
-  count = count + 1
+    if child.val != count:
+        raise RuntimeError(
+            "Expected: " + str(count) + " got: " + str(child.val))
+    count = count + 1
 
 # Was seg faulting at the end here
diff --git a/Examples/test-suite/python/python_varargs_typemap_runme.py b/Examples/test-suite/python/python_varargs_typemap_runme.py
index 65be757c8..f3a70e825 100644
--- a/Examples/test-suite/python/python_varargs_typemap_runme.py
+++ b/Examples/test-suite/python/python_varargs_typemap_runme.py
@@ -1,7 +1,7 @@
 import python_varargs_typemap
 
-if (python_varargs_typemap.testfunc(1, 2.0, "three") != "three") :
+if (python_varargs_typemap.testfunc(1, 2.0, "three") != "three"):
     raise RuntimeError("testfunc failed!")
 
-if (python_varargs_typemap.testfunc(1, 2.0, "three", "four", "five") != "threefourfive") :
+if (python_varargs_typemap.testfunc(1, 2.0, "three", "four", "five") != "threefourfive"):
     raise RuntimeError("testfunc failed! {}")
diff --git a/Examples/test-suite/python/refcount_runme.py b/Examples/test-suite/python/refcount_runme.py
index ca15e04ac..2cab6a77e 100644
--- a/Examples/test-suite/python/refcount_runme.py
+++ b/Examples/test-suite/python/refcount_runme.py
@@ -8,16 +8,15 @@ b1 = B(a)
 b2 = B_create(a)
 
 
-
 if a.ref_count() != 3:
-  raise RuntimeError("Count = %d" % a.ref_count())
+    raise RuntimeError("Count = %d" % a.ref_count())
 
 
 rca = b2.get_rca()
 b3 = B_create(rca)
 
 if a.ref_count() != 5:
-  raise RuntimeError("Count = %d" % a.ref_count())
+    raise RuntimeError("Count = %d" % a.ref_count())
 
 
 v = vector_A(2)
@@ -28,28 +27,28 @@ x = v[0]
 del v
 
 if a.ref_count() != 6:
-  raise RuntimeError("Count = %d" % a.ref_count())
+    raise RuntimeError("Count = %d" % a.ref_count())
 
 # Check %newobject
 b4 = b2.cloner()
 if b4.ref_count() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 b5 = global_create(a)
 if b5.ref_count() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 b6 = Factory_create(a)
 if b6.ref_count() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 b7 = Factory().create2(a)
 if b7.ref_count() != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 
 if a.ref_count() != 10:
-  raise RuntimeError("Count = %d" % a.ref_count())
+    raise RuntimeError("Count = %d" % a.ref_count())
 
 del b4
 del b5
@@ -57,5 +56,4 @@ del b6
 del b7
 
 if a.ref_count() != 6:
-  raise RuntimeError("Count = %d" % a.ref_count())
-
+    raise RuntimeError("Count = %d" % a.ref_count())
diff --git a/Examples/test-suite/python/reference_global_vars_runme.py b/Examples/test-suite/python/reference_global_vars_runme.py
index 98aaec5fe..6c2d181ac 100644
--- a/Examples/test-suite/python/reference_global_vars_runme.py
+++ b/Examples/test-suite/python/reference_global_vars_runme.py
@@ -71,4 +71,3 @@ if value_double(cvar.var_double) != 10.5:
 cvar.var_TestClass = createref_TestClass(TestClass(20))
 if value_TestClass(cvar.var_TestClass).num != 20:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/rename_pcre_encoder_runme.py b/Examples/test-suite/python/rename_pcre_encoder_runme.py
index 419acd1a1..aa60e4b18 100644
--- a/Examples/test-suite/python/rename_pcre_encoder_runme.py
+++ b/Examples/test-suite/python/rename_pcre_encoder_runme.py
@@ -10,7 +10,7 @@ a = AnotherWidget()
 a.DoSomething()
 
 evt = wxEVTSomeEvent()
-t   = xUnchangedName()
+t = xUnchangedName()
 
 if StartINSAneAndUNSAvoryTraNSAtlanticRaNSAck() != 42:
     raise RuntimeError("Unexpected result of renamed function call")
diff --git a/Examples/test-suite/python/rename_predicates_runme.py b/Examples/test-suite/python/rename_predicates_runme.py
index 2ce097737..2ace8274c 100644
--- a/Examples/test-suite/python/rename_predicates_runme.py
+++ b/Examples/test-suite/python/rename_predicates_runme.py
@@ -8,22 +8,22 @@ r.MF_extend_function_after()
 GF_global_function()
 
 if r.MV_member_variable != 123:
-  raise RuntimeError("variable wrong")
-r.MV_member_variable = 1234;
+    raise RuntimeError("variable wrong")
+r.MV_member_variable = 1234
 if r.MV_member_variable != 1234:
-  raise RuntimeError("variable wrong")
+    raise RuntimeError("variable wrong")
 
 if cvar.RenamePredicates_MV_static_member_variable != 456:
-  raise RuntimeError("variable wrong")
-cvar.RenamePredicates_MV_static_member_variable = 4567;
+    raise RuntimeError("variable wrong")
+cvar.RenamePredicates_MV_static_member_variable = 4567
 if cvar.RenamePredicates_MV_static_member_variable != 4567:
-  raise RuntimeError("variable wrong")
+    raise RuntimeError("variable wrong")
 
 if cvar.GV_global_variable != 789:
-  raise RuntimeError("variable wrong")
-cvar.GV_global_variable = 7890;
+    raise RuntimeError("variable wrong")
+cvar.GV_global_variable = 7890
 if cvar.GV_global_variable != 7890:
-  raise RuntimeError("variable wrong")
+    raise RuntimeError("variable wrong")
 
 UC_UPPERCASE()
 LC_lowercase()
diff --git a/Examples/test-suite/python/rename_strip_encoder_runme.py b/Examples/test-suite/python/rename_strip_encoder_runme.py
index 64be611d6..010c14246 100644
--- a/Examples/test-suite/python/rename_strip_encoder_runme.py
+++ b/Examples/test-suite/python/rename_strip_encoder_runme.py
@@ -3,4 +3,3 @@ from rename_strip_encoder import *
 s = SomeWidget()
 a = AnotherWidget()
 a.DoSomething()
-
diff --git a/Examples/test-suite/python/return_const_value_runme.py b/Examples/test-suite/python/return_const_value_runme.py
index 932c4822c..947102840 100644
--- a/Examples/test-suite/python/return_const_value_runme.py
+++ b/Examples/test-suite/python/return_const_value_runme.py
@@ -3,10 +3,10 @@ import sys
 
 p = return_const_value.Foo_ptr_getPtr()
 if (p.getVal() != 17):
-	print "Runtime test1 faild. p.getVal()=", p.getVal()
-	sys.exit(1)
+    print "Runtime test1 faild. p.getVal()=", p.getVal()
+    sys.exit(1)
 
 p = return_const_value.Foo_ptr_getConstPtr()
 if (p.getVal() != 17):
-	print "Runtime test2 faild. p.getVal()=", p.getVal()
-	sys.exit(1)
+    print "Runtime test2 faild. p.getVal()=", p.getVal()
+    sys.exit(1)
diff --git a/Examples/test-suite/python/smart_pointer_const_overload_runme.py b/Examples/test-suite/python/smart_pointer_const_overload_runme.py
index 098e5b4c3..9cec1da9f 100644
--- a/Examples/test-suite/python/smart_pointer_const_overload_runme.py
+++ b/Examples/test-suite/python/smart_pointer_const_overload_runme.py
@@ -3,115 +3,116 @@ from smart_pointer_const_overload import *
 CONST_ACCESS = 1
 MUTABLE_ACCESS = 2
 
+
 def test(b, f):
-  if f.x != 0:
-    raise RuntimeError
+    if f.x != 0:
+        raise RuntimeError
 
-  # Test member variable get
-  if b.x != 0:
-    raise RuntimeError
-    
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
+    # Test member variable get
+    if b.x != 0:
+        raise RuntimeError
 
-  # Test member variable set
-  b.x = 1
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
 
-  if f.x != 1:
-    raise RuntimeError
-  
-  if f.access != MUTABLE_ACCESS:
-    raise RuntimeError
-  
-  # Test const method
-  if b.getx() != 1:
-    raise RuntimeError
-  
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
-  
-  # Test mutable method
-  b.setx(2)
+    # Test member variable set
+    b.x = 1
 
-  if f.x != 2:
-    raise RuntimeError
-  
-  if f.access != MUTABLE_ACCESS:
-    raise RuntimeError
-  
-  # Test extended const method
-  if b.getx2() != 2:
-    raise RuntimeError
-  
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
-  
-  # Test extended mutable method
-  b.setx2(3)
+    if f.x != 1:
+        raise RuntimeError
 
-  if f.x != 3:
-    raise RuntimeError
-  
-  if f.access != MUTABLE_ACCESS:
-    raise RuntimeError
-    
-  # Test static method
-  b.statMethod()
+    if f.access != MUTABLE_ACCESS:
+        raise RuntimeError
 
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
+    # Test const method
+    if b.getx() != 1:
+        raise RuntimeError
 
-  # Test const member
-  f.access = MUTABLE_ACCESS
-  
-  if b.y != 0:
-    raise RuntimeError
-    
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
-  
-  # Test get through mutable pointer to const member
-  f.access = MUTABLE_ACCESS
-  
-  if get_int(b.yp) != 0:
-    raise RuntimeError
-    
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
 
-  # Test get through const pointer to mutable member
-  f.x = 4
-  f.access = MUTABLE_ACCESS
-  
-  if get_int(b.xp) != 4:
-    raise RuntimeError
-    
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
-    
-  # Test set through const pointer to mutable member
-  f.access = MUTABLE_ACCESS
-  set_int(b.xp, 5)
-  
-  if f.x != 5:
-    raise RuntimeError
-  
-  if f.access != CONST_ACCESS:
-    raise RuntimeError
+    # Test mutable method
+    b.setx(2)
 
-  # Test set pointer to const member
-  b.yp = new_int(6)
-  
-  if f.y != 0:
-    raise RuntimeError
-  
-  if get_int(f.yp) != 6:
-    raise RuntimeError
-  
-  if f.access != MUTABLE_ACCESS:
-    raise RuntimeError
-    
-  delete_int(f.yp);
+    if f.x != 2:
+        raise RuntimeError
+
+    if f.access != MUTABLE_ACCESS:
+        raise RuntimeError
+
+    # Test extended const method
+    if b.getx2() != 2:
+        raise RuntimeError
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test extended mutable method
+    b.setx2(3)
+
+    if f.x != 3:
+        raise RuntimeError
+
+    if f.access != MUTABLE_ACCESS:
+        raise RuntimeError
+
+    # Test static method
+    b.statMethod()
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test const member
+    f.access = MUTABLE_ACCESS
+
+    if b.y != 0:
+        raise RuntimeError
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test get through mutable pointer to const member
+    f.access = MUTABLE_ACCESS
+
+    if get_int(b.yp) != 0:
+        raise RuntimeError
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test get through const pointer to mutable member
+    f.x = 4
+    f.access = MUTABLE_ACCESS
+
+    if get_int(b.xp) != 4:
+        raise RuntimeError
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test set through const pointer to mutable member
+    f.access = MUTABLE_ACCESS
+    set_int(b.xp, 5)
+
+    if f.x != 5:
+        raise RuntimeError
+
+    if f.access != CONST_ACCESS:
+        raise RuntimeError
+
+    # Test set pointer to const member
+    b.yp = new_int(6)
+
+    if f.y != 0:
+        raise RuntimeError
+
+    if get_int(f.yp) != 6:
+        raise RuntimeError
+
+    if f.access != MUTABLE_ACCESS:
+        raise RuntimeError
+
+    delete_int(f.yp)
 
 f = Foo()
 b = Bar(f)
diff --git a/Examples/test-suite/python/smart_pointer_extend_runme.py b/Examples/test-suite/python/smart_pointer_extend_runme.py
index 969757b4c..0b2525081 100644
--- a/Examples/test-suite/python/smart_pointer_extend_runme.py
+++ b/Examples/test-suite/python/smart_pointer_extend_runme.py
@@ -4,7 +4,7 @@ f = Foo()
 b = Bar(f)
 
 if b.extension() != f.extension():
-  raise RuntimeError
+    raise RuntimeError
 
 
 b = CBase()
@@ -12,14 +12,13 @@ d = CDerived()
 p = CPtr()
 
 if b.bar() != p.bar():
-  raise RuntimeError
+    raise RuntimeError
 
 if d.foo() != p.foo():
-  raise RuntimeError
+    raise RuntimeError
 
 if b.hello() != p.hello():
-  raise RuntimeError
-
+    raise RuntimeError
 
 
 d = DFoo()
@@ -27,8 +26,7 @@ d = DFoo()
 dp = DPtrFoo(d)
 
 if d.SExt(1) != dp.SExt(1):
-  raise RuntimeError
+    raise RuntimeError
 
 if d.Ext(1) != dp.Ext(1):
-  raise RuntimeError
-  
+    raise RuntimeError
diff --git a/Examples/test-suite/python/smart_pointer_member_runme.py b/Examples/test-suite/python/smart_pointer_member_runme.py
index 2cf3686fc..ce91da2bd 100644
--- a/Examples/test-suite/python/smart_pointer_member_runme.py
+++ b/Examples/test-suite/python/smart_pointer_member_runme.py
@@ -1,34 +1,29 @@
 from smart_pointer_member import *
 
+
 def is_new_style_class(cls):
-  return hasattr(cls, "__class__")
+    return hasattr(cls, "__class__")
 
 f = Foo()
 f.y = 1
 
 if f.y != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 b = Bar(f)
 b.y = 2
 
 if f.y != 2:
-  print f.y
-  print b.y
-  raise RuntimeError
-
-if b.x != f.x:
-  raise RuntimeError
-
-if b.z != f.z:
-  raise RuntimeError
-
-if is_new_style_class(Bar): # feature not supported in old style classes
-  if Foo.z == Bar.z:
+    print f.y
+    print b.y
     raise RuntimeError
 
+if b.x != f.x:
+    raise RuntimeError
 
+if b.z != f.z:
+    raise RuntimeError
 
-
-
-
+if is_new_style_class(Bar):  # feature not supported in old style classes
+    if Foo.z == Bar.z:
+        raise RuntimeError
diff --git a/Examples/test-suite/python/smart_pointer_multi_runme.py b/Examples/test-suite/python/smart_pointer_multi_runme.py
index c17053055..26c22d449 100644
--- a/Examples/test-suite/python/smart_pointer_multi_runme.py
+++ b/Examples/test-suite/python/smart_pointer_multi_runme.py
@@ -12,4 +12,3 @@ if s.getx() != 3:
 g.x = 4
 if g.getx() != 4:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/smart_pointer_multi_typedef_runme.py b/Examples/test-suite/python/smart_pointer_multi_typedef_runme.py
index ebf4c9b09..3014febcd 100644
--- a/Examples/test-suite/python/smart_pointer_multi_typedef_runme.py
+++ b/Examples/test-suite/python/smart_pointer_multi_typedef_runme.py
@@ -12,4 +12,3 @@ if s.getx() != 3:
 g.x = 4
 if g.getx() != 4:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/smart_pointer_not_runme.py b/Examples/test-suite/python/smart_pointer_not_runme.py
index 4c90b376b..69704c4ef 100644
--- a/Examples/test-suite/python/smart_pointer_not_runme.py
+++ b/Examples/test-suite/python/smart_pointer_not_runme.py
@@ -13,7 +13,7 @@ except:
 
 try:
     x = s.x
-    print "Error! s.x"    
+    print "Error! s.x"
 except:
     pass
 
@@ -25,13 +25,13 @@ except:
 
 try:
     x = b.getx()
-    print "Error! b.getx()"    
+    print "Error! b.getx()"
 except:
     pass
 
 try:
     x = s.getx()
-    print "Error! s.getx()"        
+    print "Error! s.getx()"
 except:
     pass
 
diff --git a/Examples/test-suite/python/smart_pointer_overload_runme.py b/Examples/test-suite/python/smart_pointer_overload_runme.py
index c9fd3a5b0..16f6997fe 100644
--- a/Examples/test-suite/python/smart_pointer_overload_runme.py
+++ b/Examples/test-suite/python/smart_pointer_overload_runme.py
@@ -17,5 +17,3 @@ if b.test(3.5) != 2:
     raise RuntimeError
 if b.test("hello") != 3:
     raise RuntimeError
-
-
diff --git a/Examples/test-suite/python/smart_pointer_rename_runme.py b/Examples/test-suite/python/smart_pointer_rename_runme.py
index c6d22273c..785f69e64 100644
--- a/Examples/test-suite/python/smart_pointer_rename_runme.py
+++ b/Examples/test-suite/python/smart_pointer_rename_runme.py
@@ -9,5 +9,5 @@ if b.test() != 3:
 if b.ftest1(1) != 1:
     raise RuntimeError
 
-if b.ftest2(2,3) != 2:
+if b.ftest2(2, 3) != 2:
     raise RuntimeError
diff --git a/Examples/test-suite/python/smart_pointer_templatevariables_runme.py b/Examples/test-suite/python/smart_pointer_templatevariables_runme.py
index 367dcf3b2..465551480 100644
--- a/Examples/test-suite/python/smart_pointer_templatevariables_runme.py
+++ b/Examples/test-suite/python/smart_pointer_templatevariables_runme.py
@@ -3,15 +3,14 @@ from smart_pointer_templatevariables import *
 d = DiffImContainerPtr_D(create(1234, 5678))
 
 if (d.id != 1234):
-  raise RuntimeError
-#if (d.xyz != 5678):
+    raise RuntimeError
+# if (d.xyz != 5678):
 #  raise RuntimeError
 
 d.id = 4321
 #d.xyz = 8765
 
 if (d.id != 4321):
-  raise RuntimeError
-#if (d.xyz != 8765):
+    raise RuntimeError
+# if (d.xyz != 8765):
 #  raise RuntimeError
-
diff --git a/Examples/test-suite/python/sneaky1_runme.py b/Examples/test-suite/python/sneaky1_runme.py
index 9c2c32f85..c56f56f9e 100644
--- a/Examples/test-suite/python/sneaky1_runme.py
+++ b/Examples/test-suite/python/sneaky1_runme.py
@@ -1,5 +1,5 @@
 import sneaky1
-x = sneaky1.add(3,4)
-y = sneaky1.subtract(3,4)
-z = sneaky1.mul(3,4)
-w = sneaky1.divide(3,4)
+x = sneaky1.add(3, 4)
+y = sneaky1.subtract(3, 4)
+z = sneaky1.mul(3, 4)
+w = sneaky1.divide(3, 4)
diff --git a/Examples/test-suite/python/special_variable_macros_runme.py b/Examples/test-suite/python/special_variable_macros_runme.py
index eaf9c1858..e487f9a50 100644
--- a/Examples/test-suite/python/special_variable_macros_runme.py
+++ b/Examples/test-suite/python/special_variable_macros_runme.py
@@ -2,17 +2,16 @@ import special_variable_macros
 
 name = special_variable_macros.Name()
 if special_variable_macros.testFred(name) != "none":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testJack(name) != "$specialname":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testJill(name) != "jilly":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testMary(name) != "SWIGTYPE_p_NameWrap":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testJames(name) != "SWIGTYPE_Name":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testJim(name) != "multiname num":
-  raise "test failed"
+    raise "test failed"
 if special_variable_macros.testJohn(special_variable_macros.PairIntBool(10, False)) != 123:
-  raise "test failed"
-
+    raise "test failed"
diff --git a/Examples/test-suite/python/static_const_member_2_runme.py b/Examples/test-suite/python/static_const_member_2_runme.py
index 081726361..01704e39c 100644
--- a/Examples/test-suite/python/static_const_member_2_runme.py
+++ b/Examples/test-suite/python/static_const_member_2_runme.py
@@ -12,5 +12,5 @@ except:
     raise RuntimeError
 
 
-if Foo.BAZ.val != 2*Foo.BAR.val:
+if Foo.BAZ.val != 2 * Foo.BAR.val:
     raise RuntimeError
diff --git a/Examples/test-suite/python/std_containers_runme.py b/Examples/test-suite/python/std_containers_runme.py
index f90c98405..d4625daa0 100644
--- a/Examples/test-suite/python/std_containers_runme.py
+++ b/Examples/test-suite/python/std_containers_runme.py
@@ -5,73 +5,72 @@ import std_containers
 cube = (((1, 2), (3, 4)), ((5, 6), (7, 8)))
 
 icube = std_containers.cident(cube)
-for i in range(0,len(cube)):
-  if cube[i] != icube[i]:
-    raise RuntimeError, "bad cident"
+for i in range(0, len(cube)):
+    if cube[i] != icube[i]:
+        raise RuntimeError, "bad cident"
 
 
-p = (1,2)
+p = (1, 2)
 if p != std_containers.pident(p):
-  raise RuntimeError, "bad pident"
+    raise RuntimeError, "bad pident"
 
-v = (1,2,3,4,5,6)
+v = (1, 2, 3, 4, 5, 6)
 iv = std_containers.vident(v)
-for i in range(0,len(v)):
-  if v[i] != iv[i]:
-    raise RuntimeError, "bad vident"
-
+for i in range(0, len(v)):
+    if v[i] != iv[i]:
+        raise RuntimeError, "bad vident"
 
 
 iv = std_containers.videntu(v)
-for i in range(0,len(v)):
-  if v[i] != iv[i]:
-    raise RuntimeError, "bad videntu"
+for i in range(0, len(v)):
+    if v[i] != iv[i]:
+        raise RuntimeError, "bad videntu"
 
 
 vu = std_containers.vector_ui(v)
 if vu[2] != std_containers.videntu(vu)[2]:
-  raise RuntimeError, "bad videntu"
-  
+    raise RuntimeError, "bad videntu"
+
 
 if v[0:3][1] != vu[0:3][1]:
-  print v[0:3][1], vu[0:3][1]
-  raise RuntimeError, "bad getslice"
-  
+    print v[0:3][1], vu[0:3][1]
+    raise RuntimeError, "bad getslice"
 
-m = ((1,2,3),(2,3),(3,4))
+
+m = ((1, 2, 3), (2, 3), (3, 4))
 im = std_containers.midenti(m)
 
-for i in range(0,len(m)):
-  for j in range(0,len(m[i])):
-    if m[i][j] != im[i][j]:
-      raise RuntimeError, "bad getslice"
+for i in range(0, len(m)):
+    for j in range(0, len(m[i])):
+        if m[i][j] != im[i][j]:
+            raise RuntimeError, "bad getslice"
 
-m = ((True,False,True),(True,True),(True,True))
+m = ((True, False, True), (True, True), (True, True))
 im = std_containers.midentb(m)
-for i in range(0,len(m)):
-  for j in range(0,len(m[i])):
-    if m[i][j] != im[i][j]:
-      raise RuntimeError, "bad getslice"
+for i in range(0, len(m)):
+    for j in range(0, len(m[i])):
+        if m[i][j] != im[i][j]:
+            raise RuntimeError, "bad getslice"
 
 
 mi = std_containers.imatrix(m)
 mc = std_containers.cmatrix(m)
 if mi[0][1] != mc[0][1]:
-  raise RuntimeError, "bad matrix"
+    raise RuntimeError, "bad matrix"
 
 
-map ={}
+map = {}
 map['hello'] = 1
 map['hi'] = 2
 map['3'] = 2
 
 imap = std_containers.mapident(map)
 for k in map:
-  if map[k] != imap[k]:
-    raise RuntimeError, "bad map"
+    if map[k] != imap[k]:
+        raise RuntimeError, "bad map"
 
 
-mapc ={}
+mapc = {}
 c1 = std_containers.C()
 c2 = std_containers.C()
 mapc[1] = c1.this
@@ -80,23 +79,23 @@ mapc[2] = c2
 std_containers.mapidentc(mapc)
 
 
-vi = std_containers.vector_i((2,2,3,4))
+vi = std_containers.vector_i((2, 2, 3, 4))
 
 
-v = (1,2)
+v = (1, 2)
 v1 = std_containers.v_inout(vi)
 vi[1], v1[1]
 
-v1,v2 = ((1,2),(3,4))
-v1,v2 = std_containers.v_inout2(v1,v2)
+v1, v2 = ((1, 2), (3, 4))
+v1, v2 = std_containers.v_inout2(v1, v2)
 
 a1 = std_containers.A(1)
 a2 = std_containers.A(2)
 
-p1 = (1,a1)
-p2 = (2,a2)
-v = (p1,p2)
-v2= std_containers.pia_vident(v)
+p1 = (1, a1)
+p2 = (2, a2)
+v = (p1, p2)
+v2 = std_containers.pia_vident(v)
 
 v2[0][1].a
 v2[1][1].a
@@ -110,10 +109,8 @@ s = std_containers.set_i()
 s.append(1)
 s.append(2)
 s.append(3)
-j=1
+j = 1
 for i in s:
-  if i != j:
-    raise RuntimeError
-  j = j + 1
-
-
+    if i != j:
+        raise RuntimeError
+    j = j + 1
diff --git a/Examples/test-suite/python/struct_initialization_runme.py b/Examples/test-suite/python/struct_initialization_runme.py
index fbed6a5e9..524b89630 100644
--- a/Examples/test-suite/python/struct_initialization_runme.py
+++ b/Examples/test-suite/python/struct_initialization_runme.py
@@ -1,20 +1,19 @@
 from struct_initialization import *
 
 if cvar.instanceC1.x != 10:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.instanceD1.x != 10:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.instanceD2.x != 20:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.instanceD3.x != 30:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.instanceE1.x != 1:
-  raise RuntimeError
+    raise RuntimeError
 
 if cvar.instanceF1.x != 1:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/struct_value_runme.py b/Examples/test-suite/python/struct_value_runme.py
index a20e83439..aa3ece38c 100644
--- a/Examples/test-suite/python/struct_value_runme.py
+++ b/Examples/test-suite/python/struct_value_runme.py
@@ -3,28 +3,32 @@ import struct_value
 b = struct_value.Bar()
 
 b.a.x = 3
-if b.a.x != 3: raise RuntimeError
+if b.a.x != 3:
+    raise RuntimeError
 
 b.b.x = 3
-if b.b.x != 3: raise RuntimeError
+if b.b.x != 3:
+    raise RuntimeError
 
 
 # Test dynamically added attributes - Github pull request #320
 b.added = 123
 
 if b.added != 123:
-  raise RuntimeError("Wrong attribute value")
+    raise RuntimeError("Wrong attribute value")
 
 if not b.__dict__.has_key("added"):
-  raise RuntimeError("Missing added attribute in __dict__")
+    raise RuntimeError("Missing added attribute in __dict__")
+
 
 class PyBar(struct_value.Bar):
-  def __init__(self):
-    self.extra = "hi"
-    struct_value.Bar.__init__(self)
+
+    def __init__(self):
+        self.extra = "hi"
+        struct_value.Bar.__init__(self)
 
 pybar = PyBar()
 if not pybar.__dict__.has_key("extra"):
-  raise RuntimeError("Missing extra attribute in __dict__")
+    raise RuntimeError("Missing extra attribute in __dict__")
 if pybar.extra != "hi":
-  raise RuntimeError("Incorrect attribute value for extra")
+    raise RuntimeError("Incorrect attribute value for extra")
diff --git a/Examples/test-suite/python/swigobject_runme.py b/Examples/test-suite/python/swigobject_runme.py
index a906108e3..346b05d40 100644
--- a/Examples/test-suite/python/swigobject_runme.py
+++ b/Examples/test-suite/python/swigobject_runme.py
@@ -1,5 +1,5 @@
 
-from swigobject import  *
+from swigobject import *
 
 a = A()
 
@@ -8,11 +8,12 @@ a1 = a_ptr(a)
 a2 = a_ptr(a)
 
 if a1.this != a2.this:
-  raise RuntimeError
-  
+    raise RuntimeError
+
 
 lthis = long(a.this)
-# match pointer value, but deal with leading zeros on 8/16 bit systems and different C++ compilers interpretation of %p
+# match pointer value, but deal with leading zeros on 8/16 bit systems and
+# different C++ compilers interpretation of %p
 xstr1 = "%016X" % (lthis,)
 xstr1 = str.lstrip(xstr1, '0')
 xstr2 = pointer_str(a)
@@ -22,8 +23,8 @@ xstr2 = str.lstrip(xstr2, '0')
 xstr2 = str.upper(xstr2)
 
 if xstr1 != xstr2:
-  print xstr1, xstr2
-  raise RuntimeError
+    print xstr1, xstr2
+    raise RuntimeError
 
 s = str(a.this)
 r = repr(a.this)
@@ -31,4 +32,4 @@ r = repr(a.this)
 v1 = v_ptr(a)
 v2 = v_ptr(a)
 if long(v1) != long(v2):
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_classes_runme.py b/Examples/test-suite/python/template_classes_runme.py
index 9c04fee95..38b2d7a62 100644
--- a/Examples/test-suite/python/template_classes_runme.py
+++ b/Examples/test-suite/python/template_classes_runme.py
@@ -12,33 +12,33 @@ RectangleInt.static_onearg(1)
 
 fail = True
 try:
-  rectangle.setPoint()
+    rectangle.setPoint()
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 
 fail = True
 try:
-  rectangle.getPoint(0)
+    rectangle.getPoint(0)
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  RectangleInt.static_noargs(0)
+    RectangleInt.static_noargs(0)
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
 
 fail = True
 try:
-  RectangleInt.static_onearg()
+    RectangleInt.static_onearg()
 except TypeError, e:
-  fail = False
+    fail = False
 if fail:
-  raise RuntimeError("argument count check failed")
+    raise RuntimeError("argument count check failed")
diff --git a/Examples/test-suite/python/template_default_arg_runme.py b/Examples/test-suite/python/template_default_arg_runme.py
index 235a2313a..91b1e0e8c 100644
--- a/Examples/test-suite/python/template_default_arg_runme.py
+++ b/Examples/test-suite/python/template_default_arg_runme.py
@@ -7,22 +7,20 @@ helloInt.foo(template_default_arg.Hello_int.hi)
 
 x = template_default_arg.X_int()
 if (x.meth(20.0, 200) != 200):
-  raise RuntimeError, ("X_int test 1 failed")
+    raise RuntimeError, ("X_int test 1 failed")
 if (x.meth(20) != 20):
-  raise RuntimeError, ("X_int test 2 failed")
+    raise RuntimeError, ("X_int test 2 failed")
 if (x.meth() != 0):
-  raise RuntimeError, ("X_int test 3 failed")
-
+    raise RuntimeError, ("X_int test 3 failed")
 
 
 y = template_default_arg.Y_unsigned()
 if (y.meth(20.0, 200) != 200):
-  raise RuntimeError, ("Y_unsigned test 1 failed")
+    raise RuntimeError, ("Y_unsigned test 1 failed")
 if (y.meth(20) != 20):
-  raise RuntimeError, ("Y_unsigned test 2 failed")
+    raise RuntimeError, ("Y_unsigned test 2 failed")
 if (y.meth() != 0):
-  raise RuntimeError, ("Y_unsigned test 3 failed")
-
+    raise RuntimeError, ("Y_unsigned test 3 failed")
 
 
 x = template_default_arg.X_longlong()
@@ -37,7 +35,8 @@ x = template_default_arg.X_int(20.0, 200)
 
 x = template_default_arg.X_hello_unsigned()
 x = template_default_arg.X_hello_unsigned(20.0)
-x = template_default_arg.X_hello_unsigned(20.0, template_default_arg.Hello_int())
+x = template_default_arg.X_hello_unsigned(
+    20.0, template_default_arg.Hello_int())
 
 
 y = template_default_arg.Y_hello_unsigned()
@@ -46,7 +45,6 @@ y.meth(template_default_arg.Hello_int())
 y.meth()
 
 
-
 fz = template_default_arg.Foo_Z_8()
 x = template_default_arg.X_Foo_Z_8()
 fzc = x.meth(fz)
@@ -56,43 +54,40 @@ fzc = x.meth(fz)
 
 # plain function: int ott(Foo<int>)
 if (template_default_arg.ott(template_default_arg.Foo_int()) != 30):
-  raise RuntimeError, ("ott test 1 failed")
+    raise RuntimeError, ("ott test 1 failed")
 
 # %template(ott) ott<int, int>
 if (template_default_arg.ott() != 10):
-  raise RuntimeError, ("ott test 2 failed")
+    raise RuntimeError, ("ott test 2 failed")
 if (template_default_arg.ott(1) != 10):
-  raise RuntimeError, ("ott test 3 failed")
+    raise RuntimeError, ("ott test 3 failed")
 if (template_default_arg.ott(1, 1) != 10):
-  raise RuntimeError, ("ott test 4 failed")
+    raise RuntimeError, ("ott test 4 failed")
 
 if (template_default_arg.ott("hi") != 20):
-  raise RuntimeError, ("ott test 5 failed")
+    raise RuntimeError, ("ott test 5 failed")
 if (template_default_arg.ott("hi", 1) != 20):
-  raise RuntimeError, ("ott test 6 failed")
+    raise RuntimeError, ("ott test 6 failed")
 if (template_default_arg.ott("hi", 1, 1) != 20):
-  raise RuntimeError, ("ott test 7 failed")
+    raise RuntimeError, ("ott test 7 failed")
 
 # %template(ott) ott<const char *>
 if (template_default_arg.ottstring(template_default_arg.Hello_int(), "hi") != 40):
-  raise RuntimeError, ("ott test 8 failed")
+    raise RuntimeError, ("ott test 8 failed")
 
 if (template_default_arg.ottstring(template_default_arg.Hello_int()) != 40):
-  raise RuntimeError, ("ott test 9 failed")
+    raise RuntimeError, ("ott test 9 failed")
 
 # %template(ott) ott<int>
 if (template_default_arg.ottint(template_default_arg.Hello_int(), 1) != 50):
-  raise RuntimeError, ("ott test 10 failed")
+    raise RuntimeError, ("ott test 10 failed")
 
 if (template_default_arg.ottint(template_default_arg.Hello_int()) != 50):
-  raise RuntimeError, ("ott test 11 failed")
+    raise RuntimeError, ("ott test 11 failed")
 
 # %template(ott) ott<double>
 if (template_default_arg.ott(template_default_arg.Hello_int(), 1.0) != 60):
-  raise RuntimeError, ("ott test 12 failed")
+    raise RuntimeError, ("ott test 12 failed")
 
 if (template_default_arg.ott(template_default_arg.Hello_int()) != 60):
-  raise RuntimeError, ("ott test 13 failed")
-
-
-
+    raise RuntimeError, ("ott test 13 failed")
diff --git a/Examples/test-suite/python/template_inherit_runme.py b/Examples/test-suite/python/template_inherit_runme.py
index bb1465a2b..2c47770a5 100644
--- a/Examples/test-suite/python/template_inherit_runme.py
+++ b/Examples/test-suite/python/template_inherit_runme.py
@@ -50,4 +50,3 @@ if invoke_blah_uint(e) != "Foo":
 
 if invoke_blah_uint(f) != "Bar":
     raise ValueError
-
diff --git a/Examples/test-suite/python/template_matrix_runme.py b/Examples/test-suite/python/template_matrix_runme.py
index 95815a068..208aafb8e 100644
--- a/Examples/test-suite/python/template_matrix_runme.py
+++ b/Examples/test-suite/python/template_matrix_runme.py
@@ -1,6 +1,4 @@
-from template_matrix import  *
-passVector([1,2,3])
-passMatrix([[1,2],[1,2,3]])
-passCube([[[1,2],[1,2,3]],[[1,2],[1,2,3]]])
-
-
+from template_matrix import *
+passVector([1, 2, 3])
+passMatrix([[1, 2], [1, 2, 3]])
+passCube([[[1, 2], [1, 2, 3]], [[1, 2], [1, 2, 3]]])
diff --git a/Examples/test-suite/python/template_ns4_runme.py b/Examples/test-suite/python/template_ns4_runme.py
index 81107b493..deef019eb 100644
--- a/Examples/test-suite/python/template_ns4_runme.py
+++ b/Examples/test-suite/python/template_ns4_runme.py
@@ -1,5 +1,5 @@
 from template_ns4 import *
 
-d = make_Class_DD();
+d = make_Class_DD()
 if d.test() != "test":
-	raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_ns_runme.py b/Examples/test-suite/python/template_ns_runme.py
index 20cc9b99c..888d125c4 100644
--- a/Examples/test-suite/python/template_ns_runme.py
+++ b/Examples/test-suite/python/template_ns_runme.py
@@ -1,5 +1,5 @@
 from template_ns import *
-p1 = pairii(2,3)
+p1 = pairii(2, 3)
 p2 = pairii(p1)
 
 if p2.first != 2:
@@ -7,7 +7,7 @@ if p2.first != 2:
 if p2.second != 3:
     raise RuntimeError
 
-p3 = pairdd(3.5,2.5)
+p3 = pairdd(3.5, 2.5)
 p4 = pairdd(p3)
 
 if p4.first != 3.5:
diff --git a/Examples/test-suite/python/template_opaque_runme.py b/Examples/test-suite/python/template_opaque_runme.py
index f3aeb39d1..6f21116ee 100644
--- a/Examples/test-suite/python/template_opaque_runme.py
+++ b/Examples/test-suite/python/template_opaque_runme.py
@@ -3,4 +3,3 @@ import template_opaque
 v = template_opaque.OpaqueVectorType(10)
 
 template_opaque.FillVector(v)
-
diff --git a/Examples/test-suite/python/template_ref_type_runme.py b/Examples/test-suite/python/template_ref_type_runme.py
index 0b3e4dd26..f4ebc354c 100644
--- a/Examples/test-suite/python/template_ref_type_runme.py
+++ b/Examples/test-suite/python/template_ref_type_runme.py
@@ -1,5 +1,5 @@
 import template_ref_type
 
 xr = template_ref_type.XC()
-y  = template_ref_type.Y()
+y = template_ref_type.Y()
 y.find(xr)
diff --git a/Examples/test-suite/python/template_static_runme.py b/Examples/test-suite/python/template_static_runme.py
index 9171d93b5..c87a52439 100644
--- a/Examples/test-suite/python/template_static_runme.py
+++ b/Examples/test-suite/python/template_static_runme.py
@@ -1,3 +1,3 @@
-from template_static import  *
+from template_static import *
 
 Foo_bar_double(1)
diff --git a/Examples/test-suite/python/template_tbase_template_runme.py b/Examples/test-suite/python/template_tbase_template_runme.py
index d13c5f2c2..b5f2e31f4 100644
--- a/Examples/test-suite/python/template_tbase_template_runme.py
+++ b/Examples/test-suite/python/template_tbase_template_runme.py
@@ -2,4 +2,4 @@ from template_tbase_template import *
 
 a = make_Class_dd()
 if a.test() != "test":
-	raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_type_namespace_runme.py b/Examples/test-suite/python/template_type_namespace_runme.py
index 19ea5f5ce..5f00fe5f2 100644
--- a/Examples/test-suite/python/template_type_namespace_runme.py
+++ b/Examples/test-suite/python/template_type_namespace_runme.py
@@ -1,5 +1,4 @@
 from template_type_namespace import *
 
 if type(foo()[0]) != type(""):
-     raise RuntimeError
-                                  
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_typedef_cplx2_runme.py b/Examples/test-suite/python/template_typedef_cplx2_runme.py
index 04c599329..3043d4285 100644
--- a/Examples/test-suite/python/template_typedef_cplx2_runme.py
+++ b/Examples/test-suite/python/template_typedef_cplx2_runme.py
@@ -5,28 +5,28 @@ from template_typedef_cplx2 import *
 #
 
 try:
-  d = make_Identity_double()
-  a = d.this
+    d = make_Identity_double()
+    a = d.this
 except:
-  print d, "is not an instance"
-  raise RuntimeError
+    print d, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % d
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print d, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print d, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 try:
-  e = make_Multiplies_double_double_double_double(d, d)
-  a = e.this
+    e = make_Multiplies_double_double_double_double(d, d)
+    a = e.this
 except:
-  print e, "is not an instance"
-  raise RuntimeError
+    print e, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % e
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print e, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print e, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 
 #
@@ -34,61 +34,60 @@ if str.find(s, 'ArithUnaryFunction') == -1:
 #
 
 try:
-  c = make_Identity_complex()
-  a = c.this
+    c = make_Identity_complex()
+    a = c.this
 except:
-  print c, "is not an instance"
-  raise RuntimeError
+    print c, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % c
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print c, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print c, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 try:
-  f = make_Multiplies_complex_complex_complex_complex(c, c)
-  a = f.this
+    f = make_Multiplies_complex_complex_complex_complex(c, c)
+    a = f.this
 except:
-  print f, "is not an instance"
-  raise RuntimeError
+    print f, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % f
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print f, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print f, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 #
 # Mix case
 #
 
 try:
-  g = make_Multiplies_double_double_complex_complex(d, c)
-  a = g.this
+    g = make_Multiplies_double_double_complex_complex(d, c)
+    a = g.this
 except:
-  print g, "is not an instance"
-  raise RuntimeError
+    print g, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % g
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print g, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print g, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 
 try:
-  h = make_Multiplies_complex_complex_double_double(c, d)
-  a = h.this
+    h = make_Multiplies_complex_complex_double_double(c, d)
+    a = h.this
 except:
-  print h, "is not an instance"
-  raise RuntimeError
+    print h, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % h
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print h, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print h, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 try:
-  a = g.get_value()
+    a = g.get_value()
 except:
-  print g, "has not get_value() method"
-  raise RuntimeError
-
+    print g, "has not get_value() method"
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_typedef_cplx3_runme.py b/Examples/test-suite/python/template_typedef_cplx3_runme.py
index b8ac1b6ef..ad361426e 100644
--- a/Examples/test-suite/python/template_typedef_cplx3_runme.py
+++ b/Examples/test-suite/python/template_typedef_cplx3_runme.py
@@ -11,14 +11,14 @@ s.get_base_value()
 s.get_value()
 s.get_arith_value()
 my_func_r(s)
-make_Multiplies_double_double_double_double(s,s)
+make_Multiplies_double_double_double_double(s, s)
 
 z = CSin()
 z.get_base_value()
 z.get_value()
 z.get_arith_value()
 my_func_c(z)
-make_Multiplies_complex_complex_complex_complex(z,z)
+make_Multiplies_complex_complex_complex_complex(z, z)
 
 #
 # Here we fail
@@ -28,7 +28,3 @@ my_func_r(d)
 
 c = make_Identity_complex()
 my_func_c(c)
-  
-
-
-
diff --git a/Examples/test-suite/python/template_typedef_cplx4_runme.py b/Examples/test-suite/python/template_typedef_cplx4_runme.py
index faeca219f..25ac851fb 100644
--- a/Examples/test-suite/python/template_typedef_cplx4_runme.py
+++ b/Examples/test-suite/python/template_typedef_cplx4_runme.py
@@ -11,14 +11,14 @@ s.get_base_value()
 s.get_value()
 s.get_arith_value()
 my_func_r(s)
-make_Multiplies_double_double_double_double(s,s)
+make_Multiplies_double_double_double_double(s, s)
 
 z = CSin()
 z.get_base_value()
 z.get_value()
 z.get_arith_value()
 my_func_c(z)
-make_Multiplies_complex_complex_complex_complex(z,z)
+make_Multiplies_complex_complex_complex_complex(z, z)
 
 #
 # Here we fail
@@ -28,7 +28,3 @@ my_func_r(d)
 
 c = make_Identity_complex()
 my_func_c(c)
-  
-
-
-
diff --git a/Examples/test-suite/python/template_typedef_cplx_runme.py b/Examples/test-suite/python/template_typedef_cplx_runme.py
index 2cd9c8348..afb97d070 100644
--- a/Examples/test-suite/python/template_typedef_cplx_runme.py
+++ b/Examples/test-suite/python/template_typedef_cplx_runme.py
@@ -5,28 +5,28 @@ from template_typedef_cplx import *
 #
 
 try:
-  d = make_Identity_double()
-  a = d.this
+    d = make_Identity_double()
+    a = d.this
 except:
-  print d, "is not an instance"
-  raise RuntimeError
+    print d, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % d
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print d, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print d, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 try:
-  e = make_Multiplies_double_double_double_double(d, d)
-  a = e.this
+    e = make_Multiplies_double_double_double_double(d, d)
+    a = e.this
 except:
-  print e, "is not an instance"
-  raise RuntimeError
+    print e, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % e
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print e, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print e, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 
 #
@@ -34,54 +34,54 @@ if str.find(s, 'ArithUnaryFunction') == -1:
 #
 
 try:
-  c = make_Identity_complex()
-  a = c.this
+    c = make_Identity_complex()
+    a = c.this
 except:
-  print c, "is not an instance"
-  raise RuntimeError
+    print c, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % c
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print c, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print c, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 try:
-  f = make_Multiplies_complex_complex_complex_complex(c, c)
-  a = f.this
+    f = make_Multiplies_complex_complex_complex_complex(c, c)
+    a = f.this
 except:
-  print f, "is not an instance"
-  raise RuntimeError
+    print f, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % f
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print f, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print f, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 #
 # Mix case
 #
 
 try:
-  g = make_Multiplies_double_double_complex_complex(d, c)
-  a = g.this
+    g = make_Multiplies_double_double_complex_complex(d, c)
+    a = g.this
 except:
-  print g, "is not an instance"
-  raise RuntimeError
+    print g, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % g
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print g, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print g, "is not an ArithUnaryFunction"
+    raise RuntimeError
 
 
 try:
-  h = make_Multiplies_complex_complex_double_double(c, d)
-  a = h.this
+    h = make_Multiplies_complex_complex_double_double(c, d)
+    a = h.this
 except:
-  print h, "is not an instance"
-  raise RuntimeError
+    print h, "is not an instance"
+    raise RuntimeError
 
 s = '%s' % h
 if str.find(s, 'ArithUnaryFunction') == -1:
-  print h, "is not an ArithUnaryFunction"
-  raise RuntimeError
+    print h, "is not an ArithUnaryFunction"
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_typedef_import_runme.py b/Examples/test-suite/python/template_typedef_import_runme.py
index 5c0b0b936..5da489fea 100644
--- a/Examples/test-suite/python/template_typedef_import_runme.py
+++ b/Examples/test-suite/python/template_typedef_import_runme.py
@@ -11,14 +11,14 @@ s.get_base_value()
 s.get_value()
 s.get_arith_value()
 my_func_r(s)
-make_Multiplies_double_double_double_double(s,s)
+make_Multiplies_double_double_double_double(s, s)
 
 z = CSin()
 z.get_base_value()
 z.get_value()
 z.get_arith_value()
 my_func_c(z)
-make_Multiplies_complex_complex_complex_complex(z,z)
+make_Multiplies_complex_complex_complex_complex(z, z)
 
 #
 # Here we fail
@@ -28,7 +28,3 @@ my_func_r(d)
 
 c = make_Identity_complex()
 my_func_c(c)
-  
-
-
-
diff --git a/Examples/test-suite/python/template_typedef_runme.py b/Examples/test-suite/python/template_typedef_runme.py
index 4b3970593..16695bada 100644
--- a/Examples/test-suite/python/template_typedef_runme.py
+++ b/Examples/test-suite/python/template_typedef_runme.py
@@ -5,42 +5,42 @@ c = make_Identity_reald()
 
 
 try:
-  a = d.this
-  a = c.this
+    a = d.this
+    a = c.this
 except:
-  raise RuntimeError
+    raise RuntimeError
 
 try:
-  e = make_Multiplies_float_float_float_float(d, d)
-  a = e.this
+    e = make_Multiplies_float_float_float_float(d, d)
+    a = e.this
 except:
-  print e, "is not an instance"
-  raise RuntimeError
+    print e, "is not an instance"
+    raise RuntimeError
 
 try:
-  f = make_Multiplies_reald_reald_reald_reald(c, c)
-  a = f.this
+    f = make_Multiplies_reald_reald_reald_reald(c, c)
+    a = f.this
 except:
-  print f, "is not an instance"
-  raise RuntimeError
+    print f, "is not an instance"
+    raise RuntimeError
 
 try:
-  g = make_Multiplies_float_float_reald_reald(d, c)
-  a = g.this
+    g = make_Multiplies_float_float_reald_reald(d, c)
+    a = g.this
 except:
-  print g, "is not an instance"
-  raise RuntimeError
+    print g, "is not an instance"
+    raise RuntimeError
 
 
 # the old large format
 if not SWIG_TypeQuery("vfncs::ArithUnaryFunction<vfncs::arith_traits<float,double>::argument_type,vfncs::arith_traits<float,double >::result_type > *"):
-  raise RuntimeError
+    raise RuntimeError
 
 
 # the reduced format
 if not SWIG_TypeQuery("vfncs::ArithUnaryFunction<double,double> *"):
-  raise RuntimeError
+    raise RuntimeError
 
 # this is a bad name
 if SWIG_TypeQuery("vfncs::ArithUnaryFunction<double,doublex> *"):
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/template_typemaps_typedef2_runme.py b/Examples/test-suite/python/template_typemaps_typedef2_runme.py
index 8a66d27d0..258f44366 100644
--- a/Examples/test-suite/python/template_typemaps_typedef2_runme.py
+++ b/Examples/test-suite/python/template_typemaps_typedef2_runme.py
@@ -13,8 +13,8 @@ m2 = MultimapAInt()
 #dummy_pair = m2.make_dummy_pair()
 #val = m2.typemap_test(dummy_pair)
 
-#print val
-#if val != 4321:
+# print val
+# if val != 4321:
 #    raise RuntimeError, "typemaps not working"
 
 if typedef_test1(dummy_pair).val != 1234:
@@ -34,4 +34,3 @@ if typedef_test5(dummy_pair).val != 1234:
 
 if typedef_test6(dummy_pair).val != 1234:
     raise RuntimeError, "typedef_test6 not working"
-
diff --git a/Examples/test-suite/python/template_typemaps_typedef_runme.py b/Examples/test-suite/python/template_typemaps_typedef_runme.py
index a4d6fd0a7..1ca3f835c 100644
--- a/Examples/test-suite/python/template_typemaps_typedef_runme.py
+++ b/Examples/test-suite/python/template_typemaps_typedef_runme.py
@@ -13,8 +13,8 @@ m2 = MultimapAInt()
 #dummy_pair = m2.make_dummy_pair()
 #val = m2.typemap_test(dummy_pair)
 
-#print val
-#if val != 4321:
+# print val
+# if val != 4321:
 #    raise RuntimeError, "typemaps not working"
 
 if typedef_test1(dummy_pair).val != 1234:
@@ -34,4 +34,3 @@ if typedef_test5(dummy_pair).val != 1234:
 
 if typedef_test6(dummy_pair).val != 1234:
     raise RuntimeError, "typedef_test6 not working"
-
diff --git a/Examples/test-suite/python/threads_exception_runme.py b/Examples/test-suite/python/threads_exception_runme.py
index 6fe6947ec..056bd849b 100644
--- a/Examples/test-suite/python/threads_exception_runme.py
+++ b/Examples/test-suite/python/threads_exception_runme.py
@@ -2,40 +2,39 @@ import threads_exception
 
 t = threads_exception.Test()
 try:
-  t.unknown()
-except RuntimeError,e:
-  pass
+    t.unknown()
+except RuntimeError, e:
+    pass
 
 try:
-  t.simple()
-except RuntimeError,e:
-  if e.args[0] != 37:
-    raise RuntimeError
+    t.simple()
+except RuntimeError, e:
+    if e.args[0] != 37:
+        raise RuntimeError
 
 try:
-  t.message()
-except RuntimeError,e:
-  if e.args[0] != "I died.":
-    raise RuntimeError
+    t.message()
+except RuntimeError, e:
+    if e.args[0] != "I died.":
+        raise RuntimeError
 
 # This is expected fail with -builtin option
 # Throwing builtin classes as exceptions not supported
 if not threads_exception.is_python_builtin():
-  try:
-    t.hosed()
-  except threads_exception.Exc,e:
-    code = e.code
-    if code != 42:
-      raise RuntimeError, "bad... code: %d" % code
-    msg = e.msg
-    if msg != "Hosed":
-      raise RuntimeError, "bad... msg: '%s' len: %d" % (msg, len(msg))
-
-for i in range(1,4):
-  try:
-    t.multi(i)
-  except RuntimeError,e:
-    pass
-  except threads_exception.Exc,e:
-    pass
+    try:
+        t.hosed()
+    except threads_exception.Exc, e:
+        code = e.code
+        if code != 42:
+            raise RuntimeError, "bad... code: %d" % code
+        msg = e.msg
+        if msg != "Hosed":
+            raise RuntimeError, "bad... msg: '%s' len: %d" % (msg, len(msg))
 
+for i in range(1, 4):
+    try:
+        t.multi(i)
+    except RuntimeError, e:
+        pass
+    except threads_exception.Exc, e:
+        pass
diff --git a/Examples/test-suite/python/typedef_class_runme.py b/Examples/test-suite/python/typedef_class_runme.py
index 71436b399..6d2f2a5c3 100644
--- a/Examples/test-suite/python/typedef_class_runme.py
+++ b/Examples/test-suite/python/typedef_class_runme.py
@@ -1,7 +1,7 @@
 import typedef_class
 
-a = typedef_class.RealA() 
-a.a = 3 
- 
-b = typedef_class.B() 
-b.testA(a) 
+a = typedef_class.RealA()
+a.a = 3
+
+b = typedef_class.B()
+b.testA(a)
diff --git a/Examples/test-suite/python/typedef_scope_runme.py b/Examples/test-suite/python/typedef_scope_runme.py
index 37bfc97b1..edd3e9f3a 100644
--- a/Examples/test-suite/python/typedef_scope_runme.py
+++ b/Examples/test-suite/python/typedef_scope_runme.py
@@ -1,12 +1,10 @@
 import typedef_scope
 
 b = typedef_scope.Bar()
-x = b.test1(42,"hello")
+x = b.test1(42, "hello")
 if x != 42:
     print "Failed!!"
 
-x = b.test2(42,"hello")
+x = b.test2(42, "hello")
 if x != "hello":
     print "Failed!!"
-    
-    
diff --git a/Examples/test-suite/python/typedef_typedef_runme.py b/Examples/test-suite/python/typedef_typedef_runme.py
index 1d83065a6..92e85c27e 100644
--- a/Examples/test-suite/python/typedef_typedef_runme.py
+++ b/Examples/test-suite/python/typedef_typedef_runme.py
@@ -2,4 +2,4 @@ import typedef_typedef
 
 b = typedef_typedef.B()
 if b.getValue(123) != 1234:
-  raise Exception("Failed")
+    raise Exception("Failed")
diff --git a/Examples/test-suite/python/typemap_arrays_runme.py b/Examples/test-suite/python/typemap_arrays_runme.py
index c23222c63..ea0f08d6b 100644
--- a/Examples/test-suite/python/typemap_arrays_runme.py
+++ b/Examples/test-suite/python/typemap_arrays_runme.py
@@ -2,4 +2,3 @@ from typemap_arrays import *
 
 if sumA(None) != 60:
     raise RuntimeError, "Sum is wrong"
-
diff --git a/Examples/test-suite/python/typemap_namespace_runme.py b/Examples/test-suite/python/typemap_namespace_runme.py
index 581a0f437..b55eb8ba5 100644
--- a/Examples/test-suite/python/typemap_namespace_runme.py
+++ b/Examples/test-suite/python/typemap_namespace_runme.py
@@ -5,4 +5,3 @@ if test1("hello") != "hello":
 
 if test2("hello") != "hello":
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/typemap_out_optimal_runme.py b/Examples/test-suite/python/typemap_out_optimal_runme.py
index 95556f6bd..c7a34308e 100644
--- a/Examples/test-suite/python/typemap_out_optimal_runme.py
+++ b/Examples/test-suite/python/typemap_out_optimal_runme.py
@@ -2,4 +2,3 @@ from typemap_out_optimal import *
 
 cvar.XX_debug = False
 x = XX_create()
-
diff --git a/Examples/test-suite/python/typemap_qualifier_strip_runme.py b/Examples/test-suite/python/typemap_qualifier_strip_runme.py
index 5e466cf69..dff94f8b4 100644
--- a/Examples/test-suite/python/typemap_qualifier_strip_runme.py
+++ b/Examples/test-suite/python/typemap_qualifier_strip_runme.py
@@ -51,4 +51,3 @@ if typemap_qualifier_strip.testD3(val) != 111:
 
 if typemap_qualifier_strip.testD4(val) != 111:
     raise RuntimeError
-
diff --git a/Examples/test-suite/python/typename_runme.py b/Examples/test-suite/python/typename_runme.py
index 10c7bff1b..aac936fde 100644
--- a/Examples/test-suite/python/typename_runme.py
+++ b/Examples/test-suite/python/typename_runme.py
@@ -4,9 +4,8 @@ f = typename.Foo()
 b = typename.Bar()
 
 x = typename.twoFoo(f)
-if not isinstance(x,types.FloatType):
-    raise RuntimeError,"Wrong return type (FloatType) !"
+if not isinstance(x, types.FloatType):
+    raise RuntimeError, "Wrong return type (FloatType) !"
 y = typename.twoBar(b)
-if not isinstance(y,types.IntType):
-    raise RuntimeError,"Wrong return type (IntType)!"
-    
+if not isinstance(y, types.IntType):
+    raise RuntimeError, "Wrong return type (IntType)!"
diff --git a/Examples/test-suite/python/types_directive_runme.py b/Examples/test-suite/python/types_directive_runme.py
index c28453e84..401e3ae1d 100644
--- a/Examples/test-suite/python/types_directive_runme.py
+++ b/Examples/test-suite/python/types_directive_runme.py
@@ -1,12 +1,13 @@
 from types_directive import *
 
 d1 = Time1(2001, 2, 3, 60)
-newDate = add(d1, 7) # check that a Time1 instance is accepted where Date is expected
+# check that a Time1 instance is accepted where Date is expected
+newDate = add(d1, 7)
 if newDate.day != 10:
-  raise RuntimeError
+    raise RuntimeError
 
 d2 = Time2(1999, 8, 7, 60)
-newDate = add(d2, 7) # check that a Time2 instance is accepted where Date is expected
+# check that a Time2 instance is accepted where Date is expected
+newDate = add(d2, 7)
 if newDate.day != 14:
-  raise RuntimeError
-
+    raise RuntimeError
diff --git a/Examples/test-suite/python/unions_runme.py b/Examples/test-suite/python/unions_runme.py
index d59e2429e..387a048c8 100644
--- a/Examples/test-suite/python/unions_runme.py
+++ b/Examples/test-suite/python/unions_runme.py
@@ -1,5 +1,5 @@
 
-# This is the union runtime testcase. It ensures that values within a 
+# This is the union runtime testcase. It ensures that values within a
 # union embedded within a struct can be set and read correctly.
 
 import unions
@@ -23,12 +23,12 @@ eut.number = 1
 eut.uni.small = small
 Jill1 = eut.uni.small.jill
 if (Jill1 != 200):
-    print "Runtime test1 failed. eut.uni.small.jill=" , Jill1
+    print "Runtime test1 failed. eut.uni.small.jill=", Jill1
     sys.exit(1)
 
 Num1 = eut.number
 if (Num1 != 1):
-    print "Runtime test2 failed. eut.number=" , Num1
+    print "Runtime test2 failed. eut.number=", Num1
     sys.exit(1)
 
 # Secondly check the BigStruct in EmbeddedUnionTest
@@ -36,16 +36,15 @@ eut.number = 2
 eut.uni.big = big
 Jack1 = eut.uni.big.jack
 if (Jack1 != 300):
-    print "Runtime test3 failed. eut.uni.big.jack=" , Jack1
+    print "Runtime test3 failed. eut.uni.big.jack=", Jack1
     sys.exit(1)
 
 Jill2 = eut.uni.big.smallstruct.jill
 if (Jill2 != 200):
-    print "Runtime test4 failed. eut.uni.big.smallstruct.jill=" , Jill2
+    print "Runtime test4 failed. eut.uni.big.smallstruct.jill=", Jill2
     sys.exit(1)
 
 Num2 = eut.number
 if (Num2 != 2):
-    print "Runtime test5 failed. eut.number=" , Num2
+    print "Runtime test5 failed. eut.number=", Num2
     sys.exit(1)
-
diff --git a/Examples/test-suite/python/using_composition_runme.py b/Examples/test-suite/python/using_composition_runme.py
index 6baa16d13..c4f339095 100644
--- a/Examples/test-suite/python/using_composition_runme.py
+++ b/Examples/test-suite/python/using_composition_runme.py
@@ -2,33 +2,32 @@ from using_composition import *
 
 f = FooBar()
 if f.blah(3) != 3:
-  raise RuntimeError,"FooBar::blah(int)"
+    raise RuntimeError, "FooBar::blah(int)"
 
 if f.blah(3.5) != 3.5:
-  raise RuntimeError,"FooBar::blah(double)"
+    raise RuntimeError, "FooBar::blah(double)"
 
 if f.blah("hello") != "hello":
-  raise RuntimeError,"FooBar::blah(char *)"
+    raise RuntimeError, "FooBar::blah(char *)"
 
 
 f = FooBar2()
 if f.blah(3) != 3:
-  raise RuntimeError,"FooBar2::blah(int)"
+    raise RuntimeError, "FooBar2::blah(int)"
 
 if f.blah(3.5) != 3.5:
-  raise RuntimeError,"FooBar2::blah(double)"
+    raise RuntimeError, "FooBar2::blah(double)"
 
 if f.blah("hello") != "hello":
-  raise RuntimeError,"FooBar2::blah(char *)"
+    raise RuntimeError, "FooBar2::blah(char *)"
 
 
 f = FooBar3()
 if f.blah(3) != 3:
-  raise RuntimeError,"FooBar3::blah(int)"
+    raise RuntimeError, "FooBar3::blah(int)"
 
 if f.blah(3.5) != 3.5:
-  raise RuntimeError,"FooBar3::blah(double)"
+    raise RuntimeError, "FooBar3::blah(double)"
 
 if f.blah("hello") != "hello":
-  raise RuntimeError,"FooBar3::blah(char *)"
-
+    raise RuntimeError, "FooBar3::blah(char *)"
diff --git a/Examples/test-suite/python/using_extend_runme.py b/Examples/test-suite/python/using_extend_runme.py
index 14615a05e..038a1686a 100644
--- a/Examples/test-suite/python/using_extend_runme.py
+++ b/Examples/test-suite/python/using_extend_runme.py
@@ -2,20 +2,20 @@ from using_extend import *
 
 f = FooBar()
 if f.blah(3) != 3:
-    raise RuntimeError,"blah(int)"
+    raise RuntimeError, "blah(int)"
 
 if f.blah(3.5) != 3.5:
-    raise RuntimeError,"blah(double)"
+    raise RuntimeError, "blah(double)"
 
 if f.blah("hello") != "hello":
-    raise RuntimeError,"blah(char *)"
+    raise RuntimeError, "blah(char *)"
 
-if f.blah(3,4) != 7:
-    raise RuntimeError,"blah(int,int)"
+if f.blah(3, 4) != 7:
+    raise RuntimeError, "blah(int,int)"
 
-if f.blah(3.5,7.5) != (3.5+7.5):
-    raise RuntimeError,"blah(double,double)"
+if f.blah(3.5, 7.5) != (3.5 + 7.5):
+    raise RuntimeError, "blah(double,double)"
 
 
 if f.duh(3) != 3:
-    raise RuntimeError,"duh(int)"
+    raise RuntimeError, "duh(int)"
diff --git a/Examples/test-suite/python/using_inherit_runme.py b/Examples/test-suite/python/using_inherit_runme.py
index b00e66ec3..4fd595968 100644
--- a/Examples/test-suite/python/using_inherit_runme.py
+++ b/Examples/test-suite/python/using_inherit_runme.py
@@ -2,48 +2,47 @@ from using_inherit import *
 
 b = Bar()
 if b.test(3) != 3:
-  raise RuntimeError,"Bar::test(int)"
+    raise RuntimeError, "Bar::test(int)"
 
 if b.test(3.5) != 3.5:
-  raise RuntimeError, "Bar::test(double)"
+    raise RuntimeError, "Bar::test(double)"
 
 
 b = Bar2()
 if b.test(3) != 6:
-  raise RuntimeError,"Bar2::test(int)"
+    raise RuntimeError, "Bar2::test(int)"
 
 if b.test(3.5) != 7.0:
-  raise RuntimeError, "Bar2::test(double)"
+    raise RuntimeError, "Bar2::test(double)"
 
 
 b = Bar3()
 if b.test(3) != 6:
-  raise RuntimeError,"Bar3::test(int)"
+    raise RuntimeError, "Bar3::test(int)"
 
 if b.test(3.5) != 7.0:
-  raise RuntimeError, "Bar3::test(double)"
+    raise RuntimeError, "Bar3::test(double)"
 
 
 b = Bar4()
 if b.test(3) != 6:
-  raise RuntimeError,"Bar4::test(int)"
+    raise RuntimeError, "Bar4::test(int)"
 
 if b.test(3.5) != 7.0:
-  raise RuntimeError, "Bar4::test(double)"
+    raise RuntimeError, "Bar4::test(double)"
 
 
 b = Fred1()
 if b.test(3) != 3:
-  raise RuntimeError,"Fred1::test(int)"
+    raise RuntimeError, "Fred1::test(int)"
 
 if b.test(3.5) != 7.0:
-  raise RuntimeError, "Fred1::test(double)"
+    raise RuntimeError, "Fred1::test(double)"
 
 
 b = Fred2()
 if b.test(3) != 3:
-  raise RuntimeError,"Fred2::test(int)"
+    raise RuntimeError, "Fred2::test(int)"
 
 if b.test(3.5) != 7.0:
-  raise RuntimeError, "Fred2::test(double)"
-
+    raise RuntimeError, "Fred2::test(double)"
diff --git a/Examples/test-suite/python/varargs_overload_runme.py b/Examples/test-suite/python/varargs_overload_runme.py
index a3b2068b5..37958620c 100644
--- a/Examples/test-suite/python/varargs_overload_runme.py
+++ b/Examples/test-suite/python/varargs_overload_runme.py
@@ -28,4 +28,3 @@ if varargs_overload.vararg_over4(123) != "123":
 
 if varargs_overload.vararg_over4("Hello", 123) != "Hello":
     raise RuntimeError, "Failed"
-
diff --git a/Examples/test-suite/python/varargs_runme.py b/Examples/test-suite/python/varargs_runme.py
index 2c68f4e06..7105ba8d7 100644
--- a/Examples/test-suite/python/varargs_runme.py
+++ b/Examples/test-suite/python/varargs_runme.py
@@ -11,7 +11,7 @@ if f.test("Hello") != "Hello":
     raise RuntimeError, "Failed"
 
 
-if varargs.test_def("Hello",1) != "Hello":
+if varargs.test_def("Hello", 1) != "Hello":
     raise RuntimeError, "Failed"
 
 if varargs.test_def("Hello") != "Hello":
diff --git a/Examples/test-suite/python/virtual_derivation_runme.py b/Examples/test-suite/python/virtual_derivation_runme.py
index 8a6e743af..68546c6eb 100644
--- a/Examples/test-suite/python/virtual_derivation_runme.py
+++ b/Examples/test-suite/python/virtual_derivation_runme.py
@@ -4,5 +4,4 @@ from virtual_derivation import *
 #
 b = B(3)
 if b.get_a() != b.get_b():
-  raise RuntimeError, "something is really wrong"
-
+    raise RuntimeError, "something is really wrong"
diff --git a/Examples/test-suite/python/virtual_poly_runme.py b/Examples/test-suite/python/virtual_poly_runme.py
index 7e202f9cf..0df6271ef 100644
--- a/Examples/test-suite/python/virtual_poly_runme.py
+++ b/Examples/test-suite/python/virtual_poly_runme.py
@@ -5,25 +5,25 @@ i = virtual_poly.NInt(2)
 
 #
 # the copy methods return the right polymorphic types
-# 
+#
 dc = d.copy()
 ic = i.copy()
 
 if d.get() != dc.get():
-  raise RuntimeError
+    raise RuntimeError
 
 if i.get() != ic.get():
-  raise RuntimeError
+    raise RuntimeError
 
 virtual_poly.incr(ic)
 
 if (i.get() + 1) != ic.get():
-  raise RuntimeError
+    raise RuntimeError
 
 
 dr = d.ref_this()
 if d.get() != dr.get():
-  raise RuntimeError
+    raise RuntimeError
 
 
 #
@@ -31,8 +31,8 @@ if d.get() != dr.get():
 #
 ddc = virtual_poly.NDouble_narrow(d.nnumber())
 if d.get() != ddc.get():
-  raise RuntimeError
+    raise RuntimeError
 
 dic = virtual_poly.NInt_narrow(i.nnumber())
 if i.get() != dic.get():
-  raise RuntimeError
+    raise RuntimeError
diff --git a/Examples/test-suite/python/voidtest_runme.py b/Examples/test-suite/python/voidtest_runme.py
index a7b421d6e..b16cacf00 100644
--- a/Examples/test-suite/python/voidtest_runme.py
+++ b/Examples/test-suite/python/voidtest_runme.py
@@ -6,10 +6,11 @@ f.memberfunc()
 
 voidtest.Foo_staticmemberfunc()
 
+
 def fvoid():
     pass
 
-if  f.memberfunc() != fvoid():
+if f.memberfunc() != fvoid():
     raise RuntimeError
 
 
diff --git a/Examples/test-suite/python/wrapmacro_runme.py b/Examples/test-suite/python/wrapmacro_runme.py
index 0272afd5d..5e28d6bc9 100644
--- a/Examples/test-suite/python/wrapmacro_runme.py
+++ b/Examples/test-suite/python/wrapmacro_runme.py
@@ -2,6 +2,6 @@ import wrapmacro
 
 a = 2
 b = -1
-wrapmacro.maximum(a,b)
-wrapmacro.maximum(a/7.0, -b*256)
+wrapmacro.maximum(a, b)
+wrapmacro.maximum(a / 7.0, -b * 256)
 wrapmacro.GUINT16_SWAP_LE_BE_CONSTANT(1)

From 083a03710ae0dedfe2fcc595c05ba5693cce487d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Sat, 9 May 2015 18:34:11 +1200
Subject: [PATCH 126/220] Remove no-op calls to swig_incref().

Python and Perl were calling this from the Director constructor, but
swig_disown_flag is always false at that point, so the call doesn't
do anything.
---
 Lib/perl5/director.swg  | 1 -
 Lib/python/director.swg | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Lib/perl5/director.swg b/Lib/perl5/director.swg
index 714a87877..acdd5c3d8 100644
--- a/Lib/perl5/director.swg
+++ b/Lib/perl5/director.swg
@@ -233,7 +233,6 @@ namespace Swig {
       char *str = SvPV(pkg, len);
       swig_class = std::string(str, len);
       swig_self = newRV_inc((SV *)newHV());
-      swig_incref();
     }
 
     /* discard our reference at destruction */
diff --git a/Lib/python/director.swg b/Lib/python/director.swg
index 6e69e544c..f745f3fca 100644
--- a/Lib/python/director.swg
+++ b/Lib/python/director.swg
@@ -330,7 +330,6 @@ namespace Swig {
   public:
     /* wrap a python object, optionally taking ownership */
     Director(PyObject *self) : swig_self(self), swig_disown_flag(false) {
-      swig_incref();
     }
 
     /* discard our reference at destruction */

From d1a8675ac4824774ed1585ec7bfc12e471917b97 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Sat, 9 May 2015 21:59:03 +1200
Subject: [PATCH 127/220] Fix incorrect comments

---
 Lib/ocaml/director.swg  | 2 +-
 Lib/perl5/director.swg  | 2 +-
 Lib/python/director.swg | 2 +-
 Lib/ruby/director.swg   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Lib/ocaml/director.swg b/Lib/ocaml/director.swg
index fea0cada6..158cbfeec 100644
--- a/Lib/ocaml/director.swg
+++ b/Lib/ocaml/director.swg
@@ -72,7 +72,7 @@ namespace Swig {
       mutable bool swig_disown_flag;
 
     public:
-      /* wrap a ocaml object, optionally taking ownership */
+      /* wrap a ocaml object. */
       Director(CAML_VALUE self) : swig_self(self), swig_disown_flag(false) {
         register_global_root(&swig_self);
       }
diff --git a/Lib/perl5/director.swg b/Lib/perl5/director.swg
index acdd5c3d8..f0a6614fc 100644
--- a/Lib/perl5/director.swg
+++ b/Lib/perl5/director.swg
@@ -227,7 +227,7 @@ namespace Swig {
     }
 
   public:
-    /* wrap a Perl object, optionally taking ownership */
+    /* wrap a Perl object. */
     Director(SV *pkg) : swig_disown_flag(false) {
       STRLEN len;
       char *str = SvPV(pkg, len);
diff --git a/Lib/python/director.swg b/Lib/python/director.swg
index f745f3fca..4bdc94dc2 100644
--- a/Lib/python/director.swg
+++ b/Lib/python/director.swg
@@ -328,7 +328,7 @@ namespace Swig {
     }
 
   public:
-    /* wrap a python object, optionally taking ownership */
+    /* wrap a python object. */
     Director(PyObject *self) : swig_self(self), swig_disown_flag(false) {
     }
 
diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg
index c2c4150e6..395dccc17 100644
--- a/Lib/ruby/director.swg
+++ b/Lib/ruby/director.swg
@@ -278,7 +278,7 @@ namespace Swig {
     mutable bool swig_disown_flag;
 
   public:
-    /* wrap a Ruby object, optionally taking ownership */
+    /* wrap a Ruby object. */
     Director(VALUE self) : swig_self(self), swig_disown_flag(false) {
     }
 

From b06ec2c847bb81a8ea1bc158bb26bfe183de723d Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Sun, 10 May 2015 01:23:09 +1200
Subject: [PATCH 128/220] Fix typo in method description

---
 Lib/python/pyrun.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/python/pyrun.swg b/Lib/python/pyrun.swg
index 7ef8d5e39..5eedca483 100644
--- a/Lib/python/pyrun.swg
+++ b/Lib/python/pyrun.swg
@@ -668,7 +668,7 @@ swigobject_methods[] = {
 static PyMethodDef
 swigobject_methods[] = {
   {(char *)"disown",  (PyCFunction)SwigPyObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
-  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_VARARGS,  (char *)"acquires ownership of the pointer"},
   {(char *)"own",     (PyCFunction)SwigPyObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
   {(char *)"append",  (PyCFunction)SwigPyObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
   {(char *)"next",    (PyCFunction)SwigPyObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},

From 775afd3579ede9d434bb8a4ca3d800a8f9178137 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 9 May 2015 14:48:45 +0100
Subject: [PATCH 129/220] Refactor Java director swig_override array code

Remove code duplication: Use new Swig::BoolArray to replace multiple
instances of ZeroedBoolArray.

Refactors #403 and #413.
---
 Lib/java/director.swg   | 14 ++++++++++++++
 Source/Modules/java.cxx |  8 +-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Lib/java/director.swg b/Lib/java/director.swg
index 2d8754da3..4053c3961 100644
--- a/Lib/java/director.swg
+++ b/Lib/java/director.swg
@@ -209,6 +209,20 @@ namespace Swig {
     }
   };
 
+  // Zero initialized bool array
+  template<size_t N> class BoolArray {
+    bool array_[N];
+  public:
+    BoolArray() {
+      memset(array_, sizeof(array_), 0);
+    }
+    bool& operator[](size_t n) {
+      return array_[n];
+    }
+    bool operator[](size_t n) const {
+      return array_[n];
+    }
+  };
 
   // Utility classes and functions for exception handling.
 
diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 69b1bd74e..8fbdb13e4 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -4489,13 +4489,7 @@ public:
       Printf(f_directors_h, "      return (n < %d ? swig_override[n] : false);\n", n_methods);
       Printf(f_directors_h, "    }\n");
       Printf(f_directors_h, "protected:\n");
-      Printf(f_directors_h, "    struct ZeroedBoolArray {\n");
-      Printf(f_directors_h, "        bool array[%d];\n", n_methods);
-      Printf(f_directors_h, "        ZeroedBoolArray() { memset(array, sizeof(array), 0); }\n");
-      Printf(f_directors_h, "        bool& operator[](int n) { return array[n]; }\n");
-      Printf(f_directors_h, "        bool operator[](int n) const { return array[n]; }\n");
-      Printf(f_directors_h, "    };\n");
-      Printf(f_directors_h, "    ZeroedBoolArray swig_override;\n");
+      Printf(f_directors_h, "    Swig::BoolArray<%d> swig_override;\n", n_methods);
 
       /* Emit the code to look up the class's methods, initialize the override array */
 

From b4c441f62ee434f5428be03162add4d20cf42471 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 10 May 2015 11:49:28 +0100
Subject: [PATCH 130/220] Remove unused std_string.i from callback examples

---
 Examples/csharp/callback/example.i | 2 --
 Examples/d/callback/example.i      | 2 --
 Examples/go/callback/example.i     | 2 --
 Examples/java/callback/example.i   | 2 --
 Examples/octave/callback/example.i | 2 --
 Examples/perl5/callback/example.i  | 2 --
 Examples/php/callback/example.i    | 2 --
 Examples/python/callback/example.i | 2 --
 8 files changed, 16 deletions(-)

diff --git a/Examples/csharp/callback/example.i b/Examples/csharp/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/csharp/callback/example.i
+++ b/Examples/csharp/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/d/callback/example.i b/Examples/d/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/d/callback/example.i
+++ b/Examples/d/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/go/callback/example.i b/Examples/go/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/go/callback/example.i
+++ b/Examples/go/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/java/callback/example.i b/Examples/java/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/java/callback/example.i
+++ b/Examples/java/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/octave/callback/example.i b/Examples/octave/callback/example.i
index 50ef5096d..333127a9d 100644
--- a/Examples/octave/callback/example.i
+++ b/Examples/octave/callback/example.i
@@ -7,8 +7,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/perl5/callback/example.i b/Examples/perl5/callback/example.i
index 5f9072e61..821a9e6b5 100644
--- a/Examples/perl5/callback/example.i
+++ b/Examples/perl5/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/php/callback/example.i b/Examples/php/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/php/callback/example.i
+++ b/Examples/php/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 
diff --git a/Examples/python/callback/example.i b/Examples/python/callback/example.i
index 90beda01a..cf61ef9d2 100644
--- a/Examples/python/callback/example.i
+++ b/Examples/python/callback/example.i
@@ -4,8 +4,6 @@
 #include "example.h"
 %}
 
-%include "std_string.i"
-
 /* turn on director wrapping Callback */
 %feature("director") Callback;
 

From 6c1630b152fd4afdb8327f7ae675d081f425046f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 10 May 2015 13:35:51 +0100
Subject: [PATCH 131/220] Fix Java multi-argument typemaps (char *STRING,
 size_t LENGTH)

Now they can be applied to a wider range of types.
Closes #385.
---
 CHANGES.current                                     |  4 ++++
 Examples/test-suite/director_binary_string.i        | 13 +++++++++++++
 .../java/director_binary_string_runme.java          | 12 ++++++++++++
 Lib/java/java.swg                                   |  1 +
 4 files changed, 30 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 5fd6d6135..a30b026dc 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-10: wsfulton
+            [Java] Fix multi-argument typemaps (char *STRING, size_t LENGTH)
+            so that they can be applied to a wider range of types. Fixes #385.
+
 2015-05-07: olly
 	    [Python] Deal with an integer as the default value of a bool
 	    parameter in the C++ prototype.  Fixes github #327, reported by
diff --git a/Examples/test-suite/director_binary_string.i b/Examples/test-suite/director_binary_string.i
index f842dc2c7..17bdc1b64 100644
--- a/Examples/test-suite/director_binary_string.i
+++ b/Examples/test-suite/director_binary_string.i
@@ -4,6 +4,7 @@
 
 %apply (char *STRING, size_t LENGTH) { (char *dataBufferAA, int sizeAA) };
 %apply (char *STRING, size_t LENGTH) { (char *dataBufferBB, int sizeBB) };
+%apply (char* STRING, size_t LENGTH) { (const void* data, size_t datalen) };
 
 %inline %{
 #include <stdlib.h>
@@ -20,6 +21,7 @@ public:
     if (dataBufferBB)
       memset(dataBufferBB, -1, sizeBB);
   }
+  virtual void writeData(const void* data, size_t datalen) = 0;
 };
 
 class Caller {
@@ -50,6 +52,17 @@ public:
   void call_null() {
     _callback->run(NULL, 0, NULL, 0);
   }
+  int callWriteData() {
+    int sum = 0;
+    if (_callback) {
+      char* aa = (char*)malloc(BUFFER_SIZE_AA);
+      memset(aa, 9, BUFFER_SIZE_AA);
+      _callback->writeData(aa, BUFFER_SIZE_AA);
+      for (int i = 0; i < BUFFER_SIZE_AA; i++)
+        sum += aa[i];
+    }
+    return sum;
+  }
 };
 
 %}
diff --git a/Examples/test-suite/java/director_binary_string_runme.java b/Examples/test-suite/java/director_binary_string_runme.java
index 962073367..14982efc2 100644
--- a/Examples/test-suite/java/director_binary_string_runme.java
+++ b/Examples/test-suite/java/director_binary_string_runme.java
@@ -17,11 +17,15 @@ public class director_binary_string_runme {
     Callback callback = new DirectorBinaryStringCallback();
     caller.setCallback(callback);
     int sum = caller.call();
+    int sumData = caller.callWriteData();
     caller.delCallback();
 
     if (sum != 9*2*8 + 13*3*5)
       throw new RuntimeException("Unexpected sum: " + sum);
 
+    if (sumData != 9*2*8)
+      throw new RuntimeException("Unexpected sum: " + sum);
+
     new Callback().run(null, null);
     callback = new DirectorBinaryStringCallback();
     caller.setCallback(callback);
@@ -45,5 +49,13 @@ class DirectorBinaryStringCallback extends Callback {
       for (int i = 0; i < dataBufferBB.length; i++)
         dataBufferBB[i] = (byte)(dataBufferBB[i] * 3);
   }
+
+  @Override
+  public void writeData(byte[] dataBufferAA)
+  {
+    if (dataBufferAA != null)
+      for (int i = 0; i < dataBufferAA.length; i++)
+        dataBufferAA[i] = (byte)(dataBufferAA[i] * 2);
+  }
 }
 
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index 9374f5783..37b3fa940 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -1348,6 +1348,7 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
 %typemap(directorargout) (char *STRING, size_t LENGTH)
 %{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1);
 (jenv)->DeleteLocalRef($input);%}
+%typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput"
 %apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }
 
 /* java keywords */

From 0f94ea9208cee6e77030b9b874900730b29c4e7c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 11 May 2015 00:09:40 +0100
Subject: [PATCH 132/220] Example and test-suite makefile tidy up

Python output is less verbose if pep8 is not available (tweaks for patch #416)
---
 Examples/Makefile.in                   | 30 +++++++++++---------------
 Examples/test-suite/python/Makefile.in | 13 +++++------
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 36f68f2e1..61f127569 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -66,9 +66,6 @@ LIBCRYPT   = @LIBCRYPT@
 SYSLIBS    = $(LIBM) $(LIBC) $(LIBCRYPT)
 LIBPREFIX  =
 
-PEP8         = @PEP8@
-PEP8_FLAGS   = --ignore=E402,E501,E30,W291,W391
-
 # RUNTOOL is for use with runtime tools, eg set it to valgrind
 RUNTOOL    =
 # COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing
@@ -324,6 +321,9 @@ else
   SWIGPYTHON = $(SWIG) -python -py3
 endif
 
+PEP8         = @PEP8@
+PEP8_FLAGS   = --ignore=E402,E501,E30,W291,W391
+
 # ----------------------------------------------------------------
 # Build a C dynamically loadable module
 # ----------------------------------------------------------------
@@ -375,9 +375,11 @@ endif
 
 PY2TO3 = 2to3 `2to3 -l | grep -v -E "Available|import$$" | awk '{print "-f "$$0}'`
 
-python_run: $(PYSCRIPT) python_check
-	export PYTHONPATH=".:$$PYTHONPATH"; \
-	$(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE)
+python_run: $(PYSCRIPT)
+ifneq (,$(PEP8))
+	$(PEP8) $(PEP8_FLAGS) $(PYSCRIPT)
+endif
+	env PYTHONPATH=$$PWD $(RUNTOOL) $(PYTHON) $(PYSCRIPT) $(RUNPIPE)
 
 ifneq (,$(SRCDIR))
 $(RUNME).py: $(SRCDIR)$(RUNME).py
@@ -388,16 +390,6 @@ $(RUNME)3.py: $(SRCDIR)$(RUNME).py
 	cp $< $@
 	$(PY2TO3) -w $@ >/dev/null 2>&1
 
-# -----------------------------------------------------------------
-# Run Python pep8 if it exists
-# -----------------------------------------------------------------
-
-python_check: $(PYSCRIPT)
-	+if [ -n "$(PEP8)" ]; then \
-		$(PEP8) $(PEP8_FLAGS) $(PYSCRIPT) || true;\
-	fi
-
-
 # -----------------------------------------------------------------
 # Version display
 # -----------------------------------------------------------------
@@ -1742,7 +1734,7 @@ scilab_cpp:
 # -----------------------------------------------------------------
 
 scilab_run:
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(SRCDIR)$(RUNME).sci $(RUNPIPE)
+	env LD_LIBRARY_PATH=$$PWD $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -f $(SRCDIR)$(RUNME).sci $(RUNPIPE)
 
 # -----------------------------------------------------------------
 # Scilab version
@@ -1765,6 +1757,10 @@ scilab_clean:
 #####                        Go                             ######
 ##################################################################
 
+# TODO: The Go make targets need simplifying to use configure time
+# configuration or to use Make's ifeq rather than using lots of
+# runtime shell code. The output will then be a lot less verbose.
+
 GO = @GO@
 GOGCC = @GOGCC@
 GCCGO = @GCCGO@
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 82a0e9db1..66bbbcb6b 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -125,17 +125,14 @@ py_runme  = $(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)
 py2_runme = $(SCRIPTPREFIX)$*$(PY2SCRIPTSUFFIX)
 py3_runme = $(SCRIPTPREFIX)$*$(PY3SCRIPTSUFFIX)
 
-check_pep8 = \
-	if [ -n "$(PEP8)" ]; then \
-	  $(PEP8) $(PEP8_FLAGS) $(SCRIPTPREFIX)$*.py;\
-	fi
+ifneq (,$(PEP8))
+check_pep8 = $(PEP8) $(PEP8_FLAGS) $(SCRIPTPREFIX)$*.py
 
 check_pep8_multi_cpp = \
-	if [ -n "$(PEP8)" ]; then \
-	  for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
+	for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
 	  $(PEP8) $(PEP8_FLAGS) $$f.py; \
-	  done \
-	fi
+	done
+endif
 
 run_python = env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PYTHONPATH=.:$(srcdir):$$PYTHONPATH $(RUNTOOL) $(PYTHON) $(py_runme)
 

From e796ecaa23e233db020a01af7b20c2d4f9bd9ee6 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 12 May 2015 14:20:11 +1200
Subject: [PATCH 133/220] Fix swapped parameters in memset call

---
 Lib/java/director.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/java/director.swg b/Lib/java/director.swg
index 4053c3961..0850564f3 100644
--- a/Lib/java/director.swg
+++ b/Lib/java/director.swg
@@ -214,7 +214,7 @@ namespace Swig {
     bool array_[N];
   public:
     BoolArray() {
-      memset(array_, sizeof(array_), 0);
+      memset(array_, 0, sizeof(array_));
     }
     bool& operator[](size_t n) {
       return array_[n];

From 54e2317b24de05ad38e7670d76726d8797e12851 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 14 May 2015 18:38:32 +0100
Subject: [PATCH 134/220] Fix shared_ptr of classes with private constructors
 and destructors.

Usually these use a custom deleter passed to the shared_ptr.
This also fixes the "unref" feature when used on classes with private destructors.
---
 CHANGES.current                               |  4 +++
 .../csharp/li_boost_shared_ptr_bits_runme.cs  |  7 +++++
 .../java/li_boost_shared_ptr_bits_runme.java  |  7 +++++
 .../test-suite/li_boost_shared_ptr_bits.i     | 31 +++++++++++++++++++
 Source/CParse/parser.y                        |  4 +++
 5 files changed, 53 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index a30b026dc..06fee5658 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-14: wsfulton
+            Fix seg fault wrapping shared_ptr of classes with private constructors and destructors. 
+            This also fixes the "unref" feature when used on classes with private destructors.
+
 2015-05-10: wsfulton
             [Java] Fix multi-argument typemaps (char *STRING, size_t LENGTH)
             so that they can be applied to a wider range of types. Fixes #385.
diff --git a/Examples/test-suite/csharp/li_boost_shared_ptr_bits_runme.cs b/Examples/test-suite/csharp/li_boost_shared_ptr_bits_runme.cs
index b4ec47f02..38f71f978 100644
--- a/Examples/test-suite/csharp/li_boost_shared_ptr_bits_runme.cs
+++ b/Examples/test-suite/csharp/li_boost_shared_ptr_bits_runme.cs
@@ -16,5 +16,12 @@ public class runme
 
     HiddenDestructor hidden = HiddenDestructor.create();
     hidden.Dispose();
+
+    HiddenPrivateDestructor hiddenPrivate = HiddenPrivateDestructor.create();
+    if (HiddenPrivateDestructor.DeleteCount != 0)
+      throw new ApplicationException("Count should be zero");
+    hiddenPrivate.Dispose();
+    if (HiddenPrivateDestructor.DeleteCount != 1)
+      throw new ApplicationException("Count should be one");
   }
 }
diff --git a/Examples/test-suite/java/li_boost_shared_ptr_bits_runme.java b/Examples/test-suite/java/li_boost_shared_ptr_bits_runme.java
index d1489edf4..aefa81182 100644
--- a/Examples/test-suite/java/li_boost_shared_ptr_bits_runme.java
+++ b/Examples/test-suite/java/li_boost_shared_ptr_bits_runme.java
@@ -23,5 +23,12 @@ public class li_boost_shared_ptr_bits_runme {
 
     HiddenDestructor hidden = HiddenDestructor.create();
     hidden.delete();
+
+    HiddenPrivateDestructor hiddenPrivate = HiddenPrivateDestructor.create();
+    if (HiddenPrivateDestructor.getDeleteCount() != 0)
+      throw new RuntimeException("Count should be zero");
+    hiddenPrivate.delete();
+    if (HiddenPrivateDestructor.getDeleteCount() != 1)
+      throw new RuntimeException("Count should be one");
   }
 }
diff --git a/Examples/test-suite/li_boost_shared_ptr_bits.i b/Examples/test-suite/li_boost_shared_ptr_bits.i
index 2232b6cf6..35f4b3fbb 100644
--- a/Examples/test-suite/li_boost_shared_ptr_bits.i
+++ b/Examples/test-suite/li_boost_shared_ptr_bits.i
@@ -128,5 +128,36 @@ HiddenDestructor::~HiddenDestructor()
     delete impl_;
 }
 %}
+
+////////////////////////////
+// As above but private instead of protected destructor
 ////////////////////////////
 
+%shared_ptr(HiddenPrivateDestructor)
+
+%inline %{
+class HiddenPrivateDestructor {
+private:
+  HiddenPrivateDestructor() {}
+  virtual ~HiddenPrivateDestructor() {
+    DeleteCount++;
+  }
+
+  class Deleter {
+  public:
+    void operator()(HiddenPrivateDestructor *hidden) {
+      delete hidden;
+    }
+  };
+
+public:
+  static boost::shared_ptr<HiddenPrivateDestructor> create() {
+    boost::shared_ptr<HiddenPrivateDestructor> hidden( new HiddenPrivateDestructor(), HiddenPrivateDestructor::Deleter() );
+    return hidden;
+  }
+  static int DeleteCount;
+};
+
+int HiddenPrivateDestructor::DeleteCount = 0;
+%}
+
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index c8dc44a79..39b859d68 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -371,6 +371,10 @@ static void add_symbols(Node *n) {
 	  if ((Cmp(Getattr(n,"storage"),"virtual") == 0) && (Cmp(Getattr(n,"value"),"0") == 0)) {
 	    only_csymbol = 0;
 	  }
+	  if (Cmp(nodeType(n),"destructor") == 0) {
+	    /* Needed for "unref" feature */
+	    only_csymbol = 0;
+	  }
 	}
       } else {
 	  Setattr(n,"access", "public");

From ef0be64a6d0cdd9f1c02a2c78d6f7de56a2aade2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 14 May 2015 19:26:55 +0100
Subject: [PATCH 135/220] Update docs wrt directors and shared_ptr

Mentioned in bug #417.

[skip ci]
---
 Doc/Manual/Library.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Doc/Manual/Library.html b/Doc/Manual/Library.html
index 740988e71..069707559 100644
--- a/Doc/Manual/Library.html
+++ b/Doc/Manual/Library.html
@@ -1900,7 +1900,9 @@ Adding the missing <tt>%shared_ptr</tt> macros will fix this:
 </div>
 
 <p>
-<b>Note:</b> There is currently no support for <tt>%shared_ptr</tt> and the director feature.
+<b>Note:</b> There is somewhat limited support for <tt>%shared_ptr</tt> and the director feature
+and the degress of success varies among the different target languages.
+Please help to improve this support by providing patches with improvements.
 </p>
 
 

From 1e19e4bd4519931c6a3e4391426f8e70d323368f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 14 May 2015 21:09:08 +0100
Subject: [PATCH 136/220] li_boost_shared_ptr_bits testcase fix for languages
 without shared_ptr support

---
 Examples/test-suite/li_boost_shared_ptr_bits.i | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Examples/test-suite/li_boost_shared_ptr_bits.i b/Examples/test-suite/li_boost_shared_ptr_bits.i
index 35f4b3fbb..c0101b131 100644
--- a/Examples/test-suite/li_boost_shared_ptr_bits.i
+++ b/Examples/test-suite/li_boost_shared_ptr_bits.i
@@ -133,8 +133,13 @@ HiddenDestructor::~HiddenDestructor()
 // As above but private instead of protected destructor
 ////////////////////////////
 
+#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED)
+
 %shared_ptr(HiddenPrivateDestructor)
 
+#endif
+
+
 %inline %{
 class HiddenPrivateDestructor {
 private:

From 5bca0635363fc677576a4313d36ac0645df781fa Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 18 May 2015 09:53:13 -0700
Subject: [PATCH 137/220] [Go] Fix bug with ignored destructor--generated code
 did not compile.

---
 Examples/test-suite/director_ignore.i | 17 +++++++++-
 Source/Modules/go.cxx                 | 49 ++++++++++++++-------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/Examples/test-suite/director_ignore.i b/Examples/test-suite/director_ignore.i
index 57cbc13d8..edb657320 100644
--- a/Examples/test-suite/director_ignore.i
+++ b/Examples/test-suite/director_ignore.i
@@ -10,6 +10,7 @@
 %ignore OverloadedProtectedMethod(int n, int xoffset = 0, int yoffset = 0);
 %ignore DIgnoreConstructor(bool b);
 %ignore DIgnoreOnlyConstructor(bool b);
+%ignore DIgnoreDestructor::~DIgnoreDestructor;
 %ignore Pointers;
 %ignore References;
 %ignore PublicMethod1;
@@ -101,6 +102,13 @@ class DIgnoreOnlyConstructor
     DIgnoreOnlyConstructor(bool b) {}
 };
 
+class DIgnoreDestructor
+{
+ public:
+  DIgnoreDestructor() {}
+  virtual ~DIgnoreDestructor() {}
+};
+
 %{
 class DIgnoreConstructor
 {
@@ -118,5 +126,12 @@ class DIgnoreOnlyConstructor
   private: // Hide constructor
     DIgnoreOnlyConstructor(bool b) {}
 };
-%}
 
+class DIgnoreDestructor
+{
+ public:
+  DIgnoreDestructor() {}
+  virtual ~DIgnoreDestructor() {}
+};
+
+%}
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 502b41091..5cdb7baf2 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -3891,36 +3891,37 @@ private:
     String *director_struct_name = NewString("_swig_Director");
     Append(director_struct_name, cn);
 
-    Printv(f_c_directors_h, "  virtual ~SwigDirector_", class_name, "()", NULL);
-
-    String *throws = buildThrow(n);
-    if (throws) {
-      Printv(f_c_directors_h, " ", throws, NULL);
-    }
-
-    Printv(f_c_directors_h, ";\n", NULL);
-
-    String *director_sig = NewString("");
-
-    Printv(director_sig, "SwigDirector_", class_name, "::~SwigDirector_", class_name, "()", NULL);
-
-    if (throws) {
-      Printv(director_sig, " ", throws, NULL);
-      Delete(throws);
-    }
-
-    Printv(director_sig, "\n", NULL);
-    Printv(director_sig, "{\n", NULL);
-
     if (!is_ignored) {
+      Printv(f_c_directors_h, "  virtual ~SwigDirector_", class_name, "()", NULL);
+
+      String *throws = buildThrow(n);
+      if (throws) {
+	Printv(f_c_directors_h, " ", throws, NULL);
+      }
+
+      Printv(f_c_directors_h, ";\n", NULL);
+
+      String *director_sig = NewString("");
+
+      Printv(director_sig, "SwigDirector_", class_name, "::~SwigDirector_", class_name, "()", NULL);
+
+      if (throws) {
+	Printv(director_sig, " ", throws, NULL);
+	Delete(throws);
+      }
+
+      Printv(director_sig, "\n", NULL);
+      Printv(director_sig, "{\n", NULL);
+
       makeDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
 
       Printv(f_c_directors, "  delete swig_mem;\n", NULL);
+
+      Printv(f_c_directors, "}\n\n", NULL);
+
+      Delete(director_sig);
     }
 
-    Printv(f_c_directors, "}\n\n", NULL);
-
-    Delete(director_sig);
     Delete(go_name);
     Delete(cn);
     Delete(director_struct_name);

From 38c7d59f813240f81e059c87443148065da79111 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 18 May 2015 11:28:24 -0700
Subject: [PATCH 138/220] [Go] Adjust last change to always emit a destructor.

---
 Source/Modules/go.cxx | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 5cdb7baf2..c93b1e0cc 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -3891,37 +3891,38 @@ private:
     String *director_struct_name = NewString("_swig_Director");
     Append(director_struct_name, cn);
 
-    if (!is_ignored) {
-      Printv(f_c_directors_h, "  virtual ~SwigDirector_", class_name, "()", NULL);
+    Printv(f_c_directors_h, "  virtual ~SwigDirector_", class_name, "()", NULL);
 
-      String *throws = buildThrow(n);
-      if (throws) {
-	Printv(f_c_directors_h, " ", throws, NULL);
-      }
-
-      Printv(f_c_directors_h, ";\n", NULL);
-
-      String *director_sig = NewString("");
-
-      Printv(director_sig, "SwigDirector_", class_name, "::~SwigDirector_", class_name, "()", NULL);
-
-      if (throws) {
-	Printv(director_sig, " ", throws, NULL);
-	Delete(throws);
-      }
-
-      Printv(director_sig, "\n", NULL);
-      Printv(director_sig, "{\n", NULL);
-
-      makeDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
-
-      Printv(f_c_directors, "  delete swig_mem;\n", NULL);
-
-      Printv(f_c_directors, "}\n\n", NULL);
-
-      Delete(director_sig);
+    String *throws = buildThrow(n);
+    if (throws) {
+      Printv(f_c_directors_h, " ", throws, NULL);
     }
 
+    Printv(f_c_directors_h, ";\n", NULL);
+
+    String *director_sig = NewString("");
+
+    Printv(director_sig, "SwigDirector_", class_name, "::~SwigDirector_", class_name, "()", NULL);
+
+    if (throws) {
+      Printv(director_sig, " ", throws, NULL);
+      Delete(throws);
+    }
+
+    Printv(director_sig, "\n", NULL);
+    Printv(director_sig, "{\n", NULL);
+
+    if (is_ignored) {
+      Printv(f_c_directors, director_sig, NULL);
+    } else {
+      makeDirectorDestructorWrapper(go_name, director_struct_name, director_sig);
+    }
+
+    Printv(f_c_directors, "  delete swig_mem;\n", NULL);
+
+    Printv(f_c_directors, "}\n\n", NULL);
+
+    Delete(director_sig);
     Delete(go_name);
     Delete(cn);
     Delete(director_struct_name);

From a89a4d9e844935c53f07e1ebeea5fbd636e4b263 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 19 May 2015 15:48:25 +1200
Subject: [PATCH 139/220] [Python] Fix warning when compiling generated code
 with MSVC.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://sourceforge.net/p/swig/patches/351/ reported by Mateusz
Szymański).
---
 CHANGES.current       | 5 +++++
 Lib/python/pyinit.swg | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 06fee5658..8dadc3662 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-19: olly
+	    [Python] Fix warning when compiling generated code with MSVC.
+	    (Fixes https://sourceforge.net/p/swig/patches/351/ reported by
+	    Mateusz Szymański).
+
 2015-05-14: wsfulton
             Fix seg fault wrapping shared_ptr of classes with private constructors and destructors. 
             This also fixes the "unref" feature when used on classes with private destructors.
diff --git a/Lib/python/pyinit.swg b/Lib/python/pyinit.swg
index 47d3d9700..e71c72b27 100644
--- a/Lib/python/pyinit.swg
+++ b/Lib/python/pyinit.swg
@@ -275,7 +275,9 @@ SWIG_Python_FixMethods(PyMethodDef *methods,
   size_t i;
   for (i = 0; methods[i].ml_name; ++i) {
     const char *c = methods[i].ml_doc;
-    if (c && (c = strstr(c, "swig_ptr: "))) {
+    if (!c) continue;
+    c = strstr(c, "swig_ptr: ");
+    if (c) {
       int j;
       swig_const_info *ci = 0;
       const char *name = c + 10;

From 0a70498591c3589724415a2a7649da96571b9553 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Wed, 27 May 2015 08:06:23 +0100
Subject: [PATCH 140/220] Refactor PYTHON::convertValue

Remove multiple return statements for upcoming commits.
---
 Source/Modules/python.cxx | 162 ++++++++++++++++++++------------------
 1 file changed, 85 insertions(+), 77 deletions(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 6b603ea9e..753cc301a 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1889,6 +1889,8 @@ public:
   String *convertValue(String *v, SwigType *t) {
     const char *const s = Char(v);
     char *end;
+    String *result = NIL;
+    bool fail = false;
 
     // Check if this is a number in any base.
     long value = strtol(s, &end, 0);
@@ -1897,97 +1899,103 @@ public:
       if (errno == ERANGE) {
 	// There was an overflow, we could try representing the value as Python
 	// long integer literal, but for now don't bother with it.
-	return NIL;
-      }
+	fail = true;
+      } else {
+	if (*end != '\0') {
+	  // If there is a suffix after the number, we can safely ignore any
+	  // combination of "l" and "u", but not anything else (again, stuff like
+	  // "LL" could be handled, but we don't bother to do it currently).
+	  bool seen_long = false;
+	  for (char* p = end; *p != '\0'; ++p) {
+	    switch (*p) {
+	      case 'l':
+	      case 'L':
+		// Bail out on "LL".
+		if (seen_long) {
+		  fail = true;
+		  break;
+		}
+		seen_long = true;
+		break;
 
-      if (*end != '\0') {
-	// If there is a suffix after the number, we can safely ignore any
-	// combination of "l" and "u", but not anything else (again, stuff like
-	// "LL" could be handled, but we don't bother to do it currently).
-	bool seen_long = false;
-	for (char* p = end; *p != '\0'; ++p) {
-	  switch (*p) {
-	    case 'l':
-	    case 'L':
-	      // Bail out on "LL".
-	      if (seen_long)
-		return NIL;
-	      seen_long = true;
-	      break;
+	      case 'u':
+	      case 'U':
+		break;
 
-	    case 'u':
-	    case 'U':
-	      break;
-
-	    default:
-	      // Except that our suffix could actually be the fractional part of
-	      // a floating point number, so we still have to check for this.
-	      return convertDoubleValue(v);
-	  }
-	}
-      }
-
-      // Allow integers as the default value for a bool parameter.
-      if (Cmp(t, "bool") == 0)
-	return NewString(value ? "True" : "False");
-
-      // Deal with the values starting with 0 first as they can be octal or
-      // hexadecimal numbers or even pointers.
-      if (s[0] == '0') {
-	if (Len(v) == 1) {
-	  // This is just a lone 0, but it needs to be represented differently
-	  // in Python depending on whether it's a zero or a null pointer.
-	  if (isPointerType(t))
-	    return NewString("None");
-	  else
-	    return v;
-	} else if (s[1] == 'x' || s[1] == 'X') {
-	  // This must have been a hex number, we can use it directly in Python,
-	  // so nothing to do here.
-	} else {
-	  // This must have been an octal number, we have to change its prefix
-	  // to be "0o" in Python 3 only (and as long as we still support Python
-	  // 2.5, this can't be done unconditionally).
-	  if (py3) {
-	    if (end - s > 1) {
-	      String *res = NewString("0o");
-	      Append(res, NewStringWithSize(s + 1, end - s - 1));
-	      return res;
+	      default:
+		// Except that our suffix could actually be the fractional part of
+		// a floating point number, so we still have to check for this.
+		result = convertDoubleValue(v);
 	    }
 	  }
 	}
-      }
 
-      // Avoid unnecessary string allocation in the common case when we don't
-      // need to remove any suffix.
-      return *end == '\0' ? v : NewStringWithSize(s, end - s);
+	if (!fail) {
+	  // Allow integers as the default value for a bool parameter.
+	  if (Cmp(t, "bool") == 0) {
+	    result = NewString(value ? "True" : "False");
+	  } else {
+	    // Deal with the values starting with 0 first as they can be octal or
+	    // hexadecimal numbers or even pointers.
+	    if (s[0] == '0') {
+	      if (Len(v) == 1) {
+		// This is just a lone 0, but it needs to be represented differently
+		// in Python depending on whether it's a zero or a null pointer.
+		if (isPointerType(t))
+		  result = NewString("None");
+		else
+		  result = v;
+	      } else if (s[1] == 'x' || s[1] == 'X') {
+		// This must have been a hex number, we can use it directly in Python,
+		// so nothing to do here.
+	      } else {
+		// This must have been an octal number, we have to change its prefix
+		// to be "0o" in Python 3 only (and as long as we still support Python
+		// 2.5, this can't be done unconditionally).
+		if (py3) {
+		  if (end - s > 1) {
+		    result = NewString("0o");
+		    Append(result, NewStringWithSize(s + 1, end - s - 1));
+		  }
+		}
+	      }
+	    }
+
+	    // Avoid unnecessary string allocation in the common case when we don't
+	    // need to remove any suffix.
+	    if (!result)
+	      result = *end == '\0' ? v : NewStringWithSize(s, end - s);
+	  }
+	}
+      }
     }
 
     // Check if this is a floating point number (notice that it wasn't
     // necessarily parsed as a long above, consider e.g. ".123").
-    if (String *res = convertDoubleValue(v)) {
-      return res;
-    }
+    if (!fail && !result) {
+      result = convertDoubleValue(v);
+      if (!result) {
+	if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0)
+	  result = NewString("True");
+	else if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
+	  result = NewString("False");
+	else if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
+	  result = isPointerType(t) ? NewString("None") : NewString("0");
 
-    if (Strcmp(v, "true") == 0 || Strcmp(v, "TRUE") == 0)
-      return NewString("True");
-    if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
-      return NewString("False");
-    if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
-      return isPointerType(t) ? NewString("None") : NewString("0");
-
-    // This could also be an enum type, default value of which could be
-    // representable in Python if it doesn't include any scope (which could,
-    // but currently is not, translated).
-    if (!Strchr(s, ':')) {
-      Node *lookup = Swig_symbol_clookup(v, 0);
-      if (lookup) {
-	if (Cmp(Getattr(lookup, "nodeType"), "enumitem") == 0)
-	  return Getattr(lookup, "sym:name");
+	// This could also be an enum type, default value of which could be
+	// representable in Python if it doesn't include any scope (which could,
+	// but currently is not, translated).
+	else if (!Strchr(s, ':')) {
+	  Node *lookup = Swig_symbol_clookup(v, 0);
+	  if (lookup) {
+	    if (Cmp(Getattr(lookup, "nodeType"), "enumitem") == 0)
+	      result = Getattr(lookup, "sym:name");
+	  }
+	}
       }
     }
 
-    return NIL;
+    return result;
   }
 
   /* ------------------------------------------------------------

From 986a13f1a06518375f8dff3e37da72d2a518d6e2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Wed, 27 May 2015 20:51:20 +0100
Subject: [PATCH 141/220] Fix Python typedef bool default arguments that are
 not booleans.

Includes code optimisation in PYTHON::convertValue().

Closes #327
---
 CHANGES.current                               |  4 +++
 Examples/test-suite/default_arg_values.i      |  8 +++++
 .../python/default_arg_values_runme.py        |  6 ++++
 Source/Modules/python.cxx                     | 30 +++++++------------
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 8dadc3662..e722d1346 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-05-07: wsfulton
+	    [Python] Deal with an integer as the default value of a typedef to bool
+	    parameter in the C++ prototype.  See #327. Regression from 3.0.0 onwards.
+
 2015-05-19: olly
 	    [Python] Fix warning when compiling generated code with MSVC.
 	    (Fixes https://sourceforge.net/p/swig/patches/351/ reported by
diff --git a/Examples/test-suite/default_arg_values.i b/Examples/test-suite/default_arg_values.i
index ca82d1af4..f2fc57c9b 100644
--- a/Examples/test-suite/default_arg_values.i
+++ b/Examples/test-suite/default_arg_values.i
@@ -8,6 +8,10 @@ struct Display {
   float draw2(float *v = 0) { return v ? *v : 0; }
   bool bool0(bool x = 0) { return x; }
   bool bool1(bool x = 1) { return x; }
+
+  typedef bool mybool;
+  bool mybool0(mybool x = 0) { return x; }
+  bool mybool1(mybool x = 1) { return x; }
 };
 float* createPtr(float v) { static float val; val = v; return &val; }
 %}
@@ -18,5 +22,9 @@ struct Display {
   float draw2(float *v = NULL) { return v ? *v : 0; }
   bool bool0(bool x = 0) { return x; }
   bool bool1(bool x = 1) { return x; }
+
+  typedef bool mybool;
+  bool mybool0(mybool x = 0) { return x; }
+  bool mybool1(mybool x = 1) { return x; }
 };
 float* createPtr(float v) { static float val; val = v; return &val; }
diff --git a/Examples/test-suite/python/default_arg_values_runme.py b/Examples/test-suite/python/default_arg_values_runme.py
index 7ed52a65b..73a738866 100644
--- a/Examples/test-suite/python/default_arg_values_runme.py
+++ b/Examples/test-suite/python/default_arg_values_runme.py
@@ -20,3 +20,9 @@ if d.bool0() != False or type(d.bool0()) != type(False):
 
 if d.bool1() != True or type(d.bool1()) != type(True):
     raise RuntimeError
+
+if d.mybool0() != False or type(d.mybool0()) != type(False):
+    raise RuntimeError
+
+if d.mybool1() != True or type(d.mybool1()) != type(True):
+    raise RuntimeError
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 753cc301a..d5b920bf8 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1824,20 +1824,6 @@ public:
     return doc;
   }
 
-  /* ------------------------------------------------------------
-   * isPointerType()
-   *   Return true if the given type is a pointer after resolving
-   *   it if it's a typedef. This should be typically used instead
-   *   of SwigType_ispointer(), unless the type is already resolved.
-   * ------------------------------------------------------------ */
-  static bool isPointerType(SwigType* t) {
-    SwigType* const full_type = SwigType_typedef_resolve_all(t);
-    bool ispointer = SwigType_ispointer(full_type) ? true : false;
-    Delete(full_type);
-
-    return ispointer;
-  }
-
   /* ------------------------------------------------------------
    *  convertDoubleValue()
    *    Check if the given string looks like a decimal floating point constant
@@ -1886,11 +1872,12 @@ public:
    *    Check if string v can be a Python value literal or a
    *    constant. Return NIL if it isn't.
    * ------------------------------------------------------------ */
-  String *convertValue(String *v, SwigType *t) {
+  String *convertValue(String *v, SwigType *type) {
     const char *const s = Char(v);
     char *end;
     String *result = NIL;
     bool fail = false;
+    SwigType *resolved_type = 0;
 
     // Check if this is a number in any base.
     long value = strtol(s, &end, 0);
@@ -1932,7 +1919,8 @@ public:
 
 	if (!fail) {
 	  // Allow integers as the default value for a bool parameter.
-	  if (Cmp(t, "bool") == 0) {
+	  resolved_type = SwigType_typedef_resolve_all(type);
+	  if (Cmp(resolved_type, "bool") == 0) {
 	    result = NewString(value ? "True" : "False");
 	  } else {
 	    // Deal with the values starting with 0 first as they can be octal or
@@ -1941,7 +1929,7 @@ public:
 	      if (Len(v) == 1) {
 		// This is just a lone 0, but it needs to be represented differently
 		// in Python depending on whether it's a zero or a null pointer.
-		if (isPointerType(t))
+		if (SwigType_ispointer(resolved_type))
 		  result = NewString("None");
 		else
 		  result = v;
@@ -1979,8 +1967,11 @@ public:
 	  result = NewString("True");
 	else if (Strcmp(v, "false") == 0 || Strcmp(v, "FALSE") == 0)
 	  result = NewString("False");
-	else if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0)
-	  result = isPointerType(t) ? NewString("None") : NewString("0");
+	else if (Strcmp(v, "NULL") == 0 || Strcmp(v, "nullptr") == 0) {
+	  if (!resolved_type)
+	    resolved_type = SwigType_typedef_resolve_all(type);
+	  result = SwigType_ispointer(resolved_type) ? NewString("None") : NewString("0");
+	}
 
 	// This could also be an enum type, default value of which could be
 	// representable in Python if it doesn't include any scope (which could,
@@ -1995,6 +1986,7 @@ public:
       }
     }
 
+    Delete(resolved_type);
     return result;
   }
 

From b8e1a66a38962684b1ea7043369b2bc5181f0bab Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 28 May 2015 20:11:57 +0100
Subject: [PATCH 142/220] Add new feature "python:cdefaultargs"

Controls default argument code generation to obtain the default
arguments from the C++ layer instead of the Python layer.
---
 CHANGES.current                               | 36 ++++++-
 Doc/Manual/Python.html                        | 99 +++++++++++++++++++
 Examples/test-suite/default_args.i            |  9 ++
 .../test-suite/python/default_args_runme.py   |  7 ++
 Source/Modules/python.cxx                     |  5 +-
 5 files changed, 153 insertions(+), 3 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index e722d1346..a9847ac6f 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,7 +5,41 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
-2015-05-07: wsfulton
+2015-05-28: wsfulton
+	    [Python] Add new feature "python:cdefaultargs" to control default argument
+            code generation. By default, SWIG attempts to convert C/C++ default argument values
+            into Python values and generates code into the Python layer with these values.
+            Recent versions of SWIG are able to convert more of these values, however, the
+            new behaviour can be circumvented if desired via this new feature, such that
+            the default argument values are obtained from the C layer and not the Python layer.
+            For example:
+
+              struct CDA {
+                int fff(int a = 1, bool b = false);
+              };
+
+            The default code generation in the Python layer is:
+
+              class CDA(_object):
+                  ...
+                  def fff(self, a=1, b=False):
+                      return _default_args.CDA_fff(self, a, b)
+
+            Adding the feature:
+
+              %feature("python:cdefaultargs") CDA::fff;
+
+            Results in:
+
+              class CDA(_object):
+                  ...
+                  def fff(self, *args):
+                      return _default_args.CDA_fff(self, *args)
+
+            Some code generation modes, eg -builtin and -fastproxy, are unaffected by this as
+            the default values are always obtained from the C layer.
+
+2015-05-27: wsfulton
 	    [Python] Deal with an integer as the default value of a typedef to bool
 	    parameter in the C++ prototype.  See #327. Regression from 3.0.0 onwards.
 
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 1886fcd45..23c2aaae3 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -4147,6 +4147,105 @@ If you need to return binary data, you might use the
 also be used to extra binary data from arbitrary pointers.
 </p>
 
+
+<H3><a name="Python_default_args"></a>Default arguments</H3>
+
+<p>
+C++ default argument code generation is documented in the main
+<a href="SWIG.html#SWIGPlus_default_args">Default arguments</a> section.
+There is also an optional Python specific feature that can be used called the <tt>python:cdefaultargs</tt> 
+<a href="Customization.html#Customization_feature_flags">feature flag</a>.
+By default, SWIG attempts to convert C++ default argument values
+into Python values and generates code into the Python layer containing these values.
+For example:
+</p>
+
+<div class="code">
+<pre>
+struct CDA {
+  int fff(int a = 1, bool b = false);
+};
+</pre>
+</div>
+
+<p>
+From Python this can be called as follows:
+</p>
+
+<div class="targetlang">
+<pre>
+&gt;&gt;&gt; CDA().fff()        # C++ layer receives a=1 and b=false
+&gt;&gt;&gt; CDA().fff(2)       # C++ layer receives a=2 and b=false
+&gt;&gt;&gt; CDA().fff(3, True) # C++ layer receives a=3 and b=true
+</pre>
+</div>
+
+<p>
+The default code generation in the Python layer is:
+</p>
+
+<div class="targetlang">
+<pre>
+class CDA(object):
+    ...
+    def fff(self, a=1, b=False):
+        return _default_args.CDA_fff(self, a, b)
+</pre>
+</div>
+
+<p>
+Adding the feature:
+</p>
+  
+<div class="code">
+<pre>
+%feature("python:cdefaultargs") CDA::fff;
+struct CDA {
+  int fff(int a = 1, bool b = false);
+</pre>
+</div>
+
+<p>
+results in identical behaviour when called from Python, however, it results in different code generation:
+</p>
+
+<div class="targetlang">
+<pre>
+class CDA(object):
+    ...
+    def fff(self, *args):
+        return _default_args.CDA_fff(self, *args)
+</pre>
+</div>
+
+<p>
+The default arguments are obtained in the C++ wrapper layer instead of the Python layer.
+Some code generation modes are quite different, eg <tt>-builtin</tt> and <tt>-fastproxy</tt>,
+and are unaffected by <tt>python:cdefaultargs</tt> as the default values are always obtained from the C++ layer.
+</p>
+
+<p>
+Note that not all default arguments can be converted into a Python equivalent.
+When SWIG does not convert them, it will generate code to obtain them from the C++ layer as if
+<tt>python:cdefaultargs</tt> was specified.
+This will happen if just one argument cannot be converted into a Python equivalent.
+This occurs typically when the argument is not fully numeric, such as <tt>int(1)</tt>:
+</p>
+
+<div class="code">
+<pre>
+struct CDA {
+  int fff(int a = int(1), bool b = false);
+};
+</pre>
+</div>
+
+<p>
+<b>Compatibility Note:</b> SWIG-3.0.6 introduced the <tt>python:cdefaultargs</tt> feature.
+Versions of SWIG prior to this varied in their ability to convert C++ default values into
+equivalent Python default argument values.
+</p>
+
 <H2><a name="Python_nn53"></a>36.8 Typemaps</H2>
 
 
diff --git a/Examples/test-suite/default_args.i b/Examples/test-suite/default_args.i
index 719681f95..d3014d386 100644
--- a/Examples/test-suite/default_args.i
+++ b/Examples/test-suite/default_args.i
@@ -292,3 +292,12 @@ struct ConstMethods {
   inline int slightly_off_square(int square_error, int def17) { return def17*def17 + square_error; }
 %}
 
+// Python C default args
+%feature("python:cdefaultargs") CDA::cdefaultargs_test1;
+%inline %{
+struct CDA {
+  int cdefaultargs_test1(int a = 1) { return a; }
+  int cdefaultargs_test2(int a = 1) { return a; }
+};
+%}
+
diff --git a/Examples/test-suite/python/default_args_runme.py b/Examples/test-suite/python/default_args_runme.py
index 11878f7a4..6610a4ec4 100644
--- a/Examples/test-suite/python/default_args_runme.py
+++ b/Examples/test-suite/python/default_args_runme.py
@@ -128,6 +128,13 @@ def run(module_name):
     if default_args.slightly_off_square() != 291:
         raise RuntimeError
 
+    # It is difficult to test the python:cdefaultargs feature properly as -builtin
+    # and -fastproxy do not use the Python layer for default args
+    if default_args.CDA().cdefaultargs_test1() != 1:
+        raise RuntimeError
+
+    if default_args.CDA().cdefaultargs_test2() != 1:
+        raise RuntimeError
 
 if __name__ == "__main__":
     run('default_args')
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index d5b920bf8..1d4d5b238 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2082,9 +2082,10 @@ public:
 
 	1. The function is overloaded as Python doesn't support this.
 	2. We were explicitly asked to use the "compact" arguments form.
-	3. One of the default argument values can't be represented in Python.
+	3. We were explicitly asked to use default args from C via the "python:cdefaultargs" feature.
+	4. One of the default argument values can't be represented in Python.
      */
-    if (is_real_overloaded(n) || GetFlag(n, "feature:compactdefaultargs") || !is_representable_as_pyargs(n)) {
+    if (is_real_overloaded(n) || GetFlag(n, "feature:compactdefaultargs") || GetFlag(n, "feature:python:cdefaultargs") || !is_representable_as_pyargs(n)) {
       String *parms = NewString("");
       if (in_class)
 	Printf(parms, "self, ");

From 678937db247e4fceadbdc8f68d2c1220fe6c9067 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 2 Jun 2015 07:27:03 +0100
Subject: [PATCH 143/220] Appveyor upgrade to cygwin on stable server

Appveyor now has cygwin on their stable OS
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index e84bf6c88..aa69719d8 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 os:
-- Unstable
+- Windows Server 2012 R2
 
 platform:
 - x86

From 747e22f714e793ae619545e284496275e0fb7169 Mon Sep 17 00:00:00 2001
From: Frederick Parotat <frederick@parotat.de>
Date: Wed, 3 Jun 2015 14:19:13 +0200
Subject: [PATCH 144/220] [C#] Single file mode

Added "-csout <path>" parameter. If supplied all generated C# code will
be written to the given file. Makes it easier to integrate SWIG into
automated script based build processes.
---
 Source/Modules/csharp.cxx | 139 ++++++++++++++++++++------------------
 1 file changed, 73 insertions(+), 66 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index b251ff892..dda5bb528 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -34,6 +34,7 @@ class CSHARP:public Language {
   File *f_init;
   File *f_directors;
   File *f_directors_h;
+  File *f_single;
   List *filenames_list;
 
   bool proxy_flag;		// Flag for generating proxy classes
@@ -78,6 +79,7 @@ class CSHARP:public Language {
   String *director_method_types;	// Director method types
   String *director_connect_parms;	// Director delegates parameter list for director connect call
   String *destructor_call;	//C++ destructor call if any
+  String *cs_out;
 
   // Director method stuff:
   List *dmethods_seq;
@@ -108,6 +110,7 @@ public:
       f_init(NULL),
       f_directors(NULL),
       f_directors_h(NULL),
+      f_single(NULL),
       filenames_list(NULL),
       proxy_flag(true),
       native_function_flag(false),
@@ -150,6 +153,7 @@ public:
       director_method_types(NULL),
       director_connect_parms(NULL),
       destructor_call(NULL),
+      cs_out(NULL),
       dmethods_seq(NULL),
       dmethods_table(NULL),
       n_dmethods(0),
@@ -244,6 +248,16 @@ public:
 	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
 	  Swig_mark_arg(i);
 	  old_variable_names = true;
+    } else if (strcmp(argv[i], "-csout") == 0) {
+      if (argv[i + 1]) {
+        cs_out = NewString("");
+        Printf(cs_out, argv[i + 1]);
+        Swig_mark_arg(i);
+        Swig_mark_arg(i + 1);
+        i++;
+      } else {
+        Swig_arg_error();
+      }
 	} else if (strcmp(argv[i], "-help") == 0) {
 	  Printf(stdout, "%s\n", usage);
 	}
@@ -423,18 +437,7 @@ public:
     }
     // Generate the intermediary class
     {
-      String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), imclass_name);
-      File *f_im = NewFile(filen, "w", SWIG_output_files());
-      if (!f_im) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the intermediary class file
-      emitBanner(f_im);
+      File *f_im = getFile(SWIG_output_directory(), imclass_name);
 
       addOpenNamespace(0, f_im);
 
@@ -462,23 +465,13 @@ public:
       Printf(f_im, "}\n");
       addCloseNamespace(0, f_im);
 
-      Delete(f_im);
+      if(f_im != f_single)
+        Delete(f_im);
     }
 
     // Generate the C# module class
     {
-      String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), module_class_name);
-      File *f_module = NewFile(filen, "w", SWIG_output_files());
-      if (!f_module) {
-	FileErrorDisplay(filen);
-	SWIG_exit(EXIT_FAILURE);
-      }
-      Append(filenames_list, Copy(filen));
-      Delete(filen);
-      filen = NULL;
-
-      // Start writing out the module class file
-      emitBanner(f_module);
+      File *f_module = getFile(SWIG_output_directory(), module_class_name);
 
       addOpenNamespace(0, f_module);
 
@@ -514,7 +507,8 @@ public:
       Printf(f_module, "}\n");
       addCloseNamespace(0, f_module);
 
-      Delete(f_module);
+      if(f_module != f_single)
+        Delete(f_module);
     }
 
     if (upcasts_code)
@@ -613,6 +607,11 @@ public:
       f_directors_h = NULL;
     }
 
+    if(f_single) {
+      Dump(f_single, f_begin);
+      Delete(f_single);
+    }
+
     Dump(f_wrappers, f_begin);
     Wrapper_pretty_print(f_init, f_begin);
     Delete(f_header);
@@ -634,6 +633,44 @@ public:
     Swig_banner_target_lang(f, "//");
     Printf(f, "//------------------------------------------------------------------------------\n\n");
   }
+  
+  /* -----------------------------------------------------------------------------
+   * getFile()
+   * ----------------------------------------------------------------------------- */
+
+  File* getFile(const String* dir, String* name) {
+    if(cs_out) {
+      if(!f_single) {
+        String* filen = NewStringf("%s", cs_out);
+        f_single = NewFile(filen, "w", SWIG_output_files());
+        if(!f_single) {
+          FileErrorDisplay(filen);
+          SWIG_exit(EXIT_FAILURE);
+		}
+        Append(filenames_list, Copy(filen));
+        Delete(filen);
+        filen = NULL;
+
+		Printf(stdout, "create single file");
+
+        emitBanner(f_single);
+	  }
+      return f_single;
+    } else {
+      String* filen = NewStringf("%s%s.cs", dir, name);
+      File* f = NewFile(filen, "w", SWIG_output_files());
+      if(!f) {
+        FileErrorDisplay(f);
+        SWIG_exit(EXIT_FAILURE);
+	  }
+      Append(filenames_list, Copy(filen));
+      Delete(filen);
+      filen = NULL;
+
+      emitBanner(f);
+      return f;
+    }
+  }
 
   /*-----------------------------------------------------------------------
    * Add new director upcall signature
@@ -1198,18 +1235,7 @@ public:
 	} else {
 	  // Global enums are defined in their own file
 	  String *output_directory = outputDirectory(nspace);
-	  String *filen = NewStringf("%s%s.cs", output_directory, symname);
-	  File *f_enum = NewFile(filen, "w", SWIG_output_files());
-	  if (!f_enum) {
-	    FileErrorDisplay(filen);
-	    SWIG_exit(EXIT_FAILURE);
-	  }
-	  Append(filenames_list, Copy(filen));
-	  Delete(filen);
-	  filen = NULL;
-
-	  // Start writing out the enum file
-	  emitBanner(f_enum);
+	  File *f_enum = getFile(output_directory, symname);
 
 	  addOpenNamespace(nspace, f_enum);
 
@@ -1217,7 +1243,8 @@ public:
 		 "\n", enum_code, "\n", NIL);
 
 	  addCloseNamespace(nspace, f_enum);
-	  Delete(f_enum);
+      if(f_enum != f_single)
+        Delete(f_enum);
 	  Delete(output_directory);
 	}
       } else {
@@ -1920,18 +1947,7 @@ public:
       // Each outer proxy class goes into a separate file
       if (!has_outerclass) {
 	String *output_directory = outputDirectory(nspace);
-	String *filen = NewStringf("%s%s.cs", output_directory, proxy_class_name);
-	f_proxy = NewFile(filen, "w", SWIG_output_files());
-	if (!f_proxy) {
-	  FileErrorDisplay(filen);
-	  SWIG_exit(EXIT_FAILURE);
-	}
-	Append(filenames_list, Copy(filen));
-	Delete(filen);
-	filen = NULL;
-
-	// Start writing out the proxy class file
-	emitBanner(f_proxy);
+	f_proxy = getFile(output_directory, proxy_class_name);
 
 	addOpenNamespace(nspace, f_proxy);
       }
@@ -1991,7 +2007,8 @@ public:
       if (!has_outerclass) {
 	Printf(f_proxy, "}\n");
 	addCloseNamespace(nspace, f_proxy);
-	Delete(f_proxy);
+    if(f_proxy != f_single)
+      Delete(f_proxy);
 	f_proxy = NULL;
       } else {
 	for (int i = 0; i < nesting_depth; ++i)
@@ -3216,18 +3233,7 @@ public:
     Setline(n, line_number);
 
     String *swigtype = NewString("");
-    String *filen = NewStringf("%s%s.cs", SWIG_output_directory(), classname);
-    File *f_swigtype = NewFile(filen, "w", SWIG_output_files());
-    if (!f_swigtype) {
-      FileErrorDisplay(filen);
-      SWIG_exit(EXIT_FAILURE);
-    }
-    Append(filenames_list, Copy(filen));
-    Delete(filen);
-    filen = NULL;
-
-    // Start writing out the type wrapper class file
-    emitBanner(f_swigtype);
+    File *f_swigtype = getFile(SWIG_output_directory(), classname);
 
     addOpenNamespace(0, f_swigtype);
 
@@ -3262,8 +3268,8 @@ public:
     Printv(f_swigtype, swigtype, NIL);
 
     addCloseNamespace(0, f_swigtype);
-
-    Delete(f_swigtype);
+    if(f_swigtype != f_single)
+      Delete(f_swigtype);
     Delete(swigtype);
     Delete(n);
   }
@@ -4285,4 +4291,5 @@ C# Options (available with -csharp)\n\
      -noproxy        - Generate the low-level functional interface instead\n\
                        of proxy classes\n\
      -oldvarnames    - Old intermediary method names for variable wrappers\n\
+	 -csout <path>   - Write all C# to a single file located at <path>\n\
 \n";

From 0b0997821926b4e615286a8ad42de805d1f6912d Mon Sep 17 00:00:00 2001
From: Frederick Parotat <tzann@gmx.net>
Date: Wed, 3 Jun 2015 14:26:38 +0200
Subject: [PATCH 145/220] [C#] Single file mode (minor fix)

Removed debug output
---
 Source/Modules/csharp.cxx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index dda5bb528..7ebb9ff64 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -651,8 +651,6 @@ public:
         Delete(filen);
         filen = NULL;
 
-		Printf(stdout, "create single file");
-
         emitBanner(f_single);
 	  }
       return f_single;

From b83307e3547bcd643fc6b76bfdc09d736e308e32 Mon Sep 17 00:00:00 2001
From: Frederick Parotat <frederick@parotat.de>
Date: Thu, 4 Jun 2015 14:15:00 +0200
Subject: [PATCH 146/220] [C#] Single file mode (fixes)

Renamed argument '-csout' to '-outfile'.
Reformatting (Tab spacing; Pointer style).
Chagned html documentation.
---
 Doc/Manual/CSharp.html    |  25 +++++++++
 Source/Modules/csharp.cxx | 115 +++++++++++++++++++++-----------------
 2 files changed, 89 insertions(+), 51 deletions(-)

diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index ba49fa004..28d6d2b2e 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -13,6 +13,9 @@
 <ul>
 <li><a href="#CSharp_introduction_swig2_compatibility">SWIG 2 Compatibility</a>
 </ul>
+<ul>
+<li><a href="#CSharp_introduction_command_line_options">C# Command Line Options</a>
+</ul
 <li><a href="#CSharp_differences_java">Differences to the Java module</a>
 <li><a href="#CSharp_void_pointers">Void pointers</a>
 <li><a href="#CSharp_arrays">C# Arrays</a>
@@ -79,6 +82,28 @@ Monodoc, available from the Mono project, has a very useful section titled <a hr
 In order to minimize name collisions between names generated based on input to SWIG and names used in the generated code from the .NET framework, SWIG 3 fully qualifies the use of all .NET types. Furthermore, SWIG 3 avoids <tt>using</tt> directives in generated code. This breaks backwards compatibility with typemaps, pragmas, etc written for use with SWIG 2 that assume the presence of <tt>using System;</tt> or <tt>using System.Runtime.InteropServices;</tt> directives in the intermediate class imports, module imports, or proxy imports. SWIG 3 supports backwards compatibility though the use of the <tt>SWIG2_CSHARP</tt> macro. If <tt>SWIG2_CSHARP</tt> is defined, SWIG 3 generates <tt>using</tt> directives in the intermediate class, module class, and proxy class code similar to those generated by SWIG 2. This can be done without modifying any of the input code by passing the <tt>-DSWIG2_CSHARP</tt> commandline parameter when executing <tt>swig</tt>.
 </p>
 
+<H3><a name="CSharp_introduction_command_line_options"></a>20.1.2 C# Command Line Options</H3>
+
+
+<p>Additional command line options that can be used to control code generation:</p>
+
+<p>
+<b><tt>-outfile &lt;filename&gt;</tt></b><br>
+This command line will instruct the C# module to write all generated C# code to &lt;filename&gt; (located in the output directory) instead of creating separate files for generated classes.<br/>
+Caveats:
+<ul>
+
+<li>
+The file extension (.cs) will not be automatically be added and needs to be provided.
+</li>
+
+<li>
+Due to possible compiler limits it is not advisable to use <tt>-outfile</tt> when generating wrappers for big projects.
+</li>
+
+</ul>
+</p>
+
 <H2><a name="CSharp_differences_java"></a>20.2 Differences to the Java module</H2>
 
 
diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 7ebb9ff64..ad27a5bea 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -34,7 +34,7 @@ class CSHARP:public Language {
   File *f_init;
   File *f_directors;
   File *f_directors_h;
-  File *f_single;
+  File *f_single_out;
   List *filenames_list;
 
   bool proxy_flag;		// Flag for generating proxy classes
@@ -79,7 +79,7 @@ class CSHARP:public Language {
   String *director_method_types;	// Director method types
   String *director_connect_parms;	// Director delegates parameter list for director connect call
   String *destructor_call;	//C++ destructor call if any
-  String *cs_out;
+  String *output_file;		// File name for single file mode. If set all generated code will be written to this file
 
   // Director method stuff:
   List *dmethods_seq;
@@ -110,7 +110,7 @@ public:
       f_init(NULL),
       f_directors(NULL),
       f_directors_h(NULL),
-      f_single(NULL),
+      f_single_out(NULL),
       filenames_list(NULL),
       proxy_flag(true),
       native_function_flag(false),
@@ -153,7 +153,7 @@ public:
       director_method_types(NULL),
       director_connect_parms(NULL),
       destructor_call(NULL),
-      cs_out(NULL),
+      output_file(NULL),
       dmethods_seq(NULL),
       dmethods_table(NULL),
       n_dmethods(0),
@@ -248,10 +248,10 @@ public:
 	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
 	  Swig_mark_arg(i);
 	  old_variable_names = true;
-    } else if (strcmp(argv[i], "-csout") == 0) {
+    } else if (strcmp(argv[i], "-outfile") == 0) {
       if (argv[i + 1]) {
-        cs_out = NewString("");
-        Printf(cs_out, argv[i + 1]);
+        output_file = NewString("");
+        Printf(output_file, argv[i + 1]);
         Swig_mark_arg(i);
         Swig_mark_arg(i + 1);
         i++;
@@ -437,7 +437,7 @@ public:
     }
     // Generate the intermediary class
     {
-      File *f_im = getFile(SWIG_output_directory(), imclass_name);
+      File *f_im = getOutputFile(SWIG_output_directory(), imclass_name);
 
       addOpenNamespace(0, f_im);
 
@@ -465,13 +465,14 @@ public:
       Printf(f_im, "}\n");
       addCloseNamespace(0, f_im);
 
-      if(f_im != f_single)
-        Delete(f_im);
+      if(f_im != f_single_out)
+	Delete(f_im);
+      f_im = NULL;
     }
 
     // Generate the C# module class
     {
-      File *f_module = getFile(SWIG_output_directory(), module_class_name);
+      File *f_module = getOutputFile(SWIG_output_directory(), module_class_name);
 
       addOpenNamespace(0, f_module);
 
@@ -507,8 +508,9 @@ public:
       Printf(f_module, "}\n");
       addCloseNamespace(0, f_module);
 
-      if(f_module != f_single)
-        Delete(f_module);
+      if(f_module != f_single_out)
+	Delete(f_module);
+      f_module = NULL;
     }
 
     if (upcasts_code)
@@ -607,9 +609,10 @@ public:
       f_directors_h = NULL;
     }
 
-    if(f_single) {
-      Dump(f_single, f_begin);
-      Delete(f_single);
+    if(f_single_out) {
+      Dump(f_single_out, f_begin);
+      Delete(f_single_out);
+      f_single_out = NULL;
     }
 
     Dump(f_wrappers, f_begin);
@@ -635,32 +638,40 @@ public:
   }
   
   /* -----------------------------------------------------------------------------
-   * getFile()
+   * getOutputFile()
+   *
+   * Prepares a File object by creating the file in the file system and
+   * writing the banner for auto-generated files to it (emitBanner).
+   * If '-outfile' is provided (single file mode) the supplied parameters will
+   * be ignored and the returned file will always be:
+   *  <outdir>/<outfile>
+   * Otherwise the file will be:
+   *  <dir>/<name>.cs
    * ----------------------------------------------------------------------------- */
 
-  File* getFile(const String* dir, String* name) {
-    if(cs_out) {
-      if(!f_single) {
-        String* filen = NewStringf("%s", cs_out);
-        f_single = NewFile(filen, "w", SWIG_output_files());
-        if(!f_single) {
-          FileErrorDisplay(filen);
-          SWIG_exit(EXIT_FAILURE);
-		}
-        Append(filenames_list, Copy(filen));
-        Delete(filen);
-        filen = NULL;
+  File *getOutputFile(const String* dir, String* name) {
+    if(output_file) {
+      if(!f_single_out) {
+	String *filen = NewStringf("%s%s", SWIG_output_directory(), output_file);
+	f_single_out = NewFile(filen, "w", SWIG_output_files());
+	if(!f_single_out) {
+	  FileErrorDisplay(filen);
+	  SWIG_exit(EXIT_FAILURE);
+	}
+	Append(filenames_list, Copy(filen));
+	Delete(filen);
+	filen = NULL;
 
-        emitBanner(f_single);
-	  }
-      return f_single;
+	emitBanner(f_single_out);
+      }
+      return f_single_out;
     } else {
-      String* filen = NewStringf("%s%s.cs", dir, name);
-      File* f = NewFile(filen, "w", SWIG_output_files());
+      String *filen = NewStringf("%s%s.cs", dir, name);
+      File *f = NewFile(filen, "w", SWIG_output_files());
       if(!f) {
-        FileErrorDisplay(f);
-        SWIG_exit(EXIT_FAILURE);
-	  }
+	FileErrorDisplay(f);
+	SWIG_exit(EXIT_FAILURE);
+      }
       Append(filenames_list, Copy(filen));
       Delete(filen);
       filen = NULL;
@@ -1233,7 +1244,7 @@ public:
 	} else {
 	  // Global enums are defined in their own file
 	  String *output_directory = outputDirectory(nspace);
-	  File *f_enum = getFile(output_directory, symname);
+	  File *f_enum = getOutputFile(output_directory, symname);
 
 	  addOpenNamespace(nspace, f_enum);
 
@@ -1241,8 +1252,9 @@ public:
 		 "\n", enum_code, "\n", NIL);
 
 	  addCloseNamespace(nspace, f_enum);
-      if(f_enum != f_single)
-        Delete(f_enum);
+	  if(f_enum != f_single_out)
+	    Delete(f_enum);
+	  f_enum = NULL;
 	  Delete(output_directory);
 	}
       } else {
@@ -1945,7 +1957,7 @@ public:
       // Each outer proxy class goes into a separate file
       if (!has_outerclass) {
 	String *output_directory = outputDirectory(nspace);
-	f_proxy = getFile(output_directory, proxy_class_name);
+	f_proxy = getOutputFile(output_directory, proxy_class_name);
 
 	addOpenNamespace(nspace, f_proxy);
       }
@@ -2005,8 +2017,8 @@ public:
       if (!has_outerclass) {
 	Printf(f_proxy, "}\n");
 	addCloseNamespace(nspace, f_proxy);
-    if(f_proxy != f_single)
-      Delete(f_proxy);
+	if(f_proxy != f_single_out)
+	  Delete(f_proxy);
 	f_proxy = NULL;
       } else {
 	for (int i = 0; i < nesting_depth; ++i)
@@ -3231,7 +3243,7 @@ public:
     Setline(n, line_number);
 
     String *swigtype = NewString("");
-    File *f_swigtype = getFile(SWIG_output_directory(), classname);
+    File *f_swigtype = getOutputFile(SWIG_output_directory(), classname);
 
     addOpenNamespace(0, f_swigtype);
 
@@ -3266,8 +3278,9 @@ public:
     Printv(f_swigtype, swigtype, NIL);
 
     addCloseNamespace(0, f_swigtype);
-    if(f_swigtype != f_single)
+    if(f_swigtype != f_single_out)
       Delete(f_swigtype);
+    f_swigtype = NULL;
     Delete(swigtype);
     Delete(n);
   }
@@ -4284,10 +4297,10 @@ extern "C" Language *swig_csharp(void) {
 
 const char *CSHARP::usage = "\
 C# Options (available with -csharp)\n\
-     -dllimport <dl> - Override DllImport attribute name to <dl>\n\
-     -namespace <nm> - Generate wrappers into C# namespace <nm>\n\
-     -noproxy        - Generate the low-level functional interface instead\n\
-                       of proxy classes\n\
-     -oldvarnames    - Old intermediary method names for variable wrappers\n\
-	 -csout <path>   - Write all C# to a single file located at <path>\n\
+     -dllimport <dl>     - Override DllImport attribute name to <dl>\n\
+     -namespace <nm>     - Generate wrappers into C# namespace <nm>\n\
+     -noproxy            - Generate the low-level functional interface instead\n\
+                           of proxy classes\n\
+     -oldvarnames        - Old intermediary method names for variable wrappers\n\
+     -outfile <filename> - Write all C# to a single file <filename> located in the output directory\n\
 \n";

From 117f6d0026ae0e52286c1e1a3750c682d081b53c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 9 Jun 2015 07:49:25 +0100
Subject: [PATCH 147/220] Fix C++11 type aliasing seg fault.

Closes #424
---
 CHANGES.current                               |  3 ++
 Examples/test-suite/common.mk                 |  1 +
 Examples/test-suite/cpp11_type_aliasing.i     | 46 +++++++++++++++++++
 .../java/cpp11_type_aliasing_runme.java       | 20 ++++++++
 Source/CParse/parser.y                        |  4 +-
 5 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 Examples/test-suite/cpp11_type_aliasing.i
 create mode 100644 Examples/test-suite/java/cpp11_type_aliasing_runme.java

diff --git a/CHANGES.current b/CHANGES.current
index a9847ac6f..542f6c1a5 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-06-09: wsfulton
+	    Fix seg fault processing C++11 type aliasing. Issue #424.
+
 2015-05-28: wsfulton
 	    [Python] Add new feature "python:cdefaultargs" to control default argument
             code generation. By default, SWIG attempts to convert C/C++ default argument values
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 5fd09566e..4e3b52fe0 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -543,6 +543,7 @@ CPP11_TEST_CASES = \
 	cpp11_template_explicit \
 	cpp11_template_typedefs \
 	cpp11_type_traits \
+	cpp11_type_aliasing \
 	cpp11_uniform_initialization \
 	cpp11_unrestricted_unions \
 	cpp11_userdefined_literals \
diff --git a/Examples/test-suite/cpp11_type_aliasing.i b/Examples/test-suite/cpp11_type_aliasing.i
new file mode 100644
index 000000000..8ddbc3bdc
--- /dev/null
+++ b/Examples/test-suite/cpp11_type_aliasing.i
@@ -0,0 +1,46 @@
+%module cpp11_type_aliasing
+
+// Type aliasing seg fault : Github issue #424
+
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) Target;
+
+%inline %{
+
+namespace Halide {
+
+struct Target {
+  int bits;
+  Target(int bits=32) : bits(bits) {}
+};
+
+class NamesInterface {
+public:
+  using Target = Halide::Target;
+};
+
+Target get_host_target() { 
+  return Target();
+}
+
+namespace Internal {
+
+template <typename T> class GeneratorParam {
+  T value;
+public:
+  GeneratorParam(const char *name, const T &v) : value(v) {}
+
+  T getValue() { 
+    return value;
+  }
+};
+
+class GeneratorBase : public NamesInterface {
+public:
+  GeneratorParam<Target> target{ "target", Halide::get_host_target() };
+};
+
+}
+}
+%}
+
+%template(Halide_Target) Halide::Internal::GeneratorParam<Halide::Target>;
diff --git a/Examples/test-suite/java/cpp11_type_aliasing_runme.java b/Examples/test-suite/java/cpp11_type_aliasing_runme.java
new file mode 100644
index 000000000..0db1df372
--- /dev/null
+++ b/Examples/test-suite/java/cpp11_type_aliasing_runme.java
@@ -0,0 +1,20 @@
+import cpp11_type_aliasing.*;
+
+public class cpp11_type_aliasing_runme {
+
+  static {
+    try {
+        System.loadLibrary("cpp11_type_aliasing");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) {
+    Halide_Target ht = new GeneratorBase().getTarget();
+    Target x = ht.getValue();
+    if (x.getBits() != 32)
+      throw new RuntimeException("Incorrect bits");
+  }
+}
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 39b859d68..c6b1d5ee4 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -2850,10 +2850,10 @@ c_declaration   : c_decl {
 		  Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line, "Lambda expressions and closures are not fully supported yet.\n");
 		  SWIG_WARN_NODE_END($$);
 		}
-                | USING idcolon EQUAL {
-		  skip_decl();
+                | USING idcolon EQUAL idcolon {
 		  $$ = new_node("using");
 		  Setattr($$,"name",$2);
+		  Setattr($$,"uname",$4);
 		  add_symbols($$);
 		  SWIG_WARN_NODE_BEGIN($$);
 		  Swig_warning(WARN_CPP11_ALIAS_DECLARATION, cparse_file, cparse_line, "The 'using' keyword in type aliasing is not fully supported yet.\n");

From efa84dab7cd9caae1175546558c49b8662384f0d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 9 Jun 2015 07:54:47 +0100
Subject: [PATCH 148/220] Fix warning display of types associated with 'using'
 and templates.

---
 .../test-suite/errors/cpp_using_type_aliasing.i     | 13 +++++++++++++
 .../errors/cpp_using_type_aliasing.stderr           |  3 +++
 Source/Swig/symbol.c                                |  8 ++++----
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 Examples/test-suite/errors/cpp_using_type_aliasing.i
 create mode 100644 Examples/test-suite/errors/cpp_using_type_aliasing.stderr

diff --git a/Examples/test-suite/errors/cpp_using_type_aliasing.i b/Examples/test-suite/errors/cpp_using_type_aliasing.i
new file mode 100644
index 000000000..df65dbd3d
--- /dev/null
+++ b/Examples/test-suite/errors/cpp_using_type_aliasing.i
@@ -0,0 +1,13 @@
+%module cpp_using_type_aliasing
+
+namespace Space {
+  template<typename T> struct Okay {
+  };
+  struct User {
+  protected:
+    using OkayInt = Okay<int>;
+  };
+  struct Derived : User {
+    Okay<OkayInt> ff();
+  };
+};
diff --git a/Examples/test-suite/errors/cpp_using_type_aliasing.stderr b/Examples/test-suite/errors/cpp_using_type_aliasing.stderr
new file mode 100644
index 000000000..3f256652f
--- /dev/null
+++ b/Examples/test-suite/errors/cpp_using_type_aliasing.stderr
@@ -0,0 +1,3 @@
+cpp_using_type_aliasing.i:8: Warning 341: The 'using' keyword in type aliasing is not fully supported yet.
+cpp_using_type_aliasing.i:8: Warning 315: Nothing known about 'Okay< int >'.
+cpp_using_type_aliasing.i:8: Warning 315: Nothing known about 'Okay< int >'.
diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c
index 2202f61c6..d72451a14 100644
--- a/Source/Swig/symbol.c
+++ b/Source/Swig/symbol.c
@@ -1149,7 +1149,7 @@ Node *Swig_symbol_clookup(const_String_or_char_ptr name, Symtab *n) {
     Symtab *un = Getattr(s, "sym:symtab");
     Node *ss = (!Equal(name, uname) || (un != n)) ? Swig_symbol_clookup(uname, un) : 0;	/* avoid infinity loop */
     if (!ss) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", Getattr(s, "uname"));
+      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
     }
     s = ss;
   }
@@ -1221,7 +1221,7 @@ Node *Swig_symbol_clookup_check(const_String_or_char_ptr name, Symtab *n, int (*
     Node *ss;
     ss = Swig_symbol_clookup(Getattr(s, "uname"), Getattr(s, "sym:symtab"));
     if (!ss && !checkfunc) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", Getattr(s, "uname"));
+      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
     }
     s = ss;
   }
@@ -1272,7 +1272,7 @@ Node *Swig_symbol_clookup_local(const_String_or_char_ptr name, Symtab *n) {
   while (s && Checkattr(s, "nodeType", "using")) {
     Node *ss = Swig_symbol_clookup_local(Getattr(s, "uname"), Getattr(s, "sym:symtab"));
     if (!ss) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", Getattr(s, "uname"));
+      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
     }
     s = ss;
   }
@@ -1320,7 +1320,7 @@ Node *Swig_symbol_clookup_local_check(const_String_or_char_ptr name, Symtab *n,
   while (s && Checkattr(s, "nodeType", "using")) {
     Node *ss = Swig_symbol_clookup_local_check(Getattr(s, "uname"), Getattr(s, "sym:symtab"), checkfunc);
     if (!ss && !checkfunc) {
-      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", Getattr(s, "uname"));
+      Swig_warning(WARN_PARSE_USING_UNDEF, Getfile(s), Getline(s), "Nothing known about '%s'.\n", SwigType_namestr(Getattr(s, "uname")));
     }
     s = ss;
   }

From 2b9b007027961cf79088af2f38398e8c33dc3c4c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 11 Jun 2015 07:42:50 +0100
Subject: [PATCH 149/220] C# -outfile cosmetic code fixes

---
 Source/Modules/csharp.cxx | 57 +++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index ad27a5bea..38afc7357 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -248,16 +248,16 @@ public:
 	} else if (strcmp(argv[i], "-oldvarnames") == 0) {
 	  Swig_mark_arg(i);
 	  old_variable_names = true;
-    } else if (strcmp(argv[i], "-outfile") == 0) {
-      if (argv[i + 1]) {
-        output_file = NewString("");
-        Printf(output_file, argv[i + 1]);
-        Swig_mark_arg(i);
-        Swig_mark_arg(i + 1);
-        i++;
-      } else {
-        Swig_arg_error();
-      }
+	} else if (strcmp(argv[i], "-outfile") == 0) {
+	  if (argv[i + 1]) {
+	    output_file = NewString("");
+	    Printf(output_file, argv[i + 1]);
+	    Swig_mark_arg(i);
+	    Swig_mark_arg(i + 1);
+	    i++;
+	  } else {
+	    Swig_arg_error();
+	  }
 	} else if (strcmp(argv[i], "-help") == 0) {
 	  Printf(stdout, "%s\n", usage);
 	}
@@ -465,7 +465,7 @@ public:
       Printf(f_im, "}\n");
       addCloseNamespace(0, f_im);
 
-      if(f_im != f_single_out)
+      if (f_im != f_single_out)
 	Delete(f_im);
       f_im = NULL;
     }
@@ -508,7 +508,7 @@ public:
       Printf(f_module, "}\n");
       addCloseNamespace(0, f_module);
 
-      if(f_module != f_single_out)
+      if (f_module != f_single_out)
 	Delete(f_module);
       f_module = NULL;
     }
@@ -609,7 +609,7 @@ public:
       f_directors_h = NULL;
     }
 
-    if(f_single_out) {
+    if (f_single_out) {
       Dump(f_single_out, f_begin);
       Delete(f_single_out);
       f_single_out = NULL;
@@ -649,12 +649,12 @@ public:
    *  <dir>/<name>.cs
    * ----------------------------------------------------------------------------- */
 
-  File *getOutputFile(const String* dir, String* name) {
-    if(output_file) {
-      if(!f_single_out) {
+  File *getOutputFile(const String *dir, const String *name) {
+    if (output_file) {
+      if (!f_single_out) {
 	String *filen = NewStringf("%s%s", SWIG_output_directory(), output_file);
 	f_single_out = NewFile(filen, "w", SWIG_output_files());
-	if(!f_single_out) {
+	if (!f_single_out) {
 	  FileErrorDisplay(filen);
 	  SWIG_exit(EXIT_FAILURE);
 	}
@@ -668,7 +668,7 @@ public:
     } else {
       String *filen = NewStringf("%s%s.cs", dir, name);
       File *f = NewFile(filen, "w", SWIG_output_files());
-      if(!f) {
+      if (!f) {
 	FileErrorDisplay(f);
 	SWIG_exit(EXIT_FAILURE);
       }
@@ -1132,7 +1132,7 @@ public:
       scope = NewString("");
       if (nspace)
 	Printf(scope, "%s", nspace);
-      if (Node* cls = getCurrentClass()) {
+      if (Node *cls = getCurrentClass()) {
 	if (Node *outer = Getattr(cls, "nested:outer")) {
 	  String *outerClassesPrefix = Copy(Getattr(outer, "sym:name"));
 	  for (outer = Getattr(outer, "nested:outer"); outer != 0; outer = Getattr(outer, "nested:outer")) {
@@ -1252,7 +1252,7 @@ public:
 		 "\n", enum_code, "\n", NIL);
 
 	  addCloseNamespace(nspace, f_enum);
-	  if(f_enum != f_single_out)
+	  if (f_enum != f_single_out)
 	    Delete(f_enum);
 	  f_enum = NULL;
 	  Delete(output_directory);
@@ -1954,7 +1954,6 @@ public:
 	}
       }
 
-      // Each outer proxy class goes into a separate file
       if (!has_outerclass) {
 	String *output_directory = outputDirectory(nspace);
 	f_proxy = getOutputFile(output_directory, proxy_class_name);
@@ -2017,7 +2016,7 @@ public:
       if (!has_outerclass) {
 	Printf(f_proxy, "}\n");
 	addCloseNamespace(nspace, f_proxy);
-	if(f_proxy != f_single_out)
+	if (f_proxy != f_single_out)
 	  Delete(f_proxy);
 	f_proxy = NULL;
       } else {
@@ -3278,7 +3277,7 @@ public:
     Printv(f_swigtype, swigtype, NIL);
 
     addCloseNamespace(0, f_swigtype);
-    if(f_swigtype != f_single_out)
+    if (f_swigtype != f_single_out)
       Delete(f_swigtype);
     f_swigtype = NULL;
     Delete(swigtype);
@@ -4297,10 +4296,10 @@ extern "C" Language *swig_csharp(void) {
 
 const char *CSHARP::usage = "\
 C# Options (available with -csharp)\n\
-     -dllimport <dl>     - Override DllImport attribute name to <dl>\n\
-     -namespace <nm>     - Generate wrappers into C# namespace <nm>\n\
-     -noproxy            - Generate the low-level functional interface instead\n\
-                           of proxy classes\n\
-     -oldvarnames        - Old intermediary method names for variable wrappers\n\
-     -outfile <filename> - Write all C# to a single file <filename> located in the output directory\n\
+     -dllimport <dl> - Override DllImport attribute name to <dl>\n\
+     -namespace <nm> - Generate wrappers into C# namespace <nm>\n\
+     -noproxy        - Generate the low-level functional interface instead\n\
+                       of proxy classes\n\
+     -oldvarnames    - Old intermediary method names for variable wrappers\n\
+     -outfile <file> - Write all C# into a single <file> located in the output directory\n\
 \n";

From c1a18992ccc56bb85cb33e0a4e366608929b68de Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 11 Jun 2015 07:43:26 +0100
Subject: [PATCH 150/220] Add in all C# command line options to the docs

---
 Doc/Manual/CSharp.html | 66 +++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index 28d6d2b2e..0c0d98c0e 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -14,7 +14,7 @@
 <li><a href="#CSharp_introduction_swig2_compatibility">SWIG 2 Compatibility</a>
 </ul>
 <ul>
-<li><a href="#CSharp_introduction_command_line_options">C# Command Line Options</a>
+<li><a href="#CSharp_commandline">Additional command line options</a>
 </ul
 <li><a href="#CSharp_differences_java">Differences to the Java module</a>
 <li><a href="#CSharp_void_pointers">Void pointers</a>
@@ -37,7 +37,7 @@
 <li><a href="#CSharp_directors_implementation">Directors implementation</a>
 <li><a href="#CSharp_director_caveats">Director caveats</a>
 </ul>
-<li><a href="#CSharp_multiple_modules">Multiples modules</a>
+<li><a href="#CSharp_multiple_modules">Multiple modules</a>
 <li><a href="#CSharp_typemap_examples">C# Typemap examples</a>
 <ul>
 <li><a href="#CSharp_memory_management_member_variables">Memory management when returning references to member variables</a>
@@ -82,26 +82,58 @@ Monodoc, available from the Mono project, has a very useful section titled <a hr
 In order to minimize name collisions between names generated based on input to SWIG and names used in the generated code from the .NET framework, SWIG 3 fully qualifies the use of all .NET types. Furthermore, SWIG 3 avoids <tt>using</tt> directives in generated code. This breaks backwards compatibility with typemaps, pragmas, etc written for use with SWIG 2 that assume the presence of <tt>using System;</tt> or <tt>using System.Runtime.InteropServices;</tt> directives in the intermediate class imports, module imports, or proxy imports. SWIG 3 supports backwards compatibility though the use of the <tt>SWIG2_CSHARP</tt> macro. If <tt>SWIG2_CSHARP</tt> is defined, SWIG 3 generates <tt>using</tt> directives in the intermediate class, module class, and proxy class code similar to those generated by SWIG 2. This can be done without modifying any of the input code by passing the <tt>-DSWIG2_CSHARP</tt> commandline parameter when executing <tt>swig</tt>.
 </p>
 
-<H3><a name="CSharp_introduction_command_line_options"></a>20.1.2 C# Command Line Options</H3>
 
-
-<p>Additional command line options that can be used to control code generation:</p>
+<H3><a name="CSharp_commandline"></a>20.1.2 Additional command line options</H3>
 
 <p>
-<b><tt>-outfile &lt;filename&gt;</tt></b><br>
-This command line will instruct the C# module to write all generated C# code to &lt;filename&gt; (located in the output directory) instead of creating separate files for generated classes.<br/>
-Caveats:
-<ul>
+The following table lists the additional commandline options available for the C# module. They can also be seen by using: 
+</p>
 
-<li>
-The file extension (.cs) will not be automatically be added and needs to be provided.
-</li>
+<div class="code"><pre>
+swig -csharp -help 
+</pre></div>
 
-<li>
-Due to possible compiler limits it is not advisable to use <tt>-outfile</tt> when generating wrappers for big projects.
-</li>
+<p></p>
 
-</ul>
+<table summary="C# specific options">
+<tr>
+<th>C# specific options</th>
+</tr>
+
+<tr>
+<td>-dllimport &lt;dl&gt;</td>
+<td>Override DllImport attribute name to &lt;dl&gt;</td>
+</tr>
+
+<tr>
+<td>-namespace &lt;nm&gt;</td>
+<td>Generate wrappers into C# namespace &lt;nm&gt;</td>
+</tr>
+
+<tr>
+<td>-noproxy</td>
+<td>Generate the low-level functional interface instead of proxy classes</td>
+</tr>
+
+<tr>
+<td>-oldvarnames</td>
+<td>Old intermediary method names for variable wrappers</td>
+</tr>
+
+<tr>
+<td>-outfile &lt;file&gt;</td>
+<td>Write all C# into a single &lt;file&gt; located in the output directory
+</td>
+</tr>
+
+</table>
+
+<p>
+The -outfile option combines all the generated C# code into a single output file instead of creating multiple C# files.
+The default, when this option is not provided, is to generate separate .cs files for the module class,
+intermediary class and each of the generated proxy and type wrapper classes.
+Note that the file extension (.cs) will not be automatically added and needs to be provided.
+Due to possible compiler limits it is not advisable to use <tt>-outfile</tt> for large projects.
 </p>
 
 <H2><a name="CSharp_differences_java"></a>20.2 Differences to the Java module</H2>
@@ -1707,7 +1739,7 @@ However, a call from C# to <tt>CSharpDefaults.DefaultMethod()</tt> will of cours
 should pass the call on to <tt>CSharpDefaults.DefaultMethod(int)</tt>using the C++ default value, as shown above.
 </p>
 
-<H2><a name="CSharp_multiple_modules"></a>20.7 Multiples modules</H2>
+<H2><a name="CSharp_multiple_modules"></a>20.7 Multiple modules</H2>
 
 
 <p>

From 50b7a0410cc2ff44825b1860b203373725346d79 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 11 Jun 2015 07:47:42 +0100
Subject: [PATCH 151/220] changes file update for -outfile

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

diff --git a/CHANGES.current b/CHANGES.current
index a9847ac6f..94ed20271 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-06-11: sghirate
+	    [C#] Patch #427 adds in new command line option -outfile to combine all the
+            generated C# code into a single file.
+
 2015-05-28: wsfulton
 	    [Python] Add new feature "python:cdefaultargs" to control default argument
             code generation. By default, SWIG attempts to convert C/C++ default argument values

From 8bd6e596d1eabca437f78e980c4fc8227f07adcd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 11 Jun 2015 07:57:37 +0100
Subject: [PATCH 152/220] Cosmetics - remove references to Java in C# module

---
 Source/Modules/csharp.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/csharp.cxx b/Source/Modules/csharp.cxx
index 38afc7357..9193cd34b 100644
--- a/Source/Modules/csharp.cxx
+++ b/Source/Modules/csharp.cxx
@@ -636,7 +636,7 @@ public:
     Swig_banner_target_lang(f, "//");
     Printf(f, "//------------------------------------------------------------------------------\n\n");
   }
-  
+
   /* -----------------------------------------------------------------------------
    * getOutputFile()
    *
@@ -3375,7 +3375,7 @@ public:
   /* -----------------------------------------------------------------------------
    * outputDirectory()
    *
-   * Return the directory to use for generating Java classes/enums and create the
+   * Return the directory to use for generating C# classes/enums and create the
    * subdirectory (does not create if language specific outdir does not exist).
    * ----------------------------------------------------------------------------- */
 
@@ -3515,7 +3515,7 @@ public:
    * classDirectorMethod()
    *
    * Emit a virtual director method to pass a method call on to the 
-   * underlying Java object.
+   * underlying C# object.
    *
    * --------------------------------------------------------------- */
 
@@ -3676,7 +3676,7 @@ public:
     if (!ignored_method)
       Printf(w->code, "} else {\n");
 
-    /* Go through argument list, convert from native to Java */
+    /* Go through argument list, convert from native to C# */
     for (i = 0, p = l; p; ++i) {
       /* Is this superfluous? */
       while (checkAttribute(p, "tmap:directorin:numinputs", "0")) {

From 85c02b172d1aeb52bf67cb95906355684c38745e Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 11 Jun 2015 20:13:09 +0100
Subject: [PATCH 153/220] Expand section on code generation philosophy.

We avoid introducing 3rd party dependencies in the generated code
including the STL.
---
 Doc/Manual/Introduction.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Doc/Manual/Introduction.html b/Doc/Manual/Introduction.html
index 9cc4277c9..02a41169a 100644
--- a/Doc/Manual/Introduction.html
+++ b/Doc/Manual/Introduction.html
@@ -457,6 +457,12 @@ be used on any platform.  Again, this is an important part of staying out
 of the programmer's way----the last thing any developer wants to do is
 to spend their time debugging the output of a tool that relies on 
 non-portable or unreliable programming features.
+Dependencies are often a source of incompatibilities and problems and so
+additional third party libraries are not used in the generated code.
+SWIG will also generally avoid generating code that introduces a dependency
+on the C++ Standard Template Library (STL).
+SWIG will generate code that depends on the C libraries though.
+</p>
 
 </body>
 </html>

From cc6970e21f841a36fdce68222f16b1ea88a6b276 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 06:29:57 +0100
Subject: [PATCH 154/220] Documentation improvements for -o and -oh options

---
 Doc/Manual/SWIG.html    | 5 +++--
 Source/Modules/main.cxx | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index 4c33aeab8..774e00b23 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -146,7 +146,8 @@ can be obtained by typing <tt>swig -help</tt> or <tt>swig
 -I<em>dir</em>                 Add a directory to the file include path
 -l<em>file</em>                Include a SWIG library file.
 -module <em>name</em>          Set the name of the SWIG module
--o <em>outfile</em>            Name of output file
+-o <em>outfile</em>            Set name of C/C++ output file to &lt;outfile&gt;
+-oh <em>headfile</em>          Set name of C++ output header file for directors to &lt;headfile&gt;
 -outcurrentdir        Set default output dir to current dir instead of input file's path
 -outdir <em>dir</em>           Set language specific files output directory
 -pcreversion          Display PCRE version information
@@ -212,7 +213,7 @@ additional files depending on the target language. By default, an input file
 with the name <tt>file.i</tt> is transformed into a file
 <tt>file_wrap.c</tt> or <tt>file_wrap.cxx</tt> (depending on whether
 or not the <tt>-c++</tt> option has been used).  The name of the
-output file can be changed using the <tt>-o</tt> option.  In certain
+output C/C++ file can be changed using the <tt>-o</tt> option.  In certain
 cases, file suffixes are used by the compiler to determine the source
 language (C, C++, etc.). Therefore, you have to use the
 <tt>-o</tt> option to change the suffix of the SWIG-generated wrapper
diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
index f0f9962dd..1850a47cb 100644
--- a/Source/Modules/main.cxx
+++ b/Source/Modules/main.cxx
@@ -131,8 +131,8 @@ static const char *usage3 = (const char *) "\
 static const char *usage4 = (const char *) "\
      -O              - Enable the optimization options: \n\
                         -fastdispatch -fvirtual \n\
-     -o <outfile>    - Set name of the output file to <outfile>\n\
-     -oh <headfile>  - Set name of the output header file to <headfile>\n\
+     -o <outfile>    - Set name of C/C++ output file to <outfile>\n\
+     -oh <headfile>  - Set name of C++ output header file for directors to <headfile>\n\
      -outcurrentdir  - Set default output dir to current dir instead of input file's path\n\
      -outdir <dir>   - Set language specific files output directory to <dir>\n\
      -pcreversion    - Display PCRE version information\n\

From 1891b82e0042994fc249f1209b86de9fbf103dd9 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 20:23:56 +0100
Subject: [PATCH 155/220] R - Call to SWIG_createNewRef in copyToC was
 incorrectly named.

Closes #430
---
 CHANGES.current | 3 +++
 Lib/r/srun.swg  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 1b5d1f095..8270c254a 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-06-12: wsfulton
+	    [R] Fix #430 - call to SWIG_createNewRef in copyToC was incorrectly named.
+
 2015-06-11: sghirate
 	    [C#] Patch #427 adds in new command line option -outfile to combine all the
             generated C# code into a single file.
diff --git a/Lib/r/srun.swg b/Lib/r/srun.swg
index 71a508d49..2045ab94e 100644
--- a/Lib/r/srun.swg
+++ b/Lib/r/srun.swg
@@ -62,7 +62,7 @@ function(className, ..., append = TRUE)
 
 if(!isGeneric("copyToC")) 
  setGeneric("copyToC", 
-             function(value, obj = RSWIG_createNewRef(class(value)))
+             function(value, obj = SWIG_createNewRef(class(value)))
               standardGeneric("copyToC"
             ))
 
@@ -147,4 +147,4 @@ function(fun, userData = NULL)
 }
 
 
-#######################################################################
\ No newline at end of file
+#######################################################################

From 5fb344e0e6ee9ca4b1606c71b944a66d7f07c9ad Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 20:25:00 +0100
Subject: [PATCH 156/220] R - fix duplicate generation of 'self' parameter.

Fixes director_keywords test case.
---
 Lib/r/rkw.swg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lib/r/rkw.swg b/Lib/r/rkw.swg
index 2c181faa0..074d7dfd9 100644
--- a/Lib/r/rkw.swg
+++ b/Lib/r/rkw.swg
@@ -3,6 +3,7 @@
 */
 
 #define RKW(x) %keywordwarn("'" `x` "' is a R keyword, renaming to '_" `x`"'", rename="_%s")  `x`
+#define RSWIGKW(x) %keywordwarn("'" `x` "' is a SWIG R reserved parameter name, renaming to '_" `x`"'", rename="_%s")  `x`
 
 /*
   Warnings for R reserved words taken from
@@ -29,4 +30,7 @@ RKW(NA_real_);
 RKW(NA_complex_);
 RKW(NA_character_);
 
+RSWIGKW(self);
+
 #undef RKW
+#undef RSWIGKW

From 9b2bde403b8a68490e9e8cb91053c0ab3e732d30 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 20:26:24 +0100
Subject: [PATCH 157/220] R - Remove constantWrapper message wrapping constants

An implementation is still needed for constants.
---
 Source/Modules/r.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index a42ee97a1..61c3b9a11 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -2181,6 +2181,16 @@ int R::functionWrapper(Node *n) {
   return SWIG_OK;
 }
 
+/* ----------------------------------------------------------------------
+ * R::constantWrapper()
+ * ---------------------------------------------------------------------- */
+
+int R::constantWrapper(Node *n) {
+  (void) n;
+  // TODO
+  return SWIG_OK;
+}
+
 /*****************************************************
  Add the specified routine name to the collection of 
  generated routines that are called from R functions.

From 1f5361593555deb6f429b3b238b649e8055abb05 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 20:28:49 +0100
Subject: [PATCH 158/220] Add R to travis testing

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

diff --git a/.travis.yml b/.travis.yml
index 679d42a5d..5b80a030e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,8 @@ matrix:
       env: SWIGLANG=python SWIG_FEATURES=-O
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic
+    - compiler: gcc
+      env: SWIGLANG=r
     - compiler: gcc
       env: SWIGLANG=ruby
     - compiler: gcc
@@ -96,6 +98,7 @@ before_install:
   - if test "$SWIGLANG" = "python"; then git clone https://github.com/jcrocholl/pep8.git && pushd pep8 && git checkout tags/1.5.7 && python ./setup.py build && sudo python ./setup.py install && popd; fi
   - if test "$SWIGLANG" = "python" -a "$PY3" -a -z "$VER"; then sudo apt-get install -qq python3-dev; fi
   - if test "$SWIGLANG" = "python" -a "$VER"; then sudo add-apt-repository -y ppa:fkrull/deadsnakes && sudo apt-get -qq update && sudo apt-get -qq install python${VER}-dev && export CONFIGOPTS="--with-python${PY3}=python${VER}"; fi
+  - if test "$SWIGLANG" = "r"; then sudo apt-get -qq install r-base; fi
   - if test "$SWIGLANG" = "scilab"; then sudo apt-get -qq install scilab; fi
   - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
   - $CC --version

From b94820adcfe05b48c0e553e4e4fd0b32f385651f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 12 Jun 2015 23:37:08 +0100
Subject: [PATCH 159/220] Fix r.cxx build break

---
 Source/Modules/r.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Modules/r.cxx b/Source/Modules/r.cxx
index 61c3b9a11..0e8e23063 100644
--- a/Source/Modules/r.cxx
+++ b/Source/Modules/r.cxx
@@ -281,6 +281,7 @@ public:
   
   void dispatchFunction(Node *n);
   int functionWrapper(Node *n);
+  int constantWrapper(Node *n);
   int variableWrapper(Node *n);
 
   int classDeclaration(Node *n);

From b1f2d0749e6db99cba94eaec606d3a6ae986415f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 13 Jun 2015 10:29:09 +0100
Subject: [PATCH 160/220] Don't fail R in Travis - runtime tests are failing in
 this environment

---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b80a030e..a51c541cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,9 @@ matrix:
     - compiler: gcc
       env: SWIGLANG=tcl
   allow_failures:
+    # Lots of failing tests currently
+    - compiler: gcc
+      env: SWIGLANG=ocaml
     # Occasional gcc internal compiler error
     - compiler: gcc
       env: SWIGLANG=octave SWIGJOBS=-j3 VER=3.8
@@ -72,9 +75,9 @@ matrix:
     # Not quite working yet
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-O
-    # Lots of failing tests currently
+    # Runtime errors in Travis environment
     - compiler: gcc
-      env: SWIGLANG=ocaml
+      env: SWIGLANG=r
 before_install:
   - date -u
   - uname -a

From 180e21269d87fe36f9765f3faa5fbe7e43a88258 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 16 Jun 2015 07:59:22 +0100
Subject: [PATCH 161/220] Fix python -builtin -O and overloaded functions

More specifically fixes compile errors using -builtin -fastunpack -modernargs.
Recent regression (416277b). Closes #436.
---
 Source/Modules/python.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 1d4d5b238..378a276af 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2714,7 +2714,7 @@ public:
       Printv(f->locals, "  char *  kwnames[] = ", kwargs, ";\n", NIL);
     }
 
-    if (builtin && in_class && tuple_arguments == 0) {
+    if (builtin && !funpack && in_class && tuple_arguments == 0) {
       Printf(parse_args, "    if (args && PyTuple_Check(args) && PyTuple_GET_SIZE(args) > 0) SWIG_exception_fail(SWIG_TypeError, \"%s takes no arguments\");\n", iname);
     } else if (use_parse || allow_kwargs || !modernargs) {
       Printf(parse_args, ":%s\"", iname);

From 53b7659ebf81abd525cef5560aea658589d6273d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 16 Jun 2015 08:11:29 +0100
Subject: [PATCH 162/220] Fix Python pep8 warning when using -fastinit (or -O)

Fixes: E231 missing whitespace after ','
---
 Source/Modules/python.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 378a276af..50cf1a4c2 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -4658,7 +4658,7 @@ public:
 		Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
 	      Printv(f_shadow, pass_self, NIL);
 	      if (fastinit) {
-		Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self,", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL);
+		Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self, ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL);
 	      } else {
 		Printv(f_shadow,
 		       tab8, "this = ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), "\n",

From e180430f1ee60ecb7fa59190e6b7c26eaa0cf4f2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 16 Jun 2015 19:52:33 +0100
Subject: [PATCH 163/220] -external-runtime doc improvement

Closes #441
[skip ci]
---
 Doc/Manual/Modules.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Doc/Manual/Modules.html b/Doc/Manual/Modules.html
index 551fd0750..4846aedc1 100644
--- a/Doc/Manual/Modules.html
+++ b/Doc/Manual/Modules.html
@@ -250,7 +250,9 @@ the functions <tt>SWIG_TypeQuery</tt>, <tt>SWIG_NewPointerObj</tt>, and others s
 to be called.  Calling these functions from a typemap is supported, since the typemap code
 is embedded into the <tt>_wrap.c</tt> file, which has those declarations available.  If you need
 to call the SWIG run-time functions from another C file, there is one header you need
-to include.  To generate the header that needs to be included, run the following command:
+to include.  To generate the header that needs to be included, SWIG can be run in a different
+mode via <tt>-external-runtime</tt> to generate the run-time instead of the normal mode of
+processing an input interface file. For example:
 
 <div class="shell"><pre>
 $ swig -python -external-runtime &lt;filename&gt;

From c6b3088e58ca052c7b3a68cf32ff1c2ba35995b7 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 19 Jun 2015 14:29:38 -0700
Subject: [PATCH 164/220] [Go] Add Makefile testing support for changes in
 upcoming Go 1.5 release. No effect on the SWIG program itself.

---
 Examples/Makefile.in               | 10 +++++-----
 Examples/test-suite/go/Makefile.in |  6 +++---
 configure.ac                       | 18 ++++++++++++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 61f127569..6ba9dac12 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -1774,12 +1774,12 @@ GCCGOOPT = @GCCGOOPT@
 GOVERSIONOPTION = @GOVERSIONOPTION@
 
 GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
-GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi`
+GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi` `if $(GO13) || $(GO15); then echo -pack ; fi`
 
 GOSRCS = $(INTERFACE:.i=.go)
 GOCSRCS = $(INTERFACE:.i=_gc.c)
 
-GOLD = $(GOC:c=l)
+GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi`
 GOTOOL = `if $(GO1) ; then echo go tool; fi`
 GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
 
@@ -1787,7 +1787,7 @@ GOPACKAGE = $(notdir $(INTERFACE:.i=.a))
 
 GOPATHDIR = gopath/src/$(INTERFACE:.i=)
 
-GOOBJEXT = $(GOC:c=)
+GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi`
 GOGCOBJS = $(GOSRCS:.go=.$(GOOBJEXT))
 GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@)
 
@@ -1863,7 +1863,7 @@ go: $(SRCDIR_SRCS)
 	    $(COMPILETOOL) $(GCCGO) -c -g $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE); \
 	  elif $(GO12) || $(GO13) || $(GO15); then \
-	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CC)" -extldflags "$(CFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  else \
 	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
@@ -1960,7 +1960,7 @@ go_cpp: $(SRCDIR_SRCS)
 	    $(COMPILETOOL) $(GCCGO) -g -c $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GCCGO) -o $(RUNME) $(RUNME).@OBJEXT@ $(dir $(INTERFACE))/$(GOPACKAGE) -lstdc++; \
 	  elif $(GO12) || $(GO13) || $(GO15); then \
-	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
+	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) -o $(RUNME).$(GOOBJEXT) $(SRCDIR)$(RUNME).go; \
 	    $(COMPILETOOL) $(GOTOOL) $(GOLD) -linkmode external -extld "$(CXX)" -extldflags "$(CXXFLAGS) $(LDFLAGS)" -o $(RUNME) $(RUNME).$(GOOBJEXT); \
 	  else \
 	    $(COMPILETOOL) $(GO) $(GOCOMPILEARG) $(SRCDIR)$(RUNME).go; \
diff --git a/Examples/test-suite/go/Makefile.in b/Examples/test-suite/go/Makefile.in
index 3c99a0879..63c18f2f4 100644
--- a/Examples/test-suite/go/Makefile.in
+++ b/Examples/test-suite/go/Makefile.in
@@ -13,12 +13,12 @@ GO15		= @GO15@
 GOC		= @GOC@
 SCRIPTSUFFIX	= _runme.go
 
-GOCOMPILEARG = `if $(GO1) ; then echo tool $(GOC:c=g) ; fi`
-GOLD = $(GOC:c=l)
+GOCOMPILEARG = `if $(GO15); then echo tool compile; elif $(GO1); then echo tool $(GOC:c=g); fi`
+GOLD = `if $(GO15); then echo link; else echo $(GOC:c=l); fi`
 GOTOOL = `if $(GO1) ; then echo go tool; fi`
 GOPACK = `if $(GO1) ; then echo go tool pack; else echo gopack; fi`
 
-GOOBJEXT = $(GOC:c=)
+GOOBJEXT = `if $(GO15); then echo o; else echo $(GOC:c=); fi`
 
 SO = @SO@
 
diff --git a/configure.ac b/configure.ac
index ce596d29c..1eb338617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2426,8 +2426,15 @@ else
   if test -n "$GO" ; then
     GO1=true
     GOVERSIONOPTION=version
-    GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
     go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version //')
+    case "$go_version" in
+    go1 | go1.[[01234]]*)
+      GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
+      ;;
+    *)
+      GOC=compile
+      ;;
+    esac
     AC_MSG_CHECKING([whether go version is too old])
     case $go_version in
     go1.0* | go1 )
@@ -2437,11 +2444,14 @@ else
       ;;
     *)
       AC_MSG_RESULT([no])
-      if test "$GOC" = "6c"; then
+      case "$(go env GOARCH)" in
+      amd64 | arm64 | ppc64*)
         GOOPT="-intgosize 64"
-      else
+	;;
+      *)
         GOOPT="-intgosize 32"
-      fi
+	;;
+      esac
       ;;
     esac
     case $go_version in

From 11d8403c3cc71b3fa32ff772536f249cdeac6731 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <iant@golang.org>
Date: Sat, 20 Jun 2015 17:42:44 -0700
Subject: [PATCH 165/220] [Go] Fix member variables in base classes to handle
 CWRAP_NATURAL_VAR correctly.  Add a test case for the problem.

Fixes #339.
---
 Examples/test-suite/common.mk                  |  1 +
 Examples/test-suite/go/inherit_member_runme.go | 15 +++++++++++++++
 Examples/test-suite/inherit_member.i           | 17 +++++++++++++++++
 Source/Modules/go.cxx                          | 17 ++++++++++++++---
 4 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 Examples/test-suite/go/inherit_member_runme.go
 create mode 100644 Examples/test-suite/inherit_member.i

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 4e3b52fe0..12b70719b 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -246,6 +246,7 @@ CPP_TEST_CASES += \
 	ignore_parameter \
 	import_nomodule \
 	inherit \
+	inherit_member \
 	inherit_missing \
 	inherit_same_name \
 	inherit_target_language \
diff --git a/Examples/test-suite/go/inherit_member_runme.go b/Examples/test-suite/go/inherit_member_runme.go
new file mode 100644
index 000000000..599a0eb56
--- /dev/null
+++ b/Examples/test-suite/go/inherit_member_runme.go
@@ -0,0 +1,15 @@
+package main
+
+import wrap "./inherit_member"
+
+func main() {
+	s := wrap.NewChild()
+	s.SetPvar("p")
+	s.SetCvar("c")
+	if s.GetPvar() != "p" {
+		panic(s.GetPvar())
+	}
+	if s.GetCvar() != "c" {
+		panic(s.GetCvar())
+	}
+}
diff --git a/Examples/test-suite/inherit_member.i b/Examples/test-suite/inherit_member.i
new file mode 100644
index 000000000..9cfba0bb8
--- /dev/null
+++ b/Examples/test-suite/inherit_member.i
@@ -0,0 +1,17 @@
+// Based on https://github.com/swig/swig/issues/339 .
+
+%module inherit_member
+
+%include <std_string.i>
+
+%inline %{
+
+struct parent {
+  std::string pvar;
+};
+
+ struct child : public parent {
+  std::string cvar;
+};
+
+%}
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index c93b1e0cc..db4bf5507 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -3160,15 +3160,26 @@ private:
     Setattr(var, "type", var_type);
 
     SwigType *vt = Copy(var_type);
-    if (SwigType_isclass(vt)) {
-      SwigType_add_pointer(vt);
-    }
 
     int flags = Extend | SmartPointer | use_naturalvar_mode(var);
     if (isNonVirtualProtectedAccess(var)) {
       flags |= CWRAP_ALL_PROTECTED_ACCESS;
     }
 
+    // Copied from Swig_wrapped_member_var_type.
+    if (SwigType_isclass(vt)) {
+      if (flags & CWRAP_NATURAL_VAR) {
+	if (CPlusPlus) {
+	  if (!SwigType_isconst(vt)) {
+	    SwigType_add_qualifier(vt, "const");
+	  }
+	  SwigType_add_reference(vt);
+	}
+      } else {
+	SwigType_add_pointer(vt);
+      }
+    }
+
     String *mname = Swig_name_member(getNSpace(), Getattr(var_class, "sym:name"), var_name);
 
     if (is_assignable(var)) {

From 6890dfa88101598e2bbe6d62b0119f4d7f0a8f54 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 18 Jun 2015 21:05:12 +0100
Subject: [PATCH 166/220] Fix parse errors for C++11 type aliasing

Recently introduced by the fix for C++11 type aliasing seg fault - 117f6d00
---
 Examples/test-suite/cpp11_template_typedefs.i |  9 ++++++++
 Examples/test-suite/cpp11_type_aliasing.i     | 22 ++++++++++++++++++-
 Source/CParse/parser.y                        | 11 ++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/Examples/test-suite/cpp11_template_typedefs.i b/Examples/test-suite/cpp11_template_typedefs.i
index d6a1a3c85..67c0950cb 100644
--- a/Examples/test-suite/cpp11_template_typedefs.i
+++ b/Examples/test-suite/cpp11_template_typedefs.i
@@ -2,9 +2,13 @@
 %module cpp11_template_typedefs
 
 %warnfilter(SWIGWARN_CPP11_ALIAS_TEMPLATE) TypedefName;
+%warnfilter(SWIGWARN_CPP11_ALIAS_TEMPLATE) TypedefNamePtr;
 %warnfilter(SWIGWARN_CPP11_ALIAS_TEMPLATE) MyIntKeyClass;
 %warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) PF;
 
+// This warning should go away when type aliasing is supported
+#pragma SWIG nowarn=SWIGWARN_PARSE_USING_UNDEF // Nothing known about 'p.SomeType< char *,T2,4 >'.
+
 %inline %{
 template< typename T1, typename T2, int >
 class SomeType {
@@ -16,6 +20,8 @@ class SomeType {
 // template aliasing
 template< typename T2 >
 using TypedefName = SomeType<char*, T2, 5>;
+template< typename T2 >
+using TypedefNamePtr = SomeType<char*, T2, 4>*;
 
 // type aliasing
 typedef void (*PFD)(double);            // Old style
@@ -28,5 +34,8 @@ class MyCPP11Class {
 };
 template<typename VAL> using MyIntKeyClass = MyCPP11Class<int,VAL>;
 MyIntKeyClass<char> intchar;
+
+TypedefName<int> alias1(TypedefName<int> a) { return a; }
+TypedefNamePtr<int> alias1(TypedefNamePtr<int> a = nullptr) { return a; }
 %}
 
diff --git a/Examples/test-suite/cpp11_type_aliasing.i b/Examples/test-suite/cpp11_type_aliasing.i
index 8ddbc3bdc..87443633a 100644
--- a/Examples/test-suite/cpp11_type_aliasing.i
+++ b/Examples/test-suite/cpp11_type_aliasing.i
@@ -3,9 +3,15 @@
 // Type aliasing seg fault : Github issue #424
 
 %warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) Target;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) Int;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) IntRef;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) IntPtrRef;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) IntRValueRef;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) IntArray;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) HalideTargetPtr1;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) HalideTargetPtr2;
 
 %inline %{
-
 namespace Halide {
 
 struct Target {
@@ -44,3 +50,17 @@ public:
 %}
 
 %template(Halide_Target) Halide::Internal::GeneratorParam<Halide::Target>;
+
+
+%inline %{
+using Int = int;
+using IntRef = int&;
+using IntPtrRef = int*&;
+using IntRValueRef = int&&;
+using IntArray = int[];
+
+using HalideTargetPtr1 = Halide::Target*;
+namespace Halide {
+  using HalideTargetPtr2 = Target*;
+}
+%}
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index c6b1d5ee4..afbe2ad9b 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -2850,9 +2850,10 @@ c_declaration   : c_decl {
 		  Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line, "Lambda expressions and closures are not fully supported yet.\n");
 		  SWIG_WARN_NODE_END($$);
 		}
-                | USING idcolon EQUAL idcolon {
+                | USING idcolon EQUAL type typemap_parameter_declarator SEMI {
 		  $$ = new_node("using");
 		  Setattr($$,"name",$2);
+		  SwigType_push($4,$5.type);
 		  Setattr($$,"uname",$4);
 		  add_symbols($$);
 		  SWIG_WARN_NODE_BEGIN($$);
@@ -2861,15 +2862,17 @@ c_declaration   : c_decl {
 
 		  $$ = 0; /* TODO - ignored for now */
 		}
-                | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL identifier {
-		  skip_decl();
+                | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL type typemap_parameter_declarator SEMI {
 		  $$ = new_node("using");
-		  Setattr($$,"uname",$8);
 		  Setattr($$,"name",$6);
+		  SwigType_push($8,$9.type);
+		  Setattr($$,"uname",$8);
 		  add_symbols($$);
 		  SWIG_WARN_NODE_BEGIN($$);
 		  Swig_warning(WARN_CPP11_ALIAS_TEMPLATE, cparse_file, cparse_line, "The 'using' keyword in template aliasing is not fully supported yet.\n");
 		  SWIG_WARN_NODE_END($$);
+
+		  $$ = 0; /* TODO - ignored for now */
 		}
                 ;
 

From 0b436c65ca165ea246fc2b69eb7d259e86029728 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 19 Jun 2015 07:26:57 +0100
Subject: [PATCH 167/220] Cosmetic parser change

Rename typemap_parameter_declarator as it is no longer just used for typemaps
---
 Source/CParse/parser.y | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index afbe2ad9b..9cc7a7bb9 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1438,7 +1438,7 @@ static void mark_nodes_as_extend(Node *n) {
 %type <str>      pragma_arg;
 %type <loc>      includetype;
 %type <type>     pointer primitive_type;
-%type <decl>     declarator direct_declarator notso_direct_declarator parameter_declarator typemap_parameter_declarator;
+%type <decl>     declarator direct_declarator notso_direct_declarator parameter_declarator plain_declarator;
 %type <decl>     abstract_declarator direct_abstract_declarator ctor_end;
 %type <tmap>     typemap_type;
 %type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate stringbrace stringbracesemi;
@@ -2466,7 +2466,7 @@ tm_tail        : COMMA typemap_parm tm_tail {
                | empty { $$ = 0;}
                ;
 
-typemap_parm   : type typemap_parameter_declarator {
+typemap_parm   : type plain_declarator {
                   Parm *parm;
 		  SwigType_push($1,$2.type);
 		  $$ = new_node("typemapitem");
@@ -2850,7 +2850,7 @@ c_declaration   : c_decl {
 		  Swig_warning(WARN_CPP11_LAMBDA, cparse_file, cparse_line, "Lambda expressions and closures are not fully supported yet.\n");
 		  SWIG_WARN_NODE_END($$);
 		}
-                | USING idcolon EQUAL type typemap_parameter_declarator SEMI {
+                | USING idcolon EQUAL type plain_declarator SEMI {
 		  $$ = new_node("using");
 		  Setattr($$,"name",$2);
 		  SwigType_push($4,$5.type);
@@ -2862,7 +2862,7 @@ c_declaration   : c_decl {
 
 		  $$ = 0; /* TODO - ignored for now */
 		}
-                | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL type typemap_parameter_declarator SEMI {
+                | TEMPLATE LESSTHAN template_parms GREATERTHAN USING idcolon EQUAL type plain_declarator SEMI {
 		  $$ = new_node("using");
 		  Setattr($$,"name",$6);
 		  SwigType_push($8,$9.type);
@@ -4883,7 +4883,7 @@ parameter_declarator : declarator def_args {
             }
             ;
 
-typemap_parameter_declarator : declarator {
+plain_declarator : declarator {
                  $$ = $1;
 		 if (SwigType_isfunction($1.type)) {
 		   Delete(SwigType_pop_function($1.type));

From 64e5215f29ad1f43a0b179d415db84be0d2eeafc Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 24 Mar 2015 17:22:37 +0100
Subject: [PATCH 168/220] scilab: fix memory leak

---
 Lib/scilab/scirun.swg | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Lib/scilab/scirun.swg b/Lib/scilab/scirun.swg
index 081012fe9..7e2f85362 100644
--- a/Lib/scilab/scirun.swg
+++ b/Lib/scilab/scirun.swg
@@ -148,7 +148,8 @@ SWIGRUNTIME int
 SWIG_Scilab_ConvertPacked(void *pvApiCtx, int iVar, void *ptr, int sz, swig_type_info *ty, char *fname) {
   swig_cast_info *tc;
   int *piAddrVar = NULL;
-  char *pstStrings = NULL;
+  char *pstString = NULL;
+  char *pstStringPtr = NULL;
   SciErr sciErr;
 
   sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
@@ -157,27 +158,33 @@ SWIG_Scilab_ConvertPacked(void *pvApiCtx, int iVar, void *ptr, int sz, swig_type
     return SWIG_ERROR;
   }
 
-  if (getAllocatedSingleString(pvApiCtx, piAddrVar, &pstStrings)) {
+  if (getAllocatedSingleString(pvApiCtx, piAddrVar, &pstString)) {
     return SWIG_ERROR;
   }
 
   /* Pointer values must start with leading underscore */
-  if (*pstStrings != '_') {
+  if (*pstString != '_') {
+    freeAllocatedSingleString(pstString);
     return SWIG_ERROR;
   }
 
-  pstStrings++;
-  pstStrings = (char*)SWIG_UnpackData(pstStrings, ptr, sz);
+  pstStringPtr = pstString;
+  pstStringPtr++;
+  pstStringPtr = (char*)SWIG_UnpackData(pstStringPtr, ptr, sz);
 
   if (ty) {
-    if (!pstStrings) {
+    if (!pstStringPtr) {
+      freeAllocatedSingleString(pstString);
       return SWIG_ERROR;
     }
-    tc = SWIG_TypeCheck(pstStrings, ty);
+    tc = SWIG_TypeCheck(pstStringPtr, ty);
     if (!tc) {
+      freeAllocatedSingleString(pstString);
       return SWIG_ERROR;
     }
   }
+
+  freeAllocatedSingleString(pstString);
   return SWIG_OK;
 }
 

From 05cfa06dbb31fd8a2654d8cb24ca44e7b5e0c809 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 24 Mar 2015 17:31:17 +0100
Subject: [PATCH 169/220] scilab: use freeAllocatedSingleString() after
 getAllocatedSingleTree()

---
 Lib/scilab/scichar.swg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Lib/scilab/scichar.swg b/Lib/scilab/scichar.swg
index 66818e991..f3ea939a2 100644
--- a/Lib/scilab/scichar.swg
+++ b/Lib/scilab/scichar.swg
@@ -103,8 +103,7 @@ SWIG_SciString_AsCharPtr(void *pvApiCtx, int iVar, char *pcValue, int iLength, c
     strncpy(pcValue, pcTmpValue, iLength);
   }
 
-  free(pcTmpValue);
-
+  freeAllocatedSingleString(pcTmpValue);
   return SWIG_OK;
 }
 }

From b05f0057ca5b45f13045a93c2c00858a79206f6b Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 23 Jun 2015 16:22:31 +0200
Subject: [PATCH 170/220] improve support of varargs

---
 Lib/scilab/scirun.swg     |  2 ++
 Source/Modules/scilab.cxx | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Lib/scilab/scirun.swg b/Lib/scilab/scirun.swg
index 7e2f85362..71641e074 100644
--- a/Lib/scilab/scirun.swg
+++ b/Lib/scilab/scirun.swg
@@ -66,11 +66,13 @@ static void SWIG_Scilab_SetApiContext(void *apiCtx) {
 
 #if SWIG_SCILAB_VERSION >= 540
 #define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument)
+#define SWIG_CheckInputArgumentAtLeast(pvApiCtx, minInputArgument) CheckInputArgumentAtLeast(pvApiCtx, minInputArgument)
 #define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument)
 #define SWIG_NbInputArgument(pvApiCtx) nbInputArgument(pvApiCtx)
 #define SWIG_AssignOutputArgument(pvApiCtx, outputArgumentPos, argumentPos) AssignOutputVariable(pvApiCtx, outputArgumentPos) = argumentPos
 #else
 #define SWIG_CheckInputArgument(pvApiCtx, minInputArgument, maxInputArgument) CheckRhs(minInputArgument, maxInputArgument)
+#define SWIG_CheckInputArgumentAtLeast(pvApiCtx, minInputArgument) CheckRhs(minInputArgument, 256)
 #define SWIG_CheckOutputArgument(pvApiCtx, minOutputArgument, maxOutputArgument) CheckLhs(minOutputArgument, maxOutputArgument)
 #define SWIG_NbInputArgument(pvApiCtx) Rhs
 #define SWIG_AssignOutputArgument(pvApiCtx, outputArgumentPos, argumentPos) LhsVar(outputArgumentPos) = argumentPos
diff --git a/Source/Modules/scilab.cxx b/Source/Modules/scilab.cxx
index 82389f4cd..dd0645bd2 100644
--- a/Source/Modules/scilab.cxx
+++ b/Source/Modules/scilab.cxx
@@ -346,14 +346,18 @@ public:
     emit_attach_parmmaps(functionParamsList, wrapper);
     Setattr(node, "wrap:parms", functionParamsList);
 
-    /* Check arguments */
+    /* Check input/output arguments count */
     int maxInputArguments = emit_num_arguments(functionParamsList);
     int minInputArguments = emit_num_required(functionParamsList);
     int minOutputArguments = 0;
     int maxOutputArguments = 0;
 
-    /* Insert calls to CheckInputArgument and CheckOutputArgument */
-    Printf(wrapper->code, "SWIG_CheckInputArgument(pvApiCtx, $mininputarguments, $maxinputarguments);\n");
+    if (!emit_isvarargs(functionParamsList)) {
+      Printf(wrapper->code, "SWIG_CheckInputArgument(pvApiCtx, $mininputarguments, $maxinputarguments);\n");
+    }
+    else {
+      Printf(wrapper->code, "SWIG_CheckInputArgumentAtLeast(pvApiCtx, $mininputarguments-1);\n");
+    }
     Printf(wrapper->code, "SWIG_CheckOutputArgument(pvApiCtx, $minoutputarguments, $maxoutputarguments);\n");
 
     /* Set context */

From 078ad6cb86d1e8e93eae5b758dc35b37a476347a Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Tue, 23 Jun 2015 16:24:16 +0200
Subject: [PATCH 171/220] simplify SWIG_SciString_AsChar()

---
 Lib/scilab/scichar.swg | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/Lib/scilab/scichar.swg b/Lib/scilab/scichar.swg
index f3ea939a2..5edbf5b76 100644
--- a/Lib/scilab/scichar.swg
+++ b/Lib/scilab/scichar.swg
@@ -14,12 +14,9 @@
 SWIGINTERN int
 SWIG_SciString_AsChar(void *pvApiCtx, int iVar, char *pcValue, char *fname) {
   SciErr sciErr;
-  int iType = 0;
-  int iRows = 0;
-  int iCols = 0;
   int *piAddrVar = NULL;
-  char *pstStrings = NULL;
-  int piLength = 0;
+  char *pstValue = NULL;
+  int iRet;
 
   sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
   if (sciErr.iErr) {
@@ -27,30 +24,22 @@ SWIG_SciString_AsChar(void *pvApiCtx, int iVar, char *pcValue, char *fname) {
     return SWIG_ERROR;
   }
 
-  sciErr = getVarType(pvApiCtx, piAddrVar, &iType);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
+  if (isStringType(pvApiCtx, piAddrVar) == 0)
+  {
+      Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A single string expected.\n"), fname, iVar);
+      return SWIG_TypeError;
   }
-  if (iType != sci_strings) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A string expected.\n"), fname, iVar);
+
+  iRet = getAllocatedSingleString(pvApiCtx, piAddrVar, &pstValue);
+  if (iRet) {
     return SWIG_ERROR;
   }
 
-  pstStrings = (char *)malloc(sizeof(char));
-  sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &piLength, (char **)&pstStrings);
-  if (sciErr.iErr) {
-    printError(&sciErr, 0);
-    return SWIG_ERROR;
+  if (pcValue != NULL) {
+    *pcValue = pstValue[0];
   }
-  if (iRows * iCols != 1) {
-    Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, iVar);
-    return SWIG_ERROR;
-  }
-  *pcValue = pstStrings[0];
-
-  free(pstStrings);
 
+  freeAllocatedSingleString(pstValue);
   return SWIG_OK;
 }
 }

From 0650f3535e0a563a70dd77ddca6f982a6769be33 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 25 Jun 2015 11:31:57 +0100
Subject: [PATCH 172/220] Appveyor: use default os image

---
 appveyor.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index aa69719d8..002f35401 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,3 @@
-os:
-- Windows Server 2012 R2
-
 platform:
 - x86
 - x64

From a8c6f9c9e228207e5c92484179b231b89b8cbc02 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 10 Jun 2015 12:34:36 +1200
Subject: [PATCH 173/220] Drop removal of libtool on "make distclean"

SWIG stopped using libtool over 11 years ago.
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index daec0b08d..e8e08a994 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -409,7 +409,7 @@ clean-ccache:
 # DISTCLEAN - clean what configure built
 #####################################################################
 
-DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig
+DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log preinst-swig
 
 distclean-helper: distclean-test-suite distclean-examples distclean-tools distclean-dead
 

From 822b2355c0a88143274853afa520406b67c41082 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Wed, 3 Jun 2015 12:25:03 +1200
Subject: [PATCH 174/220] Improve handling of whitespace in %pythoncode

Previously SWIG looked at the indentation of the first line and removed
that many characters from each subsequent line, regardless of what those
characters were.  This was made worse because SWIG's preprocessor removes
any whitespace before a '#'.  Fixes github issue #379, reported by Joe
Orton.
---
 CHANGES.current                               |   9 ++
 .../test-suite/errors/swig_pythoncode_bad.i   |   7 +
 .../errors/swig_pythoncode_bad.stderr         |   1 +
 .../test-suite/errors/swig_pythoncode_bad2.i  |  13 ++
 .../errors/swig_pythoncode_bad2.stderr        |   1 +
 Examples/test-suite/python/Makefile.in        |   1 +
 .../python/python_pythoncode_runme.py         |   5 +
 Examples/test-suite/python_pythoncode.i       |  29 ++++
 Source/Include/swigwarn.h                     |   4 +
 Source/Modules/python.cxx                     | 151 ++++++++++++------
 10 files changed, 173 insertions(+), 48 deletions(-)
 create mode 100644 Examples/test-suite/errors/swig_pythoncode_bad.i
 create mode 100644 Examples/test-suite/errors/swig_pythoncode_bad.stderr
 create mode 100644 Examples/test-suite/errors/swig_pythoncode_bad2.i
 create mode 100644 Examples/test-suite/errors/swig_pythoncode_bad2.stderr
 create mode 100644 Examples/test-suite/python/python_pythoncode_runme.py
 create mode 100644 Examples/test-suite/python_pythoncode.i

diff --git a/CHANGES.current b/CHANGES.current
index 8270c254a..53f50a3db 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,15 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-06-29: olly
+	    [Python] Improve handling of whitespace in %pythoncode.
+
+	    Previously SWIG looked at the indentation of the first line and
+	    removed that many characters from each subsequent line, regardless
+	    of what those characters were.  This was made worse because SWIG's
+	    preprocessor removes any whitespace before a '#'.  Fixes github
+	    issue #379, reported by Joe Orton.
+
 2015-06-12: wsfulton
 	    [R] Fix #430 - call to SWIG_createNewRef in copyToC was incorrectly named.
 
diff --git a/Examples/test-suite/errors/swig_pythoncode_bad.i b/Examples/test-suite/errors/swig_pythoncode_bad.i
new file mode 100644
index 000000000..f1d497618
--- /dev/null
+++ b/Examples/test-suite/errors/swig_pythoncode_bad.i
@@ -0,0 +1,7 @@
+%module xxx
+
+%pythoncode %{
+    def foo():
+	a = 1 # This line starts with a tab instead of 8 spaces.
+        return 2
+%}
diff --git a/Examples/test-suite/errors/swig_pythoncode_bad.stderr b/Examples/test-suite/errors/swig_pythoncode_bad.stderr
new file mode 100644
index 000000000..71e5db8da
--- /dev/null
+++ b/Examples/test-suite/errors/swig_pythoncode_bad.stderr
@@ -0,0 +1 @@
+swig_pythoncode_bad.i:7: Error: Line indented less than expected (line 2 of pythoncode)
diff --git a/Examples/test-suite/errors/swig_pythoncode_bad2.i b/Examples/test-suite/errors/swig_pythoncode_bad2.i
new file mode 100644
index 000000000..f80f1be86
--- /dev/null
+++ b/Examples/test-suite/errors/swig_pythoncode_bad2.i
@@ -0,0 +1,13 @@
+%module xxx
+
+%pythoncode %{
+    def one():
+        print "in one"
+%}
+
+%pythoncode %{
+        print "still in one"
+
+    def two():
+        print "in two"
+%}
diff --git a/Examples/test-suite/errors/swig_pythoncode_bad2.stderr b/Examples/test-suite/errors/swig_pythoncode_bad2.stderr
new file mode 100644
index 000000000..48ad77e51
--- /dev/null
+++ b/Examples/test-suite/errors/swig_pythoncode_bad2.stderr
@@ -0,0 +1 @@
+swig_pythoncode_bad2.i:13: Error: Line indented less than expected (line 3 of pythoncode)
diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in
index 66bbbcb6b..a99c30439 100644
--- a/Examples/test-suite/python/Makefile.in
+++ b/Examples/test-suite/python/Makefile.in
@@ -61,6 +61,7 @@ CPP_TEST_CASES += \
 	python_director \
 	python_nondynamic \
 	python_overload_simple_cast \
+	python_pythoncode \
 	python_richcompare \
 	simutry \
 	std_containers \
diff --git a/Examples/test-suite/python/python_pythoncode_runme.py b/Examples/test-suite/python/python_pythoncode_runme.py
new file mode 100644
index 000000000..da238780d
--- /dev/null
+++ b/Examples/test-suite/python/python_pythoncode_runme.py
@@ -0,0 +1,5 @@
+import python_pythoncode
+
+# No need to actually do anything, this is a regression test for a bug which
+# caused an invalid python_pythoncode.py to be generated, so if we can import
+# it the bug is still fixed.
diff --git a/Examples/test-suite/python_pythoncode.i b/Examples/test-suite/python_pythoncode.i
new file mode 100644
index 000000000..d3593984f
--- /dev/null
+++ b/Examples/test-suite/python_pythoncode.i
@@ -0,0 +1,29 @@
+%module python_pythoncode
+
+// github issue#379 - these examples failed with 3.0.5 and earlier (at least as
+// far back as 1.3.37):
+
+struct TYPE {
+%pythoncode %{
+   def one():
+# Comment XXXX
+      return 1
+%}
+};
+
+%define %bar
+%pythoncode %{
+   def one():
+      # Comment XXXX
+      return 1
+%}
+%enddef
+
+struct TYPE2 {
+%bar
+};
+
+%{
+struct TYPE { };
+struct TYPE2 { };
+%}
diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h
index 75ad5696d..bc54bc774 100644
--- a/Source/Include/swigwarn.h
+++ b/Source/Include/swigwarn.h
@@ -236,6 +236,10 @@
 
 /* please leave 720-739 free for Scilab */
 
+#define WARN_PYTHON_INDENT_MISMATCH           740
+
+/* please leave 740-759 free for Python */
+
 #define WARN_RUBY_WRONG_NAME                  801
 #define WARN_RUBY_MULTIPLE_INHERITANCE        802
 
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 50cf1a4c2..14e27941f 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1361,7 +1361,7 @@ public:
    * pythoncode()     - Output python code into the shadow file
    * ------------------------------------------------------------ */
 
-  String *pythoncode(String *code, const_String_or_char_ptr indent) {
+  String *pythoncode(String *code, const_String_or_char_ptr indent, String * file, int line) {
     String *out = NewString("");
     String *temp;
     char *t;
@@ -1379,38 +1379,91 @@ public:
     /* Split the input text into lines */
     List *clist = SplitLines(temp);
     Delete(temp);
-    int initial = 0;
-    String *s = 0;
-    Iterator si;
-    /* Get the initial indentation */
 
-    for (si = First(clist); si.item; si = Next(si)) {
-      s = si.item;
-      if (Len(s)) {
-	char *c = Char(s);
-	while (*c) {
-	  if (!isspace(*c))
-	    break;
-	  initial++;
-	  c++;
-	}
-	if (*c && !isspace(*c)) {
-	  break;
-	} else {
-	  initial = 0;
-	}
+    // Line number within the pythoncode.
+    int py_line = 0;
+
+    String * initial = 0;
+    Iterator si;
+
+    /* Get the initial indentation.  Skip lines which only contain whitespace
+     * and/or a comment, as the indentation of those doesn't matter:
+     *
+     *     A logical line that contains only spaces, tabs, formfeeds and
+     *     possibly a comment, is ignored (i.e., no NEWLINE token is
+     *     generated).
+     *
+     * see:
+     * https://docs.python.org/2/reference/lexical_analysis.html#blank-lines
+     * https://docs.python.org/3/reference/lexical_analysis.html#blank-lines
+     */
+    for (si = First(clist); si.item; si = Next(si), ++py_line) {
+      const char *c = Char(si.item);
+      int i;
+      for (i = 0; isspace((unsigned char)c[i]); i++) {
+	// Scan forward until we find a non-space (which may be a nul byte).
       }
+      char ch = c[i];
+      if (ch && ch != '#') {
+	// Found a line with actual content.
+	initial = NewStringWithSize(c, i);
+	break;
+      }
+      if (ch) {
+	Printv(out, indent, c, NIL);
+      }
+      Putc('\n', out);
     }
-    while (si.item) {
-      s = si.item;
-      if (Len(s) > initial) {
-	char *c = Char(s);
-	c += initial;
+
+    // Process remaining lines.
+    for ( ; si.item; si = Next(si), ++py_line) {
+      const char *c = Char(si.item);
+      // If no prefixed line was found, the above loop should have completed.
+      assert(initial);
+
+      int i;
+      for (i = 0; isspace((unsigned char)c[i]); i++) {
+	// Scan forward until we find a non-space (which may be a nul byte).
+      }
+      char ch = c[i];
+      if (!ch) {
+	// Line is just whitespace - emit an empty line.
+	Putc('\n', out);
+	continue;
+      }
+
+      if (ch == '#') {
+	// Comment - the indentation doesn't matter to python, but try to
+	// adjust the whitespace for the benefit of human readers (though SWIG
+	// currently seems to always remove any whitespace before a '#' before
+	// we get here, in which case we'll just leave the comment at the start
+	// of the line).
+	if (i >= Len(initial)) {
+	  Printv(out, indent, NIL);
+	}
+
+	Printv(out, c + i, "\n", NIL);
+	continue;
+      }
+
+      if (i < Len(initial)) {
+	// There's non-whitespace in the initial prefix of this line.
+	Swig_error(file, line, "Line indented less than expected (line %d of pythoncode)\n", py_line);
 	Printv(out, indent, c, "\n", NIL);
       } else {
-	Printv(out, "\n", NIL);
+	if (memcmp(c, Char(initial), Len(initial)) == 0) {
+	  // Prefix matches initial, so just remove it.
+	  Printv(out, indent, c + Len(initial), "\n", NIL);
+	  continue;
+	}
+	Swig_warning(WARN_PYTHON_INDENT_MISMATCH,
+		     file, line, "Whitespace prefix doesn't match (line %d of pythoncode)\n", py_line);
+	// To avoid gratuitously breaking interface files which worked with
+	// SWIG <= 3.0.5, we remove a prefix of the same number of bytes for
+	// lines which start with different whitespace to the line we got
+	// 'initial' from.
+	Printv(out, indent, c + Len(initial), "\n", NIL);
       }
-      si = Next(si);
     }
     Delete(clist);
     return out;
@@ -1498,20 +1551,22 @@ public:
     //
     if (have_auto && have_ds) {	// Both autodoc and docstring are present
       doc = NewString("");
-      Printv(doc, triple_double, "\n", pythoncode(autodoc, indent), "\n", pythoncode(str, indent), indent, triple_double, NIL);
+      Printv(doc, triple_double, "\n",
+	     pythoncode(autodoc, indent, Getfile(n), Getline(n)), "\n",
+	     pythoncode(str, indent, Getfile(n), Getline(n)), indent, triple_double, NIL);
     } else if (!have_auto && have_ds) {	// only docstring
       if (Strchr(str, '\n') == 0) {
 	doc = NewStringf("%s%s%s", triple_double, str, triple_double);
       } else {
 	doc = NewString("");
-	Printv(doc, triple_double, "\n", pythoncode(str, indent), indent, triple_double, NIL);
+	Printv(doc, triple_double, "\n", pythoncode(str, indent, Getfile(n), Getline(n)), indent, triple_double, NIL);
       }
     } else if (have_auto && !have_ds) {	// only autodoc
       if (Strchr(autodoc, '\n') == 0) {
 	doc = NewStringf("%s%s%s", triple_double, autodoc, triple_double);
       } else {
 	doc = NewString("");
-	Printv(doc, triple_double, "\n", pythoncode(autodoc, indent), indent, triple_double, NIL);
+	Printv(doc, triple_double, "\n", pythoncode(autodoc, indent, Getfile(n), Getline(n)), indent, triple_double, NIL);
       }
     } else
       doc = NewString("");
@@ -2224,10 +2279,10 @@ public:
     if (have_docstring(n))
       Printv(f_dest, tab4, docstring(n, AUTODOC_FUNC, tab4), "\n", NIL);
     if (have_pythonprepend(n))
-      Printv(f_dest, pythoncode(pythonprepend(n), tab4), "\n", NIL);
+      Printv(f_dest, pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n)), "\n", NIL);
     if (have_pythonappend(n)) {
       Printv(f_dest, tab4 "val = ", funcCall(name, callParms), "\n", NIL);
-      Printv(f_dest, pythoncode(pythonappend(n), tab4), "\n", NIL);
+      Printv(f_dest, pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n)), "\n", NIL);
       Printv(f_dest, tab4 "return val\n", NIL);
     } else {
       Printv(f_dest, tab4 "return ", funcCall(name, callParms), "\n", NIL);
@@ -4431,7 +4486,7 @@ public:
 	  have_repr = 1;
 	}
 	if (Getattr(n, "feature:shadow")) {
-	  String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4);
+	  String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n));
 	  String *pyaction = NewStringf("%s.%s", module, fullname);
 	  Replaceall(pycode, "$action", pyaction);
 	  Delete(pyaction);
@@ -4453,12 +4508,12 @@ public:
 	      Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL);
 	    if (have_pythonprepend(n)) {
 	      fproxy = 0;
-	      Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
+	      Printv(f_shadow, pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	    }
 	    if (have_pythonappend(n)) {
 	      fproxy = 0;
 	      Printv(f_shadow, tab8, "val = ", funcCall(fullname, callParms), "\n", NIL);
-	      Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL);
+	      Printv(f_shadow, pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	      Printv(f_shadow, tab8, "return val\n\n", NIL);
 	    } else {
 	      Printv(f_shadow, tab8, "return ", funcCall(fullname, callParms), "\n\n", NIL);
@@ -4538,10 +4593,10 @@ public:
 	if (have_docstring(n))
 	  Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL);
 	if (have_pythonprepend(n))
-	  Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
+	  Printv(f_shadow, pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	if (have_pythonappend(n)) {
 	  Printv(f_shadow, tab8, "val = ", funcCall(Swig_name_member(NSPACE_TODO, class_name, symname), callParms), "\n", NIL);
-	  Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL);
+	  Printv(f_shadow, pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	  Printv(f_shadow, tab8, "return val\n\n", NIL);
 	} else {
 	  Printv(f_shadow, tab8, "return ", funcCall(Swig_name_member(NSPACE_TODO, class_name, symname), callParms), "\n\n", NIL);
@@ -4626,7 +4681,7 @@ public:
 	if (!have_constructor && handled_as_init) {
 	  if (!builtin) {
 	    if (Getattr(n, "feature:shadow")) {
-	      String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4);
+	      String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n));
 	      String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
 	      Replaceall(pycode, "$action", pyaction);
 	      Delete(pyaction);
@@ -4655,7 +4710,7 @@ public:
 	      if (have_docstring(n))
 		Printv(f_shadow, tab8, docstring(n, AUTODOC_CTOR, tab8), "\n", NIL);
 	      if (have_pythonprepend(n))
-		Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
+		Printv(f_shadow, pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	      Printv(f_shadow, pass_self, NIL);
 	      if (fastinit) {
 		Printv(f_shadow, tab8, module, ".", class_name, "_swiginit(self, ", funcCall(Swig_name_construct(NSPACE_TODO, symname), callParms), ")\n", NIL);
@@ -4665,7 +4720,7 @@ public:
 		       tab8, "try:\n", tab8, tab4, "self.this.append(this)\n", tab8, "except:\n", tab8, tab4, "self.this = this\n", NIL);
 	      }
 	      if (have_pythonappend(n))
-		Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n\n", NIL);
+		Printv(f_shadow, pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n)), "\n\n", NIL);
 	      Delete(pass_self);
 	    }
 	    have_constructor = 1;
@@ -4674,7 +4729,7 @@ public:
 	  /* Hmmm. We seem to be creating a different constructor.  We're just going to create a
 	     function for it. */
 	  if (Getattr(n, "feature:shadow")) {
-	    String *pycode = pythoncode(Getattr(n, "feature:shadow"), "");
+	    String *pycode = pythoncode(Getattr(n, "feature:shadow"), "", Getfile(n), Getline(n));
 	    String *pyaction = NewStringf("%s.%s", module, Swig_name_construct(NSPACE_TODO, symname));
 	    Replaceall(pycode, "$action", pyaction);
 	    Delete(pyaction);
@@ -4688,7 +4743,7 @@ public:
 	    if (have_docstring(n))
 	      Printv(f_shadow_stubs, tab4, docstring(n, AUTODOC_CTOR, tab4), "\n", NIL);
 	    if (have_pythonprepend(n))
-	      Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4), "\n", NIL);
+	      Printv(f_shadow_stubs, pythoncode(pythonprepend(n), tab4, Getfile(n), Getline(n)), "\n", NIL);
 	    String *subfunc = NULL;
 	    /*
 	       if (builtin)
@@ -4701,7 +4756,7 @@ public:
 	    Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL);
 #endif
 	    if (have_pythonappend(n))
-	      Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4), "\n", NIL);
+	      Printv(f_shadow_stubs, pythoncode(pythonappend(n), tab4, Getfile(n), Getline(n)), "\n", NIL);
 	    Printv(f_shadow_stubs, tab4, "return val\n", NIL);
 	    Delete(subfunc);
 	  }
@@ -4738,7 +4793,7 @@ public:
 
     if (shadow) {
       if (Getattr(n, "feature:shadow")) {
-	String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4);
+	String *pycode = pythoncode(Getattr(n, "feature:shadow"), tab4, Getfile(n), Getline(n));
 	String *pyaction = NewStringf("%s.%s", module, Swig_name_destroy(NSPACE_TODO, symname));
 	Replaceall(pycode, "$action", pyaction);
 	Delete(pyaction);
@@ -4756,7 +4811,7 @@ public:
 	if (have_docstring(n))
 	  Printv(f_shadow, tab8, docstring(n, AUTODOC_DTOR, tab8), "\n", NIL);
 	if (have_pythonprepend(n))
-	  Printv(f_shadow, pythoncode(pythonprepend(n), tab8), "\n", NIL);
+	  Printv(f_shadow, pythoncode(pythonprepend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 #ifdef USE_THISOWN
 	Printv(f_shadow, tab8, "try:\n", NIL);
 	Printv(f_shadow, tab8, tab4, "if self.thisown:", module, ".", Swig_name_destroy(NSPACE_TODO, symname), "(self)\n", NIL);
@@ -4764,7 +4819,7 @@ public:
 #else
 #endif
 	if (have_pythonappend(n))
-	  Printv(f_shadow, pythoncode(pythonappend(n), tab8), "\n", NIL);
+	  Printv(f_shadow, pythoncode(pythonappend(n), tab8, Getfile(n), Getline(n)), "\n", NIL);
 	Printv(f_shadow, tab8, "pass\n", NIL);
 	Printv(f_shadow, "\n", NIL);
       }
@@ -4944,12 +4999,12 @@ public:
 
     if (!ImportMode && (Cmp(section, "python") == 0 || Cmp(section, "shadow") == 0)) {
       if (shadow) {
-	String *pycode = pythoncode(code, shadow_indent);
+	String *pycode = pythoncode(code, shadow_indent, Getfile(n), Getline(n));
 	Printv(f_shadow, pycode, NIL);
 	Delete(pycode);
       }
     } else if (!ImportMode && (Cmp(section, "pythonbegin") == 0)) {
-      String *pycode = pythoncode(code, "");
+      String *pycode = pythoncode(code, "", Getfile(n), Getline(n));
       Printv(f_shadow_begin, pycode, NIL);
       Delete(pycode);
     } else {

From 8208d12aa55fff495685f6b58c0db4f4c9721278 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Mon, 29 Jun 2015 22:24:53 +1200
Subject: [PATCH 175/220] Document use of %pythoncode "file.py"

As discussed in github issue #379.
---
 Doc/Manual/Python.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 23c2aaae3..0cbb38021 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -3382,6 +3382,18 @@ problems, for example: <tt># error handling</tt>).  SWIG 3.0.3 and later report
 an error for invalid preprocessor directives, so you may have to update
 existing interface files to delimit blocks of Python code correctly.</p>
 
+<p>As an alternative to providing a block containing Python code, you can
+include python code from a file.  The code is inserted exactly as in the
+file, so this avoids any issues with the SWIG preprocessor.  It's a good
+approach if you have a non-trivial chunk of Python code to insert.  To
+use this feature you specify a filename in double quotes, for example:</p>
+
+<div class="code">
+<pre>
+%pythoncode "somecode.py"
+</pre>
+</div>
+
 <p>Sometimes you may want to replace or modify the wrapper function
 that SWIG creates in the proxy <tt>.py</tt> file.  The Python module
 in SWIG provides some features that enable you to do this.  First, to

From 6528e380cbc9ba4977105495a0a0f7654fe8bb9e Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 30 Jun 2015 01:36:07 +1200
Subject: [PATCH 176/220] Fix or workaround PEP8 warnings

---
 Examples/test-suite/python_pythoncode.i | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Examples/test-suite/python_pythoncode.i b/Examples/test-suite/python_pythoncode.i
index d3593984f..70474d44c 100644
--- a/Examples/test-suite/python_pythoncode.i
+++ b/Examples/test-suite/python_pythoncode.i
@@ -5,17 +5,19 @@
 
 struct TYPE {
 %pythoncode %{
-   def one():
+    def one():
+        a = 1
 # Comment XXXX
-      return 1
+        return a
 %}
 };
 
 %define %bar
 %pythoncode %{
-   def one():
-      # Comment XXXX
-      return 1
+    def one():
+        a = 1
+        #
+        return a
 %}
 %enddef
 

From ca208cfe35033b31fb7d05c160278c2eb583f499 Mon Sep 17 00:00:00 2001
From: Nils Gladitz <nilsgladitz@gmail.com>
Date: Wed, 1 Jul 2015 12:24:12 +0200
Subject: [PATCH 177/220] lua: push characters as unformatted 1-character
 strings

Since Lua 5.3 the "%c" format character in lua_pushfstring will produce
the string "<\XXX>" (XXX being a decimal code sequence) when
given unprintable characters.

Use lua_pushlstring instead to reproduce the old behavior.
---
 Examples/test-suite/chartest.i             | 15 +++++++++++++++
 Examples/test-suite/common.mk              |  1 +
 Examples/test-suite/lua/chartest_runme.lua | 14 ++++++++++++++
 Lib/lua/lua.swg                            |  2 +-
 Lib/lua/luarun.swg                         |  5 ++++-
 Lib/lua/luatypemaps.swg                    |  4 ++--
 6 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 Examples/test-suite/chartest.i
 create mode 100644 Examples/test-suite/lua/chartest_runme.lua

diff --git a/Examples/test-suite/chartest.i b/Examples/test-suite/chartest.i
new file mode 100644
index 000000000..e81cf54a4
--- /dev/null
+++ b/Examples/test-suite/chartest.i
@@ -0,0 +1,15 @@
+%module chartest
+
+%inline %{
+char printable_global_char = 'a';
+char unprintable_global_char = 0x7F;
+
+char GetPrintableChar() {
+  return 'a';
+}
+
+char GetUnprintableChar() {
+  return 0x7F;
+}
+
+%}
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 12b70719b..7457b815a 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -138,6 +138,7 @@ CPP_TEST_CASES += \
 	casts \
 	char_binary \
 	char_strings \
+	chartest \
 	class_forward \
 	class_ignore \
 	class_scope_weird \
diff --git a/Examples/test-suite/lua/chartest_runme.lua b/Examples/test-suite/lua/chartest_runme.lua
new file mode 100644
index 000000000..e15f3dc6b
--- /dev/null
+++ b/Examples/test-suite/lua/chartest_runme.lua
@@ -0,0 +1,14 @@
+require("import")   -- the import fn
+import("chartest")   -- import code
+
+function char_assert(char, code)
+  assert(type(char) == 'string')
+  assert(char:len() == 1)
+  assert(char:byte() == code)
+end
+
+char_assert(chartest.GetPrintableChar(), 0x61)
+char_assert(chartest.GetUnprintableChar(), 0x7F)
+
+char_assert(chartest.printable_global_char, 0x61)
+char_assert(chartest.unprintable_global_char, 0x7F)
diff --git a/Lib/lua/lua.swg b/Lib/lua/lua.swg
index 892d15798..9c21d0812 100644
--- a/Lib/lua/lua.swg
+++ b/Lib/lua/lua.swg
@@ -185,7 +185,7 @@ use %include <std_except.i> instead
 
 // char is changed to a string
 %typemap(throws) char
-%{lua_pushfstring(L,"%c",$1);SWIG_fail;%}
+%{lua_pushlstring(L,&$1,1);SWIG_fail;%}
 
 /*
 Throwing object is a serious problem:
diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index 0ab045287..721fac22b 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -1841,7 +1841,10 @@ SWIG_Lua_InstallConstants(lua_State *L, swig_lua_const_info constants[]) {
       break;
     case SWIG_LUA_CHAR:
       lua_pushstring(L,constants[i].name);
-      lua_pushfstring(L,"%c",(char)constants[i].lvalue);
+      {
+        char c = constants[i].lvalue;
+        lua_pushlstring(L,&c,1);
+      }
       lua_rawset(L,-3);
       break;
     case SWIG_LUA_STRING:
diff --git a/Lib/lua/luatypemaps.swg b/Lib/lua/luatypemaps.swg
index c86b40d74..5d98e6107 100644
--- a/Lib/lua/luatypemaps.swg
+++ b/Lib/lua/luatypemaps.swg
@@ -122,14 +122,14 @@ SWIGINTERN int SWIG_lua_isnilstring(lua_State *L, int idx) {
 %{$1 = (lua_tostring(L, $input))[0];%}
 
 %typemap(out) char
-%{  lua_pushfstring(L,"%c",$1); SWIG_arg++;%}
+%{  lua_pushlstring(L, &$1, 1); SWIG_arg++;%}
 
 // by const ref
 %typemap(in,checkfn="SWIG_lua_isnilstring",fragment="SWIG_lua_isnilstring") const char& (char temp)
 %{temp = (lua_tostring(L, $input))[0]; $1=&temp;%}
 
 %typemap(out) const char&
-%{  lua_pushfstring(L,"%c",*$1); SWIG_arg++;%}
+%{  lua_pushlstring(L, $1, 1); SWIG_arg++;%}
 
 // pointers and references
 // under SWIG rules, it is ok, to have a pass in a lua nil,

From 9c06cbba514d1e323a4a8b9bbd6d09e4d68acf41 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 2 Jul 2015 09:38:21 +1200
Subject: [PATCH 178/220] Add CHANGES.current entry for PR #452

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

diff --git a/CHANGES.current b/CHANGES.current
index 53f50a3db..ce9f228d4 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-07-02: ngladitz
+	    [Lua] Push characters as unformatted 1-character strings to avoid
+	    unprintable characters such as (char)127 being converted to
+	    "<\127>" with Lua 5.3 and later.  (github PR #452)
+
 2015-06-29: olly
 	    [Python] Improve handling of whitespace in %pythoncode.
 

From 05397cf6a2cd6df35e84fadc77835e598a240211 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 2 Jul 2015 07:40:29 +0100
Subject: [PATCH 179/220] Fix syntax error when the template keyword is used in
 types

For example:
  std::template vector<int> v;
---
 CHANGES.current                               |  5 ++
 Examples/test-suite/common.mk                 |  1 +
 Examples/test-suite/cpp11_template_typedefs.i | 15 ++++++
 .../test-suite/template_keyword_in_type.i     | 38 ++++++++++++++
 Source/CParse/parser.y                        | 52 ++++++++++++-------
 5 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 Examples/test-suite/template_keyword_in_type.i

diff --git a/CHANGES.current b/CHANGES.current
index ce9f228d4..c7b415248 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.6 (in progress)
 ===========================
 
+2015-07-02: wsfulton
+	    Fix syntax error when the template keyword is used in types, eg:
+
+              std::template vector<int> v;
+
 2015-07-02: ngladitz
 	    [Lua] Push characters as unformatted 1-character strings to avoid
 	    unprintable characters such as (char)127 being converted to
diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 7457b815a..3f3b2216f 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -412,6 +412,7 @@ CPP_TEST_CASES += \
 	template_inherit \
 	template_inherit_abstract \
 	template_int_const \
+	template_keyword_in_type \
 	template_methods \
 	template_namespace_forward_declaration \
 	template_using_directive_and_declaration_forward \
diff --git a/Examples/test-suite/cpp11_template_typedefs.i b/Examples/test-suite/cpp11_template_typedefs.i
index 67c0950cb..97a1da7ed 100644
--- a/Examples/test-suite/cpp11_template_typedefs.i
+++ b/Examples/test-suite/cpp11_template_typedefs.i
@@ -5,6 +5,8 @@
 %warnfilter(SWIGWARN_CPP11_ALIAS_TEMPLATE) TypedefNamePtr;
 %warnfilter(SWIGWARN_CPP11_ALIAS_TEMPLATE) MyIntKeyClass;
 %warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) PF;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) BucketAllocator1;
+%warnfilter(SWIGWARN_CPP11_ALIAS_DECLARATION) BucketAllocator2;
 
 // This warning should go away when type aliasing is supported
 #pragma SWIG nowarn=SWIGWARN_PARSE_USING_UNDEF // Nothing known about 'p.SomeType< char *,T2,4 >'.
@@ -39,3 +41,16 @@ TypedefName<int> alias1(TypedefName<int> a) { return a; }
 TypedefNamePtr<int> alias1(TypedefNamePtr<int> a = nullptr) { return a; }
 %}
 
+%inline %{
+typedef double Val;
+template<typename T> struct ListBucket {
+};
+namespace Alloc {
+  template<typename T> struct rebind {
+    typedef int other;
+  };
+}
+
+using BucketAllocator1 = typename Alloc::template rebind<ListBucket<Val>>::other;
+using BucketAllocator2 = typename Alloc::template rebind<::template ListBucket<double>>::other;
+%}
diff --git a/Examples/test-suite/template_keyword_in_type.i b/Examples/test-suite/template_keyword_in_type.i
new file mode 100644
index 000000000..054f6d5d8
--- /dev/null
+++ b/Examples/test-suite/template_keyword_in_type.i
@@ -0,0 +1,38 @@
+%module template_keyword_in_type
+
+%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) YYY;
+
+%inline %{
+  template<typename T> struct XXX;
+
+  template<typename T> struct XXX {
+    template<typename TT> struct YYY {
+      typedef TT type;
+    };
+    int xxx(int h) { return h; }
+  };
+
+#if defined(SWIG) || defined(__clang__)
+  // gcc doesn't parse this (tested with gcc-4.8)
+  void testXXX1(::template XXX<int>::template YYY<int>::type xx) {}
+#else
+  void testXXX1(::         XXX<int>::template YYY<int>::type xx) {}
+#endif
+  void testXXX2(XXX<int>::YYY<int>::type xx) {}
+  typedef ::XXX<int>::template YYY<int>::type templatetyped;
+%}
+
+%inline %{
+typedef double Val;
+template<typename T> struct ListBucket {
+};
+namespace Alloc {
+  template<typename T> struct rebind {
+    typedef int other;
+  };
+}
+
+void other1(typename Alloc::template rebind<ListBucket<Val> >::other) {}
+void other2(typename Alloc::template rebind< ::template ListBucket<Val> >::other) {}
+void other3(Alloc::template rebind<int>) {}
+%}
diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 9cc7a7bb9..ab4a0fb30 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1430,7 +1430,7 @@ static void mark_nodes_as_extend(Node *n) {
 %type <dtype>    definetype def_args etype default_delete deleted_definition explicit_default;
 %type <dtype>    expr exprnum exprcompound valexpr;
 %type <id>       ename ;
-%type <id>       template_decl;
+%type <id>       less_valparms_greater;
 %type <str>      type_qualifier ;
 %type <id>       type_qualifier_raw;
 %type <id>       idstring idstringopt;
@@ -1441,7 +1441,7 @@ static void mark_nodes_as_extend(Node *n) {
 %type <decl>     declarator direct_declarator notso_direct_declarator parameter_declarator plain_declarator;
 %type <decl>     abstract_declarator direct_abstract_declarator ctor_end;
 %type <tmap>     typemap_type;
-%type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate stringbrace stringbracesemi;
+%type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate idtemplatetemplate stringbrace stringbracesemi;
 %type <id>       string stringnum wstring;
 %type <tparms>   template_parms;
 %type <dtype>    cpp_end cpp_vend;
@@ -3073,7 +3073,9 @@ initializer   : def_args {
 cpp_alternate_rettype : primitive_type { $$ = $1; }
               | TYPE_BOOL { $$ = $1; }
               | TYPE_VOID { $$ = $1; }
+/*
               | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
+*/
               | TYPE_RAW { $$ = $1; }
               | idcolon { $$ = $1; }
               | decltype { $$ = $1; }
@@ -4646,7 +4648,9 @@ anon_bitfield_type : primitive_type { $$ = $1;
                 }
                | TYPE_BOOL { $$ = $1; }
                | TYPE_VOID { $$ = $1; }
+/*
                | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
+*/
                | TYPE_RAW { $$ = $1; }
 
                | idcolon {
@@ -5593,7 +5597,9 @@ type_right     : primitive_type { $$ = $1;
                }
                | TYPE_BOOL { $$ = $1; }
                | TYPE_VOID { $$ = $1; }
+/*
                | TYPE_TYPEDEF template_decl { $$ = NewStringf("%s%s",$1,$2); }
+*/
                | c_enum_key idcolon { $$ = NewStringf("enum %s", $2); }
                | TYPE_RAW { $$ = $1; }
 
@@ -6419,14 +6425,13 @@ mem_initializer : idcolon LPAREN {
 		}
                 ;
 
-template_decl : LESSTHAN valparms GREATERTHAN { 
+less_valparms_greater : LESSTHAN valparms GREATERTHAN {
                      String *s = NewStringEmpty();
                      SwigType_add_template(s,$2);
                      $$ = Char(s);
 		     scanner_last_id(1);
-                 }
-               | empty { $$ = (char*)"";  }
-               ;
+                }
+		;
 
 /* Identifiers including the C++11 identifiers with special meaning */
 identifier     : ID { $$ = $1; }
@@ -6448,29 +6453,32 @@ idcolon        : idtemplate idcolontail {
 		  if (!$$) $$ = NewStringf("%s%s", $1,$2);
       	          Delete($2);
                }
-               | NONID DCOLON idtemplate idcolontail { 
+               | NONID DCOLON idtemplatetemplate idcolontail {
 		 $$ = NewStringf("::%s%s",$3,$4);
                  Delete($4);
                }
                | idtemplate {
 		 $$ = NewString($1);
    	       }
-               | NONID DCOLON idtemplate {
+               | NONID DCOLON idtemplatetemplate {
 		 $$ = NewStringf("::%s",$3);
                }
-               | OPERATOR template_decl {
-                 $$ = NewStringf("%s%s",$1,$2);
+               | OPERATOR {
+                 $$ = NewStringf("%s", $1);
+	       }
+               | OPERATOR less_valparms_greater {
+                 $$ = NewStringf("%s%s", $1, $2);
 	       }
                | NONID DCOLON OPERATOR {
                  $$ = NewStringf("::%s",$3);
                }
                ;
 
-idcolontail    : DCOLON idtemplate idcolontail {
+idcolontail    : DCOLON idtemplatetemplate idcolontail {
                    $$ = NewStringf("::%s%s",$2,$3);
 		   Delete($3);
                }
-               | DCOLON idtemplate {
+               | DCOLON idtemplatetemplate {
                    $$ = NewStringf("::%s",$2);
                }
                | DCOLON OPERATOR {
@@ -6486,12 +6494,20 @@ idcolontail    : DCOLON idtemplate idcolontail {
                ;
 
 
-idtemplate    : identifier template_decl {
-                  $$ = NewStringf("%s%s",$1,$2);
-		  /*		  if (Len($2)) {
-		    scanner_last_id(1);
-		    } */
-              }
+idtemplate    : identifier {
+		$$ = NewStringf("%s", $1);
+	      }
+	      | identifier less_valparms_greater {
+		$$ = NewStringf("%s%s", $1, $2);
+	      }
+              ;
+
+idtemplatetemplate : idtemplate {
+		$$ = $1;
+	      }
+	      | TEMPLATE identifier less_valparms_greater {
+		$$ = NewStringf("%s%s", $2, $3);
+	      }
               ;
 
 /* Identifier, but no templates */

From 925cec3a8290dc666257d4d20d1a4e7825229caf Mon Sep 17 00:00:00 2001
From: Nils Gladitz <nilsgladitz@gmail.com>
Date: Fri, 5 Jun 2015 20:20:25 +0200
Subject: [PATCH 180/220] Add a space between literal and string macro

In C++11 a space between a literal and string macro is required.
---
 Source/Modules/php.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index b50470ede..35e741949 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -1722,7 +1722,7 @@ public:
 	      Printf(output, "\t\t\treturn new %s%s($r);\n", prefix, Getattr(classLookup(d), "sym:name"));
 	    } else {
 	      Printf(output, "\t\t\t$c = new stdClass();\n");
-	      Printf(output, "\t\t\t$c->"SWIG_PTR" = $r;\n");
+	      Printf(output, "\t\t\t$c->" SWIG_PTR " = $r;\n");
 	      Printf(output, "\t\t\treturn $c;\n");
 	    }
 	    Printf(output, "\t\t}\n\t\treturn $r;\n");

From 335572170b7185d24b8515f5909d091ae117d458 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 07:49:28 +0100
Subject: [PATCH 181/220] Correct testcase use of typename to be inside a
 template

---
 Examples/test-suite/template_keyword_in_type.i | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/template_keyword_in_type.i b/Examples/test-suite/template_keyword_in_type.i
index 054f6d5d8..4b1107104 100644
--- a/Examples/test-suite/template_keyword_in_type.i
+++ b/Examples/test-suite/template_keyword_in_type.i
@@ -32,7 +32,7 @@ namespace Alloc {
   };
 }
 
-void other1(typename Alloc::template rebind<ListBucket<Val> >::other) {}
-void other2(typename Alloc::template rebind< ::template ListBucket<Val> >::other) {}
-void other3(Alloc::template rebind<int>) {}
+template<typename X> void other1(typename Alloc::template rebind<ListBucket<Val> >::other) {}
+template<typename X> void other2(typename Alloc::template rebind< ::template ListBucket<Val> >::other) {}
+template<typename X> void other3(Alloc::template rebind<int>) {}
 %}

From c767b33c3f0bc7e30ac00214e77f0fc572678e6b Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 07:40:08 +0100
Subject: [PATCH 182/220] C# gc tests failure fix

Sometimes the GC just won't run the finalizers, so we output a warning
instead of throwing an error, so now the test-suite will pass but with a
warning if the number of objects is not as expected.

li_std_auto_ptr was failing during Appveyor testing

An equivalent change was put into the corresponding Java runtime tests a
while back.
---
 Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs | 2 +-
 Examples/test-suite/csharp/li_std_auto_ptr_runme.cs     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs b/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs
index 625542751..445c4d74b 100644
--- a/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs
+++ b/Examples/test-suite/csharp/li_boost_shared_ptr_runme.cs
@@ -46,7 +46,7 @@ public class runme
       }
       int actualCount = Klass.getTotal_count();
       if (actualCount != expectedCount)
-        throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
+        Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
     }
 
     int wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count(); 
diff --git a/Examples/test-suite/csharp/li_std_auto_ptr_runme.cs b/Examples/test-suite/csharp/li_std_auto_ptr_runme.cs
index 387d50400..1f66042a6 100644
--- a/Examples/test-suite/csharp/li_std_auto_ptr_runme.cs
+++ b/Examples/test-suite/csharp/li_std_auto_ptr_runme.cs
@@ -32,7 +32,7 @@ public class li_std_auto_ptr_runme {
           };
           int actualCount = Klass.getTotal_count();
           if (actualCount != expectedCount)
-            throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
+            Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
         }
 
         if (k2.getLabel() != "second")
@@ -51,7 +51,7 @@ public class li_std_auto_ptr_runme {
           }
           int actualCount = Klass.getTotal_count();
           if (actualCount != expectedCount)
-            throw new ApplicationException("Expected count: " + expectedCount + " Actual count: " + actualCount);
+            Console.Error.WriteLine("Expected count: " + expectedCount + " Actual count: " + actualCount); // Finalizers are not guaranteed to be run and sometimes they just don't
         }
     }
 }

From edcdaaec163ffd928e585e97ec08f9682790bf28 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 19:06:39 +0100
Subject: [PATCH 183/220] Warning fixes for 64bit visual c++ on Windows

---
 Source/CParse/parser.y    |  2 +-
 Source/CParse/templ.c     |  2 +-
 Source/DOH/base.c         |  6 +++---
 Source/DOH/file.c         |  2 +-
 Source/DOH/fio.c          | 18 +++++++++---------
 Source/DOH/string.c       |  4 ++--
 Source/Modules/go.cxx     |  2 +-
 Source/Modules/main.cxx   |  4 ++--
 Source/Modules/ocaml.cxx  |  4 ++--
 Source/Modules/php.cxx    |  6 +++---
 Source/Modules/python.cxx |  8 ++++----
 Source/Swig/include.c     |  4 ++--
 Source/Swig/misc.c        | 20 ++++++++++----------
 Source/Swig/naming.c      |  4 ++--
 Source/Swig/stype.c       |  6 +++---
 Source/Swig/typemap.c     |  8 ++++----
 Source/Swig/typeobj.c     | 10 +++++-----
 17 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index ab4a0fb30..a3c5e73bf 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -744,7 +744,7 @@ static String *remove_block(Node *kw, const String *inputcode) {
    String *name = Getattr(kw,"name");
    if (name && (Cmp(name,"noblock") == 0)) {
      char *cstr = Char(inputcode);
-     size_t len = Len(inputcode);
+     int len = Len(inputcode);
      if (len && cstr[0] == '{') {
        --len; ++cstr; 
        if (len && cstr[len - 1] == '}') { --len; }
diff --git a/Source/CParse/templ.c b/Source/CParse/templ.c
index 9768f1b99..e575073a4 100644
--- a/Source/CParse/templ.c
+++ b/Source/CParse/templ.c
@@ -237,7 +237,7 @@ String *partial_arg(String *s, String *p) {
   if (!c) {
     return Copy(s);
   }
-  prefix = NewStringWithSize(cp, c - cp);
+  prefix = NewStringWithSize(cp, (int)(c - cp));
   newarg = Copy(s);
   Replace(newarg, prefix, "", DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
   Delete(prefix);
diff --git a/Source/DOH/base.c b/Source/DOH/base.c
index 4034e5626..12351dd09 100644
--- a/Source/DOH/base.c
+++ b/Source/DOH/base.c
@@ -146,7 +146,7 @@ int DohLen(const DOH *obj) {
     }
     return 0;
   } else {
-    return strlen((char *) obj);
+    return (int)strlen((char *) obj);
   }
 }
 
@@ -636,7 +636,7 @@ int DohRead(DOH *obj, void *buffer, int length) {
     return -1;
   }
   /* Hmmm.  Not a file.  Maybe it's a real FILE */
-  return fread(buffer, 1, length, (FILE *) b);
+  return (int)fread(buffer, 1, length, (FILE *) b);
 }
 
 /* -----------------------------------------------------------------------------
@@ -654,7 +654,7 @@ int DohWrite(DOH *obj, const void *buffer, int length) {
     return -1;
   }
   /* Hmmm.  Not a file.  Maybe it's a real FILE */
-  return fwrite(buffer, 1, length, (FILE *) b);
+  return (int)fwrite(buffer, 1, length, (FILE *) b);
 }
 
 /* -----------------------------------------------------------------------------
diff --git a/Source/DOH/file.c b/Source/DOH/file.c
index 7409ebbfb..5c56771d0 100644
--- a/Source/DOH/file.c
+++ b/Source/DOH/file.c
@@ -52,7 +52,7 @@ static int File_read(DOH *fo, void *buffer, int len) {
   DohFile *f = (DohFile *) ObjData(fo);
 
   if (f->filep) {
-    return fread(buffer, 1, len, f->filep);
+    return (int)fread(buffer, 1, len, f->filep);
   } else if (f->fd) {
 #ifdef DOH_INTFILE
     return read(f->fd, buffer, len);
diff --git a/Source/DOH/fio.c b/Source/DOH/fio.c
index 7055ffc85..77419008c 100644
--- a/Source/DOH/fio.c
+++ b/Source/DOH/fio.c
@@ -304,9 +304,9 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
 	  }
 	  if (strlen(encoder)) {
 	    enc = encode(encoder, Sval);
-	    maxwidth = maxwidth + strlen(newformat) + Len(enc);
+	    maxwidth = maxwidth + (int)strlen(newformat) + Len(enc);
 	  } else {
-	    maxwidth = maxwidth + strlen(newformat) + Len(Sval);
+	    maxwidth = maxwidth + (int)strlen(newformat) + Len(Sval);
 	  }
 	  *(fmt++) = 's';
 	  *fmt = 0;
@@ -320,7 +320,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
 	  } else {
 	    nbytes += sprintf(stemp, newformat, Data(Sval));
 	  }
-	  if (Writen(so, stemp, strlen(stemp)) < 0)
+	  if (Writen(so, stemp, (int)strlen(stemp)) < 0)
 	    return -1;
 	  if ((DOH *) Sval != doh) {
 	    Delete(Sval);
@@ -346,7 +346,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
 	  } else {
 	    enc = 0;
 	  }
-	  maxwidth = maxwidth + strlen(newformat) + strlen((char *) doh);
+	  maxwidth = maxwidth + (int)strlen(newformat) + (int)strlen((char *) doh);
 	  *(fmt++) = 's';
 	  *fmt = 0;
 	  if ((maxwidth + 1) < OBUFLEN) {
@@ -355,7 +355,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
 	    stemp = (char *) DohMalloc(maxwidth + 1);
 	  }
 	  nbytes += sprintf(stemp, newformat, doh);
-	  if (Writen(so, stemp, strlen(stemp)) < 0)
+	  if (Writen(so, stemp, (int)strlen(stemp)) < 0)
 	    return -1;
 	  if (stemp != obuffer) {
 	    DohFree(stemp);
@@ -366,7 +366,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
       } else {
 	*(fmt++) = *p;
 	*fmt = 0;
-	maxwidth = maxwidth + strlen(newformat) + 64;
+	maxwidth = maxwidth + (int)strlen(newformat) + 64;
 
 	/* Only allocate a buffer if it is too big to fit.  Shouldn't have to do
 	   this very often */
@@ -401,7 +401,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
 	default:
 	  break;
 	}
-	if (Writen(so, stemp, strlen(stemp)) < 0)
+	if (Writen(so, stemp, (int)strlen(stemp)) < 0)
 	  return -1;
 	if (stemp != obuffer)
 	  DohFree(stemp);
@@ -414,7 +414,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
   if (state) {
     int r;
     *fmt = 0;
-    r = Writen(so, fmt, strlen(fmt));
+    r = Writen(so, fmt, (int)strlen(fmt));
     if (r < 0)
       return -1;
     nbytes += r;
@@ -455,7 +455,7 @@ int DohPrintv(DOHFile * f, ...) {
     if (DohCheck(obj)) {
       ret += DohDump(obj, f);
     } else {
-      ret += DohWrite(f, obj, strlen((char *) obj));
+      ret += DohWrite(f, obj, (int)strlen((char *) obj));
     }
   }
   va_end(ap);
diff --git a/Source/DOH/string.c b/Source/DOH/string.c
index cfc6c70f6..490198dfa 100644
--- a/Source/DOH/string.c
+++ b/Source/DOH/string.c
@@ -687,7 +687,7 @@ static int replace_simple(String *str, char *token, char *rep, int flags, int co
     return 0;
 
   base = str->str;
-  tokenlen = strlen(token);
+  tokenlen = (int)strlen(token);
   s = (*match) (base, base, token, tokenlen);
 
   if (!s)
@@ -724,7 +724,7 @@ static int replace_simple(String *str, char *token, char *rep, int flags, int co
   }
 
   first = s;
-  replen = strlen(rep);
+  replen = (int)strlen(rep);
 
   delta = (replen - tokenlen);
 
diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index db4bf5507..6b9ba760d 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -2629,7 +2629,7 @@ private:
       // exponentiation.  Treat anything else as too complicated to
       // handle as a Go constant.
       char *p = Char(value);
-      int len = strlen(p);
+      int len = (int)strlen(p);
       bool need_copy = false;
       while (len > 0) {
 	char c = p[len - 1];
diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
index 1850a47cb..632a001ac 100644
--- a/Source/Modules/main.cxx
+++ b/Source/Modules/main.cxx
@@ -595,7 +595,7 @@ void SWIG_getoptions(int argc, char *argv[]) {
           Swig_filename_correct(outfile_name);
 	  if (!outfile_name_h || !dependencies_file) {
 	    char *ext = strrchr(Char(outfile_name), '.');
-	    String *basename = ext ? NewStringWithSize(Char(outfile_name), Char(ext) - Char(outfile_name)) : NewString(outfile_name);
+	    String *basename = ext ? NewStringWithSize(Char(outfile_name), (int)(Char(ext) - Char(outfile_name))) : NewString(outfile_name);
 	    if (!dependencies_file) {
 	      dependencies_file = NewStringf("%s.%s", basename, depends_extension);
 	    }
@@ -899,7 +899,7 @@ int SWIG_main(int argc, char *argv[], Language *l) {
   String *vers = NewString("SWIG_VERSION 0x");
   int count = 0;
   while (token) {
-    int len = strlen(token);
+    int len = (int)strlen(token);
     assert(len == 1 || len == 2);
     Printf(vers, "%s%s", (len == 1) ? "0" : "", token);
     token = strtok(NULL, ".");
diff --git a/Source/Modules/ocaml.cxx b/Source/Modules/ocaml.cxx
index bca6fa2a0..87b430b02 100644
--- a/Source/Modules/ocaml.cxx
+++ b/Source/Modules/ocaml.cxx
@@ -990,7 +990,7 @@ public:
       find_marker += strlen("(*Stream:");
 
       if (next) {
-	int num_chars = next - find_marker;
+	int num_chars = (int)(next - find_marker);
 	String *stream_name = NewString(find_marker);
 	Delslice(stream_name, num_chars, Len(stream_name));
 	File *fout = Swig_filebyname(stream_name);
@@ -1001,7 +1001,7 @@ public:
 	  if (!following)
 	    following = next + strlen(next);
 	  String *chunk = NewString(next);
-	  Delslice(chunk, following - next, Len(chunk));
+	  Delslice(chunk, (int)(following - next), Len(chunk));
 	  Printv(fout, chunk, NIL);
 	}
       }
diff --git a/Source/Modules/php.cxx b/Source/Modules/php.cxx
index 35e741949..37a8f9628 100644
--- a/Source/Modules/php.cxx
+++ b/Source/Modules/php.cxx
@@ -190,7 +190,7 @@ class PHP : public Language {
 	p = strchr(p, '"');
 	if (p) {
 	  ++p;
-	  Insert(action, p - Char(action), " TSRMLS_CC");
+	  Insert(action, (int)(p - Char(action)), " TSRMLS_CC");
 	}
       }
     }
@@ -2424,7 +2424,7 @@ done:
 	String *target = Swig_method_decl(0, decl, classname, parms, 0, 0);
 	const char * p = Char(target);
 	const char * comma = strchr(p, ',');
-	size_t ins = comma ? comma - p : Len(target) - 1;
+	int ins = comma ? (int)(comma - p) : Len(target) - 1;
 	Insert(target, ins, " TSRMLS_DC");
 
 	call = Swig_csuperclass_call(0, basetype, superparms);
@@ -2443,7 +2443,7 @@ done:
 	String *target = Swig_method_decl(0, decl, classname, parms, 0, 1);
 	const char * p = Char(target);
 	const char * comma = strchr(p, ',');
-	size_t ins = comma ? comma - p : Len(target) - 1;
+	int ins = comma ? (int)(comma - p) : Len(target) - 1;
 	Insert(target, ins, " TSRMLS_DC");
 
 	Printf(f_directors_h, "    %s;\n", target);
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 14e27941f..652df8974 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1184,7 +1184,7 @@ public:
 	    const char *py3_end1 = Strchr(rpkg, '.');
 	    if (!py3_end1)
 	      py3_end1 = (Char(rpkg)) + Len(rpkg);
-	    py3_rlen1 = py3_end1 - (Char(rpkg));
+	    py3_rlen1 = (int)(py3_end1 - Char(rpkg));
 	  } else {
 	    rpkg = NewString("");
 	  }
@@ -1916,7 +1916,7 @@ public:
 
       // Avoid unnecessary string allocation in the common case when we don't
       // need to remove any suffix.
-      return *end == '\0' ? v : NewStringWithSize(s, end - s);
+      return *end == '\0' ? v : NewStringWithSize(s, (int)(end - s));
     }
 
     return NIL;
@@ -1998,7 +1998,7 @@ public:
 		if (py3) {
 		  if (end - s > 1) {
 		    result = NewString("0o");
-		    Append(result, NewStringWithSize(s + 1, end - s - 1));
+		    Append(result, NewStringWithSize(s + 1, (int)(end - s - 1)));
 		  }
 		}
 	      }
@@ -2007,7 +2007,7 @@ public:
 	    // Avoid unnecessary string allocation in the common case when we don't
 	    // need to remove any suffix.
 	    if (!result)
-	      result = *end == '\0' ? v : NewStringWithSize(s, end - s);
+	      result = *end == '\0' ? v : NewStringWithSize(s, (int)(end - s));
 	  }
 	}
       }
diff --git a/Source/Swig/include.c b/Source/Swig/include.c
index 7e80172ba..08226a25c 100644
--- a/Source/Swig/include.c
+++ b/Source/Swig/include.c
@@ -194,7 +194,7 @@ static FILE *Swig_open_file(const_String_or_char_ptr name, int sysfile, int use_
     lastpath = filename;
 
     /* Skip the UTF-8 BOM if it's present */
-    nbytes = fread(bom, 1, 3, f);
+    nbytes = (int)fread(bom, 1, 3, f);
     if (nbytes == 3 && bom[0] == (char)0xEF && bom[1] == (char)0xBB && bom[2] == (char)0xBF) {
       /* skip */
     } else {
@@ -369,7 +369,7 @@ String *Swig_file_filename(const_String_or_char_ptr filename) {
 String *Swig_file_dirname(const_String_or_char_ptr filename) {
   const char *delim = SWIG_FILE_DELIMITER;
   const char *c = strrchr(Char(filename), *delim);
-  return c ? NewStringWithSize(filename, c - Char(filename) + 1) : NewString("");
+  return c ? NewStringWithSize(filename, (int)(c - Char(filename) + 1)) : NewString("");
 }
 
 /*
diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c
index 7a6fb0114..d8034c5eb 100644
--- a/Source/Swig/misc.c
+++ b/Source/Swig/misc.c
@@ -127,7 +127,7 @@ String *Swig_strip_c_comments(const String *s) {
   }
 
   if (comment_begin && comment_end) {
-    int size = comment_begin - Char(s);
+    int size = (int)(comment_begin - Char(s));
     String *stripmore = 0;
     stripped = NewStringWithSize(s, size);
     Printv(stripped, comment_end + 1, NIL);
@@ -808,7 +808,7 @@ void Swig_scopename_split(const String *s, String **rprefix, String **rlast) {
       *rlast = Copy(s);
       return;
     } else {
-      *rprefix = NewStringWithSize(cc, co - cc - 2);
+      *rprefix = NewStringWithSize(cc, (int)(co - cc - 2));
       *rlast = NewString(co);
       return;
     }
@@ -835,7 +835,7 @@ void Swig_scopename_split(const String *s, String **rprefix, String **rlast) {
   }
 
   if (cc != tmp) {
-    *rprefix = NewStringWithSize(tmp, cc - tmp);
+    *rprefix = NewStringWithSize(tmp, (int)(cc - tmp));
     *rlast = NewString(cc + 2);
     return;
   } else {
@@ -858,7 +858,7 @@ String *Swig_scopename_prefix(const String *s) {
     if (co == cc) {
       return 0;
     } else {
-      String *prefix = NewStringWithSize(cc, co - cc - 2);
+      String *prefix = NewStringWithSize(cc, (int)(co - cc - 2));
       return prefix;
     }
   }
@@ -884,7 +884,7 @@ String *Swig_scopename_prefix(const String *s) {
   }
 
   if (cc != tmp) {
-    return NewStringWithSize(tmp, cc - tmp);
+    return NewStringWithSize(tmp, (int)(cc - tmp));
   } else {
     return 0;
   }
@@ -977,7 +977,7 @@ String *Swig_scopename_first(const String *s) {
     }
   }
   if (*c && (c != tmp)) {
-    return NewStringWithSize(tmp, c - tmp);
+    return NewStringWithSize(tmp, (int)(c - tmp));
   } else {
     return 0;
   }
@@ -1219,8 +1219,8 @@ static int split_regex_pattern_subst(String *s, String **pattern, String **subst
   if (!p) goto err_out;
   sube = p;
 
-  *pattern = NewStringWithSize(pats, pate - pats);
-  *subst   = NewStringWithSize(subs, sube - subs);
+  *pattern = NewStringWithSize(pats, (int)(pate - pats));
+  *subst   = NewStringWithSize(subs, (int)(sube - subs));
   *input   = p + 1;
   return 1;
 
@@ -1270,7 +1270,7 @@ String *replace_captures(int num_captures, const char *input, String *subst, int
     /* Copy part without substitutions */
     const char *q = strchr(p, '\\');
     if (!q) {
-      copy_with_maybe_case_conversion(result, p, strlen(p), &convertCase, convertNextOnly);
+      copy_with_maybe_case_conversion(result, p, (int)strlen(p), &convertCase, convertNextOnly);
       break;
     }
     copy_with_maybe_case_conversion(result, p, q - p, &convertCase, convertNextOnly);
@@ -1350,7 +1350,7 @@ String *Swig_string_regex(String *s) {
           pcre_error, Char(pattern), pcre_errorpos);
       exit(1);
     }
-    rc = pcre_exec(compiled_pat, NULL, input, strlen(input), 0, 0, captures, 30);
+    rc = pcre_exec(compiled_pat, NULL, input, (int)strlen(input), 0, 0, captures, 30);
     if (rc >= 0) {
       res = replace_captures(rc, input, subst, captures, pattern, s);
     } else if (rc != PCRE_ERROR_NOMATCH) {
diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c
index 272961c25..2d1effa18 100644
--- a/Source/Swig/naming.c
+++ b/Source/Swig/naming.c
@@ -578,7 +578,7 @@ void Swig_name_object_inherit(Hash *namehash, String *base, String *derived) {
   bprefix = NewStringf("%s::", base);
   dprefix = NewStringf("%s::", derived);
   cbprefix = Char(bprefix);
-  plen = strlen(cbprefix);
+  plen = (int)strlen(cbprefix);
   for (ki = First(namehash); ki.key; ki = Next(ki)) {
     char *k = Char(ki.key);
     if (strncmp(k, cbprefix, plen) == 0) {
@@ -1074,7 +1074,7 @@ static List *Swig_make_attrlist(const char *ckey) {
     String *nattr;
     const char *rattr = strchr(++cattr, '$');
     while (rattr) {
-      nattr = NewStringWithSize(cattr, rattr - cattr);
+      nattr = NewStringWithSize(cattr, (int)(rattr - cattr));
       Append(list, nattr);
       Delete(nattr);
       cattr = rattr + 1;
diff --git a/Source/Swig/stype.c b/Source/Swig/stype.c
index 506878799..a57222745 100644
--- a/Source/Swig/stype.c
+++ b/Source/Swig/stype.c
@@ -195,7 +195,7 @@ int SwigType_ispointer_return(const SwigType *t) {
   if (!t)
     return 0;
   c = Char(t);
-  idx = strlen(c) - 4;
+  idx = (int)strlen(c) - 4;
   if (idx >= 0) {
     return (strcmp(c + idx, ").p.") == 0);
   }
@@ -208,7 +208,7 @@ int SwigType_isreference_return(const SwigType *t) {
   if (!t)
     return 0;
   c = Char(t);
-  idx = strlen(c) - 4;
+  idx = (int)strlen(c) - 4;
   if (idx >= 0) {
     return (strcmp(c + idx, ").r.") == 0);
   }
@@ -485,7 +485,7 @@ String *SwigType_namestr(const SwigType *t) {
   if (!c || !strstr(c + 2, ")>"))
     return NewString(t);
 
-  r = NewStringWithSize(d, c - d);
+  r = NewStringWithSize(d, (int)(c - d));
   if (*(c - 1) == '<')
     Putc(' ', r);
   Putc('<', r);
diff --git a/Source/Swig/typemap.c b/Source/Swig/typemap.c
index 0bfbb4bce..23b1e80e9 100644
--- a/Source/Swig/typemap.c
+++ b/Source/Swig/typemap.c
@@ -1844,7 +1844,7 @@ static List *split_embedded_typemap(String *s) {
       }
     }
     if ((level == 0) && angle_level == 0 && ((*c == ',') || (*c == ')'))) {
-      String *tmp = NewStringWithSize(start, c - start);
+      String *tmp = NewStringWithSize(start, (int)(c - start));
       Append(args, tmp);
       Delete(tmp);
       start = c + 1;
@@ -1915,10 +1915,10 @@ static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper
       c++;
     }
     if (end) {
-      dollar_typemap = NewStringWithSize(start, (end - start));
+      dollar_typemap = NewStringWithSize(start, (int)((end - start)));
       syntax_error = 0;
     } else {
-      dollar_typemap = NewStringWithSize(start, (c - start));
+      dollar_typemap = NewStringWithSize(start, (int)((c - start)));
     }
 
     if (!syntax_error) {
@@ -1963,7 +1963,7 @@ static void replace_embedded_typemap(String *s, ParmList *parm_sublist, Wrapper
 	    char *eq = strchr(Char(parm), '=');
 	    char *c = Char(parm);
 	    if (eq && (eq - c > 0)) {
-	      String *name = NewStringWithSize(c, eq - c);
+	      String *name = NewStringWithSize(c, (int)(eq - c));
 	      String *value = NewString(eq + 1);
 	      Insert(name, 0, "$");
 	      Setattr(vars, name, value);
diff --git a/Source/Swig/typeobj.c b/Source/Swig/typeobj.c
index 622eac118..b2832b6a9 100644
--- a/Source/Swig/typeobj.c
+++ b/Source/Swig/typeobj.c
@@ -361,7 +361,7 @@ SwigType *SwigType_del_pointer(SwigType *t) {
     printf("Fatal error. SwigType_del_pointer applied to non-pointer.\n");
     abort();
   }
-  Delslice(t, 0, (c - s) + 2);
+  Delslice(t, 0, (int)((c - s) + 2));
   return t;
 }
 
@@ -915,7 +915,7 @@ SwigType *SwigType_add_template(SwigType *t, ParmList *parms) {
 String *SwigType_templateprefix(const SwigType *t) {
   const char *s = Char(t);
   const char *c = strstr(s, "<(");
-  return c ? NewStringWithSize(s, c - s) : NewString(s);
+  return c ? NewStringWithSize(s, (int)(c - s)) : NewString(s);
 }
 
 /* -----------------------------------------------------------------------------
@@ -966,7 +966,7 @@ String *SwigType_templatesuffix(const SwigType *t) {
 String *SwigType_istemplate_templateprefix(const SwigType *t) {
   const char *s = Char(t);
   const char *c = strstr(s, "<(");
-  return c ? NewStringWithSize(s, c - s) : 0;
+  return c ? NewStringWithSize(s, (int)(c - s)) : 0;
 }
 
 /* -----------------------------------------------------------------------------
@@ -989,7 +989,7 @@ String *SwigType_istemplate_only_templateprefix(const SwigType *t) {
   const char *s = Char(t);
   if (len >= 4 && strcmp(s + len - 2, ")>") == 0) {
     const char *c = strstr(s, "<(");
-    return c ? NewStringWithSize(s, c - s) : 0;
+    return c ? NewStringWithSize(s, (int)(c - s)) : 0;
   } else {
     return 0;
   }
@@ -1022,7 +1022,7 @@ String *SwigType_templateargs(const SwigType *t) {
 	  nest--;
 	c++;
       }
-      return NewStringWithSize(start, c - start);
+      return NewStringWithSize(start, (int)(c - start));
     }
     c++;
   }

From c7da8bb06e1d397f6e3fb2c012ec1480186f0a02 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 19:34:16 +0100
Subject: [PATCH 184/220] Warning fixes in generated Java code for 64bit Visual
 C++ on Windows.

---
 Lib/java/director.swg | 2 +-
 Lib/java/java.swg     | 6 +++---
 Lib/java/various.i    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lib/java/director.swg b/Lib/java/director.swg
index 0850564f3..355e62d67 100644
--- a/Lib/java/director.swg
+++ b/Lib/java/director.swg
@@ -369,7 +369,7 @@ namespace Swig {
     static char *copystr(const char *srcmsg) {
       char *target = 0;
       if (srcmsg) {
-	int msglen = strlen(srcmsg) + 1;
+	size_t msglen = strlen(srcmsg) + 1;
 	target = new char[msglen];
 	strncpy(target, srcmsg, msglen);
       }
diff --git a/Lib/java/java.swg b/Lib/java/java.swg
index 37b3fa940..22a4884ef 100644
--- a/Lib/java/java.swg
+++ b/Lib/java/java.swg
@@ -1341,12 +1341,12 @@ SWIG_PROXY_CONSTRUCTOR(true, true, SWIGTYPE)
   if ($input) JCALL3(ReleaseByteArrayElements, jenv, $input, (jbyte *)$1, 0);
 }
 %typemap(directorin, descriptor="[B") (char *STRING, size_t LENGTH) {
-  jbyteArray jb = (jenv)->NewByteArray($2);
-  (jenv)->SetByteArrayRegion(jb, 0, $2, (jbyte *)$1);
+  jbyteArray jb = (jenv)->NewByteArray((jsize)$2);
+  (jenv)->SetByteArrayRegion(jb, 0, (jsize)$2, (jbyte *)$1);
   $input = jb;
 }
 %typemap(directorargout) (char *STRING, size_t LENGTH)
-%{(jenv)->GetByteArrayRegion($input, 0, $2, (jbyte *)$1);
+%{(jenv)->GetByteArrayRegion($input, 0, (jsize)$2, (jbyte *)$1);
 (jenv)->DeleteLocalRef($input);%}
 %typemap(javadirectorin, descriptor="[B") (char *STRING, size_t LENGTH) "$jniinput"
 %apply (char *STRING, size_t LENGTH) { (char *STRING, int LENGTH) }
diff --git a/Lib/java/various.i b/Lib/java/various.i
index bfcf346d3..e8042b763 100644
--- a/Lib/java/various.i
+++ b/Lib/java/various.i
@@ -65,7 +65,7 @@
 %typemap(out) char **STRING_ARRAY {
   if ($1) {
     int i;
-    int len=0;
+    jsize len=0;
     jstring temp_string;
     const jclass clazz = JCALL1(FindClass, jenv, "java/lang/String");
 

From fb2b1af2e7f1942f8191069c76c6898adddd0755 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 19:44:24 +0100
Subject: [PATCH 185/220] Warning fixes for 64bit visual c++ on Windows

---
 Source/Swig/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c
index d8034c5eb..c552ac2cb 100644
--- a/Source/Swig/misc.c
+++ b/Source/Swig/misc.c
@@ -1273,7 +1273,7 @@ String *replace_captures(int num_captures, const char *input, String *subst, int
       copy_with_maybe_case_conversion(result, p, (int)strlen(p), &convertCase, convertNextOnly);
       break;
     }
-    copy_with_maybe_case_conversion(result, p, q - p, &convertCase, convertNextOnly);
+    copy_with_maybe_case_conversion(result, p, (int)(q - p), &convertCase, convertNextOnly);
     p = q + 1;
 
     /* Handle substitution */

From 236822b4880b4950f8236dee12c15c7f19ccc9aa Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 19:52:38 +0100
Subject: [PATCH 186/220] Warning fixes in generated C# code for 64bit Visual
 C++ on Windows.

---
 Lib/csharp/csharp.swg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/csharp/csharp.swg b/Lib/csharp/csharp.swg
index 94a0771ba..f7b7927ba 100644
--- a/Lib/csharp/csharp.swg
+++ b/Lib/csharp/csharp.swg
@@ -203,7 +203,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
 %typemap(directorin) int                "$input = $1;"
 %typemap(directorin) unsigned int       "$input = $1;"
 %typemap(directorin) long               "$input = $1;"
-%typemap(directorin) unsigned long      "$input = $1;"
+%typemap(directorin) unsigned long      "$input = (unsigned long)$1;"
 %typemap(directorin) long long          "$input = $1;"
 %typemap(directorin) unsigned long long "$input = $1;"
 %typemap(directorin) float              "$input = $1;"

From 2b4dda39bb19eac1aa7c331b48e81fb639400153 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 3 Jul 2015 19:55:51 +0100
Subject: [PATCH 187/220] Warning fixes in generated Python code for 64bit
 Visual C++ on Windows.

---
 Examples/python/multimap/example.i           | 6 +++---
 Examples/test-suite/python_varargs_typemap.i | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/python/multimap/example.i b/Examples/python/multimap/example.i
index cb0e079ba..635f61c13 100644
--- a/Examples/python/multimap/example.i
+++ b/Examples/python/multimap/example.i
@@ -20,7 +20,7 @@ extern int    gcd(int x, int y);
   if (!PyList_Check($input)) {
     SWIG_exception(SWIG_ValueError, "Expecting a list");
   }
-  $1 = PyList_Size($input);
+  $1 = (int)PyList_Size($input);
   if ($1 == 0) {
     SWIG_exception(SWIG_ValueError, "List must contain at least 1 element");
   }
@@ -82,7 +82,7 @@ extern int gcdmain(int argc, char *argv[]);
     return NULL;
   }
   $1 = PyString_AsString($input);
-  $2 = PyString_Size($input);
+  $2 = (int)PyString_Size($input);
 %#endif
 }
 
@@ -110,7 +110,7 @@ extern int count(char *bytes, int len, char c);
   $2 = (int)len;
   Py_DECREF(utf8str);
 %#else
-  $2 = PyString_Size($input);
+  $2 = (int)PyString_Size($input);
   $1 = (char *) malloc($2+1);
   memmove($1,PyString_AsString($input),$2);
 %#endif
diff --git a/Examples/test-suite/python_varargs_typemap.i b/Examples/test-suite/python_varargs_typemap.i
index 09deea3b7..c7d8b83ec 100644
--- a/Examples/test-suite/python_varargs_typemap.i
+++ b/Examples/test-suite/python_varargs_typemap.i
@@ -6,7 +6,7 @@
 
 %typemap(in) (...)(char *vargs[10]) {
   int i;
-  int argc;
+  Py_ssize_t argc;
   for (i = 0; i < 10; i++) vargs[i] = 0;
   argc = PyTuple_Size(varargs);
   if (argc > 10) {

From fe39ef5faee7c66a87053096c41ab1bbace9c26a Mon Sep 17 00:00:00 2001
From: Joseph C Wang <joequant@gmail.com>
Date: Sat, 4 Jul 2015 13:21:35 +0800
Subject: [PATCH 188/220] suppress warning for ExternalReference print

---
 Lib/r/r.swg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/r/r.swg b/Lib/r/r.swg
index 126611d61..a6014965e 100644
--- a/Lib/r/r.swg
+++ b/Lib/r/r.swg
@@ -264,8 +264,8 @@ x
 setAs('ExternalReference', 'character',
 function(from) {if (!is.null(from$"__str__")) from$"__str__"()})
 
-setMethod('print', 'ExternalReference',
-function(x) {print(as(x, "character"))})
+suppressWarnings(setMethod('print', 'ExternalReference',
+function(x) {print(as(x, "character"))}))
 %}
 
 

From 12dbbf13cc47ce6b72957fed649c78db17e23a26 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Jul 2015 15:07:38 +0100
Subject: [PATCH 189/220] Correct testcase use of typename to be inside a
 template II

---
 Examples/test-suite/template_keyword_in_type.i | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Examples/test-suite/template_keyword_in_type.i b/Examples/test-suite/template_keyword_in_type.i
index 4b1107104..27765c648 100644
--- a/Examples/test-suite/template_keyword_in_type.i
+++ b/Examples/test-suite/template_keyword_in_type.i
@@ -14,12 +14,12 @@
 
 #if defined(SWIG) || defined(__clang__)
   // gcc doesn't parse this (tested with gcc-4.8)
-  void testXXX1(::template XXX<int>::template YYY<int>::type xx) {}
+  template<typename X> void testXXX1(::template XXX<int>::template YYY<int>::type xx) {}
 #else
-  void testXXX1(::         XXX<int>::template YYY<int>::type xx) {}
+  template<typename X> void testXXX1(::         XXX<int>::template YYY<int>::type xx) {}
 #endif
-  void testXXX2(XXX<int>::YYY<int>::type xx) {}
-  typedef ::XXX<int>::template YYY<int>::type templatetyped;
+  template<typename X> void testXXX2(XXX<int>::YYY<int>::type xx) {}
+  template<typename X> void testXXX3(::XXX<int>::template YYY<int>::type) {}
 %}
 
 %inline %{

From e543299d97d680d021cf9940259941529a443b07 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Jul 2015 18:27:38 +0100
Subject: [PATCH 190/220] Fix array overrun in li_carrays testcase

---
 Examples/test-suite/java/li_carrays_runme.java | 2 +-
 Examples/test-suite/perl5/li_carrays_runme.pl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/java/li_carrays_runme.java b/Examples/test-suite/java/li_carrays_runme.java
index f576eab84..d32bb6ff9 100644
--- a/Examples/test-suite/java/li_carrays_runme.java
+++ b/Examples/test-suite/java/li_carrays_runme.java
@@ -31,7 +31,7 @@ public class li_carrays_runme {
 
     {
       // global array variable
-      int length = 5;
+      int length = 3;
       XY xyArrayPointer = li_carrays.getGlobalXYArray();
       XYArray xyArray = XYArray.frompointer(xyArrayPointer);
       for (int i=0; i<length; i++) {
diff --git a/Examples/test-suite/perl5/li_carrays_runme.pl b/Examples/test-suite/perl5/li_carrays_runme.pl
index 00d12cd1b..fccc68009 100644
--- a/Examples/test-suite/perl5/li_carrays_runme.pl
+++ b/Examples/test-suite/perl5/li_carrays_runme.pl
@@ -23,7 +23,7 @@ require_ok('li_carrays');
 
 {
   # global array variable
-  my $length = 5;
+  my $length = 3;
   my $xyArrayPointer = $li_carrays::globalXYArray;
   my $xyArray = li_carrays::XYArray::frompointer($xyArrayPointer);
   for (my $i=0; $i<$length; $i++) {

From 5dce99751c0f5894e78db883f286c0ff3e89ba61 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Jul 2015 20:59:25 +0100
Subject: [PATCH 191/220] Appveyor testing expanded

- New variable to control version of Visual Studio to use on appveyor
- Enable VS2015 (14.0) for C#
- Run full check-test-suite and not just partialcheck-test-suite since
  Appveyor performance improvements since using dedicated Hyper-V
  instead of Azure.
- Allow 64 bit Python 2.7 to fail on Appveyor as a vector container
  slicing bug needs fixing.
---
 appveyor.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 002f35401..25abcb342 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,13 +5,26 @@ platform:
 environment:
   matrix:
   - SWIGLANG: csharp
+    VSVER: 14
+  - SWIGLANG: csharp
+    VSVER: 12
   - SWIGLANG: java
+    VSVER: 12
   - SWIGLANG: python
+    VSVER: 12
     VER: 27
   - SWIGLANG: python
+    VSVER: 12
     VER: 34
     PY3: 1
 
+matrix:
+  allow_failures:
+    - platform: x64
+      SWIGLANG: python
+      VSVER: 12
+      VER: 27
+
 install:
 - date /T & time /T
 - set PATH=C:\cygwin\bin;%PATH%
@@ -30,7 +43,9 @@ install:
       $env:VCVARS_PLATFORM="amd64"
       $env:LANG_PLATFORM="-x64"
     }
-- call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
+- ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
+- echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
+- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
 - nuget install pcre -Verbosity detailed -Version 8.33.0.1 -OutputDirectory C:\pcre
 - set PCRE_ROOT=C:/pcre/pcre.8.33.0.1/build/native
 - set PATH=C:\Python%VER%%LANG_PLATFORM%;%PATH%
@@ -64,7 +79,7 @@ test_script:
 - bash -c "file ./swig.exe"
 - bash -c "time make -k check-%SWIGLANG%-version"
 - bash -c "time make -k check-%SWIGLANG%-examples %CHECK_OPTIONS%"
-- bash -c "time make -k partialcheck-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
+- bash -c "time make -k check-%SWIGLANG%-test-suite %CHECK_OPTIONS%"
 
 # Do not build on tags (GitHub only)
 skip_tags: true

From 81f005013500078458e092e111a3679c7f5fbe89 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 4 Jul 2015 23:23:57 +0100
Subject: [PATCH 192/220] Perl5 carrays testcase fix

Number of loops is different since seg fault fix in e543299
---
 Examples/test-suite/perl5/li_carrays_runme.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/perl5/li_carrays_runme.pl b/Examples/test-suite/perl5/li_carrays_runme.pl
index fccc68009..51c813403 100644
--- a/Examples/test-suite/perl5/li_carrays_runme.pl
+++ b/Examples/test-suite/perl5/li_carrays_runme.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Test::More tests => 38;
+use Test::More tests => 34;
 BEGIN { use_ok('li_carrays') }
 require_ok('li_carrays');
 

From af5906f9159e16d7fa52b3ca99a720fc7fb4c9c9 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 5 Jul 2015 09:29:47 +0100
Subject: [PATCH 193/220] parent_class testcase name warning fixes for PHP

---
 Examples/test-suite/inherit_member.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/inherit_member.i b/Examples/test-suite/inherit_member.i
index 9cfba0bb8..c26da6151 100644
--- a/Examples/test-suite/inherit_member.i
+++ b/Examples/test-suite/inherit_member.i
@@ -6,11 +6,11 @@
 
 %inline %{
 
-struct parent {
+struct parent_class {
   std::string pvar;
 };
 
- struct child : public parent {
+ struct child : public parent_class {
   std::string cvar;
 };
 

From fea1bbb188cf0cd369ed2159459ed6bf14dcd1c3 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 5 Jul 2015 17:15:55 +0100
Subject: [PATCH 194/220] Testcase workaround for Solaris

---
 Examples/test-suite/template_keyword_in_type.i | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Examples/test-suite/template_keyword_in_type.i b/Examples/test-suite/template_keyword_in_type.i
index 27765c648..b54b8ad4a 100644
--- a/Examples/test-suite/template_keyword_in_type.i
+++ b/Examples/test-suite/template_keyword_in_type.i
@@ -33,6 +33,10 @@ namespace Alloc {
 }
 
 template<typename X> void other1(typename Alloc::template rebind<ListBucket<Val> >::other) {}
+#if !defined(__SUNPRO_CC)
 template<typename X> void other2(typename Alloc::template rebind< ::template ListBucket<Val> >::other) {}
+#else
+template<typename X> void other2(typename Alloc::template rebind< ::         ListBucket<Val> >::other) {}
+#endif
 template<typename X> void other3(Alloc::template rebind<int>) {}
 %}

From 3b859ab5390ac80a23928fa3310b50b7259c7b9b Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 5 Jul 2015 16:55:52 +0100
Subject: [PATCH 195/220] Html doc fixes

---
 Doc/Manual/CSharp.html   | 7 ++-----
 Doc/Manual/Contents.html | 4 +++-
 Doc/Manual/Go.html       | 5 +++--
 Doc/Manual/Python.html   | 4 +++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index 0c0d98c0e..18fc3037e 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -12,10 +12,8 @@
 <li><a href="#CSharp_introduction">Introduction</a>
 <ul>
 <li><a href="#CSharp_introduction_swig2_compatibility">SWIG 2 Compatibility</a>
-</ul>
-<ul>
 <li><a href="#CSharp_commandline">Additional command line options</a>
-</ul
+</ul>
 <li><a href="#CSharp_differences_java">Differences to the Java module</a>
 <li><a href="#CSharp_void_pointers">Void pointers</a>
 <li><a href="#CSharp_arrays">C# Arrays</a>
@@ -85,6 +83,7 @@ In order to minimize name collisions between names generated based on input to S
 
 <H3><a name="CSharp_commandline"></a>20.1.2 Additional command line options</H3>
 
+
 <p>
 The following table lists the additional commandline options available for the C# module. They can also be seen by using: 
 </p>
@@ -93,8 +92,6 @@ The following table lists the additional commandline options available for the C
 swig -csharp -help 
 </pre></div>
 
-<p></p>
-
 <table summary="C# specific options">
 <tr>
 <th>C# specific options</th>
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index dd0faace6..793f2ed21 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -725,6 +725,7 @@
 <li><a href="CSharp.html#CSharp_introduction">Introduction</a>
 <ul>
 <li><a href="CSharp.html#CSharp_introduction_swig2_compatibility">SWIG 2 Compatibility</a>
+<li><a href="CSharp.html#CSharp_commandline">Additional command line options</a>
 </ul>
 <li><a href="CSharp.html#CSharp_differences_java">Differences to the Java module</a>
 <li><a href="CSharp.html#CSharp_void_pointers">Void pointers</a>
@@ -747,7 +748,7 @@
 <li><a href="CSharp.html#CSharp_directors_implementation">Directors implementation</a>
 <li><a href="CSharp.html#CSharp_director_caveats">Director caveats</a>
 </ul>
-<li><a href="CSharp.html#CSharp_multiple_modules">Multiples modules</a>
+<li><a href="CSharp.html#CSharp_multiple_modules">Multiple modules</a>
 <li><a href="CSharp.html#CSharp_typemap_examples">C# Typemap examples</a>
 <ul>
 <li><a href="CSharp.html#CSharp_memory_management_member_variables">Memory management when returning references to member variables</a>
@@ -1529,6 +1530,7 @@
 <li><a href="Python.html#Python_nn47">Simple pointers</a>
 <li><a href="Python.html#Python_nn48">Unbounded C Arrays</a>
 <li><a href="Python.html#Python_nn49">String handling</a>
+<li><a href="Python.html#Python_default_args">Default arguments</a>
 </ul>
 <li><a href="Python.html#Python_nn53">Typemaps</a>
 <ul>
diff --git a/Doc/Manual/Go.html b/Doc/Manual/Go.html
index 0a413b25a..20e923d19 100644
--- a/Doc/Manual/Go.html
+++ b/Doc/Manual/Go.html
@@ -495,8 +495,10 @@ the C++ object when the Go object is freed.  It is strongly recommended  to read
 the <a href="https://golang.org/pkg/runtime/#SetFinalizer">runtime.SetFinalizer
 </a> documentation before using this technique to understand the
 <tt>runtime.SetFinalizer</tt> limitations.<br>
-<br>
+</p>
+<p>
 Common pitfalls with <tt>runtime.SetFinalizer</tt> are:
+</p>
 <ul>
 <li>
 If a hierarchy of C++ objects will be automatically freed by Go finalizers then
@@ -514,7 +516,6 @@ The Go finalizer function typically runs in a different OS thread which can be
 problematic with C++ code that uses thread-local storage.
 </li>
 </ul>
-</p>
 
 <p>
 <tt>runtime.SetFinalizer</tt> Example:
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 0cbb38021..57a2cd3ef 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -74,6 +74,7 @@
 <li><a href="#Python_nn47">Simple pointers</a>
 <li><a href="#Python_nn48">Unbounded C Arrays</a>
 <li><a href="#Python_nn49">String handling</a>
+<li><a href="#Python_default_args">Default arguments</a>
 </ul>
 <li><a href="#Python_nn53">Typemaps</a>
 <ul>
@@ -4160,7 +4161,8 @@ also be used to extra binary data from arbitrary pointers.
 </p>
 
 
-<H3><a name="Python_default_args"></a>Default arguments</H3>
+<H3><a name="Python_default_args"></a>36.7.5 Default arguments</H3>
+
 
 <p>
 C++ default argument code generation is documented in the main

From d9bfccfc4eeee8d5984901d01868c8fb7e0eb980 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 5 Jul 2015 16:56:31 +0100
Subject: [PATCH 196/220] Add 3.0.6 release notes and release date

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

diff --git a/ANNOUNCE b/ANNOUNCE
index 96b1904ac..cd82f89ff 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-*** ANNOUNCE: SWIG 3.0.6 (in progress) ***
+*** ANNOUNCE: SWIG 3.0.6 (5 Jul 2015) ***
 
 http://www.swig.org
 
diff --git a/CHANGES.current b/CHANGES.current
index c7b415248..36e8bf758 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,8 +2,8 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 3.0.6 (in progress)
-===========================
+Version 3.0.6 (5 Jul 2015)
+==========================
 
 2015-07-02: wsfulton
 	    Fix syntax error when the template keyword is used in types, eg:
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 057d355ec..bfea68ac0 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 <body bgcolor="#ffffff">
 <H1><a name="Sections"></a>SWIG-3.0 Documentation</H1>
 
-Last update : SWIG-3.0.6 (in progress)
+Last update : SWIG-3.0.6 (5 Jul 2015)
 
 <H2>Sections</H2>
 
diff --git a/README b/README
index 5c85e6c3a..706aee7fa 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 3.0.6 (in progress)
+Version: 3.0.6 (5 Jul 2015)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
diff --git a/RELEASENOTES b/RELEASENOTES
index 6af303bc8..bb1d82bb9 100644
--- a/RELEASENOTES
+++ b/RELEASENOTES
@@ -4,6 +4,11 @@ and CHANGES files.
 
 Release Notes
 =============
+SWIG-3.0.6 summary:
+- Stability and regression fixes.
+- Fixed parsing of C++ corner cases.
+- Language improvements and bug fixes for C#, Go, Java, Lua, Python, R.
+
 SWIG-3.0.5 summary:
 - Added support for Scilab.
 - Important Python regression fix when wrapping C++ default arguments.

From 4e23595704d6ddffe4e50ca41bbc90e4b8893f4d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 5 Jul 2015 17:59:41 +0100
Subject: [PATCH 197/220] Unused method warning suppression for Javascript v8

---
 Lib/javascript/v8/javascriptrun.swg | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg
index b37059cca..dc4d37a48 100644
--- a/Lib/javascript/v8/javascriptrun.swg
+++ b/Lib/javascript/v8/javascriptrun.swg
@@ -101,7 +101,7 @@ typedef v8::PropertyCallbackInfo<v8::Value> SwigV8PropertyCallbackInfo;
 #define SWIG_fail                 goto fail
 #define SWIGV8_OVERLOAD false
 
-static void SWIG_V8_Raise(const char *msg) {
+SWIGINTERN void SWIG_V8_Raise(const char *msg) {
   SWIGV8_THROW_EXCEPTION(v8::Exception::Error(SWIGV8_STRING_NEW(msg)));
 }
 
@@ -126,7 +126,7 @@ public:
   }
 };
 // this is used in usually
-static V8ErrorHandler SWIGV8_ErrorHandler;
+SWIGRUNTIME V8ErrorHandler SWIGV8_ErrorHandler;
 
 // instances of this are used in overloaded functions
 class OverloadErrorHandler: public V8ErrorHandler {
@@ -198,9 +198,9 @@ public:
 #endif
 };
 
-static v8::Persistent<v8::FunctionTemplate> SWIGV8_SWIGTYPE_Proxy_class_templ;
+SWIGRUNTIME v8::Persistent<v8::FunctionTemplate> SWIGV8_SWIGTYPE_Proxy_class_templ;
 
-static int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void **ptr, swig_type_info *info, int flags) {
+SWIGRUNTIME int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void **ptr, swig_type_info *info, int flags) {
   SWIGV8_HANDLESCOPE();
 
   if(objRef->InternalFieldCount() < 1) return SWIG_ERROR;
@@ -234,22 +234,22 @@ static int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void **ptr,
 
 
 #if (SWIG_V8_VERSION < 0x031710)
-static void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter) {
+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Persistent< v8::Value > object, void *parameter) {
   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
 #elif (SWIG_V8_VERSION < 0x031900)
-static void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Value > object, void *parameter) {
+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Value > object, void *parameter) {
   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
 #elif (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-static void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
 #else
-static void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
   SWIGV8_Proxy *proxy = data.GetParameter();
 #endif
 
   delete proxy;
 }
 
-static int SWIG_V8_GetInstancePtr(v8::Handle<v8::Value> valRef, void **ptr) {
+SWIGRUNTIME int SWIG_V8_GetInstancePtr(v8::Handle<v8::Value> valRef, void **ptr) {
   if(!valRef->IsObject()) {
     return SWIG_TypeError;
   }
@@ -273,7 +273,7 @@ static int SWIG_V8_GetInstancePtr(v8::Handle<v8::Value> valRef, void **ptr) {
   return SWIG_OK;
 }
 
-static void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, swig_type_info *info, int flags) {
+SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, swig_type_info *info, int flags) {
   SWIGV8_Proxy *cdata = new SWIGV8_Proxy();
   cdata->swigCObject = ptr;
   cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
@@ -330,7 +330,7 @@ static void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, swig_ty
 
 }
 
-static int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void **ptr, swig_type_info *info, int flags) {
+SWIGRUNTIME int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void **ptr, swig_type_info *info, int flags) {
   SWIGV8_HANDLESCOPE();
   
   /* special case: JavaScript null => C NULL pointer */
@@ -345,7 +345,7 @@ static int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void **ptr, swig_typ
   return SWIG_V8_ConvertInstancePtr(objRef, ptr, info, flags);
 }
 
-static v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) {
+SWIGRUNTIME v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, int flags) {
   SWIGV8_HANDLESCOPE_ESC();
   
   v8::Handle<v8::FunctionTemplate> class_templ;
@@ -393,7 +393,7 @@ static v8::Handle<v8::Value> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *in
 
 #define SWIG_GetInstancePtr(obj, ptr)    SWIG_V8_GetInstancePtr(obj, ptr)
 
-static SwigV8ReturnValue _SWIGV8_wrap_equals(const SwigV8Arguments &args) {
+SWIGRUNTIME SwigV8ReturnValue _SWIGV8_wrap_equals(const SwigV8Arguments &args) {
   SWIGV8_HANDLESCOPE();
   
   v8::Handle<v8::Value> jsresult;
@@ -423,7 +423,7 @@ fail:
   SWIGV8_RETURN(SWIGV8_UNDEFINED());
 }
 
-static SwigV8ReturnValue _wrap_getCPtr(const SwigV8Arguments &args) {
+SWIGRUNTIME SwigV8ReturnValue _wrap_getCPtr(const SwigV8Arguments &args) {
   SWIGV8_HANDLESCOPE();
   
   v8::Handle<v8::Value> jsresult;
@@ -512,15 +512,15 @@ int SWIGV8_ConvertPacked(v8::Handle<v8::Value> valRef, void *ptr, size_t sz, swi
 }
 
 #if (SWIG_V8_VERSION < 0x031710)
-static void _wrap_SwigV8PackedData_delete(v8::Persistent< v8::Value > object, void *parameter) {
+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Persistent< v8::Value > object, void *parameter) {
   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
 #elif (SWIG_V8_VERSION < 0x031900)
-static void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Value> object, void *parameter) {
+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Value> object, void *parameter) {
   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
 #elif (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
-static void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
 #else
-static void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
+SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
   v8::Local<v8::Object> object = data.GetValue();
   SwigV8PackedData *cdata = data.GetParameter();
 #endif

From 55686fbe56df6c59db98eab66aae382cf203af9e Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 6 Jul 2015 06:55:43 +0100
Subject: [PATCH 198/220] Bump version to 3.0.7

---
 ANNOUNCE                 |   8 +-
 CHANGES                  | 202 +++++++++++++++++++++++++++++++++++++++
 CHANGES.current          | 202 +--------------------------------------
 Doc/Manual/Sections.html |   2 +-
 README                   |   2 +-
 configure.ac             |   2 +-
 6 files changed, 211 insertions(+), 207 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index cd82f89ff..f7d7eb8a9 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 3.0.6 (5 Jul 2015) ***
+*** ANNOUNCE: SWIG 3.0.7 (in progress) ***
 
 http://www.swig.org
 
-We're pleased to announce SWIG-3.0.6, the latest SWIG release.
+We're pleased to announce SWIG-3.0.7, the latest SWIG release.
 
 What is SWIG?
 =============
@@ -22,11 +22,11 @@ Availability
 ============
 The release is available for download on Sourceforge at
 
-     http://prdownloads.sourceforge.net/swig/swig-3.0.6.tar.gz
+     http://prdownloads.sourceforge.net/swig/swig-3.0.7.tar.gz
 
 A Windows version is also available at
 
-     http://prdownloads.sourceforge.net/swig/swigwin-3.0.6.zip
+     http://prdownloads.sourceforge.net/swig/swigwin-3.0.7.zip
 
 Please report problems with this release to the swig-devel mailing list,
 details at http://www.swig.org/mail.html.
diff --git a/CHANGES b/CHANGES
index 4548de0fd..eb500e5f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,208 @@ 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 3.0.6 (5 Jul 2015)
+==========================
+
+2015-07-02: wsfulton
+	    Fix syntax error when the template keyword is used in types, eg:
+
+              std::template vector<int> v;
+
+2015-07-02: ngladitz
+	    [Lua] Push characters as unformatted 1-character strings to avoid
+	    unprintable characters such as (char)127 being converted to
+	    "<\127>" with Lua 5.3 and later.  (github PR #452)
+
+2015-06-29: olly
+	    [Python] Improve handling of whitespace in %pythoncode.
+
+	    Previously SWIG looked at the indentation of the first line and
+	    removed that many characters from each subsequent line, regardless
+	    of what those characters were.  This was made worse because SWIG's
+	    preprocessor removes any whitespace before a '#'.  Fixes github
+	    issue #379, reported by Joe Orton.
+
+2015-06-12: wsfulton
+	    [R] Fix #430 - call to SWIG_createNewRef in copyToC was incorrectly named.
+
+2015-06-11: sghirate
+	    [C#] Patch #427 adds in new command line option -outfile to combine all the
+            generated C# code into a single file.
+
+2015-06-09: wsfulton
+	    Fix seg fault processing C++11 type aliasing. Issue #424.
+
+2015-05-28: wsfulton
+	    [Python] Add new feature "python:cdefaultargs" to control default argument
+            code generation. By default, SWIG attempts to convert C/C++ default argument values
+            into Python values and generates code into the Python layer with these values.
+            Recent versions of SWIG are able to convert more of these values, however, the
+            new behaviour can be circumvented if desired via this new feature, such that
+            the default argument values are obtained from the C layer and not the Python layer.
+            For example:
+
+              struct CDA {
+                int fff(int a = 1, bool b = false);
+              };
+
+            The default code generation in the Python layer is:
+
+              class CDA(_object):
+                  ...
+                  def fff(self, a=1, b=False):
+                      return _default_args.CDA_fff(self, a, b)
+
+            Adding the feature:
+
+              %feature("python:cdefaultargs") CDA::fff;
+
+            Results in:
+
+              class CDA(_object):
+                  ...
+                  def fff(self, *args):
+                      return _default_args.CDA_fff(self, *args)
+
+            Some code generation modes, eg -builtin and -fastproxy, are unaffected by this as
+            the default values are always obtained from the C layer.
+
+2015-05-27: wsfulton
+	    [Python] Deal with an integer as the default value of a typedef to bool
+	    parameter in the C++ prototype.  See #327. Regression from 3.0.0 onwards.
+
+2015-05-19: olly
+	    [Python] Fix warning when compiling generated code with MSVC.
+	    (Fixes https://sourceforge.net/p/swig/patches/351/ reported by
+	    Mateusz Szyma¿ski).
+
+2015-05-14: wsfulton
+            Fix seg fault wrapping shared_ptr of classes with private constructors and destructors. 
+            This also fixes the "unref" feature when used on classes with private destructors.
+
+2015-05-10: wsfulton
+            [Java] Fix multi-argument typemaps (char *STRING, size_t LENGTH)
+            so that they can be applied to a wider range of types. Fixes #385.
+
+2015-05-07: olly
+	    [Python] Deal with an integer as the default value of a bool
+	    parameter in the C++ prototype.  Fixes github #327, reported by
+	    Greg Allen.
+
+2015-05-07: LindleyF
+	    [Java] Allow feature("director") and feature("ref") to be used
+	    together.  Github PR#403.
+
+2015-05-05: olly
+	    Suppress warning 325 "Nested class not currently supported (Foo
+	    ignored)" when Foo has already been explicitly ignored with "%ignore".
+
+2015-05-04: wsfulton
+            Add support for friend templates, including operator overloading - fixes #196. Considering
+            the example below, previously the operator gave a syntax error and friendfunc incorrectly
+            warned with:
+
+             "Warning 503: Can't wrap 'friendfunc<(Type)>' unless renamed to a valid identifier."
+
+              template <class Type> class MyClass {
+                friend int friendfunc <Type>(double is, MyClass <Type> & x);
+                friend int operator<< <Type>(double un, const MyClass <Type> &x);
+              };
+
+            The following also previously incorrectly warned with:
+
+              "Warning 302: Identifier 'template_friend' redefined (ignored),"
+
+              template<typename T> T template_friend(T);
+              struct MyTemplate {
+                template<typename T> friend T template_friend(T);
+              };
+
+2015-05-01: wsfulton
+            Fix handling of conversion operators where the operator is split over multiple
+            lines or has comments within the operator type. Fixes #401.
+
+            Also fix similar problem with normal operators which gave a syntax error if split over
+            multiple lines or had a comment within the operator declaration.
+
+2015-04-30: olly
+	    Ignore unknown preprocessor directives which are inside an inactive
+	    conditional (github issue #394, reported by Dan Wilcox).
+	    Regression introduced in 3.0.3.
+
+2015-04-27: vadz
+            [Python] Fix "default" typemap used after an argument with "numinputs=0" (#377).
+
+2015-04-24: wsfulton
+            [Python] Fix #256. Code generated with '-builtin -modernargs' segfaults for any
+            method taking zero arguments.
+
+            Also fixes: "SystemError: error return without exception set" during error checking
+            when using just -builtin and the incorrect number of arguments is passed to a class
+            method expecting zero arguments.
+
+2015-04-23: wsfulton
+            [Java] Bug #386 - Memory leak fix in (char *STRING, size_t LENGTH) typemaps.
+
+2015-04-23: vadz
+            [Python] Make "default" typemap work again (#330, #377).
+
+2015-04-23: vadz
+            [Python] Fix the use of default values for the pointer types (#365, #376).
+
+2015-04-23: wsfulton
+            Fix 'make check-ccache' which is part of 'make check' when one of the CCACHE_
+            environment variables, for example CCACHE_DISABLE, is set.
+
+2015-04-14: wsfulton
+            Clearer warning message for badly constructed typecheck typemaps. For example, was:
+
+              example.i:3: Warning 467: Overloaded foo(int) not supported (no type checking
+              rule for 'int').
+
+            Now:
+
+              example.i:3: Warning 467: Overloaded foo(int) not supported (incomplete type checking
+              rule - no precedence level in typecheck typemap for 'int').
+
+2015-04-11: wsfulton
+            [Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
+            using directors and multiple modules.
+
+2015-04-11: wsfulton
+            Merge #320 - Make __dict__ accessible for Python builtin classes.
+
+2015-04-07: wsfulton
+            Fix #375 - parsing of extern "C" and typedef for example:
+              extern "C" typedef void (*Hook2_t)(int, const char *);
+              extern "C" typedef int Integer;
+
+2015-03-12: olly
+	    -DSWIG_DIRECTOR_STATIC is now supported for all languages with
+	    director support, not only Python and PHP.
+
+2015-03-02: ianlancetaylor
+	    [Go] Add -cgo option, required for Go versions 1.5 and
+	    later.
+
+2015-02-26: olly
+	    Fix segmentation fault when top==NULL, introduced by nested class
+	    handling (reported in issue#346 by Pawe¿ Tomulik).
+
+2015-02-09: wsfulton
+            [Guile] Fix generated code for static const char member variables when
+            defined and declared inline.
+
+2015-02-09: mishas
+            [Go] Fix %import of files in sub directories.
+
+2015-02-05: ianlancetaylor
+            [Go] Ignore Go specific type maps (goin, goout, etc.) if they are empty.
+
+2015-02-05: ianlancetaylor
+            [Go] Generated Go code no longer calls _swig_goallocate or
+            _swig_makegostring, as they will no longer work as of Go 1.5.
+
 Version 3.0.5 (31 Jan 2015)
 ===========================
 
diff --git a/CHANGES.current b/CHANGES.current
index 36e8bf758..63dd22d21 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -2,204 +2,6 @@ Below are the changes for the current release.
 See the CHANGES file for changes in older releases.
 See the RELEASENOTES file for a summary of changes in each release.
 
-Version 3.0.6 (5 Jul 2015)
-==========================
+Version 3.0.7 (in progress)
+===========================
 
-2015-07-02: wsfulton
-	    Fix syntax error when the template keyword is used in types, eg:
-
-              std::template vector<int> v;
-
-2015-07-02: ngladitz
-	    [Lua] Push characters as unformatted 1-character strings to avoid
-	    unprintable characters such as (char)127 being converted to
-	    "<\127>" with Lua 5.3 and later.  (github PR #452)
-
-2015-06-29: olly
-	    [Python] Improve handling of whitespace in %pythoncode.
-
-	    Previously SWIG looked at the indentation of the first line and
-	    removed that many characters from each subsequent line, regardless
-	    of what those characters were.  This was made worse because SWIG's
-	    preprocessor removes any whitespace before a '#'.  Fixes github
-	    issue #379, reported by Joe Orton.
-
-2015-06-12: wsfulton
-	    [R] Fix #430 - call to SWIG_createNewRef in copyToC was incorrectly named.
-
-2015-06-11: sghirate
-	    [C#] Patch #427 adds in new command line option -outfile to combine all the
-            generated C# code into a single file.
-
-2015-06-09: wsfulton
-	    Fix seg fault processing C++11 type aliasing. Issue #424.
-
-2015-05-28: wsfulton
-	    [Python] Add new feature "python:cdefaultargs" to control default argument
-            code generation. By default, SWIG attempts to convert C/C++ default argument values
-            into Python values and generates code into the Python layer with these values.
-            Recent versions of SWIG are able to convert more of these values, however, the
-            new behaviour can be circumvented if desired via this new feature, such that
-            the default argument values are obtained from the C layer and not the Python layer.
-            For example:
-
-              struct CDA {
-                int fff(int a = 1, bool b = false);
-              };
-
-            The default code generation in the Python layer is:
-
-              class CDA(_object):
-                  ...
-                  def fff(self, a=1, b=False):
-                      return _default_args.CDA_fff(self, a, b)
-
-            Adding the feature:
-
-              %feature("python:cdefaultargs") CDA::fff;
-
-            Results in:
-
-              class CDA(_object):
-                  ...
-                  def fff(self, *args):
-                      return _default_args.CDA_fff(self, *args)
-
-            Some code generation modes, eg -builtin and -fastproxy, are unaffected by this as
-            the default values are always obtained from the C layer.
-
-2015-05-27: wsfulton
-	    [Python] Deal with an integer as the default value of a typedef to bool
-	    parameter in the C++ prototype.  See #327. Regression from 3.0.0 onwards.
-
-2015-05-19: olly
-	    [Python] Fix warning when compiling generated code with MSVC.
-	    (Fixes https://sourceforge.net/p/swig/patches/351/ reported by
-	    Mateusz Szymański).
-
-2015-05-14: wsfulton
-            Fix seg fault wrapping shared_ptr of classes with private constructors and destructors. 
-            This also fixes the "unref" feature when used on classes with private destructors.
-
-2015-05-10: wsfulton
-            [Java] Fix multi-argument typemaps (char *STRING, size_t LENGTH)
-            so that they can be applied to a wider range of types. Fixes #385.
-
-2015-05-07: olly
-	    [Python] Deal with an integer as the default value of a bool
-	    parameter in the C++ prototype.  Fixes github #327, reported by
-	    Greg Allen.
-
-2015-05-07: LindleyF
-	    [Java] Allow feature("director") and feature("ref") to be used
-	    together.  Github PR#403.
-
-2015-05-05: olly
-	    Suppress warning 325 "Nested class not currently supported (Foo
-	    ignored)" when Foo has already been explicitly ignored with "%ignore".
-
-2015-05-04: wsfulton
-            Add support for friend templates, including operator overloading - fixes #196. Considering
-            the example below, previously the operator gave a syntax error and friendfunc incorrectly
-            warned with:
-
-             "Warning 503: Can't wrap 'friendfunc<(Type)>' unless renamed to a valid identifier."
-
-              template <class Type> class MyClass {
-                friend int friendfunc <Type>(double is, MyClass <Type> & x);
-                friend int operator<< <Type>(double un, const MyClass <Type> &x);
-              };
-
-            The following also previously incorrectly warned with:
-
-              "Warning 302: Identifier 'template_friend' redefined (ignored),"
-
-              template<typename T> T template_friend(T);
-              struct MyTemplate {
-                template<typename T> friend T template_friend(T);
-              };
-
-2015-05-01: wsfulton
-            Fix handling of conversion operators where the operator is split over multiple
-            lines or has comments within the operator type. Fixes #401.
-
-            Also fix similar problem with normal operators which gave a syntax error if split over
-            multiple lines or had a comment within the operator declaration.
-
-2015-04-30: olly
-	    Ignore unknown preprocessor directives which are inside an inactive
-	    conditional (github issue #394, reported by Dan Wilcox).
-	    Regression introduced in 3.0.3.
-
-2015-04-27: vadz
-            [Python] Fix "default" typemap used after an argument with "numinputs=0" (#377).
-
-2015-04-24: wsfulton
-            [Python] Fix #256. Code generated with '-builtin -modernargs' segfaults for any
-            method taking zero arguments.
-
-            Also fixes: "SystemError: error return without exception set" during error checking
-            when using just -builtin and the incorrect number of arguments is passed to a class
-            method expecting zero arguments.
-
-2015-04-23: wsfulton
-            [Java] Bug #386 - Memory leak fix in (char *STRING, size_t LENGTH) typemaps.
-
-2015-04-23: vadz
-            [Python] Make "default" typemap work again (#330, #377).
-
-2015-04-23: vadz
-            [Python] Fix the use of default values for the pointer types (#365, #376).
-
-2015-04-23: wsfulton
-            Fix 'make check-ccache' which is part of 'make check' when one of the CCACHE_
-            environment variables, for example CCACHE_DISABLE, is set.
-
-2015-04-14: wsfulton
-            Clearer warning message for badly constructed typecheck typemaps. For example, was:
-
-              example.i:3: Warning 467: Overloaded foo(int) not supported (no type checking
-              rule for 'int').
-
-            Now:
-
-              example.i:3: Warning 467: Overloaded foo(int) not supported (incomplete type checking
-              rule - no precedence level in typecheck typemap for 'int').
-
-2015-04-11: wsfulton
-            [Java] Fix #353 - Linker multiple definition of 'ExceptionMatches' when
-            using directors and multiple modules.
-
-2015-04-11: wsfulton
-            Merge #320 - Make __dict__ accessible for Python builtin classes.
-
-2015-04-07: wsfulton
-            Fix #375 - parsing of extern "C" and typedef for example:
-              extern "C" typedef void (*Hook2_t)(int, const char *);
-              extern "C" typedef int Integer;
-
-2015-03-12: olly
-	    -DSWIG_DIRECTOR_STATIC is now supported for all languages with
-	    director support, not only Python and PHP.
-
-2015-03-02: ianlancetaylor
-	    [Go] Add -cgo option, required for Go versions 1.5 and
-	    later.
-
-2015-02-26: olly
-	    Fix segmentation fault when top==NULL, introduced by nested class
-	    handling (reported in issue#346 by Paweł Tomulik).
-
-2015-02-09: wsfulton
-            [Guile] Fix generated code for static const char member variables when
-            defined and declared inline.
-
-2015-02-09: mishas
-            [Go] Fix %import of files in sub directories.
-
-2015-02-05: ianlancetaylor
-            [Go] Ignore Go specific type maps (goin, goout, etc.) if they are empty.
-
-2015-02-05: ianlancetaylor
-            [Go] Generated Go code no longer calls _swig_goallocate or
-            _swig_makegostring, as they will no longer work as of Go 1.5.
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index bfea68ac0..4bf40c969 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
 <body bgcolor="#ffffff">
 <H1><a name="Sections"></a>SWIG-3.0 Documentation</H1>
 
-Last update : SWIG-3.0.6 (5 Jul 2015)
+Last update : SWIG-3.0.7 (in progress)
 
 <H2>Sections</H2>
 
diff --git a/README b/README
index 706aee7fa..a02c56ea9 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 SWIG (Simplified Wrapper and Interface Generator)
 
-Version: 3.0.6 (5 Jul 2015)
+Version: 3.0.7 (in progress)
 
 Tagline: SWIG is a compiler that integrates C and C++ with languages
          including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
diff --git a/configure.ac b/configure.ac
index 1eb338617..712ca0abd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl The macros which aren't shipped with the autotools are stored in the
 dnl Tools/config directory in .m4 files.
 
-AC_INIT([swig],[3.0.6],[http://www.swig.org])
+AC_INIT([swig],[3.0.7],[http://www.swig.org])
 
 dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
 dnl     definition below can be removed

From d325eeee8492e9b0923aaebf78a83fc79920c981 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 6 Jul 2015 19:50:22 +0100
Subject: [PATCH 199/220] Fix incorrect test case code

---
 Examples/test-suite/java/cpp11_constexpr_runme.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Examples/test-suite/java/cpp11_constexpr_runme.java b/Examples/test-suite/java/cpp11_constexpr_runme.java
index c774e82f8..de1ae8cc3 100644
--- a/Examples/test-suite/java/cpp11_constexpr_runme.java
+++ b/Examples/test-suite/java/cpp11_constexpr_runme.java
@@ -23,7 +23,7 @@ public class cpp11_constexpr_runme {
     check(cpp11_constexpr.CCC(), 30);
     check(cpp11_constexpr.DDD(), 40);
 
-    ConstExpressions ce = new ConstExpressions();
+    ConstExpressions ce = new ConstExpressions(0);
     check(ce.JJJ, 100);
     check(ce.KKK, 200);
     check(ce.LLL, 300);

From 1514e19efb00e5cfdfd00794341cbf991b87f693 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 6 Jul 2015 20:07:23 +0100
Subject: [PATCH 200/220] Test-suite fixes for c++11 compilation by g++-5.1

---
 Examples/test-suite/array_typedef_memberin.i  | 7 ++-----
 Examples/test-suite/cpp11_lambda_functions.i  | 3 ---
 Examples/test-suite/cpp11_rvalue_reference2.i | 2 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/array_typedef_memberin.i b/Examples/test-suite/array_typedef_memberin.i
index d9f768ed8..3618c9305 100644
--- a/Examples/test-suite/array_typedef_memberin.i
+++ b/Examples/test-suite/array_typedef_memberin.i
@@ -13,13 +13,8 @@ namespace ArrayExample
     { 
     public: 
         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) {}
@@ -32,6 +27,8 @@ namespace ArrayExample
         void fn7(Eight*& a) {}
         void fn8(ConstEight*& a) {}
         void fn9(const ConstEight*& a) {}
+
+        ExampleDetail() : node_list(), node_list2(), node_list3() {}
     };
 } 
 
diff --git a/Examples/test-suite/cpp11_lambda_functions.i b/Examples/test-suite/cpp11_lambda_functions.i
index 87c7196d8..161e08c65 100644
--- a/Examples/test-suite/cpp11_lambda_functions.i
+++ b/Examples/test-suite/cpp11_lambda_functions.i
@@ -100,9 +100,6 @@ int runLambdaInline() {
 
 %{
 // TODO
-struct LambdaStruct {
-  static constexpr auto lambda_struct1 = [=]() { return thing; };
-};
 int(*lambda101notauto)(int, int) = [] (int a, int b) { return a + b; };
 int lambda102 = [] (int a, int b) mutable { return a + b; }(1, 2);
 void lambda_init(int = ([=]{ return 0; })());
diff --git a/Examples/test-suite/cpp11_rvalue_reference2.i b/Examples/test-suite/cpp11_rvalue_reference2.i
index 4ef871c63..89d2ee054 100644
--- a/Examples/test-suite/cpp11_rvalue_reference2.i
+++ b/Examples/test-suite/cpp11_rvalue_reference2.i
@@ -32,6 +32,7 @@ struct Thingy {
   void compactDefaultArgs(const bool &&b = (const bool &&)PublicGlobalTrue, const UserDef &&u  = (const UserDef &&)PublicUserDef) {}
   void privateDefaultArgs(const bool &&b = (const bool &&)PrivateTrue) {}
   operator int &&() {}
+  Thingy(const Thingy& rhs) : val(rhs.val), lvalref(rhs.lvalref), rvalref(copy_int(rhs.rvalref)) {}
   Thingy& operator=(const Thingy& rhs) {
     val = rhs.val;
     lvalref = rhs.lvalref;
@@ -39,6 +40,7 @@ struct Thingy {
   }
 private:
   static const bool PrivateTrue;
+  int copy_int(int& i) { return i; }
   Thingy();
 };
 const bool Thingy::PrivateTrue = true;

From 3718b810c749f08d6db14571cced469023ad4c6b Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 7 Jul 2015 20:15:55 +0100
Subject: [PATCH 201/220] Don't generate constructor wrappers if a base class
 has a private constructor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

g++-5 errors out with this now with errors such as:

default_constructor_wrap.cxx:665:27: error: use of deleted function ‘FFF::FFF()’
   result = (FFF *)new FFF();
                           ^
default_constructor_wrap.cxx:314:7: note: ‘FFF::FFF()’ is implicitly deleted because the default definition would be ill-formed:
 class FFF : public F {
       ^
default_constructor_wrap.cxx:301:4: error: ‘F::~F()’ is private
    ~F() { }
    ^
default_constructor_wrap.cxx:314:7: error: within this context
---
 CHANGES.current                               | 12 ++++++++++
 .../csharp/default_constructor_runme.cs       |  8 -------
 .../d/default_constructor_runme.1.d           | 13 -----------
 .../d/default_constructor_runme.2.d           |  2 --
 Examples/test-suite/default_constructor.i     | 23 ++++++++++++++-----
 .../go/default_constructor_runme.go           |  3 ---
 .../java/default_constructor_runme.java       |  8 -------
 .../octave/default_constructor_runme.m        |  9 --------
 .../python/default_constructor_runme.py       |  9 --------
 .../ruby/default_constructor_runme.rb         |  3 ---
 .../scilab/default_constructor_runme.sci      |  9 --------
 Source/Modules/allocate.cxx                   |  2 ++
 Source/Modules/lang.cxx                       | 16 +++++++++++--
 13 files changed, 45 insertions(+), 72 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 63dd22d21..5bec5d4e0 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,3 +5,15 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.7 (in progress)
 ===========================
 
+2015-07-07: wsfulton
+	    SWIG no longer generates a wrapper for a class' constructor if that class has
+            any base class with a private destructor. This is because your compiler should
+            not allow a class to be instantiated if a base has a private destructor. Some
+            compilers do, so if you need the old behaviour, use the "notabstract" feature, eg:
+
+              %feature("notabstract") Derived;
+              class Base {
+                ~Base() {}
+              };
+              struct Derived : Base {};
+
diff --git a/Examples/test-suite/csharp/default_constructor_runme.cs b/Examples/test-suite/csharp/default_constructor_runme.cs
index acd62dc3d..9fc8d754b 100644
--- a/Examples/test-suite/csharp/default_constructor_runme.cs
+++ b/Examples/test-suite/csharp/default_constructor_runme.cs
@@ -12,13 +12,5 @@ public class runme
             throw new Exception("Protected destructor exception should have been thrown");
         } catch (MethodAccessException) {
         }
-
-        // calling private destructor test
-        try {
-            using (FFF f = new FFF()) {
-            }
-            throw new Exception("Private destructor exception should have been thrown");
-        } catch (MethodAccessException) {
-        }
     }
 }
diff --git a/Examples/test-suite/d/default_constructor_runme.1.d b/Examples/test-suite/d/default_constructor_runme.1.d
index 3640218ae..bd79cdf99 100644
--- a/Examples/test-suite/d/default_constructor_runme.1.d
+++ b/Examples/test-suite/d/default_constructor_runme.1.d
@@ -1,6 +1,5 @@
 module default_constructor_runme;
 
-import default_constructor.FFF;
 import default_constructor.G;
 
 void main() {
@@ -15,16 +14,4 @@ void main() {
       throw e;
     }
   }
-
-  // Private destructor test.
-  try {
-    {
-      scope f = new FFF();
-    }
-    throw new Exception("Private destructor exception should have been thrown");
-  } catch (Exception e) {
-    if (e.msg != "C++ destructor does not have public access") {
-      throw e;
-    }
-  }
 }
diff --git a/Examples/test-suite/d/default_constructor_runme.2.d b/Examples/test-suite/d/default_constructor_runme.2.d
index 22f5bffd2..991b4186a 100644
--- a/Examples/test-suite/d/default_constructor_runme.2.d
+++ b/Examples/test-suite/d/default_constructor_runme.2.d
@@ -1,6 +1,5 @@
 module default_constructor_runme;
 
-import default_constructor.FFF;
 import default_constructor.G;
 
 void main() {
@@ -8,7 +7,6 @@ void main() {
   // destruction yet.
 
   // enforceThrows((){ scope g = new G(); }, "Protected destructor exception should have been thrown");
-  // enforceThrows((){ scope f = new FFF(); }, "Private destructor exception should have been thrown");
 }
 
 private void enforceThrows(void delegate() dg, string errorMessage) {
diff --git a/Examples/test-suite/default_constructor.i b/Examples/test-suite/default_constructor.i
index f7fc8cfa6..74673b74a 100644
--- a/Examples/test-suite/default_constructor.i
+++ b/Examples/test-suite/default_constructor.i
@@ -13,6 +13,16 @@
 	    SWIGWARN_D_MULTIPLE_INHERITANCE,
 	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, D, Java, PHP multiple inheritance */
 
+%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
+	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) GGG; /* C#, D, Java, PHP multiple inheritance */
+
+%warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
+	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
+	    SWIGWARN_D_MULTIPLE_INHERITANCE,
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) HHH; /* C#, D, Java, PHP multiple inheritance */
+
 %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */
 
 %delobject F::destroy;
@@ -103,14 +113,15 @@ public:
 
 void bar(F *) { }
 
-#if defined(_MSC_VER)
-  #pragma warning(disable: 4624) // : destructor could not be generated because a base class destructor is inaccessible
-#endif
+// Single inheritance, base has private destructor
 class FFF : public F { 
 };
-#if defined(_MSC_VER)
-  #pragma warning(default: 4624) // : destructor could not be generated because a base class destructor is inaccessible
-#endif
+
+// Multiple inheritance, one base has private destructor
+class GGG : public A, public F {
+};
+class HHH : public F, public A {
+};
 
 /* A class with a protected destructor */
 class G {
diff --git a/Examples/test-suite/go/default_constructor_runme.go b/Examples/test-suite/go/default_constructor_runme.go
index e5e325475..40a5a6e49 100644
--- a/Examples/test-suite/go/default_constructor_runme.go
+++ b/Examples/test-suite/go/default_constructor_runme.go
@@ -21,9 +21,6 @@ func main() {
 	f := dc.NewF()
 	f.Destroy()
 
-	ff := dc.NewFFF()
-	ff.Destroy()
-
 	g := dc.NewG()
 
 	dc.GDestroy(g)
diff --git a/Examples/test-suite/java/default_constructor_runme.java b/Examples/test-suite/java/default_constructor_runme.java
index 6473c4099..eb6a2df53 100644
--- a/Examples/test-suite/java/default_constructor_runme.java
+++ b/Examples/test-suite/java/default_constructor_runme.java
@@ -20,13 +20,5 @@ public class default_constructor_runme {
           throw new RuntimeException("Protected destructor exception should have been thrown");
       } catch (UnsupportedOperationException e) {
       }
-
-      // calling private destructor test
-      try {
-          FFF f = new FFF();
-          f.delete();
-          throw new RuntimeException("Private destructor exception should have been thrown");
-      } catch (UnsupportedOperationException e) {
-      }
   }
 }
diff --git a/Examples/test-suite/octave/default_constructor_runme.m b/Examples/test-suite/octave/default_constructor_runme.m
index 41d0f3f1e..2f8bb39ef 100644
--- a/Examples/test-suite/octave/default_constructor_runme.m
+++ b/Examples/test-suite/octave/default_constructor_runme.m
@@ -83,15 +83,6 @@ end_try_catch
 
 dc.F_destroy(f);
 
-ff = dc.new_FFF();
-try
-    del_ff = dc.delete_FFF;
-    error("Whoa. delete_FFF created")
-catch
-end_try_catch
-
-dc.F_destroy(ff);
-
 g = dc.new_G();
 
 try
diff --git a/Examples/test-suite/python/default_constructor_runme.py b/Examples/test-suite/python/default_constructor_runme.py
index c80c1e81e..1e877adda 100644
--- a/Examples/test-suite/python/default_constructor_runme.py
+++ b/Examples/test-suite/python/default_constructor_runme.py
@@ -89,15 +89,6 @@ except AttributeError:
 
 dc.F_destroy(f)
 
-ff = dc.new_FFF()
-try:
-    del_ff = dc.delete_FFF
-    print "Whoa. delete_FFF created"
-except AttributeError:
-    pass
-
-dc.F_destroy(ff)
-
 g = dc.new_G()
 
 try:
diff --git a/Examples/test-suite/ruby/default_constructor_runme.rb b/Examples/test-suite/ruby/default_constructor_runme.rb
index 2706f67ca..5cd675879 100644
--- a/Examples/test-suite/ruby/default_constructor_runme.rb
+++ b/Examples/test-suite/ruby/default_constructor_runme.rb
@@ -143,9 +143,6 @@ end
 # This should work fine
 f = F.new
 
-# This should work fine
-ff = FFF.new
-
 # This should work fine
 g = G.new
 
diff --git a/Examples/test-suite/scilab/default_constructor_runme.sci b/Examples/test-suite/scilab/default_constructor_runme.sci
index 6c5250bec..26726f1e0 100644
--- a/Examples/test-suite/scilab/default_constructor_runme.sci
+++ b/Examples/test-suite/scilab/default_constructor_runme.sci
@@ -84,15 +84,6 @@ end
 
 F_destroy(f);
 
-ff = new_FFF();
-try
-  del_ff = delete_FFF;
-  swigtesterror("delete_FFF created")
-catch
-end
-
-F_destroy(ff);
-
 g = new_G();
 
 try
diff --git a/Source/Modules/allocate.cxx b/Source/Modules/allocate.cxx
index dc3820766..f79373d18 100644
--- a/Source/Modules/allocate.cxx
+++ b/Source/Modules/allocate.cxx
@@ -941,6 +941,8 @@ Allocate():
 	Setattr(inclass, "allocate:default_destructor", "1");
       } else if (cplus_mode == PROTECTED) {
 	Setattr(inclass, "allocate:default_base_destructor", "1");
+      } else if (cplus_mode == PRIVATE) {
+	Setattr(inclass, "allocate:private_destructor", "1");
       }
     } else {
       Setattr(inclass, "allocate:has_destructor", "1");
diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index 7943dc4c7..aa81581f0 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -3676,14 +3676,26 @@ int Language::abstractClassTest(Node *n) {
     return 0;
   if (Getattr(n, "allocate:nonew"))
     return 1;
+
+  // A class cannot be instantiated if one of its bases has a private destructor
+  // Note that if the above does not hold the class can be instantiated if its own destructor is private
+  List *bases = Getattr(n, "bases");
+  if (bases) {
+    for (int i = 0; i < Len(bases); i++) {
+      Node *b = Getitem(bases, i);
+      if (GetFlag(b, "allocate:private_destructor"))
+	return 1;
+    }
+  }
+
   /* now check for the rest */
   List *abstracts = Getattr(n, "abstracts");
   if (!abstracts)
     return 0;
   int labs = Len(abstracts);
 #ifdef SWIG_DEBUG
-  List *bases = Getattr(n, "allbases");
-  Printf(stderr, "testing %s %d %d\n", Getattr(n, "name"), labs, Len(bases));
+  List *allbases = Getattr(n, "allbases");
+  Printf(stderr, "testing %s %d %d\n", Getattr(n, "name"), labs, Len(allbases));
 #endif
   if (!labs)
     return 0;			/*strange, but need to be fixed */

From 248890aad08a2b1e1182f9b5986806e2b8c92d17 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 8 Jul 2015 13:26:36 -0600
Subject: [PATCH 202/220] Support for octave 4.0.0

---
 Lib/octave/octrun.swg | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg
index b5c3e5d86..40035449e 100644
--- a/Lib/octave/octrun.swg
+++ b/Lib/octave/octrun.swg
@@ -868,6 +868,17 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
     }
 
 #if defined (HAVE_HDF5)
+# if SWIG_OCTAVE_PREREQ(4,0,0)
+    virtual bool
+      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+# else
     virtual bool
       save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
       return true;
@@ -877,6 +888,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
       return true;
     }
+# endif
 #endif
 
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
@@ -1089,6 +1101,15 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       { return ptr->load_binary(is, swap, fmt); }
 
 #if defined (HAVE_HDF5)
+# if SWIG_OCTAVE_PREREQ(4,0,0)
+    virtual bool
+      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
+      { return ptr->save_hdf5(loc_id, name, save_as_floats); }
+
+    virtual bool
+      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug)
+      { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+# else
     virtual bool
       save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
       { return ptr->save_hdf5(loc_id, name, save_as_floats); }
@@ -1096,6 +1117,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
     virtual bool
       load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
       { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+# endif
 #endif
 
     virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
@@ -1108,10 +1130,14 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       { return ptr->print(os, pr_as_read_syntax); }
 
   private:
+#if !SWIG_OCTAVE_PREREQ(4,0,0)
     DECLARE_OCTAVE_ALLOCATOR;
+#endif
     DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
   };
+#if !SWIG_OCTAVE_PREREQ(4,0,0)
   DEFINE_OCTAVE_ALLOCATOR(octave_swig_ref);
+#endif
   DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_ref, "swig_ref", "swig_ref");
 
   class octave_swig_packed:public octave_base_value {
@@ -1167,6 +1193,17 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
     }
 
 #if defined (HAVE_HDF5)
+# if SWIG_OCTAVE_PREREQ(4,0,0)
+    virtual bool
+      save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats) {
+      return true;
+    }
+
+    virtual bool
+      load_hdf5 (octave_hdf5_id loc_id, const char *name, bool have_h5giterate_bug) {
+      return true;
+    }
+# else
     virtual bool
       save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
       return true;
@@ -1176,13 +1213,18 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
       return true;
     }
+# endif
 #endif
 
   private:
+#if !SWIG_OCTAVE_PREREQ(4,0,0)
     DECLARE_OCTAVE_ALLOCATOR;
+#endif
     DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
   };
+#if !SWIG_OCTAVE_PREREQ(4,0,0)
   DEFINE_OCTAVE_ALLOCATOR(octave_swig_packed);
+#endif
   DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_swig_packed, "swig_packed", "swig_packed");
 
   SWIGRUNTIME octave_value_list octave_set_immutable(const octave_value_list &args, int nargout) {

From 701f8d4baee6efdd48d46a5f2cacf651cc1f80dd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 9 Jul 2015 00:12:28 +0100
Subject: [PATCH 203/220] Configuring C++11 compiler flags for testing fix

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

diff --git a/configure.ac b/configure.ac
index 712ca0abd..c6eb76c18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -340,6 +340,7 @@ PLATCXXFLAGS="$PLATCFLAGS"
 if test x"$enable_cpp11_testing" = xyes; then
   AC_LANG_PUSH([C++])
   CXXFLAGS_SAVED=$CXXFLAGS
+  CXXFLAGS=
   AX_CXX_COMPILE_STDCXX_11([noext], [nostop])
   CXXFLAGS=$CXXFLAGS_SAVED
   AC_LANG_POP([C++])

From 9244621827a6c3d0dc5e532a2deda7e031bfc266 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 9 Jul 2015 00:12:42 +0100
Subject: [PATCH 204/220] Travis testing extended to test c++11 and c++14 with
 gcc-5

- SWIG executable compiled with gcc-5 using both c++11 and c++14 standards
- cpp11 tests enabled using c++11 standard
- Add clang compile using c++11
---
 .travis.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a51c541cb..f4921f8cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
 language: cpp
-compiler:
-  - clang
-  - gcc
-env:
-  - SWIGLANG=
 matrix:
   include:
+    - compiler: clang
+      env: SWIGLANG=
+    - compiler: gcc
+      env: SWIGLANG=
+    - compiler: gcc
+      env: SWIGLANG= GCC5=1 CPP11=1
+    - compiler: gcc
+      env: SWIGLANG= GCC5=1 CPP14=1
     - compiler: gcc
       env: SWIGLANG=csharp
     - compiler: gcc
@@ -62,6 +65,12 @@ matrix:
       env: SWIGLANG=scilab
     - compiler: gcc
       env: SWIGLANG=tcl
+    - compiler: gcc
+      env: SWIGLANG=csharp GCC5=1 CPP11=1
+    - compiler: gcc
+      env: SWIGLANG=java GCC5=1 CPP11=1
+    - compiler: gcc
+      env: SWIGLANG=python GCC5=1 CPP11=1
   allow_failures:
     # Lots of failing tests currently
     - compiler: gcc
@@ -85,6 +94,7 @@ before_install:
   - sudo apt-get -qq update
   - time sudo apt-get -qq install libboost-dev
   - if test -z "$SWIGLANG"; then sudo apt-get -qq install yodl; fi
+  - if test -n "$GCC5"; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get install -qq g++-5 && export CC=gcc-5 && export CXX=g++-5; fi
   - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi
   - if test "$SWIGLANG" = "d"; then wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb; sudo dpkg -i dmd_2.066.0-0_amd64.deb; fi
   - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed
@@ -100,10 +110,12 @@ before_install:
   - if test "$SWIGLANG" = "php"; then sudo apt-get install php5-cli php5-dev; fi
   - if test "$SWIGLANG" = "python"; then git clone https://github.com/jcrocholl/pep8.git && pushd pep8 && git checkout tags/1.5.7 && python ./setup.py build && sudo python ./setup.py install && popd; fi
   - if test "$SWIGLANG" = "python" -a "$PY3" -a -z "$VER"; then sudo apt-get install -qq python3-dev; fi
-  - if test "$SWIGLANG" = "python" -a "$VER"; then sudo add-apt-repository -y ppa:fkrull/deadsnakes && sudo apt-get -qq update && sudo apt-get -qq install python${VER}-dev && export CONFIGOPTS="--with-python${PY3}=python${VER}"; fi
+  - if test "$SWIGLANG" = "python" -a "$VER"; then sudo add-apt-repository -y ppa:fkrull/deadsnakes && sudo apt-get -qq update && sudo apt-get -qq install python${VER}-dev && CONFIGOPTS+=("--with-python${PY3}=python${VER}"); fi
   - if test "$SWIGLANG" = "r"; then sudo apt-get -qq install r-base; fi
   - if test "$SWIGLANG" = "scilab"; then sudo apt-get -qq install scilab; fi
   - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
+  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi
+  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi
   - $CC --version
   - $CXX --version
   # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
@@ -111,7 +123,8 @@ before_install:
   - export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
-  - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure $CONFIGOPTS
+  - echo "${CONFIGOPTS[@]}"
+  - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure "${CONFIGOPTS[@]}"
   - echo -en 'travis_fold:end:script.1\\r'
   - make -s $SWIGJOBS
   - ./swig -version && ./swig -pcreversion

From 7ed63b11d7ae4c6774c2e99d9e8b30b78e3d078b Mon Sep 17 00:00:00 2001
From: Michael Thon <m7.thon@gmail.com>
Date: Thu, 9 Jul 2015 02:05:33 +0200
Subject: [PATCH 205/220] Set class docstring in tp_doc slot for python
 -builtin

---
 Source/Modules/python.cxx | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 652df8974..781cab721 100644
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -1808,10 +1808,17 @@ public:
 	    // Only do the autodoc if there isn't a docstring for the class
 	    String *str = Getattr(n, "feature:docstring");
 	    if (!str || Len(str) == 0) {
-	      if (CPlusPlus) {
-		Printf(doc, "Proxy of C++ %s class", real_classname);
+	      if (builtin) {
+		String *name = Getattr(n, "name");
+		String *rname = add_explicit_scope(SwigType_namestr(name));
+		Printf(doc, "%s", rname);
+		Delete(rname);
 	      } else {
-		Printf(doc, "Proxy of C %s struct", real_classname);
+		if (CPlusPlus) {
+		  Printf(doc, "Proxy of C++ %s class", real_classname);
+		} else {
+		  Printf(doc, "Proxy of C %s struct", real_classname);
+		}
 	      }
 	    }
 	  }
@@ -3882,7 +3889,7 @@ public:
       else
 	quoted_symname = NewStringf("\"%s\"", symname);
     }
-    String *quoted_rname = NewStringf("\"%s\"", rname);
+    String *quoted_tp_doc_str = NewStringf("\"%s\"", getSlot(n, "feature:python:tp_doc"));
     char const *tp_init = builtin_tp_init ? Char(builtin_tp_init) : Swig_directorclass(n) ? "0" : "SwigPyBuiltin_BadInit";
     String *tp_flags = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_CHECKTYPES");
     String *py3_tp_flags = NewString("Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE");
@@ -3925,7 +3932,7 @@ public:
     Printv(f, "#else\n", NIL);
     printSlot(f, tp_flags, "tp_flags");
     Printv(f, "#endif\n", NIL);
-    printSlot(f, quoted_rname, "tp_doc");
+    printSlot(f, quoted_tp_doc_str, "tp_doc");
     printSlot(f, getSlot(n, "feature:python:tp_traverse"), "tp_traverse", "traverseproc");
     printSlot(f, getSlot(n, "feature:python:tp_clear"), "tp_clear", "inquiry");
     printSlot(f, richcompare_func, "feature:python:tp_richcompare", "richcmpfunc");
@@ -4108,7 +4115,7 @@ public:
     Delete(tp_flags);
     Delete(py3_tp_flags);
     Delete(quoted_symname);
-    Delete(quoted_rname);
+    Delete(quoted_tp_doc_str);
     Delete(clientdata_klass);
     Delete(richcompare_func);
     Delete(getset_name);
@@ -4208,6 +4215,11 @@ public:
 	  String *str = cdocstring(n, AUTODOC_CLASS);
 	  Setattr(n, "feature:python:tp_doc", str);
 	  Delete(str);
+	} else {
+	  String *name = Getattr(n, "name");
+	  String *rname = add_explicit_scope(SwigType_namestr(name));
+	  Setattr(n, "feature:python:tp_doc", rname);
+	  Delete(rname);
 	}
       } else {
 	Printv(f_shadow, "class ", class_name, NIL);

From 350c410d4bba978263e592a070e87cdae1663c7f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Thu, 9 Jul 2015 19:20:46 -0600
Subject: [PATCH 206/220] Update print() signature for octave 4.0

---
 Lib/octave/octrun.swg | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg
index 40035449e..ddfd48939 100644
--- a/Lib/octave/octrun.swg
+++ b/Lib/octave/octrun.swg
@@ -981,7 +981,11 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       return octave_value();
     }
 
+#if SWIG_OCTAVE_PREREQ(4,0,0)
+    void print(std::ostream &os, bool pr_as_read_syntax = false) {
+#else
     void print(std::ostream &os, bool pr_as_read_syntax = false) const {
+#endif
       if (is_string()) {
 	os << string_value();
 	return;
@@ -1126,7 +1130,11 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
     virtual octave_value convert_to_str_internal(bool pad, bool force, char type) const
       { return ptr->convert_to_str_internal(pad, force, type); }
 
+#if SWIG_OCTAVE_PREREQ(4,0,0)
+    void print(std::ostream &os, bool pr_as_read_syntax = false)
+#else
     void print(std::ostream &os, bool pr_as_read_syntax = false) const
+#endif
       { return ptr->print(os, pr_as_read_syntax); }
 
   private:
@@ -1169,7 +1177,11 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own);
       return true;
     }
 
+#if SWIG_OCTAVE_PREREQ(4,0,0)
+    void print(std::ostream &os, bool pr_as_read_syntax = false) {
+#else
     void print(std::ostream &os, bool pr_as_read_syntax = false) const {
+#endif
       indent(os);
       os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size(); newline(os);
     }

From 5a6a39a4eeaaef11cd8100cb2660722a2a3352c7 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 10 Jul 2015 08:24:09 -0600
Subject: [PATCH 207/220] Add #include <climits> for INT_MAX

---
 Lib/octave/octcontainer.swg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Lib/octave/octcontainer.swg b/Lib/octave/octcontainer.swg
index 723256ca0..0211b33c6 100644
--- a/Lib/octave/octcontainer.swg
+++ b/Lib/octave/octcontainer.swg
@@ -12,6 +12,7 @@
  * ----------------------------------------------------------------------------- */
 
 %{
+#include <climits>
 #include <iostream>
 %}
 

From 1d5d2243284534231fbca0842d2da68d5792ed09 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 10 Jul 2015 11:59:45 -0600
Subject: [PATCH 208/220] Fix default_constructor_runme.m test

---
 .../octave/default_constructor_runme.m         | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Examples/test-suite/octave/default_constructor_runme.m b/Examples/test-suite/octave/default_constructor_runme.m
index 2f8bb39ef..ebe553b20 100644
--- a/Examples/test-suite/octave/default_constructor_runme.m
+++ b/Examples/test-suite/octave/default_constructor_runme.m
@@ -14,24 +14,18 @@ try
 catch
 end_try_catch
 
-del_b = dc.delete_B;
-
 try
     bb = dc.new_BB();
     error("Whoa. new_BB created.")
 catch
 end_try_catch
 
-del_bb = dc.delete_BB;
-
 try
     c = dc.new_C();
     error("Whoa. new_C created.")
 catch
 end_try_catch
 
-del_c = dc.delete_C;
-
 cc = dc.new_CC();
 dc.delete_CC(cc);
 
@@ -41,24 +35,18 @@ try
 catch
 end_try_catch
 
-del_d = dc.delete_D;
-
 try
     dd = dc.new_DD();
     error("Whoa. new_DD created")
 catch
 end_try_catch
 
-dd = dc.delete_DD;
-
 try
     ad = dc.new_AD();
     error("Whoa. new_AD created")
 catch
 end_try_catch
 
-del_ad = dc.delete_AD;
-
 e = dc.new_E();
 dc.delete_E(e);
 
@@ -71,12 +59,10 @@ try
 catch
 end_try_catch
 
-del_eb = dc.delete_EB;
-
 f = dc.new_F();
 
 try
-    del_f = dc.delete_F;
+    del_f = dc.delete_F(f);
     error("Whoa. delete_F created")
 catch
 end_try_catch
@@ -86,7 +72,7 @@ dc.F_destroy(f);
 g = dc.new_G();
 
 try
-    del_g = dc.delete_G;
+    del_g = dc.delete_G(g);
     error("Whoa. delete_G created")
 catch
 end_try_catch

From 5a282f3ac372c286981901b8f779ddb1d71bf688 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 10 Jul 2015 21:03:33 +0100
Subject: [PATCH 209/220] c++11 test case fixes

---
 Examples/test-suite/cpp11_noexcept.i          | 2 +-
 Examples/test-suite/cpp11_rvalue_reference2.i | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Examples/test-suite/cpp11_noexcept.i b/Examples/test-suite/cpp11_noexcept.i
index 6fed5b8df..ef96fd8a7 100644
--- a/Examples/test-suite/cpp11_noexcept.i
+++ b/Examples/test-suite/cpp11_noexcept.i
@@ -13,7 +13,7 @@ struct NoExceptClass {
   NoExceptClass() noexcept {}
   NoExceptClass(const NoExceptClass&) noexcept {}
   NoExceptClass(NoExceptClass&&) noexcept {}
-  NoExceptClass& operator=(const NoExceptClass&) noexcept {}
+  NoExceptClass& operator=(const NoExceptClass&) noexcept { return *this; }
   ~NoExceptClass() noexcept {}
 
   void noex0() noexcept {}
diff --git a/Examples/test-suite/cpp11_rvalue_reference2.i b/Examples/test-suite/cpp11_rvalue_reference2.i
index 89d2ee054..6718a3941 100644
--- a/Examples/test-suite/cpp11_rvalue_reference2.i
+++ b/Examples/test-suite/cpp11_rvalue_reference2.i
@@ -31,12 +31,13 @@ struct Thingy {
   // test both primitive and user defined rvalue reference default arguments and compactdefaultargs
   void compactDefaultArgs(const bool &&b = (const bool &&)PublicGlobalTrue, const UserDef &&u  = (const UserDef &&)PublicUserDef) {}
   void privateDefaultArgs(const bool &&b = (const bool &&)PrivateTrue) {}
-  operator int &&() {}
+  operator int &&() { return std::move(0); }
   Thingy(const Thingy& rhs) : val(rhs.val), lvalref(rhs.lvalref), rvalref(copy_int(rhs.rvalref)) {}
   Thingy& operator=(const Thingy& rhs) {
     val = rhs.val;
     lvalref = rhs.lvalref;
     rvalref = rhs.rvalref;
+    return *this;
   }
 private:
   static const bool PrivateTrue;

From f815209c7de45103f8d983fd71356323c52b2851 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 10 Jul 2015 21:54:59 +0100
Subject: [PATCH 210/220] Travis testing c++11 and gcc5

Modify testflags.py to control the -std= option passed to gcc
Install new boost for c++11 with gcc5 testing
---
 .travis.yml        |  9 +++++----
 Tools/testflags.py | 34 ++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4921f8cf..5ca17c7ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,9 +92,10 @@ before_install:
   - uname -a
   - lsb_release -a
   - sudo apt-get -qq update
-  - time sudo apt-get -qq install libboost-dev
-  - if test -z "$SWIGLANG"; then sudo apt-get -qq install yodl; fi
   - if test -n "$GCC5"; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get install -qq g++-5 && export CC=gcc-5 && export CXX=g++-5; fi
+  - if test -z "$GCC5"; then sudo apt-get -qq install libboost-dev; fi
+  - if test -n "$GCC5"; then sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get -qq update && sudo apt-get install -qq libboost1.55-dev; fi
+  - if test -z "$SWIGLANG"; then sudo apt-get -qq install yodl; fi
   - if test "$SWIGLANG" = "csharp"; then sudo apt-get -qq install mono-devel; fi
   - if test "$SWIGLANG" = "d"; then wget http://downloads.dlang.org/releases/2014/dmd_2.066.0-0_amd64.deb; sudo dpkg -i dmd_2.066.0-0_amd64.deb; fi
   - if test "$SWIGLANG" = "go"; then go env | sed -e 's/^/export /' > goenvsetup && source goenvsetup && rm -f goenvsetup; fi # Until configure.ac is fixed
@@ -119,8 +120,8 @@ before_install:
   - $CC --version
   - $CXX --version
   # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
-  - export cflags=$(Tools/testflags.py --language $SWIGLANG --cflags) && echo $cflags
-  - export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags) && echo $cxxflags
+  - if test -n "$SWIGLANG"; then export cflags=$(Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD) && echo $cflags; fi
+  - if test -n "$SWIGLANG"; then export cxxflags=$(Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD) && echo $cxxflags; fi
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
   - echo "${CONFIGOPTS[@]}"
diff --git a/Tools/testflags.py b/Tools/testflags.py
index 23bec9c8d..04bbc1c67 100755
--- a/Tools/testflags.py
+++ b/Tools/testflags.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python
-c_common = "-fdiagnostics-show-option -std=gnu89 -Wno-long-long -Wreturn-type -Wdeclaration-after-statement"
-cflags = {
+
+def get_cflags(language, std):
+    if std == None or len(std) == 0:
+        std = "gnu89"
+    c_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wdeclaration-after-statement"
+    cflags = {
         "csharp":"-Werror " + c_common,
              "d":"-Werror " + c_common,
             "go":"-Werror " + c_common,
@@ -15,10 +19,18 @@ cflags = {
           "ruby":"-Werror " + c_common,
         "scilab":"-Werror " + c_common,
            "tcl":"-Werror " + c_common,
-}
+    }
 
-cxx_common = "-fdiagnostics-show-option -std=c++98 -Wno-long-long -Wreturn-type"
-cxxflags = {
+    if language not in cflags:
+        raise RuntimeError("{} is not a supported language".format(language))
+
+    return cflags[language]
+
+def get_cxxflags(language, std):
+    if std == None or len(std) == 0:
+        std = "c++98"
+    cxx_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type"
+    cxxflags = {
         "csharp":"-Werror " + cxx_common,
              "d":"-Werror " + cxx_common,
             "go":"-Werror " + cxx_common,
@@ -33,7 +45,12 @@ cxxflags = {
           "ruby":"-Werror " + cxx_common,
         "scilab":             cxx_common,
            "tcl":"-Werror " + cxx_common,
-}
+    }
+
+    if language not in cxxflags:
+        raise RuntimeError("{} is not a supported language".format(language))
+
+    return cxxflags[language]
 
 import argparse
 parser = argparse.ArgumentParser(description="Display CFLAGS or CXXFLAGS to use for testing the SWIG examples and test-suite.")
@@ -41,12 +58,13 @@ parser.add_argument('-l', '--language', required=True, help='set language to sho
 flags = parser.add_mutually_exclusive_group(required=True)
 flags.add_argument('-c', '--cflags', action='store_true', default=False, help='show CFLAGS')
 flags.add_argument('-x', '--cxxflags', action='store_true', default=False, help='show CXXFLAGS')
+parser.add_argument('-s', '--std', required=False, help='language standard flags for the -std= option')
 args = parser.parse_args()
 
 if args.cflags:
-    print("{}".format(cflags[args.language]))
+    print("{}".format(get_cflags(args.language, args.std)))
 elif args.cxxflags:
-    print("{}".format(cxxflags[args.language]))
+    print("{}".format(get_cxxflags(args.language, args.std)))
 else:
     parser.print_help()
     exit(1)

From d49267ca3fc0aeaa1b45f48be8f48453be54a6a9 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 11 Jul 2015 00:02:10 +0100
Subject: [PATCH 211/220] Fix compile flags for Travis C++11 testing

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ca17c7ad..860360266 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,8 +115,8 @@ before_install:
   - if test "$SWIGLANG" = "r"; then sudo apt-get -qq install r-base; fi
   - if test "$SWIGLANG" = "scilab"; then sudo apt-get -qq install scilab; fi
   - if test "$SWIGLANG" = "tcl"; then sudo apt-get -qq install tcl8.4-dev; fi
-  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi
-  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra"); fi
+  - if test -n "$CPP11"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++11 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++11; fi
+  - if test -n "$CPP14"; then CONFIGOPTS+=(--enable-cpp11-testing --without-maximum-compile-warnings "CXXFLAGS=-std=c++14 -Wall -Wextra" "CFLAGS=-std=c11 -Wall -Wextra") && export CSTD=c11 && export CPPSTD=c++14; fi
   - $CC --version
   - $CXX --version
   # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.

From 68e833a5b97ba02feeb594c736620b832697486a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 10 Jul 2015 22:37:43 -0600
Subject: [PATCH 212/220] Add octave 4.0 to travis

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

diff --git a/.travis.yml b/.travis.yml
index a51c541cb..9c738b1d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ matrix:
       env: SWIGLANG=octave SWIGJOBS=-j3 # 3.2
     - compiler: gcc
       env: SWIGLANG=octave SWIGJOBS=-j3 VER=3.8
+    - compiler: gcc
+      env: SWIGLANG=octave SWIGJOBS=-j3 VER=4.0
     - compiler: gcc
       env: SWIGLANG=perl5
     - compiler: gcc

From 5ab9563c2ade6f61e4ecdbe5363d4251ff7c6991 Mon Sep 17 00:00:00 2001
From: Mike Miller <mtmiller@octave.org>
Date: Sat, 11 Jul 2015 18:53:22 -0400
Subject: [PATCH 213/220] Octave: use correct mkoctfile executable

Allow a versioned Octave executable to be configured via --with-octave
and the correct corresponding mkoctfile executable to be used.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c6eb76c18..713680f59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1030,7 +1030,7 @@ fi
 
 if test -n "$OCTAVE"; then
    AC_MSG_CHECKING([for mkoctfile])
-   mkoctfile="`dirname ${OCTAVE}`/mkoctfile"
+   mkoctfile="$(dirname $OCTAVE)/$(basename $OCTAVE | sed -e 's/octave/mkoctfile/')"
    AS_IF([test -x "${mkoctfile}"],[
       AC_MSG_RESULT([${mkoctfile}])
    ],[

From 8261fc7fc4d6fbde8fa595f8700fd461bde692f4 Mon Sep 17 00:00:00 2001
From: Karl Wette <karl.wette@ligo.org>
Date: Fri, 17 Jul 2015 09:49:44 +0200
Subject: [PATCH 214/220] Update CHANGES.current and Octave.html to indicate
 Octave 4.0.0 support

---
 CHANGES.current        | 3 +++
 Doc/Manual/Octave.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.current b/CHANGES.current
index 5bec5d4e0..8917fa4a1 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.7 (in progress)
 ===========================
 
+2015-07-17: kwwette
+            [octave] Support Octave version 4.0.0 (thanks to patches from Orion Poplawski).
+
 2015-07-07: wsfulton
 	    SWIG no longer generates a wrapper for a class' constructor if that class has
             any base class with a private destructor. This is because your compiler should
diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html
index 46a8941c2..5f8437a6a 100644
--- a/Doc/Manual/Octave.html
+++ b/Doc/Manual/Octave.html
@@ -59,7 +59,7 @@ Also, there are a dozen or so examples in the Examples/octave directory, and hun
 
 
 <p>
-As of SWIG 3.0.3, the Octave module has been tested with Octave versions 3.2.4, 3.4.3, 3.6.4, and 3.8.1.
+As of SWIG 3.0.7, the Octave module is regularly tested with Octave versions 3.2.4, 3.8.1, and 4.0.0.
 Use of older Octave versions is not recommended, as these versions are no longer tested with SWIG.
 </p>
 

From 2e03845be8c17fa65b9d6e06534f1b737b55560c Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 17 Jul 2015 17:50:11 +0100
Subject: [PATCH 215/220] const char * fixes in the parser

---
 Source/CParse/parser.y | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index a3c5e73bf..4cdadc7ef 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -51,7 +51,7 @@ static String  *Classprefix = 0;
 static String  *Namespaceprefix = 0;
 static int      inclass = 0;
 static Node    *currentOuterClass = 0; /* for nested classes */
-static char    *last_cpptype = 0;
+static const char *last_cpptype = 0;
 static int      inherit_list = 0;
 static Parm    *template_parameters = 0;
 static int      extendmode   = 0;
@@ -703,14 +703,14 @@ static String *make_class_name(String *name) {
 
 /* Use typedef name as class name */
 
-static void add_typedef_name(Node *n, Node *decl, String *oldName, Symtab *cscope, String *scpname) {
+static void add_typedef_name(Node *n, Node *declnode, String *oldName, Symtab *cscope, String *scpname) {
   String *class_rename = 0;
-  SwigType *decltype = Getattr(decl, "decl");
-  if (!decltype || !Len(decltype)) {
+  SwigType *decl = Getattr(declnode, "decl");
+  if (!decl || !Len(decl)) {
     String *cname;
     String *tdscopename;
     String *class_scope = Swig_symbol_qualifiedscopename(cscope);
-    String *name = Getattr(decl, "name");
+    String *name = Getattr(declnode, "name");
     cname = Copy(name);
     Setattr(n, "tdname", cname);
     tdscopename = class_scope ? NewStringf("%s::%s", class_scope, name) : Copy(name);
@@ -721,7 +721,7 @@ static void add_typedef_name(Node *n, Node *decl, String *oldName, Symtab *cscop
     if (!Equal(scpname, tdscopename) && !Getattr(classes_typedefs, tdscopename)) {
       Setattr(classes_typedefs, tdscopename, n);
     }
-    Setattr(n, "decl", decltype);
+    Setattr(n, "decl", decl);
     Delete(class_scope);
     Delete(cname);
     Delete(tdscopename);
@@ -1299,7 +1299,7 @@ static void mark_nodes_as_extend(Node *n) {
 %}
 
 %union {
-  char  *id;
+  const char  *id;
   List  *bases;
   struct Define {
     String *val;
@@ -6551,17 +6551,19 @@ idcolontailnt   : DCOLON identifier idcolontailnt {
 
 /* Concatenated strings */
 string         : string STRING { 
-                   $$ = (char *) malloc(strlen($1)+strlen($2)+1);
-                   strcpy($$,$1);
-                   strcat($$,$2);
+                   char *s = (char *) malloc(strlen($1)+strlen($2)+1);
+                   strcpy(s,$1);
+                   strcat(s,$2);
+                   $$ = s;
                }
                | STRING { $$ = $1;}
                ; 
 /* Concatenated wide strings: L"str1" L"str2" */
 wstring         : wstring WSTRING {
-                   $$ = (char *) malloc(strlen($1)+strlen($2)+1);
-                   strcpy($$,$1);
-                   strcat($$,$2);
+                   char *s = (char *) malloc(strlen($1)+strlen($2)+1);
+                   strcpy(s,$1);
+                   strcat(s,$2);
+                   $$ = s;
                }
 /* Concatenated wide string and normal string literal: L"str1" "str2" */
 /*not all the compilers support this concatenation mode, so perhaps better to postpone it*/

From 8ccf639f42a8f087c96b7bfa9cc4fbef6c0fd25f Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 17 Jul 2015 18:14:25 +0100
Subject: [PATCH 216/220] String / char * usage in parser fixes

---
 Source/CParse/parser.y | 61 +++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y
index 4cdadc7ef..38f876390 100644
--- a/Source/CParse/parser.y
+++ b/Source/CParse/parser.y
@@ -1442,7 +1442,7 @@ static void mark_nodes_as_extend(Node *n) {
 %type <decl>     abstract_declarator direct_abstract_declarator ctor_end;
 %type <tmap>     typemap_type;
 %type <str>      idcolon idcolontail idcolonnt idcolontailnt idtemplate idtemplatetemplate stringbrace stringbracesemi;
-%type <id>       string stringnum wstring;
+%type <str>      string stringnum wstring;
 %type <tparms>   template_parms;
 %type <dtype>    cpp_end cpp_vend;
 %type <intvalue> rename_namewarn;
@@ -1741,7 +1741,7 @@ echo_directive : ECHO HBLOCK {
 	       }
                | ECHO string {
 		 char temp[64];
-		 String *s = NewString($2);
+		 String *s = $2;
 		 Replace(s,"$file",cparse_file, DOH_REPLACE_ANY);
 		 sprintf(temp,"%d", cparse_line);
 		 Replace(s,"$line",temp,DOH_REPLACE_ANY);
@@ -1846,7 +1846,7 @@ fragment_directive: FRAGMENT LPAREN fname COMMA kwargs RPAREN HBLOCK {
 include_directive: includetype options string BEGINFILE {
                      $1.filename = Copy(cparse_file);
 		     $1.line = cparse_line;
-		     scanner_set_location(NewString($3),1);
+		     scanner_set_location($3,1);
                      if ($2) { 
 		       String *maininput = Getattr($2, "maininput");
 		       if (maininput)
@@ -2101,7 +2101,7 @@ pragma_directive : PRAGMA pragma_lang identifier EQUAL pragma_arg {
 	      }
               ;
 
-pragma_arg    : string { $$ = NewString($1); }
+pragma_arg    : string { $$ = $1; }
               | HBLOCK { $$ = $1; }
               ;
 
@@ -2253,7 +2253,7 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr
                     scanner_clear_rename();
                   }
                   | FEATURE LPAREN idstring COMMA stringnum RPAREN declarator cpp_const SEMI {
-                    String *val = Len($5) ? NewString($5) : 0;
+                    String *val = Len($5) ? $5 : 0;
                     new_feature($3, val, 0, $7.id, $7.type, $7.parms, $8.qualifier);
                     $$ = 0;
                     scanner_clear_rename();
@@ -2265,7 +2265,7 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr
                     scanner_clear_rename();
                   }
                   | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN declarator cpp_const SEMI {
-                    String *val = Len($5) ? NewString($5) : 0;
+                    String *val = Len($5) ? $5 : 0;
                     new_feature($3, val, $6, $8.id, $8.type, $8.parms, $9.qualifier);
                     $$ = 0;
                     scanner_clear_rename();
@@ -2279,7 +2279,7 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr
                     scanner_clear_rename();
                   }
                   | FEATURE LPAREN idstring COMMA stringnum RPAREN SEMI {
-                    String *val = Len($5) ? NewString($5) : 0;
+                    String *val = Len($5) ? $5 : 0;
                     new_feature($3, val, 0, 0, 0, 0, 0);
                     $$ = 0;
                     scanner_clear_rename();
@@ -2291,7 +2291,7 @@ feature_directive : FEATURE LPAREN idstring RPAREN declarator cpp_const stringbr
                     scanner_clear_rename();
                   }
                   | FEATURE LPAREN idstring COMMA stringnum featattr RPAREN SEMI {
-                    String *val = Len($5) ? NewString($5) : 0;
+                    String *val = Len($5) ? $5 : 0;
                     new_feature($3, val, $6, 0, 0, 0, 0);
                     $$ = 0;
                     scanner_clear_rename();
@@ -2668,7 +2668,7 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
 
 			       String *symname = Swig_name_make(templnode,0,$3,0,0);
 			    */
-			    String *symname = $3;
+			    String *symname = NewString($3);
                             Swig_cparse_template_expand(templnode,symname,temparms,tscope);
                             Setattr(templnode,"sym:name",symname);
                           } else {
@@ -4662,9 +4662,9 @@ anon_bitfield_type : primitive_type { $$ = $1;
  *                       PRIMITIVES
  * ====================================================================== */
 extern_string :  EXTERN string {
-                   if (strcmp($2,"C") == 0) {
+                   if (Strcmp($2,"C") == 0) {
 		     $$ = "externc";
-                   } else if (strcmp($2,"C++") == 0) {
+                   } else if (Strcmp($2,"C++") == 0) {
 		     $$ = "extern";
 		   } else {
 		     Swig_warning(WARN_PARSE_UNDEFINED_EXTERN,cparse_file, cparse_line,"Unrecognized extern type \"%s\".\n", $2);
@@ -5782,17 +5782,6 @@ definetype     : { /* scanner_check_typedef(); */ } expr {
                 | default_delete {
 		  $$ = $1;
 		}
-/*
-                | string {
-                   $$.val = NewString($1);
-		   $$.rawval = NewStringf("\"%(escape)s\"",$$.val);
-                   $$.type = T_STRING;
-		   $$.bitfield = 0;
-		   $$.throws = 0;
-		   $$.throwf = 0;
-		   $$.nexcept = 0;
-		}
-*/
                 ;
 
 default_delete : deleted_definition {
@@ -5915,7 +5904,7 @@ expr           : valexpr { $$ = $1; }
 
 valexpr        : exprnum { $$ = $1; }
                | string {
-		    $$.val = NewString($1);
+		    $$.val = $1;
                     $$.type = T_STRING;
                }
                | SIZEOF LPAREN type parameter_declarator RPAREN {
@@ -5930,7 +5919,7 @@ valexpr        : exprnum { $$ = $1; }
                }
                | exprcompound { $$ = $1; }
 	       | wstring {
-		    $$.val = NewString($1);
+		    $$.val = $1;
 		    $$.rawval = NewStringf("L\"%s\"", $$.val);
                     $$.type = T_WSTRING;
 	       }
@@ -6440,8 +6429,8 @@ identifier     : ID { $$ = $1; }
 	       ;
 
 idstring       : identifier { $$ = $1; }
-               | default_delete { $$ = $1.val; }
-               | string { $$ = $1; }
+               | default_delete { $$ = Char($1.val); }
+               | string { $$ = Char($1); }
                ;
 
 idstringopt    : idstring { $$ = $1; }
@@ -6551,32 +6540,24 @@ idcolontailnt   : DCOLON identifier idcolontailnt {
 
 /* Concatenated strings */
 string         : string STRING { 
-                   char *s = (char *) malloc(strlen($1)+strlen($2)+1);
-                   strcpy(s,$1);
-                   strcat(s,$2);
-                   $$ = s;
+                   $$ = NewStringf("%s%s", $1, $2);
                }
-               | STRING { $$ = $1;}
+               | STRING { $$ = NewString($1);}
                ; 
 /* Concatenated wide strings: L"str1" L"str2" */
 wstring         : wstring WSTRING {
-                   char *s = (char *) malloc(strlen($1)+strlen($2)+1);
-                   strcpy(s,$1);
-                   strcat(s,$2);
-                   $$ = s;
+                   $$ = NewStringf("%s%s", $1, $2);
                }
 /* Concatenated wide string and normal string literal: L"str1" "str2" */
 /*not all the compilers support this concatenation mode, so perhaps better to postpone it*/
                /*| wstring STRING { here $2 comes unescaped, we have to escape it back first via NewStringf("%(escape)s)"
-                   $$ = (char *) malloc(strlen($1)+strlen($2)+1);
-                   strcpy($$,$1);
-                   strcat($$,$2);
+                   $$ = NewStringf("%s%s", $1, $2);
 	       }*/
-               | WSTRING { $$ = $1;}
+               | WSTRING { $$ = NewString($1);}
                ;
 
 stringbrace    : string {
-		 $$ = NewString($1);
+		 $$ = $1;
                }
                | LBRACE {
                   skip_balanced('{','}');

From 64652523d5f96f3b96d36d6ce9d01b42bd47ecc0 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 17 Jul 2015 18:18:44 +0100
Subject: [PATCH 217/220] warning fixes

---
 Source/Swig/scanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Swig/scanner.c b/Source/Swig/scanner.c
index b0d608c9e..227a1d00c 100644
--- a/Source/Swig/scanner.c
+++ b/Source/Swig/scanner.c
@@ -336,7 +336,7 @@ static void brackets_reset(Scanner *s) {
  * Usually called when '(' is found.
  * ----------------------------------------------------------------------------- */
 static void brackets_push(Scanner *s) {
-  int *newInt = malloc(sizeof(int));
+  int *newInt = (int *)malloc(sizeof(int));
   *newInt = 0;
   Push(s->brackets, NewVoid(newInt, free));
 }

From 977240b3f4ba40e9a821171c02fcf48ff1219b0b Mon Sep 17 00:00:00 2001
From: Anbiru Shouta <anbi929@gmail.com>
Date: Wed, 15 Jul 2015 06:13:02 -0700
Subject: [PATCH 218/220] Clearer variable name in Java director generated code

Closes #463
---
 Source/Modules/java.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx
index 8fbdb13e4..0109bf41a 100644
--- a/Source/Modules/java.cxx
+++ b/Source/Modules/java.cxx
@@ -3428,7 +3428,7 @@ public:
       Printf(f_runtime, "namespace Swig {\n");
       Printf(f_runtime, "  namespace {\n");
       Printf(f_runtime, "    jclass jclass_%s = NULL;\n", imclass_name);
-      Printf(f_runtime, "    jmethodID director_methids[%d];\n", n_methods);
+      Printf(f_runtime, "    jmethodID director_method_ids[%d];\n", n_methods);
       Printf(f_runtime, "  }\n");
       Printf(f_runtime, "}\n");
 
@@ -3445,8 +3445,8 @@ public:
       Printf(w->code, "Swig::jclass_%s = (jclass) jenv->NewGlobalRef(jcls);\n", imclass_name);
       Printf(w->code, "if (!Swig::jclass_%s) return;\n", imclass_name);
       Printf(w->code, "for (i = 0; i < (int) (sizeof(methods)/sizeof(methods[0])); ++i) {\n");
-      Printf(w->code, "  Swig::director_methids[i] = jenv->GetStaticMethodID(jcls, methods[i].method, methods[i].signature);\n");
-      Printf(w->code, "  if (!Swig::director_methids[i]) return;\n");
+      Printf(w->code, "  Swig::director_method_ids[i] = jenv->GetStaticMethodID(jcls, methods[i].method, methods[i].signature);\n");
+      Printf(w->code, "  if (!Swig::director_method_ids[i]) return;\n");
       Printf(w->code, "}\n");
 
       Printf(w->code, "}\n");
@@ -4100,7 +4100,7 @@ public:
       if (!is_void)
 	Printf(w->code, "jresult = (%s) ", c_ret_type);
 
-      Printf(w->code, "jenv->%s(Swig::jclass_%s, Swig::director_methids[%s], %s);\n", methop, imclass_name, methid, jupcall_args);
+      Printf(w->code, "jenv->%s(Swig::jclass_%s, Swig::director_method_ids[%s], %s);\n", methop, imclass_name, methid, jupcall_args);
 
       // Generate code to handle any Java exception thrown by director delegation
       directorExceptHandler(n, catches_list ? catches_list : throw_parm_list, w);

From 484077088c546b35ccb85c680d5bbbcc403b5679 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 18 Jul 2015 00:09:31 +0100
Subject: [PATCH 219/220] Add changes note for Python tp_doc slot and docstring

Issue #461
---
 CHANGES.current | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.current b/CHANGES.current
index 5bec5d4e0..3070bcf40 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,12 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.7 (in progress)
 ===========================
 
+2015-07-18: m7thon
+	    [Python] Docstrings provided via %feature("docstring") are now quoted and added to
+            the tp_doc slot when using python builtin classes (-builtin). When no docstring is
+            provided, the tp_doc slot is set to the fully qualified C/C++ class name.
+            Github issues #445 and #461.
+
 2015-07-07: wsfulton
 	    SWIG no longer generates a wrapper for a class' constructor if that class has
             any base class with a private destructor. This is because your compiler should

From 54aef6686ae2e3f41470fd5e94a7bee45e543f21 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 19 Jul 2015 15:10:10 +0100
Subject: [PATCH 220/220] Octave 4.0 fails in Travis

Mark as failing in Travis due to gcc 4.6 internal compiler error
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3ca009b92..9b47611b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,9 @@ matrix:
     # Occasional gcc internal compiler error
     - compiler: gcc
       env: SWIGLANG=octave SWIGJOBS=-j3 VER=3.8
+    # Occasional gcc internal compiler error
+    - compiler: gcc
+      env: SWIGLANG=octave SWIGJOBS=-j3 VER=4.0
     # Not quite working yet
     - compiler: gcc
       env: SWIGLANG=python SWIG_FEATURES=-classic