Another merge with master.

Updated Doxygen error numbers yet again, as Python errors got added in the
meanwhile, pushing the Doxygen ones further off.

And re-merged PEP8/whitespace-related conflicts in autodoc_runme.py once again
(if anybody is looking for a motivating example about why significant
whitespace is bad, here is a great use case).

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)
+  };
+};

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);

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

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();
+  };
+};

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

Examples/test-suite/errors/doxygen_unknown_command.stderr

@@ -1 +1 @@
-doxygen_unknown_command.i:4: Warning 740: Doxygen parser warning: unknown command "unknown".
+doxygen_unknown_command.i:4: Warning 760: Doxygen parser warning: unknown command "unknown".

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.

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

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. */

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
+%}

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)

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"
+%}

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)