cpp/openttd-patchpack/source Changeset - r27437:c8c76aa89930

Changeset - r27437:c8c76aa89930

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Loïc Guilloux - 17 months ago 2023-05-25 10:46:27
glx22@users.noreply.github.com

Fix #10867, 8b93e45: Squirrel compile error exception type changed (#10869)

1 file changed with 3 insertions and 3 deletions:

src/3rdparty/squirrel/squirrel/sqcompiler.cpp

0 comments (0 inline, 0 general)

src/3rdparty/squirrel/squirrel/sqcompiler.cpp

➞

Show inline comments

@@ @@ -179,18 +179,18 @@ public: @@
 			o =_fs->BuildProto();
 #ifdef _DEBUG_DUMP
 			_fs->Dump(_funcproto(o));
 #endif
 			return true;
+		}
-		catch (SQChar *compilererror) {
+		catch (const std::string &compilererror) {
 			if(_raiseerror && _ss(_vm)->_compilererrorhandler) {
 				_ss(_vm)->_compilererrorhandler(_vm, compilererror, type(_sourcename) == OT_STRING?_stringval(_sourcename):"unknown",
+				_ss(_vm)->_compilererrorhandler(_vm, compilererror.c_str(), type(_sourcename) == OT_STRING ? _stringval(_sourcename) : "unknown",
 					_lex._currentline, _lex._currentcolumn);
+			}
 			_vm->_lasterror = SQString::Create(_ss(_vm), compilererror, -1);
+			_vm->_lasterror = SQString::Create(_ss(_vm), compilererror.c_str(), -1);
 			return false;
+		}
+	}
 	void Statements()
+	{
 		while(_token != '}' && _token != TK_DEFAULT && _token != TK_CASE) {

0 comments (0 inline, 0 general)