Turn MCerrorptr into an object handle

livecodefraser · livecodefraser · commit c64cde27b0ab · 2016-10-26T17:05:43.000+01:00
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -1289,7 +1289,7 @@ Exec_stat MCCard::handle(Handler_type htype, MCNameRef mess, MCParameter *params
 		}
 	}
 
-	if (stat == ES_ERROR && MCerrorptr == NULL)
+	if (stat == ES_ERROR && !MCerrorptr)
 		MCerrorptr = this;
 
 	return stat;
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -1940,7 +1940,7 @@ void MCEngineEvalTargetAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 
 void MCEngineEvalErrorObjectAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)
 {
-    if (MCerrorptr != nil)
+    if (MCerrorptr)
     {
         r_object . object = MCerrorptr;
         r_object . part_id = 0;
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -190,7 +190,7 @@ void MCKeywordsExecCommandOrFunction(MCExecContext& ctxt, bool resolved, MCHandl
             case ES_ERROR:
             case ES_PASS:
                 MCeerror->add(is_function ? EE_FUNCTION_BADFUNCTION : EE_STATEMENT_BADCOMMAND, line, pos, handler -> getname());
-                if (MCerrorptr == NULL)
+                if (!MCerrorptr)
                     MCerrorptr = p;
                 stat = ES_ERROR;
                 break;
diff --git a/engine/src/globals.cpp b/engine/src/globals.cpp
@@ -271,8 +271,8 @@ MCStackHandle MCclickstackptr;
 MCStackHandle MCfocusedstackptr;
 MCCardHandle MCdynamiccard;
 Boolean MCdynamicpath;
-MCObject *MCerrorptr;
 MCObject *MCerrorlockptr;
+MCObjectHandle MCerrorptr;
 MCObjectPtr MCtargetptr;
 MCGroup *MCsavegroupptr;
 MCGroup *MCdefaultmenubar;
diff --git a/engine/src/globals.h b/engine/src/globals.h
@@ -191,13 +191,13 @@ extern MCObjectPtr MCtargetptr;
 extern MCObjectHandle MCmenuobjectptr;
 extern MCCardHandle MCdynamiccard;
 extern Boolean MCdynamicpath;
-extern MCObject *MCerrorptr;
 extern MCObject *MCerrorlockptr;
 extern MCGroup *MCsavegroupptr;
 extern MCGroup *MCdefaultmenubar;
 extern MCGroup *MCmenubar;
 extern MCAudioClip *MCacptr;
 extern MCPlayer *MCplayers;
+extern MCObjectHandle MCerrorptr;
 
 extern MCStack *MCtemplatestack;
 extern MCAudioClip *MCtemplateaudio;
diff --git a/engine/src/mcerror.cpp b/engine/src/mcerror.cpp
@@ -125,7 +125,7 @@ void MCError::clear()
     MCStringCreateMutable(0, buffer);
 	thrown = False;
 	if (this == MCeerror)
-		MCerrorptr = NULL;
+		MCerrorptr = nil;
 }
 
 void MCError::geterrorloc(uint2 &line, uint2 &pos)
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -298,7 +298,7 @@ MCObject::~MCObject()
 	MCB_clearbreaks(this);
 
 	if (MCerrorptr == this)
-		MCerrorptr = NULL;
+		MCerrorptr = nil;
 	if (state & CS_SELECTED)
 		MCselected->remove(this);
 	IO_freeobject(this);
@@ -1165,7 +1165,7 @@ Exec_stat MCObject::handle(Handler_type htype, MCNameRef mess, MCParameter *para
 		}
 	}
 
-	if (stat == ES_ERROR && MCerrorptr == NULL)
+	if (stat == ES_ERROR && !MCerrorptr)
 		MCerrorptr = this;
 
 	return stat;
@@ -2283,13 +2283,13 @@ void MCObject::senderror()
 		/* UNCHECKED */ MCperror->copyasstringref(&t_perror);
 		MCperror->clear();
 	}
-	if (MCerrorptr == NULL)
+	if (!MCerrorptr)
 		MCerrorptr = this;
 	MCAutoStringRef t_eerror;
 	/* UNCHECKED */ MCeerror->copyasstringref(&t_eerror);
 	MCscreen->delaymessage(MCerrorlockptr == NULL ? MCerrorptr : MCerrorlockptr, MCM_error_dialog, *t_eerror, *t_perror);
 	MCeerror->clear();
-	MCerrorptr = NULL;
+	MCerrorptr = nil;
 }
 
 void MCObject::sendmessage(Handler_type htype, MCNameRef m, Boolean h)
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -1554,7 +1554,7 @@ Exec_stat MCStack::handle(Handler_type htype, MCNameRef message, MCParameter *pa
 			stat = ES_PASS;
 	}
 
-	if (stat == ES_ERROR && MCerrorptr == NULL)
+	if (stat == ES_ERROR && !MCerrorptr)
 		MCerrorptr = this;
 
 	return stat;
diff --git a/engine/src/widget.cpp b/engine/src/widget.cpp
@@ -981,7 +981,7 @@ void MCWidget::SendError(void)
 {
     MCExecContext ctxt(this, nil, nil);
     MCExtensionCatchError(ctxt);
-    if (MCerrorptr == NULL)
+    if (!MCerrorptr)
         MCerrorptr = this;
     senderror();
 }

Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,7 @@ Exec_stat MCCard::handle(Handler_type htype, MCNameRef mess, MCParameter *params`
`1289`	`1289`	`}`
`1290`	`1290`	`}`
`1291`	`1291`
`1292`		`- if (stat == ES_ERROR && MCerrorptr == NULL)`
	`1292`	`+ if (stat == ES_ERROR && !MCerrorptr)`
`1293`	`1293`	`MCerrorptr = this;`
`1294`	`1294`
`1295`	`1295`	`return stat;`
Original file line number	Diff line number	Diff line change
`@@ -1940,7 +1940,7 @@ void MCEngineEvalTargetAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1940`	`1940`
`1941`	`1941`	`void MCEngineEvalErrorObjectAsObject(MCExecContext& ctxt, MCObjectPtr& r_object)`
`1942`	`1942`	`{`
`1943`		`- if (MCerrorptr != nil)`
	`1943`	`+ if (MCerrorptr)`
`1944`	`1944`	`{`
`1945`	`1945`	`r_object . object = MCerrorptr;`
`1946`	`1946`	`r_object . part_id = 0;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void MCError::clear()`
`125`	`125`	`MCStringCreateMutable(0, buffer);`
`126`	`126`	`thrown = False;`
`127`	`127`	`if (this == MCeerror)`
`128`		`- MCerrorptr = NULL;`
	`128`	`+ MCerrorptr = nil;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`void MCError::geterrorloc(uint2 &line, uint2 &pos)`
Original file line number	Diff line number	Diff line change
`@@ -1554,7 +1554,7 @@ Exec_stat MCStack::handle(Handler_type htype, MCNameRef message, MCParameter *pa`
`1554`	`1554`	`stat = ES_PASS;`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`		`- if (stat == ES_ERROR && MCerrorptr == NULL)`
	`1557`	`+ if (stat == ES_ERROR && !MCerrorptr)`
`1558`	`1558`	`MCerrorptr = this;`
`1559`	`1559`
`1560`	`1560`	`return stat;`
Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@ void MCWidget::SendError(void)`
`981`	`981`	`{`
`982`	`982`	`MCExecContext ctxt(this, nil, nil);`
`983`	`983`	`MCExtensionCatchError(ctxt);`
`984`		`- if (MCerrorptr == NULL)`
	`984`	`+ if (!MCerrorptr)`
`985`	`985`	`MCerrorptr = this;`
`986`	`986`	`senderror();`
`987`	`987`	`}`