Ensure errors are cleared before re-trying statements

Fraser J. Gordon · Fraser J. Gordon · commit 6e9f7bc3b1bd · 2014-01-30T11:41:50.000Z
diff --git a/engine/src/cmdse.cpp b/engine/src/cmdse.cpp
@@ -1086,7 +1086,7 @@ void MCDispatchCmd::exec_ctxt(MCExecContext &ctxt)
 		t_target_ptr = nil;
 	
 	// Evaluate the parameter list
-    bool t_success;
+    bool t_success, t_can_debug;
 	MCParameter *tptr = params;
 	while (tptr != NULL)
 	{
@@ -1099,10 +1099,17 @@ void MCDispatchCmd::exec_ctxt(MCExecContext &ctxt)
         {
             MCAutoValueRef t_value;
             tptr -> clear_argument();
-            while (!(t_success = tptr->eval(ctxt, &t_value))
-                   && (MCtrace || MCnbreakpoints)
-                   && !MCtrylock && !MClockerrors)
-				MCB_error(ctxt, line, pos, EE_STATEMENT_BADPARAM);
+
+            do
+            {
+                if (!(t_success = tptr->eval(ctxt, &t_value)))
+                    t_success = true;
+                else
+                    t_can_debug = MCB_error(ctxt, line, pos, EE_STATEMENT_BADPARAM);
+                ctxt.IgnoreLastError();
+            }
+            while (!t_success && t_can_debug && (MCtrace || MCnbreakpoints) && !MCtrylock && !MClockerrors);
+            
             if (!t_success)
 			{
                 ctxt . LegacyThrow(EE_STATEMENT_BADPARAM);
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -84,9 +84,9 @@ static Exec_stat MCKeywordsExecuteStatements(MCExecContext& ctxt, MCStatement *p
                 if ((MCtrace || MCnbreakpoints) && !MCtrylock && !MClockerrors)
                     do
                     {
-                        ctxt . IgnoreLastError();
                         MCB_error(ctxt, tspr->getline(), tspr->getpos(),
                                   EE_REPEAT_BADSTATEMENT);
+                        ctxt . IgnoreLastError();
                         tspr->exec_ctxt(ctxt);
                     }
                 while (MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);
@@ -700,6 +700,7 @@ void MCKeywordsExecTry(MCExecContext& ctxt, MCStatement *trystatements, MCStatem
                     do
                     {
                         MCB_error(ctxt, tspr->getline(), tspr->getpos(), EE_TRY_BADSTATEMENT);
+                        ctxt.IgnoreLastError();
                         tspr->exec_ctxt(ctxt);
                     }
 				while(MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);
diff --git a/engine/src/handler.cpp b/engine/src/handler.cpp
@@ -441,6 +441,7 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)
                     do
                     {
                         MCB_error(ctxt, tspr->getline(), tspr->getpos(), EE_HANDLER_BADSTATEMENT);
+                        ctxt . IgnoreLastError();
                         tspr->exec_ctxt(ctxt);
                     }
 				while (MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ static Exec_stat MCKeywordsExecuteStatements(MCExecContext& ctxt, MCStatement *p`
`84`	`84`	`if ((MCtrace \|\| MCnbreakpoints) && !MCtrylock && !MClockerrors)`
`85`	`85`	`do`
`86`	`86`	`{`
`87`		`- ctxt . IgnoreLastError();`
`88`	`87`	`MCB_error(ctxt, tspr->getline(), tspr->getpos(),`
`89`	`88`	`EE_REPEAT_BADSTATEMENT);`
	`89`	`+ ctxt . IgnoreLastError();`
`90`	`90`	`tspr->exec_ctxt(ctxt);`
`91`	`91`	`}`
`92`	`92`	`while (MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);`
`@@ -700,6 +700,7 @@ void MCKeywordsExecTry(MCExecContext& ctxt, MCStatement *trystatements, MCStatem`
`700`	`700`	`do`
`701`	`701`	`{`
`702`	`702`	`MCB_error(ctxt, tspr->getline(), tspr->getpos(), EE_TRY_BADSTATEMENT);`
	`703`	`+ ctxt.IgnoreLastError();`
`703`	`704`	`tspr->exec_ctxt(ctxt);`
`704`	`705`	`}`
`705`	`706`	`while(MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);`
Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,7 @@ Exec_stat MCHandler::exec(MCExecContext& ctxt, MCParameter *plist)`
`441`	`441`	`do`
`442`	`442`	`{`
`443`	`443`	`MCB_error(ctxt, tspr->getline(), tspr->getpos(), EE_HANDLER_BADSTATEMENT);`
	`444`	`+ ctxt . IgnoreLastError();`
`444`	`445`	`tspr->exec_ctxt(ctxt);`
`445`	`446`	`}`
`446`	`447`	`while (MCtrace && (stat = ctxt . GetExecStat()) != ES_NORMAL);`