X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=2147d0ca35c1b84760ca57380c523ad77b85b89a;hb=3924782985e3d7c795af6bb46c602157cfad59f0;hp=dfea3e87dbc8487d9aeb4777f83d1a99bdfa0af5;hpb=2769d3123cddecf9d220bd5458d9e2855f298006;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index dfea3e8..2147d0c 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/02/06 09:27:52 $
-  Version:   $Revision: 1.26 $
+  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
@@ -17,15 +17,16 @@
 =========================================================================*/
 /**
  *  \file 
- *  \brief class Interpreter : 
+ *  \brief class Interpreter :
  */
 
-#include "bbtkInterpreter.h" 
+#include "bbtkInterpreter.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
 #include "bbtkWxConsole.h"
 #include "bbtkUtilities.h"
 #include <sys/stat.h>
+#include <algorithm>
 #ifdef CMAKE_HAVE_TERMIOS_H
 #include <termios.h>
 #define BBTK_USE_TERMIOS_BASED_PROMPT
@@ -36,25 +37,31 @@
 namespace bbtk
 {
 
-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+  //Interpreter* Interpreter::mGlobalInterpreter = NULL;
 
  //=======================================================================
  /**
-   *  
+   *
    */
   Interpreter::Interpreter() 
     :
+#ifdef _USE_WXWIDGETS_
+    mWxConsole(0),
+#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);
  
-    mGlobalInterpreter = this;
-
-    //    mFactory = new bbtk::Factory();
     mExecuter = new bbtk::Executer();
-    //mExecuter->SetFactory(mFactory);
+    mExecuter->SetInterpreter(this);
+    
+    // For the time being, comment out previous line, and
+    // uncomment next line to check Transcriptor
+
+    //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt");
 
     // Builds the commands dict
     CommandInfoType info;
@@ -168,11 +175,11 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     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;
 
-    info.category = "reset";  //EED
+    info.category = "reset";  
     info.argmin = 0;
     info.argmax = 0;
     info.code = cReset;
@@ -225,7 +232,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmax = 2;
     info.code = cInclude;
     info.syntax = "include <filename> [source]";
-    info.help = "Includes the file <filename>.\n Advanced (used to get the right 'Include' field in doc of packages appli) : If the keyword 'source' is provided then informs bbi that the included file is the source of the current box definition.";
+    info.help = "Includes the file <filename>.\n  'source' : If the keyword 'source' is provided then informs bbi that the included file is the source of the current box definition (Advanced; used to get the right 'Include' field in html doc of packages 'appli' scripts).";
     mCommandDict[info.category] = info;
 
     info.category = "quit";
@@ -285,7 +292,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
-    //delete mFactory;
 
     bbtkDebugDecTab("Interpreter",9);
   }
@@ -296,38 +302,53 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   /**
    *  
    */
-  void Interpreter::InterpretFile( const std::string& filename,  
-				   bool use_configuration_file)
+  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, use_configuration_file);
+      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) 
       {
-         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);
-      
             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);
-         }
-        //if (mFile.size()>0) 
-        CloseCurrentFile();
+	        InterpretLine(str, insideComment);
+
+       }//while
+       //if (mFile.size()>0) 
+       CloseCurrentFile();
       }
     }
     catch (QuitException e) 
@@ -367,6 +388,97 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   //=======================================================================
 
 
+  //=======================================================================
+  /**
+   *  
+   */
+  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;
+  }
+  //=======================================================================
+
+
 
   //=======================================================================  
   /**
@@ -374,7 +486,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
 void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 {
-
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
     bbtkMessage("Echo",2,"\""<<line<<"\""<<std::endl);
 
@@ -440,18 +551,18 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cNew :
         mExecuter->Create(words[1],words[2]);
         break;
-        
+
       case cDelete :
         // TO DO !!
         // mExecuter->Remove(words[1]);
         break;
-        
+
       case cConnect :
         Utilities::SplitAroundFirstDot(words[1],left,right);
         Utilities::SplitAroundFirstDot(words[2],left2,right2);      
         mExecuter->Connect(left,right,left2,right2);
         break;
-        
+
       case cPackage :
         mExecuter->BeginPackage(words[1]);
         break;
@@ -459,7 +570,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cEndPackage :
         mExecuter->EndPackage();
         break;
-        
+
       case cDefine :
         if (mFileName.size()>0) 
         {
@@ -469,18 +580,18 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         {
            mExecuter->Define(words[1],"",filename);
         }
-        else 
+        else
         {
            mExecuter->Define(words[1],words[2],filename);
         }
         break;
-        
+
       case cEndDefine :
         mExecuter->EndDefine();
         break;
-        
+
       case cPrint :
-        Print(words[1]); /// \todo use mExecuter 
+        Print(words[1]); /// \todo use generate command 
         break;
         
       case cExec :
@@ -488,108 +599,110 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
           mExecuter->SetNoExecMode(true);
         else if (words[1]=="unfreeze") 
           mExecuter->SetNoExecMode(false);
-        else 
+        else
           mExecuter->Update(words[1]);
         break;
-        
+
       case cInput :
         Utilities::SplitAroundFirstDot(words[2],left,right);
         mExecuter->DefineInput(words[1],left,right,words[3]);
         break;
-        
+
       case cOutput :
         Utilities::SplitAroundFirstDot(words[2],left,right);
         mExecuter->DefineOutput(words[1],left,right,words[3]);
         break;
-        
+
       case cSet :
         Utilities::SplitAroundFirstDot(words[1],left,right);
         mExecuter->Set(left,right,words[2]);
         break;
-        
+
       case cAuthor :
         mExecuter->Author(words[1]);
         break;
 
-    case cCategory :
-      mExecuter->Category(words[1]);
-      break;
-      
-    case cIndex :
-      if (words.size()==1) 
-	Index("tmp_index.html");
-      else if (words.size()==2) 
-	Index(words[1]);
-      else if (words.size()==3) 
-	Index(words[1],words[2]);
-      break;
-    case cDescription :
-      mExecuter->Description(words[1]);
+      case cCategory :
+        mExecuter->Category(words[1]);
         break;
-        
+
+      case cIndex :
+        if (words.size()==1)
+	     Index("tmp_index.html");
+        else if (words.size()==2)
+	     Index(words[1]);
+        else if (words.size()==3)
+	     Index(words[1],words[2]);
+        break;
+
+      case cDescription :
+        mExecuter->Description(words[1]);
+        break;
+
       case cHelp :
         Help(words);
         break;
-        
+
       case cMessage : 
-        if (words.size()<3) 
+        if (words.size()<3)
         {
-            bbtk::MessageManager::PrintInfo();
+           bbtk::MessageManager::PrintInfo();
         }
-        else 
+        else
         {
            sscanf(words[2].c_str(),"%d",&level);
            bbtk::MessageManager::SetMessageLevel(words[1],level);
         }
         break;
-        
-      case cGraph : 
+
+      case cGraph :
         Graph(words);
         break;
-        
+
       case cConfig :
-        Config();            
+        Config();
         break;
-        
-      case cReset :  // EED
+
+      case cReset :  
         this->mExecuter->Reset();
         break;
-        
+
       case cInclude :
-        if (mCommandLine) 
+        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) 
 	  {
-	    this->mExecuter->SetCurrentFileName(words[1]);
+	    GetExecuter()->SetCurrentFileName(words[1]);
 	  }
         break;
-        
+
       case cLoad:
-        LoadPackage(words[1], true ); // true : better pass use_config_file
+        GetExecuter()->GetFactory()->LoadPackage(words[1]);
         break;
-        
+
       case cUnload:
-        UnLoadPackage(words[1]);
+        GetExecuter()->GetFactory()->UnLoadPackage(words[1]);
         break;
-        
+
       case cQuit :
+        delete mExecuter;
         throw QuitException();
         break;
-        
-         case cWorkspace :
+
+      case cWorkspace :
         if (words.size() == 2) 
         {
            if (words[1]=="freeze")        mExecuter->SetNoExecMode(true);
            else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
         }
-        else 
+        else
         {
            mExecuter->SetWorkspaceName(words[2]);
         }
@@ -598,7 +711,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       default:
         bbtkInternalError("should not reach here !!!");
    }
-    
+
    bbtkDecTab("Interpreter",9);
 }
   //=======================================================================  
@@ -609,12 +722,12 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 
   //=======================================================================
   /**
-   *  
+   *
    */
 void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>& tokens)
 {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""<<str<<"\")"<<std::endl);
- 
+
     std::string delimiters = "\"";
     std::vector<std::string> quote;
     Utilities::SplitString(str,delimiters,quote);
@@ -639,7 +752,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     }
     bbtkDebugMessageCont("Interpreter",9,std::endl);
 
-    bbtkDebugDecTab("Interpreter",9);    
+    bbtkDebugDecTab("Interpreter",9);
  }
   //=======================================================================
 
@@ -653,23 +766,31 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     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);
-   } 
+    }
   }
   //=======================================================================
 
 
   //=======================================================================
   /**
-   *  
+   *
    */
   void Interpreter::Print( const std::string& str)
   {
     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("$");
@@ -678,24 +799,31 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
     bool is_text = true;
     if (lastPos>0) is_text = false;
-  
+
     // Find first delimiter.
     std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-    
+
     while (std::string::npos != pos || std::string::npos != lastPos)
     {
        if (is_text) 
        {
           // 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 
        {
+
        // 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);
@@ -703,7 +831,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        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) 
      {
@@ -712,18 +844,17 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        std::cout << *i;
      }
      std::cout << std::endl;
-     bbtkDebugDecTab("Interpreter",9);    
+     bbtkDebugDecTab("Interpreter",9);
  }
 
   //=======================================================================
   /**
-   *  
+   *
    */
 
 // ===================================================================================
 
-  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 
@@ -734,7 +865,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   //
   // use ./directory/subdir/scrname.bbs
   //
-  
+
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 
@@ -742,51 +873,72 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     std::string fullPathScriptName;  // full path script name
     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);
 
+    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/*)
     {
+// std::cout << "JPR==================  * found, load all boxes " << std::endl;
       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
       {
+// 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)
         {
-           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++;
-        }
-        if (nbBssFiles==0)
+        } // for vector
+		if (nbBssFiles==0){
            bbtkMessage("Interpreter",2,
 		       "WARNING : No '.bbs' file found in [" 
 		       << upath << "]" << std::endl);
-
+		} else {
+            SwitchToStream(stream);
+		}
         return;
-      }
-      
+      }  // if upath
 
       std::string path;
       std::vector<std::string>::iterator i;
       std::string fullDirectoryName;
-      for (i=script_paths.begin();i!=script_paths.end();++i)// ==== relative name, iterate + load all .bbs files
+      for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files
       {
         path = *i;
 
@@ -796,44 +948,63 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           char * currentDir = getcwd(buf, 2048);
           std::string cwd(currentDir);
           path = currentDir;
-        }
+        } // if path
 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
 
-      // Check if library exists           
-        if ( ! Utilities::IsDirectory(fullDirectoryName) )
+        // without last slash "\"
+        std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1);
+
+      // Check if library exists
+        if ( ! Utilities::IsDirectory( fullDirectoryNameClean ) )
         {
         // 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
-        }
+        } // if IsDirectory
         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)
         {
+// 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);
 
-           if ((*i).substr((*i).size()-4, 4) != ".bbs")
-              continue;      // ignore non .bbs files
-           LoadScript(*i,name);
            nbBssFiles++;
-        }
-        if (nbBssFiles==0)
-	  bbtkMessage("Interpreter",1,
+        } // for vector
+		if (nbBssFiles==0){
+           bbtkMessage("Interpreter",1,
 		      "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 !
-       }
+       } // for vector
        return;
-    }
+    }  // if *
 
     //std::string::size_type slash_position = name.find_last_of("/\\");
 
@@ -848,14 +1019,13 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       // ===========================================================check user supplied location
       fullnameGiven = true;
 
-      
       fullPathScriptName =  Utilities::ExpandLibName(name, false);
 
       // allow user to always forget ".bbs"
       int l = fullPathScriptName.size();
 
       if (l!=0) {
-      
+
       if (l>4)
       {
          if (fullPathScriptName.substr(l-4, 4) != ".bbs")
@@ -868,21 +1038,19 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
          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)
       {
-
         path = *i;
        // we *really* want '.' to be the current working directory
         if (path == ".") {
@@ -892,10 +1060,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
           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) )
@@ -903,14 +1068,14 @@ 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.
-	  bbtkMessage("Interpreter",2,
+	      bbtkMessage("Interpreter",2,
 		      "   [" <<fullPathScriptName <<"] : doesn't exist" 
 		      <<std::endl);
           continue;  // try next path
         }
-	bbtkMessage("Interpreter",2,
+	    bbtkMessage("Interpreter",2,
 		    "   [" <<fullPathScriptName 
-		    <<"] : found" <<std::endl);        
+		    <<"] : found" <<std::endl);
         foundFile = true;
         break; // a script was found; we stop iterating
 
@@ -926,37 +1091,88 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
             bbtkError("Script ["<<fullPathScriptName<<"] not found");
        else
           bbtkError("No ["<<pkgname<<".bbs] script found");
-       return;    
+       return;
     }
     else
       LoadScript(fullPathScriptName,name);
 
     return;
-  }   
-   
+  }
+
+
+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)
   {
-    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);
-	return;
-      }
+        return;
+     }
 
-    std::ifstream* s;      
+    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;     
+        return;
     }
-    
+
     bbtkMessage("Interpreter",1,"   -->[" << fullPathScriptName 
 		<< "] found" << std::endl);
 
@@ -964,7 +1180,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     mFileName.push_back(fullPathScriptName);
     mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);
-    return;  
+    return;
   }
 
   //=======================================================================
@@ -975,22 +1191,24 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()"
                       <<std::endl);
-    
-    if (mFile.size()==0) 
+
+    if (mFile.size()==0)
     {
       bbtkDebugMessage("Interpreter",9," -> no file left open"<<std::endl);
       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();
-    bbtkDebugMessage("Interpreter",9,
-                     " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-    
     mFileName.pop_back();
     mIncludeFileName.pop_back();
     mLine.pop_back();
+
     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);
@@ -1007,9 +1225,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()"
                       <<std::endl);
-    
+
     while (mFile.size() != 0) 
     {
+       CloseCurrentFile();
+    /*
       mFile.back()->close();
       delete mFile.back();
       mFile.pop_back();
@@ -1018,6 +1238,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       mFileName.pop_back();
       mIncludeFileName.pop_back();
       mLine.pop_back();
+*/
     }
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
                       <<std::endl);
@@ -1034,7 +1255,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
                                       CommandInfoType& info )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretCommand(...)"<<std::endl);
-    
+
     // searches the command category
     CommandDictType::iterator c;
     c = mCommandDict.find(words[0]);
@@ -1061,7 +1282,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 void Interpreter::Help(const std::vector<std::string>& words)
 {
     unsigned int nbarg = words.size()-1;
-    
+
     if (nbarg==0) 
     {
        HelpCommands();
@@ -1070,7 +1291,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     {
       if (words[1]=="packages") 
       {
-         PrintPackages(true);
+         GetExecuter()->GetFactory()->PrintPackages(true);
          return;
       }
       try 
@@ -1081,27 +1302,53 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          try 
          {
-            HelpPackage(words[1]);
+            GetExecuter()->GetFactory()->HelpPackage(words[1]);
+#ifdef _USE_WXWIDGETS_
+	    if ( mWxConsole != 0 )
+	      {
+		std::string url = 
+		  ConfigurationFile::GetInstance().Get_doc_path();
+		url += "/bbdoc/" + words[1] + "/index.html";
+		if (Utilities::FileExists(url)) 
+		  {
+		    mWxConsole->ShowHtmlPage(url);
+		  }
+	      }
+#endif	    
          }
          catch (bbtk::Exception f) 
          {
             try 
             {
-               HelpBlackBox(words[1]);
-            }
-           catch (bbtk::Exception g) 
-           {
-              try
-              {
-                 this->mExecuter->ShowRelations(words[1],"0","9999");
-              }
-              catch (bbtk::Exception h){
-                bbtkError("\""<<words[1].c_str()
-                          <<"\" is not a known command, package, black box type or black box name");
-              }
-           }
+	      std::string package;
+	      GetExecuter()->GetFactory()->HelpBlackBox(words[1],package);
+#ifdef _USE_WXWIDGETS_
+	       if ( mWxConsole != 0 )
+		 {
+		   std::string url = 
+		     ConfigurationFile::GetInstance().Get_doc_path();
+		   url += "/bbdoc/" + package + "/index.html";
+		   if (Utilities::FileExists(url))
+		     {
+		       url += "#" + words[1];
+		       mWxConsole->ShowHtmlPage(url);
+		     }
+		 }
+#endif
+	    }
+	    catch (bbtk::Exception g) 
+	      {
+		try
+		  {
+		    GetExecuter()->ShowRelations(words[1],"0","9999");
+		  }
+		catch (bbtk::Exception h){
+		  bbtkError("\""<<words[1].c_str()
+			    <<"\" is not a known command, package, black box type or black box name");
+		}
+	      }
          }
-       }
+      }
     }
     else if (nbarg==2) 
     {
@@ -1109,12 +1356,12 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          if ( words[1]=="packages" )
          {
-            PrintPackages(true,true);
+            GetExecuter()->GetFactory()->PrintPackages(true,true);
             return;
           }
          try 
          {
-            HelpPackage(words[1],true);
+            GetExecuter()->GetFactory()->HelpPackage(words[1],true);
          }
          catch (bbtk::Exception f) 
          {
@@ -1137,44 +1384,9 @@ void Interpreter::Help(const std::vector<std::string>& words)
   /// Displays the Configuration
   void Interpreter::Config() const
   {
-    bbtkDebugMessageInc("Kernel",9,"Factory::Config"<<std::endl);
-    
-    ConfigurationFile cf = ConfigurationFile::GetInstance();
-    
-    const std::string config_xml_full_path      = cf.Get_config_xml_full_path();    
-    const std::string description               = cf.Get_description();
-    const std::string url                       = cf.Get_url();
-    const std::string data_path                 = cf.Get_data_path();
-    const std::string default_doc_tmp           = cf.Get_default_doc_tmp();    
-    const std::string file_separator            = cf.Get_file_separator();    
-    const std::vector<std::string>bbs_paths     = cf.Get_bbs_paths();
-    const std::vector<std::string>package_paths = cf.Get_package_paths();
-    
-    bbtkMessage("Help",1, "============="   << std::endl);           
-    bbtkMessage("Help",1, "Configuration"   << std::endl);
-    bbtkMessage("Help",1, "============="   << std::endl);
-    bbtkMessage("Help",1, "bbtk_config.xml   : [" << config_xml_full_path  << "]" << std::endl); 
-    bbtkMessage("Help",1, "Documentation Url : [" << url             << "]" << std::endl);
-    bbtkMessage("Help",1, "Data Path         : [" << data_path       << "]" << std::endl);
-    bbtkMessage("Help",1, "Default Doc_tmp   : [" << default_doc_tmp << "]" << std::endl);
-    bbtkMessage("Help",1, "File Separator    : [" << file_separator  << "]" << std::endl);
-
-    std::vector<std::string>::const_iterator i;
-           
-    bbtkMessage("Help",1, "BBS Paths   " << std::endl);     
-    for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i )
-    {
-      bbtkMessage("Help",1,"--- ["<<*i<<"]"<<std::endl);
-    }    
-    
-    bbtkMessage("Help",1, "PACKAGE Paths : " << std::endl);     
-    for (i = package_paths.begin(); i!=package_paths.end(); ++i )
-    {
-      bbtkMessage("Help",1,"--- ["<<*i<<"]"<<std::endl);
-    }
-
-    bbtkDebugDecTab("Kernel",9);
+    ConfigurationFile::GetInstance().GetHelp(1);
   }  
+   //===================================================================    
 
   //=======================================================================
   /// Displays help on all the commands
@@ -1188,7 +1400,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
               std::cout << " " << i->first << std::endl;
       //      std::cout << "   usage : " << i->second.syntax << std::endl;
       //     std::cout << "    " << i->second.help << std::endl;
- 
+
     }
   }
   //=======================================================================
@@ -1210,7 +1422,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     //      ++i) {
     std::cout << " usage : " << c->second.syntax << std::endl;
     std::cout << "  " << c->second.help << std::endl;
-    
+
   }
   //=======================================================================
 
@@ -1234,7 +1446,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
   //=======================================================================
 
 
-  
+
   //=======================================================================
 #ifdef BBTK_USE_TERMIOS_BASED_PROMPT
   
@@ -1257,19 +1469,18 @@ void Interpreter::Help(const std::vector<std::string>& words)
   {
     int c;
     int ind=0;
-    
+
     int MAX_LINE_SIZE = 160;
     int MAX_HISTORY_SIZE = 100;
-    
+
     char* newline = new char[MAX_LINE_SIZE];
     memset(newline,0,MAX_LINE_SIZE);
     char* histline = new char[MAX_LINE_SIZE];
     memset(histline,0,MAX_LINE_SIZE);
-    
+
     char* line = newline;
     int hist = mHistory.size();
-    
-    
+
     write(1,"> ",2);
     while(1)
     {
@@ -1458,7 +1669,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
   {
     bbtkDebugMessageInc("Interpreter",9,
                         "Interpreter::CommandLineInterpreter()"<<std::endl);
-    
+
 #ifdef BBTK_USE_TERMIOS_BASED_PROMPT  
     // Initialise the tty in non canonical mode with no echo
     // oter remembers the previous settings to restore them after 
@@ -1501,13 +1712,13 @@ void Interpreter::Help(const std::vector<std::string>& words)
       }
     }
     while (again);
-  
+
 #ifdef BBTK_USE_TERMIOS_BASED_PROMPT
     tcsetattr(0,TCSANOW,&oter);
 #endif
-  
+
     std::cout << "Good bye !" << std::endl;
-    
+
     bbtkDebugDecTab("Interpreter",9);
   }
 
@@ -1518,7 +1729,7 @@ void Interpreter::Graph(const std::vector<std::string>& words)
     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) 
@@ -1551,8 +1762,8 @@ void Interpreter::Graph(const std::vector<std::string>& words)
       } 
     
 #ifdef _USE_WXWIDGETS_
-    if ( WxConsole::GetInstance() != 0 )
-      WxConsole::GetInstance()->ShowHtmlPage(page);
+    if ( mWxConsole != 0 )
+      mWxConsole->ShowHtmlPage(page);
 #endif
   }
 //=======================================================================
@@ -1566,8 +1777,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;
+  else if (type=="Adaptors") t = Factory::Adaptors;
   
-  GetGlobalFactory()->CreateHtmlIndex(t,filename);
+  GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename);
 }
 //=======================================================================