[[ Cleanup ]] engine: Add some disambiguating parentheses and braces.

peter-b · peter-b · commit 6837fb5a3655 · 2014-12-30T14:29:49.000Z
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -3254,7 +3254,7 @@ void MCStop::exec_ctxt(MCExecContext &ctxt)
 
 	if (target != NULL)
         if (!target->getobj(ctxt, optr, parid, True)
-		        || optr == NULL && mode != SC_EDITING)
+            || (optr == NULL && mode != SC_EDITING))
 		{
             ctxt . LegacyThrow(EE_STOP_BADTARGET);
             return;
diff --git a/engine/src/cmdsf.cpp b/engine/src/cmdsf.cpp
@@ -3131,11 +3131,12 @@ Parse_stat MCOpen::parse(MCScriptPoint &sp)
 	}
 
 	if (sp.skip_token(SP_SUGAR, TT_PREP, PT_WITHOUT) == PS_NORMAL)
+	{
 		if (sp.skip_token(SP_SSL, TT_UNDEFINED, SSL_VERIFICATION) == PS_NORMAL)
 			secureverify = False;
 		else
-			MCperror->add
-			(PE_OPEN_BADMESSAGE, sp);
+			MCperror->add (PE_OPEN_BADMESSAGE, sp);
+	}
 	return PS_NORMAL;
 }
 
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -147,6 +147,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
 	while (True)
 	{
 		if (sp.next(type) != PS_NORMAL)
+		{
 			if (need_target)
 			{
 				if (ct_class(oterm) == CT_ORDINAL)
@@ -165,6 +166,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)
 			}
 			else
 				break;
+		}
 		if (type == ST_ID && (sp.lookup(SP_FACTOR, te) == PS_NORMAL
 		                      || sp.lookup(SP_GO, te) == PS_NORMAL))
 		{
@@ -2832,7 +2834,7 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)
     // Need to have a second MCExecContext as getobj may throw a non-fatal error
     MCExecContext ctxt2(ctxt);
     if (!target -> getobj(ctxt2, optr, parid, True)
-	        || optr->gettype() != CT_BUTTON && optr->gettype() != CT_STACK)
+        || (optr->gettype() != CT_BUTTON && optr->gettype() != CT_STACK))
 	{
 		MCerrorlock--;
         if (!ctxt . EvalExprAsNameRef(target, EE_SUBWINDOW_BADEXP, &optr_name))

Original file line number	Diff line number	Diff line change
`@@ -3254,7 +3254,7 @@ void MCStop::exec_ctxt(MCExecContext &ctxt)`
`3254`	`3254`
`3255`	`3255`	`if (target != NULL)`
`3256`	`3256`	`if (!target->getobj(ctxt, optr, parid, True)`
`3257`		`- \|\| optr == NULL && mode != SC_EDITING)`
	`3257`	`+ \|\| (optr == NULL && mode != SC_EDITING))`
`3258`	`3258`	`{`
`3259`	`3259`	`ctxt . LegacyThrow(EE_STOP_BADTARGET);`
`3260`	`3260`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -3131,11 +3131,12 @@ Parse_stat MCOpen::parse(MCScriptPoint &sp)`
`3131`	`3131`	`}`
`3132`	`3132`
`3133`	`3133`	`if (sp.skip_token(SP_SUGAR, TT_PREP, PT_WITHOUT) == PS_NORMAL)`
	`3134`	`+ {`
`3134`	`3135`	`if (sp.skip_token(SP_SSL, TT_UNDEFINED, SSL_VERIFICATION) == PS_NORMAL)`
`3135`	`3136`	`secureverify = False;`
`3136`	`3137`	`else`
`3137`		`- MCperror->add`
`3138`		`- (PE_OPEN_BADMESSAGE, sp);`
	`3138`	`+ MCperror->add (PE_OPEN_BADMESSAGE, sp);`
	`3139`	`+ }`
`3139`	`3140`	`return PS_NORMAL;`
`3140`	`3141`	`}`
`3141`	`3142`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)`
`147`	`147`	`while (True)`
`148`	`148`	`{`
`149`	`149`	`if (sp.next(type) != PS_NORMAL)`
	`150`	`+ {`
`150`	`151`	`if (need_target)`
`151`	`152`	`{`
`152`	`153`	`if (ct_class(oterm) == CT_ORDINAL)`
`@@ -165,6 +166,7 @@ Parse_stat MCGo::parse(MCScriptPoint &sp)`
`165`	`166`	`}`
`166`	`167`	`else`
`167`	`168`	`break;`
	`169`	`+ }`
`168`	`170`	`if (type == ST_ID && (sp.lookup(SP_FACTOR, te) == PS_NORMAL`
`169`	`171`	`\|\| sp.lookup(SP_GO, te) == PS_NORMAL))`
`170`	`172`	`{`
`@@ -2832,7 +2834,7 @@ void MCSubwindow::exec_ctxt(MCExecContext &ctxt)`
`2832`	`2834`	`// Need to have a second MCExecContext as getobj may throw a non-fatal error`
`2833`	`2835`	`MCExecContext ctxt2(ctxt);`
`2834`	`2836`	`if (!target -> getobj(ctxt2, optr, parid, True)`
`2835`		`- \|\| optr->gettype() != CT_BUTTON && optr->gettype() != CT_STACK)`
	`2837`	`+ \|\| (optr->gettype() != CT_BUTTON && optr->gettype() != CT_STACK))`
`2836`	`2838`	`{`
`2837`	`2839`	`MCerrorlock--;`
`2838`	`2840`	`if (!ctxt . EvalExprAsNameRef(target, EE_SUBWINDOW_BADEXP, &optr_name))`