Bugfix: import fails when imported script throws exception

Change-Id: Ia729cc8fbb787af452e06eb95563e83bff52655b

diff --git a/src/batch/BatchRunner.cpp b/src/batch/BatchRunner.cpp
index e0c0bf9..14fb79d 100644 (file)
--- a/src/batch/BatchRunner.cpp
+++ b/src/batch/BatchRunner.cpp
@@ -799,8 +799,22 @@ void BatchExecutor::insertMethods()
                                throw std::move(error);
                        }
                        ASSERT(result);
-                       result->evaluate();
-                       it.first->second = std::move(result);
+                       CallOnExit _tmp{ [&]()
+                       {
+                               it.first->second = std::move(result);
+                       }};
+                       try
+                       {
+                               result->evaluate();
+                       } catch (ReturnValue)
+                       {
+                       } catch (BreakValue)
+                       {
+                               throw EvaluationFailure{} << "break used on global scope in file " << filename;
+                       } catch (ContinueValue)
+                       {
+                               throw EvaluationFailure{} << "continue used on global scope in file " << filename;
+                       }
                        return {};
                }, { {"filename"} } };