Merge pull request #1614 from GillesDuvert/close_1604

closes #1604
gnudatalanguage · Aug 13, 2023 · 5343845 · 5343845
2 parents 3ed14fa + 10d18c1
commit 5343845
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/src/GDLInterpreter.hpp b/src/GDLInterpreter.hpp
@@ -201,6 +201,7 @@ class CUSTOM_API GDLInterpreter : public antlr::TreeParser, public GDLInterprete
 
     static EnvStackT  callStack; 
     static bool noInteractive;
+    static bool InBatchProcedureAtMain;
     static DLong stepCount;
     static std::string MyProName;
 

diff --git a/src/basic_pro.cpp b/src/basic_pro.cpp
@@ -1167,6 +1167,11 @@ namespace lib {
   }
 
   void stop(EnvT* e) {
+    if ( e->Interpreter()->IsInBatchProcedureAtMain() ) {
+      debugMode = DEBUG_STOP;
+      e->Throw("Prematurely closing batch file:");
+      return;
+    }
     if (e->NParam() > 0) {
       print(e);
       debugMode = DEBUG_STOP_SILENT;

diff --git a/src/dinterpreter.cpp b/src/dinterpreter.cpp
@@ -64,6 +64,7 @@ EnvStackT                 GDLInterpreter::callStack;
 DLong                     GDLInterpreter::stepCount;
 std::string               GDLInterpreter::MyProName;
 bool                      GDLInterpreter::noInteractive; // To exit on error or stop in line execution mode (gdl -e do_something)
+bool                      GDLInterpreter::InBatchProcedureAtMain; // To exit on error or stop in interactive batch file (@file at MAIN level)
 ProgNode                  GDLInterpreter::NULLProgNode;
 ProgNodeP GDLInterpreter::NULLProgNodeP = &GDLInterpreter::NULLProgNode;
 
@@ -1115,8 +1116,9 @@ DInterpreter::CommandCode DInterpreter::ExecuteLine( istream* in, SizeT lineOffs
 	  file = fileRaw;
 	  CompleteFileName( file);
 	}
-
+      InBatchProcedureAtMain=true;
       ExecuteFile( file);
+      InBatchProcedureAtMain=false;
       return CC_OK;
     }
 

diff --git a/src/dinterpreter.hpp b/src/dinterpreter.hpp
@@ -106,6 +106,7 @@ class DInterpreter: public GDLInterpreter
   // called within InterpreterLoop()
   RetCode InnerInterpreterLoop(SizeT lineOffset);
 
+  bool IsInBatchProcedureAtMain(){return InBatchProcedureAtMain;}
 };
 
 #endif
diff --git a/src/gdlc.i.g b/src/gdlc.i.g
@@ -254,6 +254,7 @@ protected:
 
     static EnvStackT  callStack; 
     static bool noInteractive;
+    static bool InBatchProcedureAtMain;
     static DLong stepCount;
     static std::string MyProName;