*** empty log message ***

[bbtk.git] / kernel / src / bbtkInterpreter.cxx

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index c63ec51f30a6862bd033f3865c24fa0001386051..2147d0ca35c1b84760ca57380c523ad77b85b89a 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++

-  Date:      $Date: 2008/03/07 11:15:15 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2008/03/18 12:51:26 $
+  Version:   $Revision: 1.46 $

                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or


@@ -50,6 +50,7 @@ namespace bbtk
 #endif
     mCommandLine(false)
   {
 #endif
     mCommandLine(false)
   {

+bufferNb =0;  

     bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
     bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0);
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);
     bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
     bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0);
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);


@@ -178,7 +179,7 @@ namespace bbtk
     info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories. If 'Adaptors' is provided then an alphabetical index of all adaptors is created.";
     mCommandDict[info.category] = info;
 
     info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories. If 'Adaptors' is provided then an alphabetical index of all adaptors is created.";
     mCommandDict[info.category] = info;
 

-    info.category = "reset";  //EED
+    info.category = "reset";  

     info.argmin = 0;
     info.argmax = 0;
     info.code = cReset;
     info.argmin = 0;
     info.argmax = 0;
     info.code = cReset;


@@ -289,8 +290,6 @@ namespace bbtk
    */
   Interpreter::~Interpreter()
   {
    */
   Interpreter::~Interpreter()
   {

-
-std::cout << "=========================================~Interpreter()" << std::endl;

     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
 
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
 


@@ -306,34 +305,50 @@ std::cout << "=========================================~Interpreter()" << std::e
   void Interpreter::InterpretFile( const std::string& filename )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
   void Interpreter::InterpretFile( const std::string& filename )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);

-
+  //  std::cout << "==========================================Entree InterpretFile ["<<filename<<"] try SwitchToFile "<<std::endl;

     bool exm = mCommandLine;
     mCommandLine = false;
 
     try 
     {
       SwitchToFile(filename);
     bool exm = mCommandLine;
     mCommandLine = false;
 
     try 
     {
       SwitchToFile(filename);

+
+/*
+      for( std::vector<std::string>::iterator it =mFileName.begin(); it!=mFileName.end(); ++it)
+      {
+         std::cout << "A=== [" << (*it) << "]" << std::endl;
+      }
+*/      

       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
       {
       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
       {

-         while ((mFile.size()>0) && 
-                (!mFile.back()->eof()))
+/*
+         for( std::vector<std::string>::iterator it =mFileName.begin(); it!=mFileName.end(); ++it)

          {
          {

-            mLine.back()++;
+            std::cout << "B=== [" << (*it) << "]" << std::endl;
+         }
+*/      
+
+         //while ((mFile.size()>0) && !mFile.back()->eof() ) 
+         //{
+//      std::cout << "mFile.size() "<< mFile.size() << " mFileName.back() [" << mFileName.back() << "]" <<  std::endl;
+        while (!mFile.back()->eof()) {
+                    mLine.back()++;

             char buf[500];
             mFile.back()->getline(buf,500);
             char buf[500];
             mFile.back()->getline(buf,500);

-      

             std::string str(buf);
             std::string str(buf);

+// std::cout << " in InterpretFile mFile.back()->getline [" << str << "]" << std::endl;    

             int size=str.length();
             if ( str[ size-1 ]==13  )
             {
                str.erase(size-1,1);
             }
       
             int size=str.length();
             if ( str[ size-1 ]==13  )
             {
                str.erase(size-1,1);
             }
       

-            InterpretLine(str, insideComment);
-         }
-        //if (mFile.size()>0) 
-        CloseCurrentFile();
+               InterpretLine(str, insideComment);
+
+       }//while
+       //if (mFile.size()>0) 
+       CloseCurrentFile();

       }
     }
     catch (QuitException e) 
       }
     }
     catch (QuitException e) 


@@ -373,6 +388,97 @@ std::cout << "=========================================~Interpreter()" << std::e
   //=======================================================================
 
 
   //=======================================================================
 
 

+  //=======================================================================
+  /**
+   *  
+   */
+  void Interpreter::InterpretBuffer( std::stringstream* buffer )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretBuffer()"<<std::endl);
+  //  std::cout << "==========================================Entree InterpretFile ["<<filename<<"] try SwitchToFile "<<std::endl;
+    bool exm = mCommandLine;
+    mCommandLine = false;
+
+    try 
+    {
+      SwitchToStream(buffer);
+
+/*
+      for( std::vector<std::string>::iterator it =mFileName.begin(); it!=mFileName.end(); ++it)
+      {
+         std::cout << "A=== [" << (*it) << "]" << std::endl;
+      }
+*/      
+      bool insideComment = false; // for multiline comment
+      while (mFile.size()>0) 
+      {
+/*
+         for( std::vector<std::string>::iterator it =mFileName.begin(); it!=mFileName.end(); ++it)
+         {
+            std::cout << "B=== [" << (*it) << "]" << std::endl;
+         }
+*/      
+
+         //while ((mFile.size()>0) && !mFile.back()->eof() ) 
+         //{
+//      std::cout << "mFile.size() "<< mFile.size() << " mFileName.back() [" << mFileName.back() << "]" <<  std::endl;
+        while (!mFile.back()->eof()) {
+                    mLine.back()++;
+            char buf[500];
+            mFile.back()->getline(buf,500);
+            std::string str(buf);
+// std::cout << " in InterpretFile mFile.back()->getline [" << str << "]" << std::endl;    
+            int size=str.length();
+            if ( str[ size-1 ]==13  )
+            {
+               str.erase(size-1,1);
+            }
+      
+               InterpretLine(str, insideComment);
+
+       }//while
+       //if (mFile.size()>0) 
+       CloseCurrentFile();
+      }
+    }
+    catch (QuitException e) 
+    { 
+      //      std::cout  << "**QuitException caught**"<<std::endl;
+    }
+    catch (bbtk::Exception e) 
+    {
+      std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
+      if (mFileName.size()) {
+         std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+         std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+      }    
+    }
+    catch (std::exception& e) 
+    {
+       std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+       if (mFileName.size()) {
+          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+       }    
+    }  
+    catch (...)
+    {
+       std::cout << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+       if (mFileName.size()) {
+          std::cout << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          std::cout << "* LINE  : "<<mLine.back()<<std::endl;
+      }    
+    }
+
+    CloseAllFiles();
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
+    bbtkDecTab("Interpreter",9);
+
+    mCommandLine = exm;
+  }
+  //=======================================================================
+
+

 
   //=======================================================================  
   /**
 
   //=======================================================================  
   /**


@@ -380,7 +486,6 @@ std::cout << "=========================================~Interpreter()" << std::e
    */
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {
    */
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {

-

     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
     bbtkMessage("Echo",2,"\""<<line<<"\""<<std::endl);
 
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
     bbtkMessage("Echo",2,"\""<<line<<"\""<<std::endl);
 


@@ -558,7 +663,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         Config();
         break;
 
         Config();
         break;
 

-      case cReset :  // EED
+      case cReset :  

         this->mExecuter->Reset();
         break;
 
         this->mExecuter->Reset();
         break;
 


@@ -661,10 +766,10 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     pos = s.find(ss,0);
     char* cr = "\n";
     while ( pos != std::string::npos )
     pos = s.find(ss,0);
     char* cr = "\n";
     while ( pos != std::string::npos )

-   {
+    {

       s.replace(pos,2,cr,1);
       pos = s.find(ss, pos-1);
       s.replace(pos,2,cr,1);
       pos = s.find(ss, pos-1);

-   }
+    }

   }
   //=======================================================================
 
   }
   //=======================================================================
 


@@ -773,41 +878,62 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     // It's a user intended message.
     // Please don't remove it.
     bbtkMessage("Interpreter",1,
     // It's a user intended message.
     // Please don't remove it.
     bbtkMessage("Interpreter",1,

-               "look for : [" << name
-                 << "]" << std::endl);
+        "look for : [" << name
+        << "]" << std::endl);

     script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
 
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
 
     script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
 
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
 

+    bbtkMessage("Interpreter",1,
+               "extract : pkgname [" << pkgname
+                << "] upath [" << upath << "]" << std::endl);

     bool fullnameGiven = false; 
     bool foundFile     = false;
 
     if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*)
     {
     bool fullnameGiven = false; 
     bool foundFile     = false;
 
     if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*)
     {

+// std::cout << "JPR==================  * found, load all boxes " << std::endl;

       int nbBssFiles;
 
       int nbBssFiles;
 

+      std::stringstream* stream = new std::stringstream;
+      //if (upath.size()!=0) // avoid troubles for "*"
+      

       if (upath[0]=='/' || upath[1] == ':' ) // ==== absolute name, load all .bbs files
       {
       if (upath[0]=='/' || upath[1] == ':' ) // ==== absolute name, load all .bbs files
       {

+// std::cout << "JPR==================  absolute name, load all .bbs files " << std::endl;      

         int nbFiles = Utilities::Explore(upath, false, Filenames);
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
         int nbFiles = Utilities::Explore(upath, false, Filenames);
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {

-           if ((*i).substr((*i).size()-4, 4) != ".bbs")
-              continue;      // ignore non .bbs files
-          std::string command("include ");
-          command += *i;
-          //  LoadScript(*i,name);
-          bool tmp;
-          InterpretLine(command,tmp);
+// std::cout << "JPR==================  iterate [" << *i << "]" << std::endl;
+           int lgr = (*i).size();
+          if (lgr < 5)
+             continue;  // ignore non .bbs file
+           if ((*i).substr(lgr-4, 4) != ".bbs")
+             continue;
+          /*
+          if (lgr > 10) // 10 -> '-appli.bbs'
+          {    
+           if ((*i).substr(lgr-10, 10) == "-appli.bbs")
+              continue;      // ignore  '-appli.bbs' files
+          }
+          */
+
+       (*stream) << "include " << *i << "\n";
+//EED  InterpretFile(*i);
+

            nbBssFiles++;
            nbBssFiles++;

-        }
-        if (nbBssFiles==0)
+        } // for vector
+               if (nbBssFiles==0){

            bbtkMessage("Interpreter",2,
                       "WARNING : No '.bbs' file found in [" 
                       << upath << "]" << std::endl);
            bbtkMessage("Interpreter",2,
                       "WARNING : No '.bbs' file found in [" 
                       << upath << "]" << std::endl);

+               } else {
+            SwitchToStream(stream);
+               }

         return;
         return;

-      }
+      }  // if upath

 
       std::string path;
       std::vector<std::string>::iterator i;
 
       std::string path;
       std::vector<std::string>::iterator i;


@@ -822,11 +948,10 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           char * currentDir = getcwd(buf, 2048);
           std::string cwd(currentDir);
           path = currentDir;
           char * currentDir = getcwd(buf, 2048);
           std::string cwd(currentDir);
           path = currentDir;

-        }
+        } // if path

 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
 
 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
 

-        //EED 18 Fev 2008

         // without last slash "\"
         std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1);
 
         // without last slash "\"
         std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1);
 


@@ -836,37 +961,50 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.

-         bbtkMessage("Interpreter",1,"   [" <<fullDirectoryName 
+             bbtkMessage("Interpreter",1,"   [" <<fullDirectoryName 

                      <<"] : doesn't exist" <<std::endl);
           continue;  // try next path
                      <<"] : doesn't exist" <<std::endl);
           continue;  // try next path

-        }
+        } // if IsDirectory

         foundFile = true;
 
         foundFile = true;
 

-
+        Filenames.clear();

         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
 
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
 
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {

-           if ((*i).substr((*i).size()-4, 4) != ".bbs")
-              continue;      // ignore non .bbs files
-          std::string command("include ");
-          command += *i;
-          bool tmp;
-          InterpretLine(command,tmp);
-          //           LoadScript(*i,name);
+// std::cout << "JPR==================  iterate [" << *i << "]" << std::endl;
+           int lgr = (*i).size();
+          if (lgr < 5)
+             continue;  // ignore non .bbs file
+           if ((*i).substr(lgr-4, 4) != ".bbs")
+             continue;
+           /*
+          if (lgr > 10) // 10 -> '-appli.bbs'
+          {    
+           if ((*i).substr(lgr-10, 10) == "-appli.bbs")
+              continue;      // ignore  '-appli.bbs' files
+          }
+          */
+
+      (*stream) << "include " << *i << "\n";
+//EED    InterpretFile(*i);
+

            nbBssFiles++;
            nbBssFiles++;

-        }
-        if (nbBssFiles==0)
-         bbtkMessage("Interpreter",1,
+        } // for vector
+               if (nbBssFiles==0){
+           bbtkMessage("Interpreter",1,

                      "WARNING : No '.bbs' file found in [" 
                      << fullDirectoryName << "]" << std::endl);
                      "WARNING : No '.bbs' file found in [" 
                      << fullDirectoryName << "]" << std::endl);

+               } else {
+           SwitchToStream(stream);
+               }

 
         //break; // a directory was found; we stop iterating
        // LG : No! We want all files included !
 
         //break; // a directory was found; we stop iterating
        // LG : No! We want all files included !

-       }
+       } // for vector

        return;
        return;

-    }
+    }  // if *

 
     //std::string::size_type slash_position = name.find_last_of("/\\");
 
 
     //std::string::size_type slash_position = name.find_last_of("/\\");
 


@@ -887,7 +1025,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       int l = fullPathScriptName.size();
 
       if (l!=0) {
       int l = fullPathScriptName.size();
 
       if (l!=0) {

-      
+

       if (l>4)
       {
          if (fullPathScriptName.substr(l-4, 4) != ".bbs")
       if (l>4)
       {
          if (fullPathScriptName.substr(l-4, 4) != ".bbs")


@@ -900,21 +1038,19 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
          fullPathScriptName = fullPathScriptName + ".bbs";   
       }
 
          fullPathScriptName = fullPathScriptName + ".bbs";   
       }
 

-        if ( Utilities::FileExists(fullPathScriptName))
-        {
-          foundFile = true;
-        }
-      } // endif l != 0
-    }
-    else 
-
-      // =============================================================== iterate on the paths
+      if ( Utilities::FileExists(fullPathScriptName))

       {
       {

+        foundFile = true;
+      }
+    } // endif l != 0
+  }
+  else
+      // =============================================================== iterate on the paths
+  {

       std::string path;
       std::vector<std::string>::iterator i;
       for (i=script_paths.begin();i!=script_paths.end();++i)
       {
       std::string path;
       std::vector<std::string>::iterator i;
       for (i=script_paths.begin();i!=script_paths.end();++i)
       {

-

         path = *i;
        // we *really* want '.' to be the current working directory
         if (path == ".") {
         path = *i;
        // we *really* want '.' to be the current working directory
         if (path == ".") {


@@ -924,10 +1060,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           path = currentDir;
         }
 
           path = currentDir;
         }
 

-       // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
-
-           fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
-
+       fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);

 
       // Check if library exists
         if ( ! Utilities::FileExists(fullPathScriptName) )
 
       // Check if library exists
         if ( ! Utilities::FileExists(fullPathScriptName) )


@@ -935,12 +1068,12 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.

-         bbtkMessage("Interpreter",2,
+             bbtkMessage("Interpreter",2,

                      "   [" <<fullPathScriptName <<"] : doesn't exist" 
                      <<std::endl);
           continue;  // try next path
         }
                      "   [" <<fullPathScriptName <<"] : doesn't exist" 
                      <<std::endl);
           continue;  // try next path
         }

-       bbtkMessage("Interpreter",2,
+           bbtkMessage("Interpreter",2,

                    "   [" <<fullPathScriptName 
                    <<"] : found" <<std::endl);
         foundFile = true;
                    "   [" <<fullPathScriptName 
                    <<"] : found" <<std::endl);
         foundFile = true;


@@ -967,23 +1100,74 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   }
 
 
   }
 
 

+void Interpreter::SwitchToStream( std::stringstream* stream )
+{
+//std::cout << "== 1 Entry in Interpreter::SwitchToStream " << std::endl;
+
+       mFile.push_back(stream);
+    //std::cout << " mFile.size() " << mFile.size() << std::endl;
+    std::ostringstream buffer_name;
+    bufferNb++;
+    buffer_name << "buffer_" ; // << bufferNb;
+    
+//    std::cout << " mFile.size() "     << mFile.size() << std::endl;
+//    std::cout << " mFileName.size() " << mFileName.size() << std::endl;
+//    std::cout << " mLine.size() "     << mLine.size() << std::endl;
+   // std::vector<std::string>::iterator j = mFileName.begin();
+   //    std::cout << "  mFileName.begin() succeeded"  << std::endl;
+   //    std::cout << "  mFileName[0] " <<   mFileName[0] << std::endl;
+       //std::cout << "  mFileName.begin() " <<   mFileName.begin() << std::endl;
+/*
+    for( std::vector<std::string>::iterator i = mFileName.begin(); i!= mFileName.end(); ++i)
+    {
+
+       std::cout <<   "Interpreter::SwitchToStream : mFileName [" <<  *i << "]" << std::endl;
+    }
+*/
+  //  std::cout << " mLine.back() " << mLine.back() << std::endl;
+   // std::cout << " mFileName.back() " <<  mFileName.back() << std::endl;
+
+    if (mFileName.size()>0 )// && (mFile.size()>0) )  // NO!!!
+    {
+   // std::cout << "  mFileName.back() " <<  mFileName.back() << std::endl;
+   // std::cout << "  mLine.back() " <<  mLine.back() << std::endl;
+       buffer_name << mFileName.back() << "_" << mLine.back();
+    }
+//std::cout << "3 in Interpreter::SwitchToStream buffer_name :[" << buffer_name.str() << "]" << std::endl;
+    mFileName.push_back(buffer_name.str());
+    mIncludeFileName.push_back(buffer_name.str());
+    mLine.push_back(0);
+}
+

   //=======================================================================
 
   void Interpreter::LoadScript( std::string fullPathScriptName,
                                std::string includeScriptName)
   {
   //=======================================================================
 
   void Interpreter::LoadScript( std::string fullPathScriptName,
                                std::string includeScriptName)
   {

-    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
-       !=mFileName.end()) 
-      {
-       bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
+     Utilities::replace( fullPathScriptName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
+     bool okScriptExist=false;
+     int iStrScript,sizeVecStricpt=mFileName.size();
+     for ( iStrScript=0;iStrScript<sizeVecStricpt;iStrScript++)
+     {
+        if (mFileName[iStrScript] == fullPathScriptName )
+        {
+           okScriptExist=true;
+        } // if
+     } // for
+
+     if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)!=mFileName.end())
+//    if (okScriptExist==true)
+     {
+           bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName

                    <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
                    <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);

-       return;
-      }
+        return;
+     }

 
     std::ifstream* s;
     s = new std::ifstream;
     s->open(fullPathScriptName.c_str());
 
     std::ifstream* s;
     s = new std::ifstream;
     s->open(fullPathScriptName.c_str());

-    if (!s->good()) 
+    if (!s->good())

     {
         bbtkError("Could not open file ["<<fullPathScriptName<<"]");
         return;
     {
         bbtkError("Could not open file ["<<fullPathScriptName<<"]");
         return;


@@ -1014,15 +1198,17 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       return;
     }
 
       return;
     }
 

-    mFile.back()->close();
+    bbtkDebugMessage("Interpreter",9," Closing file '"<<mFileName.back()<<"'"<<std::endl);
+
+    std::ifstream* file = dynamic_cast<std::ifstream*>(mFile.back());
+    if (file!=0) file->close();
+

     delete mFile.back();
     mFile.pop_back();
     delete mFile.back();
     mFile.pop_back();

-    bbtkDebugMessage("Interpreter",9,
-                     " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-

     mFileName.pop_back();
     mIncludeFileName.pop_back();
     mLine.pop_back();
     mFileName.pop_back();
     mIncludeFileName.pop_back();
     mLine.pop_back();

+

     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);
     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);


@@ -1042,6 +1228,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
     while (mFile.size() != 0) 
     {
 
     while (mFile.size() != 0) 
     {

+       CloseCurrentFile();
+    /*

       mFile.back()->close();
       delete mFile.back();
       mFile.pop_back();
       mFile.back()->close();
       delete mFile.back();
       mFile.pop_back();


@@ -1050,6 +1238,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       mFileName.pop_back();
       mIncludeFileName.pop_back();
       mLine.pop_back();
       mFileName.pop_back();
       mIncludeFileName.pop_back();
       mLine.pop_back();

+*/

     }
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
                       <<std::endl);
     }
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
                       <<std::endl);