*** empty log message ***

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

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 951c40db00b1831324f4edfaaedc523db8a6afde..674513f847edc62677042542069d0285351b42f0 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/02/21 07:30:20 $
-  Version:   $Revision: 1.36 $
+  Date:      $Date: 2008/03/19 14:58:13 $
+  Version:   $Revision: 1.47 $

                                                                                 
   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


@@ -37,7 +37,7 @@
 namespace bbtk
 {
 
 namespace bbtk
 {
 

-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+  //Interpreter* Interpreter::mGlobalInterpreter = NULL;

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


@@ -45,20 +45,23 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::Interpreter() 
     :
    */
   Interpreter::Interpreter() 
     :

+#ifdef _USE_WXWIDGETS_
+    mWxConsole(0),
+#endif

     mCommandLine(false)
   {
     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);
  

-    mGlobalInterpreter = this;
-

     mExecuter = new bbtk::Executer();
     mExecuter = new bbtk::Executer();

+    mExecuter->SetInterpreter(this);

     
     // For the time being, comment out previous line, and
     // uncomment next line to check Transcriptor
 
     
     // For the time being, comment out previous line, and
     // uncomment next line to check Transcriptor
 

-   // mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt");
+    //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt");

 
     // Builds the commands dict
     CommandInfoType info;
 
     // Builds the commands dict
     CommandInfoType info;


@@ -172,11 +175,11 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmax = 2;
     info.code = cIndex;
 
     info.argmax = 2;
     info.code = cIndex;
 

-    info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Categories']]";
-    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";
+    info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Categories'|'Adaptors']]";
+    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;
 
     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,7 +292,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;

-    //delete mFactory;

 
     bbtkDebugDecTab("Interpreter",9);
   }
 
     bbtkDebugDecTab("Interpreter",9);
   }


@@ -300,42 +302,41 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   /**
    *  
    */
   /**
    *  
    */

-  void Interpreter::InterpretFile( const std::string& filename,  
-                                   bool use_configuration_file)
+  Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )

   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
     mCommandLine = false;
 
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
     mCommandLine = false;
 

+    ExitStatus status = OK;
+

     try 
     {
     try 
     {

-      SwitchToFile(filename, use_configuration_file);
+      SwitchToFile(filename);

       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()))
-         {
-            mLine.back()++;
-            char buf[500];
-            mFile.back()->getline(buf,500);
-      
-            std::string str(buf);
-            int size=str.length();
-            if ( str[ size-1 ]==13  )
+       while (!mFile.back()->eof()) {
+         mLine.back()++;
+         char buf[500];
+         mFile.back()->getline(buf,500);
+         std::string str(buf);
+         int size=str.length();
+         if ( str[ size-1 ]==13  )

             {
             {

-               str.erase(size-1,1);
+             str.erase(size-1,1);

             }
             }

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

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

+      status = QUIT;

     }
     catch (bbtk::Exception e) 
     {
     }
     catch (bbtk::Exception e) 
     {


@@ -344,6 +345,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
       }    
          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
       }    

+      status = ERROR;

     }
     catch (std::exception& e) 
     {
     }
     catch (std::exception& e) 
     {


@@ -351,15 +353,17 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
        if (mFileName.size()) {
           std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
           std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
        if (mFileName.size()) {
           std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
           std::cerr << "* LINE  : "<<mLine.back()<<std::endl;

-       }    
+       }  
+      status = ERROR;

     }  
     catch (...)
     {
     }  
     catch (...)
     {

-       std::cout << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+       std::cerr << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;

        if (mFileName.size()) {
        if (mFileName.size()) {

-          std::cout << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
-          std::cout << "* LINE  : "<<mLine.back()<<std::endl;
+          std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+          std::cerr << "* LINE  : "<<mLine.back()<<std::endl;

       }    
       }    

+       status = ERROR;

     }
 
     CloseAllFiles();
     }
 
     CloseAllFiles();


@@ -367,10 +371,138 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     bbtkDecTab("Interpreter",9);
 
     mCommandLine = exm;
     bbtkDecTab("Interpreter",9);
 
     mCommandLine = exm;

+    
+    return status;

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

+  //=======================================================================
+  /**
+   *  
+   */
+  Interpreter::ExitStatus 
+  Interpreter::InterpretBuffer( std::stringstream* buffer )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretBuffer()"<<std::endl);
+
+    bool exm = mCommandLine;
+    mCommandLine = false;
+
+    ExitStatus status = OK;
+
+    try 
+    {
+      SwitchToStream(buffer);
+      bool insideComment = false; // for multiline comment
+      while (mFile.size()>0) 
+      {
+       while (!mFile.back()->eof()) {
+         mLine.back()++;
+         char buf[500];
+         mFile.back()->getline(buf,500);
+         std::string str(buf);
+         
+         int size=str.length();
+         if ( str[ size-1 ]==13  )
+            {
+             str.erase(size-1,1);
+            }
+         
+         InterpretLine(str, insideComment);
+         
+       }//while
+       
+       CloseCurrentFile();
+      }
+    }
+    catch (QuitException e) 
+      { 
+       status = QUIT;
+      }
+    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;
+         }    
+       status = ERROR;
+      }
+    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;
+         }    
+       status = ERROR;
+    }  
+    catch (...)
+      {
+       std::cerr 
+         << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+       if (mFileName.size()) 
+         {
+           std::cerr << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+           std::cerr << "* LINE  : "<<mLine.back()<<std::endl;
+         }    
+       status = ERROR;
+      }
+    
+    CloseAllFiles();
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    mCommandLine = exm;
+    return status;
+  }
+  //=======================================================================
+
+  //=======================================================================
+  /// Runs the interpretation of a command
+  Interpreter::ExitStatus Interpreter::InterpretLine( const std::string& line )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine('"<<line<<"')"<<std::endl);
+
+    ExitStatus status = OK;
+
+    try 
+    {
+      bool insideComment = false;
+      InterpretLine(line, insideComment);
+    }
+    catch (QuitException e) 
+      { 
+      status = QUIT;
+      }
+    catch (bbtk::Exception e) 
+      {
+       std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
+       status = ERROR;
+      }
+    catch (std::exception& e) 
+      {
+       std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+       status = ERROR;
+    }  
+    catch (...)
+      {
+       std::cerr 
+         << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+       status = ERROR;
+      }
+    
+
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
+                    <<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    return status;
+  }
+  

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


@@ -378,7 +510,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
 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);
 


@@ -484,7 +615,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         break;
 
       case cPrint :
         break;
 
       case cPrint :

-        Print(words[1]); /// \todo use mExecuter 
+        Print(words[1]); /// \todo use generate command 

         break;
         
       case cExec :
         break;
         
       case cExec :


@@ -556,32 +687,32 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         Config();
         break;
 
         Config();
         break;
 

-      case cReset :  // EED
+      case cReset :  

         this->mExecuter->Reset();
         break;
 
       case cInclude :
         if (mCommandLine)
         {
         this->mExecuter->Reset();
         break;
 
       case cInclude :
         if (mCommandLine)
         {

-           InterpretFile(words[1], true ); // true : better pass use_config_file
+           InterpretFile(words[1]); 

         }
         else
         {
         }
         else
         {

-            SwitchToFile(words[1], true ); // true : better pass use_config_file
+            SwitchToFile(words[1]);

         }
        // if 'source' was given
        if (words.size()==3) 
          {
         }
        // if 'source' was given
        if (words.size()==3) 
          {

-           this->mExecuter->SetCurrentFileName(words[1]);
+           GetExecuter()->SetCurrentFileName(words[1]);

          }
         break;
 
       case cLoad:
          }
         break;
 
       case cLoad:

-        LoadPackage(words[1], true ); // true : better pass use_config_file
+        GetExecuter()->GetFactory()->LoadPackage(words[1]);

         break;
 
       case cUnload:
         break;
 
       case cUnload:

-        UnLoadPackage(words[1]);
+        GetExecuter()->GetFactory()->UnLoadPackage(words[1]);

         break;
 
       case cQuit :
         break;
 
       case cQuit :


@@ -659,10 +790,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);

-   }
+    }

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


@@ -675,7 +806,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   {
     if (mExecuter->GetNoExecMode()) return;
 
   {
     if (mExecuter->GetNoExecMode()) return;
 

-    bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""<<str<<"\")"<<std::endl);
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<<str<<"\")"<<std::endl);
+
+ // TO DO :
+ // InterpretLine ("load std")
+ // InterpretLine("new ConcatStrings _C_ ") -> trouver un nom unique : # commande 
+ // InterpretLine("new Print _P_") 
+ // InterpretLine("connect _C_.Out _P_.In")
+ // int num = 1
+ 

 
     std::vector<std::string> chains;
     std::string delimiters("$");
 
     std::vector<std::string> chains;
     std::string delimiters("$");


@@ -694,14 +833,21 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        {
           // Found a text token, add it to the vector.
           chains.push_back(str.substr(lastPos, pos - lastPos));
        {
           // Found a text token, add it to the vector.
           chains.push_back(str.substr(lastPos, pos - lastPos));

+ // std::string token = str.substr(lastPos, pos - lastPos)
+ // InterpretLine("set _C_.In%num% %token%")
+ 

        }
        else 
        {
        }
        else 
        {

+

        // is an output (between $$) : decode 
          std::string tok,box,output;
          tok = str.substr(lastPos, pos - lastPos);
          Utilities::SplitAroundFirstDot(tok,box,output);
          chains.push_back( mExecuter->Get(box,output) );
        // is an output (between $$) : decode 
          std::string tok,box,output;
          tok = str.substr(lastPos, pos - lastPos);
          Utilities::SplitAroundFirstDot(tok,box,output);
          chains.push_back( mExecuter->Get(box,output) );

+
+// InterpretLine("connect %tok% _C_.In%num%") 
+

        }
         // Skip delimiters.  Note the "not_of"
        lastPos = str.find_first_not_of(delimiters, pos);
        }
         // Skip delimiters.  Note the "not_of"
        lastPos = str.find_first_not_of(delimiters, pos);


@@ -709,7 +855,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        pos = str.find_first_of(delimiters, lastPos);
     //
        is_text = !is_text;
        pos = str.find_first_of(delimiters, lastPos);
     //
        is_text = !is_text;

+// num ++;

      }
      }

+// InterpretLine("exec _P_")
+// if (IS_IN_WORKSPACE) InterpretLine("delete _C_; delete _P_");
+

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


@@ -728,8 +878,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
 // ===================================================================================
 
 
 // ===================================================================================
 

-  void Interpreter::SwitchToFile( const std::string& name,
-                                  bool use_configuration_file )
+  void Interpreter::SwitchToFile( const std::string& name )

   {
   // Note : in the following :
   // name : the user supplied name 
   {
   // Note : in the following :
   // name : the user supplied name 


@@ -749,43 +898,66 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     std::string pkgname;             // e.g. <scriptname>.bbs
     std::vector<std::string> Filenames;
 
     std::string pkgname;             // e.g. <scriptname>.bbs
     std::vector<std::string> Filenames;
 

-    if (use_configuration_file)
-    {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-      bbtkMessage("Interpreter",1,
-                 "look for : [" << name
-                 << "] (use_configuration_file == TRUE)" << std::endl);
-      script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
-    }
+    // The following is *NOT* a debug time message :
+    // It's a user intended message.
+    // Please don't remove it.
+    bbtkMessage("Interpreter",1,
+        "look for : [" << name
+        << "]" << std::endl);
+    script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
+

     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
 
     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
-           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)
+        } // 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;


@@ -800,11 +972,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);
 


@@ -814,33 +985,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
-           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("/\\");
 


@@ -861,7 +1049,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")


@@ -874,21 +1062,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 == ".") {


@@ -898,10 +1084,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) )


@@ -909,12 +1092,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;


@@ -941,23 +1124,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;


@@ -988,15 +1222,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);


@@ -1016,6 +1252,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();


@@ -1024,6 +1262,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);


@@ -1076,7 +1315,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     {
       if (words[1]=="packages") 
       {
     {
       if (words[1]=="packages") 
       {

-         PrintPackages(true);
+         GetExecuter()->GetFactory()->PrintPackages(true);

          return;
       }
       try 
          return;
       }
       try 


@@ -1087,16 +1326,16 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          try 
          {
       {
          try 
          {

-            HelpPackage(words[1]);
+            GetExecuter()->GetFactory()->HelpPackage(words[1]);

 #ifdef _USE_WXWIDGETS_
 #ifdef _USE_WXWIDGETS_

-           if ( WxConsole::GetInstance() != 0 )
+           if ( mWxConsole != 0 )

              {
                std::string url = 
                  ConfigurationFile::GetInstance().Get_doc_path();
                url += "/bbdoc/" + words[1] + "/index.html";
                if (Utilities::FileExists(url)) 
                  {
              {
                std::string url = 
                  ConfigurationFile::GetInstance().Get_doc_path();
                url += "/bbdoc/" + words[1] + "/index.html";
                if (Utilities::FileExists(url)) 
                  {

-                   WxConsole::GetInstance()->ShowHtmlPage(url);
+                   mWxConsole->ShowHtmlPage(url);

                  }
              }
 #endif     
                  }
              }
 #endif     


@@ -1106,9 +1345,9 @@ void Interpreter::Help(const std::vector<std::string>& words)
             try 
             {
              std::string package;
             try 
             {
              std::string package;

-             HelpBlackBox(words[1],package);
+             GetExecuter()->GetFactory()->HelpBlackBox(words[1],package);

 #ifdef _USE_WXWIDGETS_
 #ifdef _USE_WXWIDGETS_

-              if ( WxConsole::GetInstance() != 0 )
+              if ( mWxConsole != 0 )

                 {
                   std::string url = 
                     ConfigurationFile::GetInstance().Get_doc_path();
                 {
                   std::string url = 
                     ConfigurationFile::GetInstance().Get_doc_path();


@@ -1116,7 +1355,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
                   if (Utilities::FileExists(url))
                     {
                       url += "#" + words[1];
                   if (Utilities::FileExists(url))
                     {
                       url += "#" + words[1];

-                      WxConsole::GetInstance()->ShowHtmlPage(url);
+                      mWxConsole->ShowHtmlPage(url);

                     }
                 }
 #endif
                     }
                 }
 #endif


@@ -1125,7 +1364,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
              {
                try
                  {
              {
                try
                  {

-                   this->mExecuter->ShowRelations(words[1],"0","9999");
+                   GetExecuter()->ShowRelations(words[1],"0","9999");

                  }
                catch (bbtk::Exception h){
                  bbtkError("\""<<words[1].c_str()
                  }
                catch (bbtk::Exception h){
                  bbtkError("\""<<words[1].c_str()


@@ -1141,12 +1380,12 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          if ( words[1]=="packages" )
          {
       {
          if ( words[1]=="packages" )
          {

-            PrintPackages(true,true);
+            GetExecuter()->GetFactory()->PrintPackages(true,true);

             return;
           }
          try 
          {
             return;
           }
          try 
          {

-            HelpPackage(words[1],true);
+            GetExecuter()->GetFactory()->HelpPackage(words[1],true);

          }
          catch (bbtk::Exception f) 
          {
          }
          catch (bbtk::Exception f) 
          {


@@ -1481,6 +1720,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
       }
       catch (QuitException e)
       {
       }
       catch (QuitException e)
       {

+       bbtkMessage("Interpreter",1,"Interpreter : Quit"<<std::endl);

         again = false;
       }
       catch (bbtk::Exception e) 
         again = false;
       }
       catch (bbtk::Exception e) 


@@ -1514,7 +1754,7 @@ void Interpreter::Graph(const std::vector<std::string>& words)
     bool system_display = true;
 
 #ifdef _USE_WXWIDGETS_
     bool system_display = true;
 
 #ifdef _USE_WXWIDGETS_

-    if ( WxConsole::GetInstance() != 0 ) system_display = false; 
+    if ( mWxConsole != 0 ) system_display = false; 

 #endif
  
     if (words.size()==1) 
 #endif
  
     if (words.size()==1) 


@@ -1547,8 +1787,8 @@ void Interpreter::Graph(const std::vector<std::string>& words)
       } 
     
 #ifdef _USE_WXWIDGETS_
       } 
     
 #ifdef _USE_WXWIDGETS_

-    if ( WxConsole::GetInstance() != 0 )
-      WxConsole::GetInstance()->ShowHtmlPage(page);
+    if ( mWxConsole != 0 )
+      mWxConsole->ShowHtmlPage(page);

 #endif
   }
 //=======================================================================
 #endif
   }
 //=======================================================================


@@ -1562,8 +1802,9 @@ void  Interpreter::Index(const std::string& filename,
   if (type=="Initials") t = Factory::Initials;
   else if (type=="Categories") t = Factory::Categories;
   else if (type=="Packages") t = Factory::Packages;
   if (type=="Initials") t = Factory::Initials;
   else if (type=="Categories") t = Factory::Categories;
   else if (type=="Packages") t = Factory::Packages;

+  else if (type=="Adaptors") t = Factory::Adaptors;

   
   

-  GetGlobalFactory()->CreateHtmlIndex(t,filename);
+  GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename);

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