Turn MCtracestackptr into an object handle

livecodefraser · livecodefraser · commit 874323e29127 · 2016-10-26T17:13:31.000+01:00
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -45,7 +45,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 ////////////////////////////////////////////////////////////////////////////////
 
 MCExecContext *MCECptr;
-MCStack *MCtracestackptr;
+MCStackHandle MCtracestackptr;
 Window MCtracewindow;
 Boolean MCtrace;
 Boolean MCtraceabort;
@@ -177,7 +177,7 @@ void MCB_message(MCExecContext &ctxt, MCNameRef mess, MCParameter *p)
 	MCU_resetprops(True);
 
 	MCtrace = False;
-	if (MCtracestackptr != NULL)
+	if (MCtracestackptr)
 		MCtracewindow = MCtracestackptr->getw();
 	else
 		MCtracewindow = ctxt.GetObject()->getw();
@@ -214,7 +214,7 @@ void MCB_message(MCExecContext &ctxt, MCNameRef mess, MCParameter *p)
 			exitall = True;
 		}
 		else
-			if (MCtracestackptr != NULL)
+			if (MCtracestackptr)
 				MCtrace = True;
 	 }
 	 MCcheckstack = oldcheck;
diff --git a/engine/src/debug.h b/engine/src/debug.h
@@ -17,6 +17,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef __MC_DEBUG_H__
 #define __MC_DEBUG_H__
 
+#include "stack.h"
+
 //
 // script debugger functions
 //
@@ -44,7 +46,7 @@ struct Watchvar
 #define MAX_CONTEXTS 100
 
 extern MCExecContext *MCECptr;
-extern MCStack *MCtracestackptr;
+extern MCStackHandle MCtracestackptr;
 extern Window MCtracewindow;
 extern Boolean MCtrace;
 extern Boolean MCtraceabort;
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -89,7 +89,7 @@ void MCPlatformHandleApplicationShutdownRequest(bool& r_terminate)
 			MCdefaultstackptr->getcard()->message(MCM_shut_down);
 			MCquit = True;
 			MCexitall = True;
-			MCtracestackptr = NULL;
+			MCtracestackptr = nil;
 			MCtraceabort = True;
 			MCtracereturn = True;
 			r_terminate = true;
diff --git a/engine/src/eventqueue.cpp b/engine/src/eventqueue.cpp
@@ -278,7 +278,7 @@ static void MCEventQueueDispatchEvent(MCEvent *p_event)
 				MCdefaultstackptr->getcard()->message(MCM_shut_down);
 				MCquit = True;
 				MCexitall = True;
-				MCtracestackptr = NULL;
+				MCtracestackptr = nil;
 				MCtraceabort = True;
 				MCtracereturn = True;
 				break;
diff --git a/engine/src/exec-debugging.cpp b/engine/src/exec-debugging.cpp
@@ -134,7 +134,7 @@ void MCDebuggingSetTraceReturn(MCExecContext& ctxtm, bool p_value)
 
 void MCDebuggingGetTraceStack(MCExecContext& ctxt, MCStringRef& r_value)
 {
-	if (MCtracestackptr == nil)
+	if (!MCtracestackptr)
 	{
 		r_value = (MCStringRef)MCValueRetain(kMCEmptyString);
 		return;
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -929,7 +929,7 @@ void MCEngineExecQuit(MCExecContext& ctxt, integer_t p_retcode)
 	MCquit = True;
 	MCquitisexplicit = True;
 	MCexitall = True;
-	MCtracestackptr = NULL;
+	MCtracestackptr = nil;
 	MCtraceabort = True;
 	MCtracereturn = True;
 }
diff --git a/engine/src/mode_development.cpp b/engine/src/mode_development.cpp
@@ -252,7 +252,7 @@ void MCRevRelicense::exec_ctxt(MCExecContext& ctxt)
 	MCretcode = 0;
 	MCquit = True;
 	MCexitall = True;
-	MCtracestackptr = NULL;
+	MCtracestackptr = nil;
 	MCtraceabort = True;
 	MCtracereturn = True;
     
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -932,7 +932,7 @@ Exec_stat MCObject::exechandler(MCHandler *hptr, MCParameter *params)
 	
 	lockforexecution();
     MCExecContext ctxt(this, hlist, hptr);
-	if (MCtracestackptr != NULL && MCtracereturn)
+	if (MCtracestackptr && MCtracereturn)
 	{
 		Boolean oldtrace = MCtrace;
 		if (MCtracestackptr == getstack())
@@ -989,7 +989,7 @@ Exec_stat MCObject::execparenthandler(MCHandler *hptr, MCParameter *params, MCPa
 
     MCExecContext ctxt(this, t_parentscript_object -> hlist, hptr);
 	ctxt.SetParentScript(parentscript);
-	if (MCtracestackptr != NULL && MCtracereturn)
+	if (MCtracestackptr && MCtracereturn)
 	{
 		Boolean oldtrace = MCtrace;
 		if (MCtracestackptr == getstack())

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void MCDebuggingSetTraceReturn(MCExecContext& ctxtm, bool p_value)`
`134`	`134`
`135`	`135`	`void MCDebuggingGetTraceStack(MCExecContext& ctxt, MCStringRef& r_value)`
`136`	`136`	`{`
`137`		`- if (MCtracestackptr == nil)`
	`137`	`+ if (!MCtracestackptr)`
`138`	`138`	`{`
`139`	`139`	`r_value = (MCStringRef)MCValueRetain(kMCEmptyString);`
`140`	`140`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ void MCEngineExecQuit(MCExecContext& ctxt, integer_t p_retcode)`
`929`	`929`	`MCquit = True;`
`930`	`930`	`MCquitisexplicit = True;`
`931`	`931`	`MCexitall = True;`
`932`		`- MCtracestackptr = NULL;`
	`932`	`+ MCtracestackptr = nil;`
`933`	`933`	`MCtraceabort = True;`
`934`	`934`	`MCtracereturn = True;`
`935`	`935`	`}`