remove unsupported gotos

Roberto De Ioris · Roberto De Ioris · commit 89571c5f4be4 · 2016-08-23T12:55:49.000+02:00
diff --git a/Source/PythonConsole/Private/SPythonLog.cpp b/Source/PythonConsole/Private/SPythonLog.cpp
@@ -197,35 +197,51 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 				PyErr_Fetch(&type, &value, &traceback);
 				PyErr_NormalizeException(&type, &value, &traceback);
 
-				if (!value)
-					goto end;
+				if (!value) {
+					PyErr_Clear();
+					OnConsoleCommandExecuted.ExecuteIfBound();
+					return;
+				}
 
 				char *msg = NULL;
 				PyObject *zero = PyUnicode_AsUTF8String(PyObject_Str(value));
 				if (zero) {
 					msg = PyBytes_AsString(zero);
 				}
 
-				if (!msg)
-					goto end;
+				if (!msg) {
+					PyErr_Clear();
+					OnConsoleCommandExecuted.ExecuteIfBound();
+					return;
+				}
 
 				UE_LOG(LogTemp, Error, TEXT("%s"), UTF8_TO_TCHAR(msg));
 
 				// taken from uWSGI ;)
-				if (!traceback) goto end;
+				if (!traceback) {
+					PyErr_Clear();
+					OnConsoleCommandExecuted.ExecuteIfBound();
+					return;
+				}
 
 				PyObject *traceback_module = PyImport_ImportModule("traceback");
 				if (!traceback_module) {
-					goto end;
+					PyErr_Clear();
+					OnConsoleCommandExecuted.ExecuteIfBound();
+					return;
 				}
 
 				PyObject *traceback_dict = PyModule_GetDict(traceback_module);
 				PyObject *format_exception = PyDict_GetItemString(traceback_dict, "format_exception");
 
 				if (format_exception) {
 					PyObject *ret = PyObject_CallFunctionObjArgs(format_exception, type, value, traceback, NULL);
-					if (!ret)
-						goto end;
+					if (!ret) {
+						PyErr_Clear();
+						OnConsoleCommandExecuted.ExecuteIfBound();
+						return;
+					}
+						
 					if (PyList_Check(ret)) {
 						for (int i = 0; i < PyList_Size(ret); i++) {
 							PyObject *item = PyList_GetItem(ret, i);
@@ -238,8 +254,6 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 						UE_LOG(LogTemp, Error, TEXT("%s"), UTF8_TO_TCHAR(PyUnicode_AsUTF8(PyObject_Str(ret))));
 					}
 				}
-
-			end:
 				PyErr_Clear();
 			}
 		}
