thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-01-31 09:57:14 +01:00
Code Releases Activity

Adjusted routine messages to exclude unnecessary details except for places where the script error handler will catch the error location.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-03-12 22:51:05 +02:00
parent f7f5eb82e5
commit a5b353b104
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/Routine.cpp
View File

@ -250,7 +250,7 @@ Routine::Routine(Object & env, Function & func, Interval interval)
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
{ {
Create(); Create();
@ -263,7 +263,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
{ {
Create(); Create();
@ -278,7 +278,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
, m_Arg1(a1) , m_Arg1(a1)
{ {
@ -294,7 +294,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
, m_Arg1(a1), m_Arg2(a2) , m_Arg1(a1), m_Arg2(a2)
{ {
@ -310,7 +310,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
, m_Arg1(a1), m_Arg2(a2), m_Arg3(a3) , m_Arg1(a1), m_Arg2(a2), m_Arg3(a3)
{ {
@ -326,7 +326,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
, m_Arg1(a1), m_Arg2(a2), m_Arg3(a3), m_Arg4(a4) , m_Arg1(a1), m_Arg2(a2), m_Arg3(a3), m_Arg4(a4)
{ {
@ -342,7 +342,7 @@ Routine::Routine(Object & env, Function & func, Interval interval, Iterate itera
, m_Suspended(false) , m_Suspended(false)
, m_Terminated(false) , m_Terminated(false)
, m_Callback(env.GetVM(), env, func.GetFunc()) , m_Callback(env.GetVM(), env, func.GetFunc())
, m_Tag() , m_Tag(_SC(""))
, m_Data() , m_Data()
, m_Arg1(a1), m_Arg2(a2), m_Arg3(a3), m_Arg4(a4), m_Arg5(a5) , m_Arg1(a1), m_Arg2(a2), m_Arg3(a3), m_Arg4(a4), m_Arg5(a5)
{ {
@ -391,7 +391,7 @@ const String & Routine::GetTag() const
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Routine::SetTag(CSStr tag) void Routine::SetTag(CSStr tag)
{ {
m_Tag.assign(tag); m_Tag.assign(tag ? tag : _SC(""));
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -415,7 +415,7 @@ void Routine::SetData(Object & data)
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
Routine & Routine::ApplyTag(CSStr tag) Routine & Routine::ApplyTag(CSStr tag)
{ {
m_Tag.assign(tag); m_Tag.assign(tag ? tag : _SC(""));
// Allow chaining // Allow chaining
return *this; return *this;
} }
@ -437,7 +437,7 @@ void Routine::Terminate()
// Was the routine already terminated? // Was the routine already terminated?
if (m_Terminated) if (m_Terminated)
{ {
SqThrowF("Routine [%s] => Was already terminated", m_Tag.c_str()); SqThrowF("Routine was already terminated");
} }
// Detach from the associated bucket // Detach from the associated bucket
Detach(); Detach();
@ -467,7 +467,7 @@ Routine & Routine::SetArg(Uint8 num, Object & val)
case 12: m_Arg12 = val; break; case 12: m_Arg12 = val; break;
case 13: m_Arg13 = val; break; case 13: m_Arg13 = val; break;
case 14: m_Arg14 = val; break; case 14: m_Arg14 = val; break;
default: SqThrowF("Routine [%s] => Argument is out of range: %d", m_Tag.c_str(), num); default: SqThrowF("Argument is out of range: %d", num);
} }
// Allow chaining // Allow chaining
return *this; return *this;
@ -495,7 +495,7 @@ Object & Routine::GetArg(Uint8 num)
case 12: return m_Arg12; case 12: return m_Arg12;
case 13: return m_Arg13; case 13: return m_Arg13;
case 14: return m_Arg14; case 14: return m_Arg14;
default: SqThrowF("Routine [%s] => Argument is out of range: %d", m_Tag.c_str(), num); default: SqThrowF("Argument is out of range: %d", num);
} }
// Shouldn't really reach this point // Shouldn't really reach this point
return NullObject(); return NullObject();
@ -515,7 +515,7 @@ void Routine::SetInterval(Interval interval)
// Is the specified interval valid? // Is the specified interval valid?
if (!interval) if (!interval)
{ {
SqThrowF("Routine [%s] => Invalid interval", m_Tag.c_str()); SqThrowF("Invalid routine interval");
} }
// Detach from the current bucket // Detach from the current bucket
Detach(); Detach();
@ -553,7 +553,7 @@ void Routine::SetArguments(Uint8 num)
// Is the specified argument count valid? // Is the specified argument count valid?
if (num > 14) if (num > 14)
{ {
SqThrowF("Routine [%s] => Argument is out of range: %d", m_Tag.c_str(), num); SqThrowF("Argument is out of range: %d", num);
} }
// Perform the requested operation // Perform the requested operation
m_Arguments = num; m_Arguments = num;
@ -633,12 +633,12 @@ void Routine::Create()
// Do we even have a valid interval? // Do we even have a valid interval?
if (!m_Interval) if (!m_Interval)
{ {
SqThrowF("Routine [%s] => Invalid interval", m_Tag.c_str()); SqThrowF("Invalid routine interval");
} }
// Is the specified callback even valid? // Is the specified callback even valid?
else if (m_Callback.IsNull()) else if (m_Callback.IsNull())
{ {
SqThrowF("Routine [%s] => Invalid callback", m_Tag.c_str()); SqThrowF("Invalid routine callback");
} }
// Always use the command queue to attach the routine when created // Always use the command queue to attach the routine when created
s_Queue.emplace_back(this, m_Interval, CMD_ATTACH); s_Queue.emplace_back(this, m_Interval, CMD_ATTACH);
@ -703,7 +703,7 @@ void Routine::Execute()
// Make sure that we have a known number of arguments // Make sure that we have a known number of arguments
else if (m_Arguments > 14) else if (m_Arguments > 14)
{ {
SqThrowF("Routine [%s] => Out of range argument count: %d", m_Tag.c_str(), m_Arguments); SqThrowF("Routine [%s] => Out of range argument count [%d]", m_Tag.c_str(), m_Arguments);
} }
// Attempt to forward the call // Attempt to forward the call
try try
@ -767,15 +767,15 @@ void Routine::Execute()
} }
catch (const Sqrat::Exception & e) catch (const Sqrat::Exception & e)
{ {
SqThrowF("Routine [%s] => Squirrel error: %s", m_Tag.c_str(), e.Message().c_str()); LogErr("Routine [%s] => Squirrel error [%s]", m_Tag.c_str(), e.Message().c_str());
} }
catch (const std::exception & e) catch (const std::exception & e)
{ {
SqThrowF("Routine [%s] => Program error: %s", m_Tag.c_str(), e.what()); LogErr("Routine [%s] => Program error [%s]", m_Tag.c_str(), e.what());
} }
catch (...) catch (...)
{ {
SqThrowF("Routine [%s] => Unknown error", m_Tag.c_str()); LogErr("Routine [%s] => Unknown error", m_Tag.c_str());
} }
// Decrease the number of iterations if necessary // Decrease the number of iterations if necessary
if (m_Iterations && (--m_Iterations) == 0) if (m_Iterations && (--m_Iterations) == 0)

2
source/Routine.hpp
View File

@ -231,7 +231,7 @@ protected:
{ {
if (m_Terminated) if (m_Terminated)
{ {
SqThrowF("Routine [%s] => Was terminated", m_Tag.c_str()); SqThrowF("Routine was terminated [%s]", m_Tag.c_str());
} }
} }