Another merge with master.

Change Doxygen error codes to start at 740 instead of at 720 as the latter was
taken by Scilab in the meanwhile.

Resolve conflicts in autodoc_runme.py once again.

Examples/test-suite/errors/.gitignore

@@ -0,0 +1,4 @@
+*.newerr
+cpp_recursive_typedef.py
+cpp_shared_ptr.py
+xxx.py

Examples/test-suite/errors/c_extra_rblock.stderr

@@ -1 +1 @@
-c_extra_rblock.i:5: Error: Syntax error in input(1).
+c_extra_rblock.i:5: Error: Syntax error. Extraneous '%}'

Examples/test-suite/errors/c_missing_semi.stderr

@@ -1 +1 @@
-c_missing_semi.i:3: Error: Syntax error in input(1).
+c_missing_semi.i:3: Error: Syntax error - possibly a missing semicolon.

Examples/test-suite/errors/cpp_extra_brackets.stderr

@@ -1 +1 @@
-cpp_extra_brackets.i:5: Error: Syntax error in input(3).
+cpp_extra_brackets.i:5: Error: Unexpected ')'.

Examples/test-suite/errors/doxygen_unknown_command.stderr

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

Examples/test-suite/errors/pp_missing_enddef.stderr

@@ -1 +1 @@
-pp_missing_enddef.i:EOF: Error: Missing %enddef for macro starting on line 3
+pp_missing_enddef.i:3: Error: Missing %enddef for macro starting here

Examples/test-suite/errors/pp_missing_endif.stderr

@@ -1 +1 @@
-pp_missing_endif.i:EOF: Error: Missing #endif for conditional starting on line 3
+pp_missing_endif.i:3: Error: Missing #endif for conditional starting here

Examples/test-suite/errors/pp_missing_endoffile.i

@@ -0,0 +1,7 @@
+%module xxx
+/* %beginfile and %endoffile are internal directives inserted when %include is
+ * used.  Users should never use them directly, but test coverage for this
+ * error message still seems useful to have.
+ */
+%includefile "dummy.i" %beginfile
+

Examples/test-suite/errors/pp_missing_endoffile.stderr

@@ -0,0 +1 @@
+pp_missing_endoffile.i:6: Error: Missing %endoffile for file inclusion block starting here

Examples/test-suite/errors/pp_missing_rblock.stderr

@@ -1 +1 @@
-pp_missing_rblock.i:EOF: Error: Unterminated %{ ... %} block starting on line 3
+pp_missing_rblock.i:3: Error: Unterminated %{ ... %} block

Examples/test-suite/errors/pp_unknowndirective.i

@@ -0,0 +1,7 @@
+%module xxx
+
+/* 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.
+ */
+%remane("typo") tyop;

Examples/test-suite/errors/pp_unknowndirective.stderr

@@ -0,0 +1 @@
+pp_unknowndirective.i:7: Error: Unknown directive '%remane'.

Examples/test-suite/errors/pp_unknowndirective2.i

@@ -0,0 +1,11 @@
+%module xxx
+
+#ifdef 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. */
+#elsif defined(BAR)
+long i;
+#else
+int i;
+#endif

Examples/test-suite/errors/pp_unknowndirective2.stderr

@@ -0,0 +1 @@
+pp_unknowndirective2.i:7: Error: Unknown SWIG preprocessor directive: elsif (if this is a block of target language code, delimit it with %{ and %})

Examples/test-suite/errors/pp_unterm_char.stderr

@@ -1 +1 @@
-pp_unterm_char.i:EOF: Error: Unterminated character constant starting at line 4
+pp_unterm_char.i:4: Error: Unterminated character constant

Examples/test-suite/errors/pp_unterm_comment.stderr

@@ -1 +1 @@
-pp_unterm_comment.i:EOF: Error: Unterminated comment starting on line 3
+pp_unterm_comment.i:3: Error: Unterminated comment

Examples/test-suite/errors/pp_unterm_string.stderr

@@ -1 +1 @@
-pp_unterm_string.i:EOF: Error: Unterminated string constant starting at line 4
+pp_unterm_string.i:4: Error: Unterminated string constant

Examples/test-suite/errors/pp_unterminated_block.i

@@ -0,0 +1,5 @@
+%module xxx
+
+%{
+int foo(int x);
+

Examples/test-suite/errors/pp_unterminated_block.stderr

@@ -0,0 +1 @@
+pp_unterminated_block.i:3: Error: Unterminated %{ ... %} block