Solve 1289 compile opt at main level (#1954)

gnudatalanguage · Dec 17, 2024 · 35d32bb · 35d32bb
1 parent 2c5a9bc
commit 35d32bb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/src/GDLLexer.hpp b/src/GDLLexer.hpp
@@ -30,7 +30,7 @@
 //#include "dinterpreter.hpp"
 
 // defintion in dinterpreter.cpp
-//void SetActualCompileOpt( unsigned int cOpt);
+void MemorizeCompileOptForMAINIfNeeded( unsigned int cOpt);
 
 class CUSTOM_API GDLLexer : public antlr::CharScanner, public GDLTokenTypes
 {

diff --git a/src/GDLParser.hpp b/src/GDLParser.hpp
@@ -10,11 +10,13 @@
 
 
 #include <fstream>
-#include "basegdl.hpp"
-//#include "str.hpp"
-//#include "dnodefactory.hpp"
+
+#include "GDLParser.hpp"
+
+#include "str.hpp"
+#include "dnodefactory.hpp"
 #include "objects.hpp"
-//#include "initsysvar.hpp"
+#include "initsysvar.hpp"
 
 #include <antlr/TokenStreamSelector.hpp>
 
@@ -28,7 +30,7 @@
 //#include "dinterpreter.hpp"
 
 // defintion in dinterpreter.cpp
-//void SetActualCompileOpt( unsigned int cOpt);
+void MemorizeCompileOptForMAINIfNeeded( unsigned int cOpt);
 
 class CUSTOM_API GDLParser : public antlr::LLkParser, public GDLTokenTypes
 {
@@ -67,7 +69,7 @@ class CUSTOM_API GDLParser : public antlr::LLkParser, public GDLTokenTypes
         else if( opt == "STATIC")            compileOpt |= STATIC;
         else if( opt == "NOSAVE")            compileOpt |= NOSAVE;
         else throw GDLException("Unrecognised COMPILE_OPT option: "+opt);
-//        SetActualCompileOpt( compileOpt);
+        MemorizeCompileOptForMAINIfNeeded( compileOpt);
     }
 
     std::string subName; // name of procedure function to be compiled ("" -> all file)

diff --git a/src/dinterpreter.cpp b/src/dinterpreter.cpp
@@ -101,11 +101,11 @@ DInterpreter::DInterpreter(): GDLInterpreter()
   //  tmpList.reserve(100);
 }
 
-// void SetActualCompileOpt( unsigned int cOpt)
-// {
-// if( BaseGDL::interpreter!=NULL && BaseGDL::interpreter->CallStack().size()>0) 
-// 	BaseGDL::interpreter->CallStack().back()->SetCompileOpt( cOpt);
-// }
+ void MemorizeCompileOptForMAINIfNeeded( unsigned int cOpt)
+ {
+   if( BaseGDL::interpreter!=NULL && BaseGDL::interpreter->CallStack().size()>0 && BaseGDL::interpreter->CallStack().back()->CallingNode() == 0) 
+     BaseGDL::interpreter->CallStack().back()->SetCompileOpt( cOpt);
+ }
 
 // used in the statement function.
 // runs a new instance of the interpreter if not
@@ -1238,7 +1238,7 @@ DInterpreter::CommandCode DInterpreter::ExecuteLine( istream* in, SizeT lineOffs
 			executeLine.clear(); // clear EOF (for executeLine)
 			executeLine.str( "print,/implied_print," + executeLine.str()); // append new line
 
-			lexer.reset( new GDLLexer(executeLine, "", callStack.back()->CompileOpt()));
+			lexer.reset( new GDLLexer(executeLine, "", 2 )); //2 is HIDDEN //callStack.back()->CompileOpt()));
 			lexer->Parser().interactive();
 
 			break; // no error -> everything ok

diff --git a/src/gdlc.g b/src/gdlc.g
@@ -46,7 +46,7 @@ header {
 //#include "dinterpreter.hpp"
 
 // defintion in dinterpreter.cpp
-//void SetActualCompileOpt( unsigned int cOpt);
+void MemorizeCompileOptForMAINIfNeeded( unsigned int cOpt);
 }
 
 options {
@@ -198,7 +198,7 @@ tokens {
         else if( opt == "STATIC")            compileOpt |= STATIC;
         else if( opt == "NOSAVE")            compileOpt |= NOSAVE;
         else throw GDLException("Unrecognised COMPILE_OPT option: "+opt);
-//        SetActualCompileOpt( compileOpt);
+        MemorizeCompileOptForMAINIfNeeded( compileOpt);
     }
 
     std::string subName; // name of procedure function to be compiled ("" -> all file)

diff --git a/src/pro/utilities/gdl_implied_print.pro b/src/pro/utilities/gdl_implied_print.pro
@@ -19,7 +19,8 @@
 ;
 function pretty_serialize,value,tagname=tagname,flat=flat
 common json_serialize_gdl_level, level
-COMPILE_OPT idl2, HIDDEN
+  ; warning as this is directly compiled within the $MAIN$ interpretor there must be no COMPILE_OPT here.
+;COMPILE_OPT HIDDEN
 ON_ERROR,2
    ;; CATCH, Error_status
    ;; IF Error_status NE 0 THEN BEGIN
@@ -159,7 +160,8 @@ endif else tmpstr=''
 end
 
 pro gdl_implied_print,out,value
-COMPILE_OPT idl2, HIDDEN
+  ; warning as this is directly compiled within the $MAIN$ interpretor there must be no COMPILE_OPT here.
+;COMPILE_OPT HIDDEN
 ON_ERROR, 2
 ; get info on out
 info=fstat(out)