Don't store a separate error / stack string

mkeeter · mkeeter · commit 658c8daf7340 · 2021-04-02T08:44:45.000-04:00
diff --git a/studio/include/studio/result.hpp b/studio/include/studio/result.hpp
@@ -29,7 +29,6 @@ class Shape;
 
 struct Error {
     QString error;
-    QString stack;
     QRect range;
 };
 
diff --git a/studio/src/editor.cpp b/studio/src/editor.cpp
@@ -142,7 +142,7 @@ void Editor::onInterpreterDone(Result r)
 
         emit(shapes(r.shapes));
     } else {
-        setResult(Color::red, r.error.error + "\n\nStack trace:\n" + r.error.stack);
+        setResult(Color::red, r.error.error);
 
         // Add new selections for errors in the script doc
         QTextCursor c(script_doc);
diff --git a/studio/src/guile/interpreter.cpp b/studio/src/guile/interpreter.cpp
@@ -247,10 +247,10 @@ void Interpreter::eval(QString script)
         const int end_col = scm_to_int(scm_cdr(after));
 
         out.error = Error {
-            QString(str), QString(stack),
-                QRect(start_col, start_row,
-                      end_col - start_col + 1,
-                      end_row - start_row) };
+            QString(str) + "\n\nStack trace:\n" + QString(stack),
+            QRect(start_col, start_row,
+                  end_col - start_col + 1,
+                  end_row - start_row) };
         free(str);
         free(stack);
     }
diff --git a/studio/src/python/interpreter.cpp b/studio/src/python/interpreter.cpp
@@ -535,7 +535,7 @@ void Interpreter::eval(QString script)
         const auto s = PyObject_Str(value);
         const auto ws = PyUnicode_AsWideCharString(s, NULL);
         PyErr_Print();
-        out.error = {QString::fromWCharArray(ws), "", QRect()};
+        out.error = {QString::fromWCharArray(ws), QRect()};
         PyMem_Free(ws);
         Py_XDECREF(s);
     }

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ void Interpreter::eval(QString script)`
`535`	`535`	`const auto s = PyObject_Str(value);`
`536`	`536`	`const auto ws = PyUnicode_AsWideCharString(s, NULL);`
`537`	`537`	`PyErr_Print();`
`538`		`- out.error = {QString::fromWCharArray(ws), "", QRect()};`
	`538`	`+ out.error = {QString::fromWCharArray(ws), QRect()};`
`539`	`539`	`PyMem_Free(ws);`
`540`	`540`	`Py_XDECREF(s);`
`541`	`541`	`}`