cppgenerator: get rid of all goto constructs

[ChangeLog][shiboken6] The generated code no longer contains `goto`.

Change-Id: I3b90abafd8dbe2c19b4fffb7880322451d1ed068
Fixes: PYSIDE-2256
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 19 insertions, 2 deletions

diff --git a/sources/shiboken6/libshiboken/basewrapper.h b/sources/shiboken6/libshiboken/basewrapper.h
index 86806c917..1d1127b8e 100644
--- a/sources/shiboken6/libshiboken/basewrapper.h
+++ b/sources/shiboken6/libshiboken/basewrapper.h
@@ -130,11 +130,28 @@ void callCppDestructor(void *cptr)
     delete reinterpret_cast<T *>(cptr);
 }
 
-// setErrorAboutWrongArguments now gets overload information from the signature module.
-// The extra info argument can contain additional data about the error.
+/// setErrorAboutWrongArguments now gets overload information from the signature module.
+/// The extra info argument can contain additional data about the error.
 LIBSHIBOKEN_API void setErrorAboutWrongArguments(PyObject *args, const char *funcName,
                                                  PyObject *info);
 
+/// Return values for the different retun variants.
+/// This is used instead of goto.
+LIBSHIBOKEN_API PyObject *returnWrongArguments(PyObject *args, const char *funcName,
+                                               PyObject *info);
+
+LIBSHIBOKEN_API int returnWrongArguments_Zero(PyObject *args, const char *funcName,
+                                                    PyObject *info);
+
+LIBSHIBOKEN_API int returnWrongArguments_MinusOne(PyObject *args, const char *funcName,
+                                                        PyObject *info);
+
+LIBSHIBOKEN_API void returnWrongArguments_Void(PyObject *args, const char *funcName,
+                                                    PyObject *info);
+
+/// A simple special version for the end of rich comparison.
+LIBSHIBOKEN_API PyObject *returnFromRichCompare(PyObject *result);
+
 // Return error information object if the argument count is wrong
 LIBSHIBOKEN_API PyObject *checkInvalidArgumentCount(Py_ssize_t numArgs,
                                                     Py_ssize_t minArgs,