Removals of GetEP() calls where possible

livecodepanos · livecodepanos · commit 12f438d5cd57 · 2013-12-03T13:54:56.000Z
diff --git a/engine/src/debug.cpp b/engine/src/debug.cpp
@@ -211,7 +211,7 @@ void MCB_prepmessage(MCExecContext &ctxt, MCNameRef mess, uint2 line, uint2 pos,
 	Boolean added = False;
 	if (MCnexecutioncontexts < MAX_CONTEXTS)
 	{
-		ctxt.GetEP().setline(line);
+		ctxt.SetLine(line);
 		MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;
 		added = True;
 	}
diff --git a/engine/src/exec-debugging.cpp b/engine/src/exec-debugging.cpp
@@ -63,7 +63,7 @@ void MCDebuggingExecDebugDo(MCExecContext& ctxt, MCStringRef p_script, uinteger_
 	Boolean added = False;
 	if (MCnexecutioncontexts < MAX_CONTEXTS)
 	{
-		ctxt.GetEP().setline(p_line);
+		ctxt.SetLine(p_line);
 		MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;
 		added = True;
 	}
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -780,7 +780,7 @@ void MCEngineExecDo(MCExecContext& ctxt, MCStringRef p_script, int p_line, int p
 	Boolean added = False;
 	if (MCnexecutioncontexts < MAX_CONTEXTS)
 	{
-		ctxt.GetEP().setline(p_line);
+		ctxt.SetLine(p_line);
 		MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;
 		added = True;
 	}
diff --git a/engine/src/exec-interface.cpp b/engine/src/exec-interface.cpp
@@ -365,14 +365,12 @@ MCExecEnumTypeInfo *kMCInterfaceWindowAlignmentTypeInfo = &_kMCInterfaceWindowAl
 
 bool MCInterfaceTryToResolveObject(MCExecContext& ctxt, MCStringRef long_id, MCObjectPtr& r_object)
 {
-	ctxt.GetEP().setvalueref(long_id);
-	
 	bool t_found;
 	t_found = false;
 	
 	MCChunk *tchunk = new MCChunk(False);
 	MCerrorlock++;
-	MCScriptPoint sp(ctxt);
+	MCScriptPoint sp(long_id);
 	if (tchunk->parse(sp, False) == PS_NORMAL)
 	{
 		if (tchunk->getobj(ctxt, r_object, True))
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -171,7 +171,7 @@ void MCKeywordsExecCommandOrFunction(MCExecContext& ctxt, bool resolved, MCHandl
 	Boolean added = False;
 	if (MCnexecutioncontexts < MAX_CONTEXTS)
 	{
-		ctxt . GetEP() . setline(line);
+		ctxt . SetLine(line);
 		MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;
 		added = True;
 	}
@@ -610,7 +610,7 @@ void MCKeywordsExecTry(MCExecContext& ctxt, MCStatement *trystatements, MCStatem
 			if (MCexitall)
 				break;
 		}
-		ctxt . GetEP() . setline(tspr->getline());
+		ctxt . SetLine(tspr->getline());
         
 		stat = tspr->exec(ctxt . GetEP());
         
diff --git a/engine/src/externalv0.cpp b/engine/src/externalv0.cpp
@@ -286,6 +286,7 @@ static Exec_stat getvarptr(MCExecContext& ctxt, const MCString &vname,MCVariable
 	/* UNCHECKED */ t_name . CreateWithOldString(vname);
 
 	MCVarref *newvar;
+    
 	if (MCECptr->GetEP().findvar(t_name, &newvar) != PS_NORMAL)
 		return ES_ERROR;
 	
diff --git a/engine/src/handler.cpp b/engine/src/handler.cpp
@@ -943,8 +943,7 @@ Exec_stat MCHandler::getvarnames(MCExecPoint& ep, Boolean all)
 
 void MCHandler::eval(MCExecContext &ctxt, MCStringRef p_expression, MCValueRef &r_value)
 {
-	ctxt.GetEP().setvalueref(p_expression);
-	MCScriptPoint sp(ctxt);
+	MCScriptPoint sp(p_expression);
 	sp.sethandler(this);
 	MCExpression *exp = NULL;
 	Symbol_type type;
diff --git a/engine/src/hndlrlst.cpp b/engine/src/hndlrlst.cpp
@@ -242,9 +242,9 @@ Parse_stat MCHandlerlist::findvar(MCNameRef p_name, bool p_ignore_uql, MCVarref
 	if (MCdebugcontext != MAXUINT2)
 	{
 		MCExecContext *ctxtptr = MCexecutioncontexts[MCdebugcontext];
-		if (ctxtptr->GetEP().gethlist() != this)
+		if (ctxtptr->GetHandlerList() != this)
 			if (ctxtptr->GetHandler()->findvar(p_name, dptr) != PS_NORMAL)
-				return ctxtptr->GetEP().gethlist()->findvar(p_name, false, dptr);
+				return ctxtptr->GetHandlerList()->findvar(p_name, false, dptr);
 			else
 				return PS_NORMAL;
 	}
diff --git a/engine/src/mblhandlers.cpp b/engine/src/mblhandlers.cpp
@@ -6069,17 +6069,19 @@ Exec_stat MCHandleSpecificCameraFeatures(void *p_context, MCParameter *p_paramet
 	
 	MCCameraFeaturesType t_features_set;
     t_features_set = (MCCameraFeaturesType)t_result;
+    MCAutoListRef t_list;
+    /* UNCHECKED */ MCListCreateMutable(EC_COMMA, &t_list);
     
 	if ((t_features_set & kMCCameraFeaturePhoto) != 0)
-		ctxt . GetEP() . concatcstring("photo", EC_COMMA, ctxt . GetEP() . isempty());
+        /* UNCHECKED */ MCListAppendCString(*t_list, "photo");
 	if ((t_features_set & kMCCameraFeatureVideo) != 0)
-		ctxt . GetEP() . concatcstring("video", EC_COMMA, ctxt . GetEP() . isempty());
+        /* UNCHECKED */ MCListAppendCString(*t_list, "video");
 	if ((t_features_set & kMCCameraFeatureFlash) != 0)
-		ctxt . GetEP() . concatcstring("flash", EC_COMMA, ctxt . GetEP() . isempty());
+        /* UNCHECKED */ MCListAppendCString(*t_list, "flash");
 	
     MCAutoStringRef t_features;
-    /* UNCHECKED */ ep . copyasstringref(&t_features);
-    ctxt . SetTheResultToValue(&t_result);
+    /* UNCHECKED */ MCListCopyAsString(*t_list, &t_features);
+    ctxt . SetTheResultToValue(*t_features);
     
 	return ES_NORMAL;
 }
diff --git a/engine/src/property.cpp b/engine/src/property.cpp
@@ -5190,7 +5190,7 @@ void MCProperty::eval_count_ctxt(MCExecContext& ctxt, MCExecValue& r_value)
 
 void MCProperty::eval_ctxt(MCExecContext& ctxt, MCExecValue& r_value)
 {
-	ctxt . GetEP() . setline(line);
+	ctxt . SetLine(line);
     
 	if (destvar != nil && which != P_CUSTOM_VAR)
 		return eval_variable_ctxt(ctxt, r_value);

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ void MCB_prepmessage(MCExecContext &ctxt, MCNameRef mess, uint2 line, uint2 pos,`
`211`	`211`	`Boolean added = False;`
`212`	`212`	`if (MCnexecutioncontexts < MAX_CONTEXTS)`
`213`	`213`	`{`
`214`		`- ctxt.GetEP().setline(line);`
	`214`	`+ ctxt.SetLine(line);`
`215`	`215`	`MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;`
`216`	`216`	`added = True;`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void MCDebuggingExecDebugDo(MCExecContext& ctxt, MCStringRef p_script, uinteger_`
`63`	`63`	`Boolean added = False;`
`64`	`64`	`if (MCnexecutioncontexts < MAX_CONTEXTS)`
`65`	`65`	`{`
`66`		`- ctxt.GetEP().setline(p_line);`
	`66`	`+ ctxt.SetLine(p_line);`
`67`	`67`	`MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;`
`68`	`68`	`added = True;`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,7 @@ void MCEngineExecDo(MCExecContext& ctxt, MCStringRef p_script, int p_line, int p`
`780`	`780`	`Boolean added = False;`
`781`	`781`	`if (MCnexecutioncontexts < MAX_CONTEXTS)`
`782`	`782`	`{`
`783`		`- ctxt.GetEP().setline(p_line);`
	`783`	`+ ctxt.SetLine(p_line);`
`784`	`784`	`MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;`
`785`	`785`	`added = True;`
`786`	`786`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,14 +365,12 @@ MCExecEnumTypeInfo *kMCInterfaceWindowAlignmentTypeInfo = &_kMCInterfaceWindowAl`
`365`	`365`
`366`	`366`	`bool MCInterfaceTryToResolveObject(MCExecContext& ctxt, MCStringRef long_id, MCObjectPtr& r_object)`
`367`	`367`	`{`
`368`		`- ctxt.GetEP().setvalueref(long_id);`
`369`		`-`
`370`	`368`	`bool t_found;`
`371`	`369`	`t_found = false;`
`372`	`370`
`373`	`371`	`MCChunk *tchunk = new MCChunk(False);`
`374`	`372`	`MCerrorlock++;`
`375`		`- MCScriptPoint sp(ctxt);`
	`373`	`+ MCScriptPoint sp(long_id);`
`376`	`374`	`if (tchunk->parse(sp, False) == PS_NORMAL)`
`377`	`375`	`{`
`378`	`376`	`if (tchunk->getobj(ctxt, r_object, True))`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void MCKeywordsExecCommandOrFunction(MCExecContext& ctxt, bool resolved, MCHandl`
`171`	`171`	`Boolean added = False;`
`172`	`172`	`if (MCnexecutioncontexts < MAX_CONTEXTS)`
`173`	`173`	`{`
`174`		`- ctxt . GetEP() . setline(line);`
	`174`	`+ ctxt . SetLine(line);`
`175`	`175`	`MCexecutioncontexts[MCnexecutioncontexts++] = &ctxt;`
`176`	`176`	`added = True;`
`177`	`177`	`}`
`@@ -610,7 +610,7 @@ void MCKeywordsExecTry(MCExecContext& ctxt, MCStatement *trystatements, MCStatem`
`610`	`610`	`if (MCexitall)`
`611`	`611`	`break;`
`612`	`612`	`}`
`613`		`- ctxt . GetEP() . setline(tspr->getline());`
	`613`	`+ ctxt . SetLine(tspr->getline());`
`614`	`614`
`615`	`615`	`stat = tspr->exec(ctxt . GetEP());`
`616`	`616`
Original file line number	Diff line number	Diff line change
`@@ -943,8 +943,7 @@ Exec_stat MCHandler::getvarnames(MCExecPoint& ep, Boolean all)`
`943`	`943`
`944`	`944`	`void MCHandler::eval(MCExecContext &ctxt, MCStringRef p_expression, MCValueRef &r_value)`
`945`	`945`	`{`
`946`		`- ctxt.GetEP().setvalueref(p_expression);`
`947`		`- MCScriptPoint sp(ctxt);`
	`946`	`+ MCScriptPoint sp(p_expression);`
`948`	`947`	`sp.sethandler(this);`
`949`	`948`	`MCExpression *exp = NULL;`
`950`	`949`	`Symbol_type type;`
Original file line number	Diff line number	Diff line change
`@@ -242,9 +242,9 @@ Parse_stat MCHandlerlist::findvar(MCNameRef p_name, bool p_ignore_uql, MCVarref`
`242`	`242`	`if (MCdebugcontext != MAXUINT2)`
`243`	`243`	`{`
`244`	`244`	`MCExecContext *ctxtptr = MCexecutioncontexts[MCdebugcontext];`
`245`		`- if (ctxtptr->GetEP().gethlist() != this)`
	`245`	`+ if (ctxtptr->GetHandlerList() != this)`
`246`	`246`	`if (ctxtptr->GetHandler()->findvar(p_name, dptr) != PS_NORMAL)`
`247`		`- return ctxtptr->GetEP().gethlist()->findvar(p_name, false, dptr);`
	`247`	`+ return ctxtptr->GetHandlerList()->findvar(p_name, false, dptr);`
`248`	`248`	`else`
`249`	`249`	`return PS_NORMAL;`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5190,7 +5190,7 @@ void MCProperty::eval_count_ctxt(MCExecContext& ctxt, MCExecValue& r_value)`
`5190`	`5190`
`5191`	`5191`	`void MCProperty::eval_ctxt(MCExecContext& ctxt, MCExecValue& r_value)`
`5192`	`5192`	`{`
`5193`		`- ctxt . GetEP() . setline(line);`
	`5193`	`+ ctxt . SetLine(line);`
`5194`	`5194`
`5195`	`5195`	`if (destvar != nil && which != P_CUSTOM_VAR)`
`5196`	`5196`	`return eval_variable_ctxt(ctxt, r_value);`