X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=62f523319641ce16d9e5e447d22207fcbd2ebc81;hb=13304e56deca37fe54072b423bc1214687ec503a;hp=a6101a5a2881f678cc33247ad30dfa9165f0fab9;hpb=cadbc7f9439327013dfbefa9415ad7c8680fb351;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index a6101a5..62f5233 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/01/29 10:12:45 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/04/25 08:05:23 $
+  Version:   $Revision: 1.65 $
                                                                                 
   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,18 @@
 =========================================================================*/
 /**
  *  \file 
- *  \brief class Interpreter : 
+ *  \brief class Interpreter :
  */
 
-#include "bbtkInterpreter.h" 
+#include "bbtkInterpreter.h"
+#include "bbtkExecuter.h"
+#include "bbtkTranscriptor.h"
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
-#include "bbtkWxConsole.h"
 #include "bbtkUtilities.h"
+#include "bbtkWxBlackBox.h"
 #include <sys/stat.h>
+#include <algorithm>
 #ifdef CMAKE_HAVE_TERMIOS_H
 #include <termios.h>
 #define BBTK_USE_TERMIOS_BASED_PROMPT
@@ -36,25 +39,45 @@
 namespace bbtk
 {
 
-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+ //=======================================================================
+  Interpreter::Pointer Interpreter::New(const std::string& cpp_file) 
+  {
+    bbtkDebugMessage("Kernel",9,"Interpreter::New()"<<std::endl);
+    return MakePointer(new Interpreter(cpp_file));
+  }
+ //=======================================================================
 
  //=======================================================================
- /**
-   *  
-   */
-  Interpreter::Interpreter() 
+  Interpreter::Interpreter(const std::string& cpp_file) 
     :
-    mCommandLine(false), verbose(false)
+    mUser(0),
+    mCommandLine(false),
+    mThrow(false)
   {
-    bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
+
+    bufferNb =0;  
+    bbtk::MessageManager::RegisterMessageType("echo","Level>0 : Prints the output of the 'print' 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;
+    if (cpp_file.size()!=0)
+      {
+	mVirtualExecuter = boost::static_pointer_cast<VirtualExec>(bbtk::Transcriptor::New(cpp_file));
+      }
+    else 
+      {
+	bbtk::Executer::Pointer exe = bbtk::Executer::New();
+	mRealExecuter = exe;
+	mVirtualExecuter = boost::static_pointer_cast<VirtualExec>(exe);
+      }
 
-    //    mFactory = new bbtk::Factory();
-    mExecuter = new bbtk::Executer();
-    //mExecuter->SetFactory(mFactory);
+    // Lock this pointer or will auto-destruct !!
+    mVirtualExecuter->SetInterpreter(MakePointer(this,true));
+    
+    // For the time being, comment out previous line, and
+    // uncomment next line to check Transcriptor
+
+    //mVirtualExecuter = new bbtk::Transcriptor("GeneratedProgram.txt");
 
     // Builds the commands dict
     CommandInfoType info;
@@ -75,6 +98,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.help = "Deletes the black box of name <box>";
     mCommandDict[info.keyword] = info;
 
+    info.keyword = "newgui";
+    info.argmin = 2;
+    info.argmax = 2;
+    info.code = cNewGUI;
+    info.syntax = "newgui <box> <name>";
+    info.help = "Automatically creates a graphical user interface with name <name> for the black box <box> and connects it to the box inputs";
+    mCommandDict[info.keyword] = info;
+
     info.keyword = "connect";
     info.argmin = 2;
     info.argmax = 2;
@@ -88,7 +119,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmax = 1;
     info.code = cPrint;
     info.syntax = "print <string>";
-    info.help = "Prints the string. Substitutes any token of the form '$box.output$' by the string adaptation of the output of the box (requires the right adaptor). No carriage return is issued at the end, use '\\n' to add carriage returns. The level of 'Echo' messages must be greater than 1 (see the command 'message').";
+    info.help = "Prints the string. Substitutes any token of the form '$box.output$' by the string adaptation of the output of the box (requires the right adaptor). No carriage return is issued at the end, use '\\n' to add carriage returns. The level of 'echo' messages must be greater than 1 (see the command 'message').";
     mCommandDict[info.keyword] = info;
 
     info.keyword = "exec";
@@ -131,6 +162,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.help = "Ends the definition of a new type of complex black box";
     mCommandDict[info.keyword] = info;
 
+    info.keyword = "kind";
+    info.argmin = 1;
+    info.argmax = 1;
+    info.code = cKind;
+    info.syntax = "kind <ADAPTOR|DEFAULT_ADAPTOR|WIDGET_ADAPTOR|DEFAULT_WIDGET_ADAPTOR>";
+    info.help = "Sets the kind of the currently defined complex black box";
+    mCommandDict[info.keyword] = info;
+
     info.keyword = "input";
     info.argmin = 3;
     info.argmax = 3;
@@ -157,13 +196,22 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    
     info.keyword = "config";  // JPR
     info.argmin = 0;
-    info.argmax = 1;
+    info.argmax = 0;
     info.code = cConfig;
-    info.syntax = "config [<verbose>|<v>]";
+    info.syntax = "config";
     info.help = "Prints the value of all configuration parameters";
     mCommandDict[info.keyword] = info;
 
-    info.keyword = "reset";  //EED
+    info.keyword = "index";  // LG
+    info.argmin = 0;
+    info.argmax = 2;
+    info.code = cIndex;
+
+    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.keyword] = info;
+
+    info.keyword = "reset";  
     info.argmin = 0;
     info.argmax = 0;
     info.code = cReset;
@@ -178,6 +226,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.syntax = "author <string>";
     info.help = "Adds the string <string> to the author information of the black box being defined";
     mCommandDict[info.keyword] = info;
+    
+    info.keyword = "category"; //JP
+    info.argmin = 1;
+    info.argmax = 1;
+    info.code = cCategory;
+    info.syntax = "category <list of items, separated by ;>";
+    info.help = "Adds the string <string> to the category information of the black box being defined";
+    mCommandDict[info.keyword] = info;
 
     info.keyword = "description";
     info.argmin = 1;
@@ -200,16 +256,15 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmin = 0;
     info.argmax = 2;
     info.code = cMessage;
-    info.syntax = "message <category> <level>";
-    info.help = "Sets the level of the category of messages <category> to <level>.\n  If category='All' then sets the level for all categories. If no category nor level is passed then prints info on available categories of messages and their current level.";
-    mCommandDict[info.keyword] = info;
+    info.syntax = "message <kind> <level>";
+    info.help = "Sets the level of the kind of messages <kind> to <level>.\n  If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level.";  mCommandDict[info.keyword] = info;
 
     info.keyword = "include";
     info.argmin = 1;
-    info.argmax = 1;
+    info.argmax = 2;
     info.code = cInclude;
-    info.syntax = "include <filename>";
-    info.help = "Includes the file <filename>";
+    info.syntax = "include <filename> [source]";
+    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.keyword] = info;
 
     info.keyword = "quit";
@@ -244,6 +299,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.help = "Shows a graphical view of a bbtk pipeline.\n- BlackBoxName : name of the box to view. Default '.' : current box.\n- BlackBoxNameType : name of the type of box to view, ex : 'workspace')";
     mCommandDict[info.keyword] = info;
 
+    info.keyword = "debug";
+    info.argmin = 0;
+    info.argmax = 1;
+    info.code = cDebug;
+    info.syntax = "debug [expr|-C|-D]";
+    info.help = "Prints debug info on living bbtk objects containing the string 'expr' (default expr=''). -C checks the factory integrity. -D turns on objects debug info after main ends";
+    mCommandDict[info.keyword] = info;
+
     /*
     info.keyword = "workspace";
     info.argmin = 1;
@@ -267,90 +330,276 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::~Interpreter()
   {
-    bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
-    delete mExecuter;
-    //delete mFactory;
+    bbtkDebugMessageInc("Interpreter",9,"==> Interpreter::~Interpreter()" <<std::endl);
+    mVirtualExecuter = VirtualExec::Pointer();
+    bbtkDebugMessageInc("Interpreter",9,"<== Interpreter::~Interpreter()" <<std::endl);
+  }
+  //=======================================================================
 
-    //    std::cout <<"EO Interpreter::~Interpreter()"<<std::endl;
-    bbtkDebugDecTab("Interpreter",9);
+
+  InterpreterError::InterpreterError( const std::string& message,
+				      bool in_script_file,
+				      const std::string& script_file,
+				      int script_line 
+				      )
+    : Exception("Interpreter",0,message),
+      mInScriptFile(in_script_file),
+      mScriptFile(script_file),
+      mScriptLine(script_line)
+  {
+  }
+  InterpreterError::InterpreterError( const Exception& excep,
+		      bool in_script_file,
+		      const std::string& script_file,
+		      int script_line 
+		      )
+    : Exception(excep),
+      mInScriptFile(in_script_file),
+      mScriptFile(script_file),
+      mScriptLine(script_line)
+  {
+  }
+  //=======================================================================
+  void Interpreter::CatchBbtkException( const bbtk::Exception& e )
+  {
+    if (mThrow) 
+      {
+	bool in_script = false;
+	std::string file("");
+	int line = 0;
+	if (mFileName.size()) {
+	  std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+	  if (fs!=0) in_script = true;	  
+	  file = mFileName.back();
+	  line = mLine.back();
+	}   
+	CloseAllFiles();
+ 	throw InterpreterError(e,in_script,file,line);
+      }
+    else
+      {
+	std::stringstream mess;
+	mess << "* ERROR : "<<e.GetMessage()<<std::endl;
+	if (mFileName.size()) {
+	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	  mess << "* LINE  : "<<mLine.back()<<std::endl;
+	}    
+	std::cerr << mess.str();
+      }
+  }
+  //=======================================================================
+  
+  //=======================================================================
+  void Interpreter::CatchStdException( const std::exception& e )
+  {  
+    if (mThrow) 
+      {
+	bool in_script = false;
+	std::string file("");
+	int line = 0;
+	if (mFileName.size()) {
+	  std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+	  if (fs!=0) in_script = true;	  
+	  file = mFileName.back();
+	  line = mLine.back();
+	}    
+ 	CloseAllFiles();
+	throw InterpreterError(e.what(),in_script,file,line);
+      }
+    else
+      {
+	std::stringstream mess;
+	mess << "* ERROR : "<<e.what()<<std::endl;
+	if (mFileName.size()) {
+	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	  mess << "* LINE  : "<<mLine.back()<<std::endl;
+	}    
+	std::cerr << mess.str();
+      }
   }
   //=======================================================================
 
+  //=======================================================================
+  void Interpreter::CatchUnknownException()
+  {
+    if (mThrow) 
+      {
+	bool in_script = false;
+	std::string file("");
+	int line = 0;
+	if (mFileName.size()) {
+	  std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+	  if (fs!=0) in_script = true;	  
+	  file = mFileName.back();
+	  line = mLine.back();
+	}    
+ 	CloseAllFiles();
+	throw InterpreterError("Unknown exception caught",
+				   in_script,file,line);
+      }
+    else
+      {
+	std::stringstream mess;
+	mess << "* UNDEFINED ERROR (not a bbtk nor a std exception)" 
+	     << std::endl;
+	if (mFileName.size()) {
+	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
+	  mess << "* LINE  : "<<mLine.back()<<std::endl;
+	}    
+	std::cerr << mess.str();
+      }
+  }
+  //=======================================================================
+
+  //=======================================================================
+
+#define CATCH_MACRO				\
+  catch (QuitException e)			\
+    {						\
+      status = Interpreter_QUIT;		\
+      if (mThrow) throw QuitException();	\
+    }						\
+  catch (bbtk::Exception e)			\
+    {						\
+      status = Interpreter_ERROR;		\
+      CatchBbtkException(e);			\
+    }						\
+  catch (std::exception& e)			\
+    {						\
+      status = Interpreter_ERROR;		\
+      CatchStdException(e);			\
+    }						\
+  catch (...)					\
+    {						\
+      status = Interpreter_ERROR;		\
+      CatchUnknownException();			\
+    }						
+  //=======================================================================
+   
 
   //=======================================================================
   /**
    *  
    */
-  void Interpreter::InterpretFile( const std::string& filename,  bool use_configuration_file, bool verbose)
+  Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
     mCommandLine = false;
 
+    ExitStatus status = Interpreter_OK;
+
     try 
     {
-      SwitchToFile(filename, use_configuration_file, verbose);
+      SwitchToFile(filename);
+
       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 (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;
-      }    
-    }
-
+    CATCH_MACRO;
+    
     CloseAllFiles();
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
     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 = Interpreter_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_MACRO;
+    
+    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 = Interpreter_OK;
+
+    try 
+    {
+      bool insideComment = false;
+      InterpretLine(line, insideComment);
+    }
+    CATCH_MACRO;
+  
+
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
+		     <<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    return status;
+  }
+  
 
   //=======================================================================  
   /**
@@ -358,9 +607,8 @@ 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);
+    bbtkMessage("echo",2,line<<std::endl);
 
     std::vector<std::string> words;
     SplitLine(line,words);
@@ -422,201 +670,205 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
     switch (command.code) 
     {
       case cNew :
-        mExecuter->Create(words[1],words[2]);
+        mVirtualExecuter->Create(words[1],words[2]);
         break;
-        
+
       case cDelete :
-        // TO DO !!
-        // mExecuter->Remove(words[1]);
+	mVirtualExecuter->Destroy(words[1]);
         break;
-        
+
       case cConnect :
         Utilities::SplitAroundFirstDot(words[1],left,right);
         Utilities::SplitAroundFirstDot(words[2],left2,right2);      
-        mExecuter->Connect(left,right,left2,right2);
+        mVirtualExecuter->Connect(left,right,left2,right2);
         break;
-        
+
       case cPackage :
-        mExecuter->BeginPackage(words[1]);
+        mVirtualExecuter->BeginPackage(words[1]);
         break;
 
       case cEndPackage :
-        mExecuter->EndPackage();
+        mVirtualExecuter->EndPackage();
         break;
-        
+
       case cDefine :
         if (mFileName.size()>0) 
         {
-           filename = Utilities::get_file_name(mFileName.back());
+	  filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
         }
         if (words.size()==2) 
         {
-           mExecuter->Define(words[1],"",filename);
+           mVirtualExecuter->Define(words[1],"",filename);
         }
-        else 
+        else
         {
-           mExecuter->Define(words[1],words[2],filename);
+           mVirtualExecuter->Define(words[1],words[2],filename);
         }
         break;
-        
+
       case cEndDefine :
-        mExecuter->EndDefine();
+        mVirtualExecuter->EndDefine();
         break;
-        
+
+      case cKind :
+        mVirtualExecuter->Kind(words[1]);
+        break;
+
       case cPrint :
-        Print(words[1]); /// \todo use mExecuter 
+        mVirtualExecuter->Print(words[1]);
         break;
         
       case cExec :
         if (words[1]=="freeze") 
-          mExecuter->SetNoExecMode(true);
+          mVirtualExecuter->SetNoExecMode(true);
         else if (words[1]=="unfreeze") 
-          mExecuter->SetNoExecMode(false);
-        else 
-          mExecuter->Update(words[1]);
+          mVirtualExecuter->SetNoExecMode(false);
+        else
+          mVirtualExecuter->Execute(words[1]);
         break;
-        
+
       case cInput :
         Utilities::SplitAroundFirstDot(words[2],left,right);
-        mExecuter->DefineInput(words[1],left,right,words[3]);
+        mVirtualExecuter->DefineInput(words[1],left,right,words[3]);
         break;
-        
+
       case cOutput :
         Utilities::SplitAroundFirstDot(words[2],left,right);
-        mExecuter->DefineOutput(words[1],left,right,words[3]);
+        mVirtualExecuter->DefineOutput(words[1],left,right,words[3]);
         break;
-        
+
       case cSet :
         Utilities::SplitAroundFirstDot(words[1],left,right);
-        mExecuter->Set(left,right,words[2]);
+        mVirtualExecuter->Set(left,right,words[2]);
         break;
-        
+
       case cAuthor :
-        mExecuter->Author(words[1]);
+        mVirtualExecuter->Author(words[1]);
         break;
-        
+
+      case cNewGUI :
+        NewGUI(words[1],words[2]);
+        break;
+
+      case cCategory :
+        mVirtualExecuter->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]);
+        mVirtualExecuter->Description(words[1]);
         break;
-        
+
       case cHelp :
         Help(words);
         break;
-        
+
       case cMessage : 
-        if (words.size()<3) 
+        if (words.size()<3)
         {
-            bbtk::MessageManager::PrintInfo();
+	  mVirtualExecuter->HelpMessages();
         }
-        else 
+        else
         {
-           sscanf(words[2].c_str(),"%d",&level);
-           bbtk::MessageManager::SetMessageLevel(words[1],level);
+	  sscanf(words[2].c_str(),"%d",&level);
+          mVirtualExecuter->SetMessageLevel(words[1],level);
         }
         break;
-        
-      case cGraph : 
+
+      case cGraph :
         Graph(words);
         break;
-        
+
       case cConfig :
-        if (words.size()>1) // any param for config means verbose = true
-          verbose = true;
-        else
-          verbose = false;
-        Config(verbose);            
+        Config();
         break;
-        
-      case cReset :  // EED
-        this->mExecuter->Reset();
+
+      case cReset :  
+	Reset();
         break;
-        
+
       case cInclude :
-        if (mCommandLine) 
+        if (mCommandLine)
         {
-           InterpretFile(words[1], true, verbose); // true : better pass use_config_file
+           InterpretFile(words[1]); 
         }
-        else 
+        else
         {
-            SwitchToFile(words[1], true, verbose); // true : better pass use_config_file
+            SwitchToFile(words[1]);
         }
+	// if 'source' was given
+	if (words.size()==3) 
+	  {
+	    GetExecuter()->SetCurrentFileName(words[1]);
+	  }
         break;
-        
+
       case cLoad:
-        LoadPackage(words[1], true, verbose); // true : better pass use_config_file
+        GetExecuter()->LoadPackage(words[1]);
         break;
-        
+
       case cUnload:
-        UnLoadPackage(words[1]);
+        GetExecuter()->UnLoadPackage(words[1]);
         break;
-        
+
       case cQuit :
         throw QuitException();
         break;
-        
-         case cWorkspace :
+
+      case cDebug :
+	if (words.size()==2) Debug(words[1]);
+	else Debug("");
+        break;
+	/* obsolete
+      case cWorkspace :
         if (words.size() == 2) 
         {
-           if (words[1]=="freeze")        mExecuter->SetNoExecMode(true);
-           else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
+           if (words[1]=="freeze")        mVirtualExecuter->SetNoExecMode(true);
+           else if (words[1]=="unfreeze") mVirtualExecuter->SetNoExecMode(false);
         }
-        else 
+        else
         {
-           mExecuter->SetWorkspaceName(words[2]);
+           mVirtualExecuter->SetWorkspaceName(words[2]);
         }
         break;
-        
+        */
       default:
         bbtkInternalError("should not reach here !!!");
    }
-    
+
    bbtkDecTab("Interpreter",9);
 }
   //=======================================================================  
 
 
 
-  //=======================================================================
-  void SplitString ( const std::string& str, const std::string& delimiters, 
-                     std::vector<std::string>& tokens)
-  {
-    // Skip delimiters at beginning.
-    std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
-    // Find first delimiter.
-    std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
-    
-    while (std::string::npos != pos || std::string::npos != lastPos)
-      {
-        // Found a token, add it to the vector.
-        tokens.push_back(str.substr(lastPos, pos - lastPos));
-        // Skip delimiters.  Note the "not_of"
-        lastPos = str.find_first_not_of(delimiters, pos);
-        // Find next delimiter
-        pos = str.find_first_of(delimiters, lastPos);
-      }
-    
-  }
-  //=======================================================================
-
 
 
   //=======================================================================
   /**
-   *  
+   *
    */
 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;
-    SplitString(str,delimiters,quote);
+    Utilities::SplitString(str,delimiters,quote);
 
     delimiters = " \t";
     std::vector<std::string>::iterator i;
     for (i=quote.begin(); i!=quote.end(); ) 
     {
-       SplitString(*i,delimiters,tokens);
+       Utilities::SplitString(*i,delimiters,tokens);
        ++i;
        if (i!=quote.end()) 
        {
@@ -632,40 +884,39 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     }
     bbtkDebugMessageCont("Interpreter",9,std::endl);
 
-    bbtkDebugDecTab("Interpreter",9);    
+    bbtkDebugDecTab("Interpreter",9);
  }
   //=======================================================================
 
 
   //=======================================================================
-  // Replaces substrings "\\n" by a real carriage return "\n"
-  void SubsBackslashN ( std::string& s )
+  void Interpreter::Reset()
   {
-    //   std::cout << "BEFORE=["<<s<<"]"<<std::endl;
-    std::string ss("\\n");
-    std::string::size_type pos = 0;
-    pos = s.find(ss,0);
-    char* cr = "\n";
-    while ( pos != std::string::npos )
-   {
-      //  std::cout << "*** find one "<<std::endl;
-      s.replace(pos,2,cr,1);
-      pos = s.find(ss, pos-1);
-   } 
-    //    std::cout << "AFTER=["<<s<<"]"<<std::endl;
+    // Cannot close all files if the reset command is read from a file !
+    //    CloseAllFiles();
+    mFileNameHistory.clear();
+    this->mVirtualExecuter->Reset();
   }
   //=======================================================================
 
-
   //=======================================================================
   /**
-   *  
+   *
    */
+  /*
   void Interpreter::Print( const std::string& str)
   {
-    if (mExecuter->GetNoExecMode()) return;
+    if (mVirtualExecuter->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("$");
@@ -674,26 +925,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::cout << "text='"<<chains.back()<<"'"<<std::endl;
+ // 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) );
-    //    std::cout << "outp='"<<chains.back()<<"'"<<std::endl;
+         chains.push_back( mVirtualExecuter->Get(box,output) );
+
+// InterpretLine("connect %tok% _C_.In%num%") 
+
        }
         // Skip delimiters.  Note the "not_of"
        lastPos = str.find_first_not_of(delimiters, pos);
@@ -701,28 +957,30 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        pos = str.find_first_of(delimiters, lastPos);
     //
        is_text = !is_text;
+// num ++;
      }
-    //    std::cout << "nb="<<chains.size()<<std::endl;
+// 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) 
      {
-       //  bbtkMessage("Echo",1,*i);
-       SubsBackslashN(*i);
+
+       Utilities::SubsBackslashN(*i);
        std::cout << *i;
      }
      std::cout << std::endl;
-     bbtkDebugDecTab("Interpreter",9);    
+     bbtkDebugDecTab("Interpreter",9);
  }
+*/
 
   //=======================================================================
   /**
-   *  
+   *
    */
 
-// ===================================================================================
-
-  void Interpreter::SwitchToFile( const std::string& name,
-                                  bool use_configuration_file, bool verbose)
+  // =========================================================================
+  void Interpreter::SwitchToFile( const std::string& name )
   {
   // Note : in the following :
   // name : the user supplied name 
@@ -731,107 +989,162 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   //      - absolute full name e.g.       /home/usrname/proj/dir/scr.bbs
   //          same for Windows, with      c:, d: ...
   //
-  // expression like directory/subdir/scrname.bbs is FORBIDDEN (*)
   // use ./directory/subdir/scrname.bbs
   //
-  //   (*) except when using packagename/boxes/*
-  
+
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 
-// to be remove in final version
-// use : Config v
-verbose = true;
     std::vector<std::string> script_paths;
     std::string fullPathScriptName;  // full path script name
     std::string pkgname;             // e.g. <scriptname>.bbs
+    std::vector<std::string> Filenames;
+
+    // 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);
+
 
-    if (use_configuration_file)
-    {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-      if (verbose)
-         std::cout << "look for : [" << name << "] (use_configuration_file == TRUE)"  << std::endl;
-      script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
-    }
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
-    
+
+    bbtkMessage("Interpreter",3,
+		"extract : pkgname [" << pkgname
+		 << "] upath [" << upath << "]" << std::endl);
     bool fullnameGiven = false; 
     bool foundFile     = false;
 
-    if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*)
-    {
-      std::string path;
-      std::vector<std::string>::iterator i;
-      std::string fullDirectoryName;
-      for (i=script_paths.begin();i!=script_paths.end();++i)
+    // ==== "*" provided : load all scripts in given path 
+    // relative (e.g. std/boxes/*) or absolute 
+    if (pkgname == "*") 
       {
-        path = *i;
-
-       // we *really* want '.' to be the current working directory
-        if (path == ".") {
-          char buf[2048]; // for getcwd
-          char * currentDir = getcwd(buf, 2048);
-          std::string cwd(currentDir);
-          path = currentDir;
-        }
+	int nbBssFiles;
+	
+	std::stringstream* stream = new std::stringstream;
+	//if (upath.size()!=0) // avoid troubles for "*"
+	
+	// ==== no path provided : look in root bbs path
+	if (upath.size()==0)
+	  {
+	    //	    bbtkMessage("Interpreter",1,
+	    script_paths.push_back(  ConfigurationFile::GetInstance().Get_root_bbs_path() );
+	  }
+	// ==== absolute path provided 
+	else if (upath[0]=='/' || upath[1] == ':' ) 
+	  {
+	    if ( Utilities::IsDirectory( upath ) )
+	      {
+		script_paths.push_back(upath);
+	      }
+	    else 
+	      {
+		bbtkError("'"<<upath<<"' : directory does not exist"); 
+	      }
+	  }
+	// ==== relative path provided : search all bbs path appended with 
+	// the relative path provided
+	else
+	  {    
+	     std::vector<std::string>::const_iterator i;
+	     for (i=ConfigurationFile::GetInstance().Get_bbs_paths().begin();
+		  i!=ConfigurationFile::GetInstance().Get_bbs_paths().end();
+		  i++)
+	       {
+		 std::string full_path(*i);
+		 // we *really* want '.' to be the current working directory
+		 if (full_path == ".") {
+		   char buf[2048]; // for getcwd
+		   char * currentDir = getcwd(buf, 2048);
+		   std::string cwd(currentDir);
+		   full_path = currentDir;
+		 } // if full_path
+	    
+		 full_path += ConfigurationFile::GetInstance().Get_file_separator();
+		 full_path += upath;
+
+		 if ( Utilities::IsDirectory( full_path ) )
+		   {
+		     script_paths.push_back(full_path);
+		   }
+	       } 
+	     if (script_paths.empty())
+	       {
+		 bbtkError("no '"<<upath<<"' subdir found in search paths" 
+			   << std::endl);
+	       }
 
-        fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
-//std::cout <<"fullpath [" <<   fullDirectoryName << "]" <<std::endl;
-      // Check if library exists           
-        if ( ! Utilities::IsDirectory(fullDirectoryName) )
-        {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-          if (verbose)
-            std::cout <<"   [" <<fullDirectoryName <<"] : doesn't exist" <<std::endl;
-          continue;  // try next path
-        }
-        foundFile = true;
+	  }
+	// === search paths list complete : now explore it
 
-        std::cout << "recherche tous les .bbs du directory" << std::endl;
-        std::cout << "pour chacun, LoadScript" << std::endl; 
 
-        std::vector<std::string> Filenames;
-        int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
-// std::cout << "=================nbFiles " << nbFiles << std::endl;
-        int 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);
-           nbBssFiles++;
-        }
-        if (nbBssFiles==0)
-           if (verbose)
-              std::cout << "WARNING : No '.bbs' file found in [" << fullDirectoryName << "]" << std::endl;
-           
-        break; // a directory was found; we stop iterating
-       }
-       return;
-    }
+	std::vector<std::string>::iterator i;
+	for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files
+	  {
+	    bbtkMessage("Interpreter",1,
+			"--> Looking in '" << *i << "'" << std::endl);
+	 
+	    
+	    Filenames.clear();
+	    int nbFiles = Utilities::Explore(*i, false, Filenames);
+	    
+	    nbBssFiles = 0;
+	    for (std::vector<std::string>::iterator j = Filenames.begin(); 
+		 j!= Filenames.end(); ++j)
+	      {
+		int lgr = (*j).size();
+		if (lgr < 5)
+		  continue;  // ignore non .bbs file
+		if ((*j).substr(lgr-4, 4) != ".bbs")
+		  continue;
+		
+		(*stream) << "include \"" << *j << "\"\n";
+		bbtkMessage("Interpreter",2,
+			    "  --> Found '" << *j << "'" << std::endl);
+		
+		nbBssFiles++;
+	      } // for vector
+	    
+	    if (nbBssFiles==0)
+	      {
+		bbtkMessage("Interpreter",1,
+			    "  --> No .bbs found"<< std::endl);
+	      } 
+	    else 
+	      {
+		bbtkMessage("Interpreter",1,
+			    "  --> "<<nbBssFiles<<" .bbs found"<< std::endl);
+		SwitchToStream(stream);
+	      }
+	    
+	    //break; // a directory was found; we stop iterating
+	    // LG : No! We want all files included !
+	  } // for vector
+	return;
+      }  
+    //=============== end pkgname=="*" ===========
 
-    std::string::size_type slash_position = name.find_last_of("/\\");
 
-    // if name contains a slash (anywhere), user is assumed to have passed a relative/absolute name
+    // if name starts with a / or a . or contains : user is assumed to have passed a relative/absolute name
     // (not only a plain script name)
-    // we trust him, and try to explade the directory name
+    // we trust him, and try to expland the directory name
     // WARNING : starting from current local directory :  ./whatYouWant  (./ mandatory!)
-    
-    if (slash_position != std::string::npos)
-    {       // ===========================================================check user supplied location
+
+    if (name[0]=='/' || name[1] == ':' || name[0]=='.')  // absolute path (linux/windows) or relative path
+    { 
+
+      // ===========================================================check user supplied location
       fullnameGiven = true;
-      
-      fullPathScriptName =  Utilities::ExpandLibName(name, verbose);
-      
+
+      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")
@@ -844,88 +1157,122 @@ verbose = true;
          fullPathScriptName = fullPathScriptName + ".bbs";   
       }
 
-      //if (fullPathScriptName != "") {
-        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
     {
+      script_paths = ConfigurationFile::GetInstance().Get_bbs_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 == ".") {
-          char buf[2048]; // for getcwd
-          char * currentDir = getcwd(buf, 2048);
-          std::string cwd(currentDir);
-          path = currentDir;
-        }
-
-       // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
-       fullPathScriptName = Utilities::MakePkgnameFromPath(path, pkgname, true);
-      // Check if library exists
-        if ( ! Utilities::FileExists(fullPathScriptName) )
-        {
-        // The following is *NOT* a debug time message :
-        // It's a user intended message.
-        // Please don't remove it.
-          if (verbose)
-            std::cout <<"   [" <<fullPathScriptName <<"] : doesn't exist" <<std::endl;
-          continue;  // try next path
-        }
-        foundFile = true;
-        break; // a script was found; we stop iterating
-
-      } //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
+	{
+	  path = *i;
+	  // we *really* want '.' to be the current working directory
+	  if (path == ".") {
+	    char buf[2048]; // for getcwd
+	    char * currentDir = getcwd(buf, 2048);
+	    std::string cwd(currentDir);
+	    path = currentDir;
+	  }
+	  
+	  fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
+	  
+	  // Check if library exists
+	  if ( ! Utilities::FileExists(fullPathScriptName) )
+	    {
+	      // The following is *NOT* a debug time message :
+	      // It's a user intended message.
+	      // Please don't remove it.
+	      bbtkMessage("Interpreter",2,
+			  "   [" <<fullPathScriptName <<"] : doesn't exist" 
+			  <<std::endl);
+	      continue;  // try next path
+	    }
+	  bbtkMessage("Interpreter",2,
+		      "   [" <<fullPathScriptName 
+		      <<"] : found" <<std::endl);
+	  foundFile = true;
+	  break; // a script was found; we stop iterating
+
+	} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
     }
-
+    
     if (!foundFile)
-    {
-       if (fullnameGiven)
-         if(fullPathScriptName == "")
+      {
+	if (fullnameGiven)
+	  if(fullPathScriptName == "")
             bbtkError("Path ["<<upath<<"] doesn't exist");
-         else
+	  else
             bbtkError("Script ["<<fullPathScriptName<<"] not found");
-       else
+	else
           bbtkError("No ["<<pkgname<<".bbs] script found");
-       return;    
-    }
+	return;
+      }
     else
-       LoadScript(fullPathScriptName);
-
+      LoadScript(fullPathScriptName,name);
+    
     return;
-  }   
-   
+  }
+  //=======================================================================
+
 
   //=======================================================================
+void Interpreter::SwitchToStream( std::stringstream* stream )
+{
+    mFile.push_back(stream);
+    std::ostringstream buffer_name;
+    bufferNb++;
+    buffer_name << "buffer_" ;
 
-  void Interpreter::LoadScript( std::string fullPathScriptName)
+    if (mFileName.size()>0 )
+    {
+       buffer_name << mFileName.back() << "_" << mLine.back();
+    }
+    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)
   {
-    bbtkMessage("Interpreter",1,fullPathScriptName<<" found"<<std::endl);
+     Utilities::replace( fullPathScriptName , 
+			 INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+   
+     if (find(mFileNameHistory.begin(),
+	      mFileNameHistory.end(),
+	      fullPathScriptName)!=mFileNameHistory.end())
+     {
+        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;
     }
-    
-    if (verbose)
-       std::cout << "   -->[" << fullPathScriptName << "] found" << std::endl;
+
+    bbtkMessage("Interpreter",1,"   -->[" << fullPathScriptName 
+		<< "] found" << std::endl);
 
     mFile.push_back(s);
     mFileName.push_back(fullPathScriptName);
+    mFileNameHistory.push_back(fullPathScriptName);
+    mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);
-    return;  
+
+    return;
   }
 
   //=======================================================================
@@ -936,21 +1283,24 @@ verbose = true;
   {
     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);
@@ -967,16 +1317,10 @@ verbose = true;
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()"
                       <<std::endl);
-    
+
     while (mFile.size() != 0) 
     {
-      mFile.back()->close();
-      delete mFile.back();
-      mFile.pop_back();
-      bbtkDebugMessage("Interpreter",9,
-                      " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-      mFileName.pop_back();
-      mLine.pop_back();
+       CloseCurrentFile();
     }
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
                       <<std::endl);
@@ -993,7 +1337,7 @@ verbose = true;
                                       CommandInfoType& info )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretCommand(...)"<<std::endl);
-    
+
     // searches the command keyword
     CommandDictType::iterator c;
     c = mCommandDict.find(words[0]);
@@ -1020,7 +1364,7 @@ verbose = true;
 void Interpreter::Help(const std::vector<std::string>& words)
 {
     unsigned int nbarg = words.size()-1;
-    
+
     if (nbarg==0) 
     {
        HelpCommands();
@@ -1029,7 +1373,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     {
       if (words[1]=="packages") 
       {
-         PrintPackages(true);
+         GetExecuter()->GetFactory()->PrintPackages(true);
          return;
       }
       try 
@@ -1040,27 +1384,49 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          try 
          {
-            HelpPackage(words[1]);
+            GetExecuter()->GetFactory()->HelpPackage(words[1]);
+	    if ( mUser != 0 )
+	      {
+		std::string url = 
+		  ConfigurationFile::GetInstance().Get_doc_path();
+		url += "/bbdoc/" + words[1] + "/index.html";
+		if (Utilities::FileExists(url)) 
+		  {
+		    mUser->InterpreterUserViewHtmlPage(url);
+		  }
+	      }
          }
          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");
-              }
-           }
+	   try 
+	     {
+	       std::string package;
+	       GetExecuter()->GetFactory()->HelpBlackBox(words[1],package);
+	       if ( mUser != 0 )
+		 {
+		   std::string url = 
+		     ConfigurationFile::GetInstance().Get_doc_path();
+		   url += "/bbdoc/" + package + "/index.html";
+		   if (Utilities::FileExists(url)) 
+		     {
+		       url += "#" + words[1];
+		       mUser->InterpreterUserViewHtmlPage(url);
+		     }
+		 }
+	     }
+	   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) 
     {
@@ -1068,12 +1434,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) 
          {
@@ -1094,46 +1460,11 @@ void Interpreter::Help(const std::vector<std::string>& words)
 
    //===================================================================    
   /// Displays the Configuration
-  void Interpreter::Config( bool verbose ) const
+  void Interpreter::Config() const
   {
-    bbtkDebugMessageInc("Core",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("Core",9);
+    ConfigurationFile::GetInstance().GetHelp(1);
   }  
+   //===================================================================    
 
   //=======================================================================
   /// Displays help on all the commands
@@ -1147,7 +1478,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;
- 
+
     }
   }
   //=======================================================================
@@ -1169,7 +1500,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;
-    
+
   }
   //=======================================================================
 
@@ -1193,7 +1524,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
   //=======================================================================
 
 
-  
+
   //=======================================================================
 #ifdef BBTK_USE_TERMIOS_BASED_PROMPT
   
@@ -1216,26 +1547,25 @@ 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)
     {
        c=0;
        read ( STDIN_FILENO, &c, 4) ;
 
-       bbtkDebugMessage("Debug",9,"[0x"<<std::hex<<c<<"]\n");
+       bbtkDebugMessage("debug",9,"[0x"<<std::hex<<c<<"]\n");
 
        // Printable character
        if ( (ind<MAX_LINE_SIZE-1) &&
@@ -1417,7 +1747,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 
@@ -1444,6 +1774,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
       }
       catch (QuitException e)
       {
+	bbtkMessage("Interpreter",1,"Interpreter : Quit"<<std::endl);
         again = false;
       }
       catch (bbtk::Exception e) 
@@ -1460,63 +1791,310 @@ 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);
   }
 
-  //=======================================================================
-  void Interpreter::Graph(const std::vector<std::string>& words)
-  {
-    std::string page;
+//=======================================================================
+void Interpreter::Graph(const std::vector<std::string>& words)
+{
+  std::string page;
     bool system_display = true;
 
-#ifdef _USE_WXWIDGETS_
-    if ( WxConsole::GetInstance() != 0 ) system_display = false; 
-#endif
+    if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) )
+      system_display = false; 
  
     if (words.size()==1) 
     {
-      page = mExecuter->ShowGraph(".","0","0","","","",system_display);
+      page = mVirtualExecuter->ShowGraph(".","0","0","","","",system_display);
     }
     else if (words.size()==2) 
     {
-      page = mExecuter->ShowGraph(words[1],"0","0","","","",system_display);
+      page = mVirtualExecuter->ShowGraph(words[1],"0","0","","","",system_display);
     }
     else if (words.size()==3) 
     {
-      page = mExecuter->ShowGraph(words[1],words[2],"0","","","",system_display);
+      page = mVirtualExecuter->ShowGraph(words[1],words[2],"0","","","",system_display);
     }
     else if (words.size()==4) 
     {
-      page = mExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display);
+      page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display);
     } 
     else if (words.size()==5) 
     {
-      page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display);
+      page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display);
     } 
     else if (words.size()==6) 
     {
-      page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],"",system_display);
+      page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],"",system_display);
     } 
     else if (words.size()==7) 
-    {
-      page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display);
-    } 
+      {
+	page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display);
+      } 
+    
+    if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) )
+      mUser->InterpreterUserViewHtmlPage(page);
 
-#ifdef _USE_WXWIDGETS_
-    if ( WxConsole::GetInstance() != 0 )
-      WxConsole::GetInstance()->ShowHtmlPage(page);
-#endif
   }
-  //=======================================================================
+//=======================================================================
+
+
+//=======================================================================
+void  Interpreter::Index(const std::string& filename, 
+			 const std::string& type)
+{
+  Factory::IndexEntryType t;
+  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;
+  
+  GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename);
+}
+//=======================================================================
+
+
+//=======================================================================
+void  Interpreter::NewGUI(const std::string& boxname,
+			     const std::string& instanceName)
+{
+  if (mRealExecuter.expired())
+    {
+      bbtkError("command 'newgui' cannot be compiled yet");
+    }
+
+  std::string typeName = instanceName+"Type";
+  std::stringstream* s = new std::stringstream;
+  // create the complex box
+  (*s) << "define "<<typeName<<std::endl;
+  //  (*s) << "  description 'Automatically generated user interface for the box "
+  //       << boxname << "'" <<std::endl;
+  // create the Layout box
+  (*s) << "  load wx"<<std::endl;
+  (*s) << "  new LayoutLine layout"<<std::endl;
+  // create the output 'Widget'
+  (*s) << "  output Widget layout.Widget Widget"<<std::endl;
+  // the box change output 
+  (*s) << "  new MultipleInputs change"<<std::endl;
+  (*s) << "  output BoxChange change.Out BoxChange"<<std::endl;
+
+  // Browse the inputs of the box in order to find which ones are not 
+  // connected and can be adapted from a widget adaptor
+  // vector which stores the list of inputs of the box which must be connected
+  std::vector<std::string> in;
+ 
+  Factory::Pointer F = mVirtualExecuter->GetFactory();
+  /*
+  Package::Pointer user = F->GetPackage("user");
+  */
+  ComplexBlackBoxDescriptor::Pointer workspace = 
+    mRealExecuter.lock()->GetCurrentDescriptor();
+
+  if (workspace==0)
+    {
+      delete s;
+      bbtkError("Interpreter::CreateGUI : could not access the executer currently defined complex box");
+    }
+ 
+
+  /*
+    (ComplexBlackBoxDescriptor::Pointer)(user->GetBlackBoxMap().find("workspace")->second.get());
+  */
+
+  BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname);
+  //  BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap();
+  int nb = 0;
+  BlackBox::InputConnectorMapType::iterator i;
+  for (i=box->bbGetInputConnectorMap().begin();
+       i!=box->bbGetInputConnectorMap().end();
+       ++i)
+    {
+      // If the input is connected : continue
+      if (i->second->IsConnected()) continue;
+      // Get the input descriptor 
+      const BlackBoxInputDescriptor* d = box->bbGetDescriptor()->GetInputDescriptor(i->first);
+      // If it is a "system" input : skip it
+      if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) ||
+	   ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) )
+	continue;
+      bool widok = true;
+      std::string widget,adaptor;
+      // try to find a widget adaptor
+      if (F->FindWidgetAdaptor(DataInfo(d->GetTypeInfo(),""),
+			       d->GetDataInfo(),
+			       adaptor))
+	{
+	  // command to create the adaptor
+	  (*s) << "  new "<<adaptor<<" "<<i->first<<std::endl;
+	  // Sets the label of the widget adaptor to the name of the input
+	  (*s) << "  set "<<i->first<<".Label "<<i->first<<std::endl;
+	  // Sets the initial value of the widget to the value of the input
+	  (*s) << "  set "<<i->first<<".In \" "
+	       <<box->bbGetInputAsString(i->first)<<"\""
+	       << std::endl;
+	  // store the input name
+	  in.push_back(i->first);
+	  (*s) << "  connect "<<i->first<<".Widget layout.Widget"<<in.size()<<std::endl;
+	    //<i->first<<"'"<<std::endl;
+	  (*s) << "  connect "<<i->first<<".BoxChange change.In"<<in.size()<<std::endl;
+	}
+      // try to find a two pieces adaptor
+      else if (F->FindWidgetAdaptor2(DataInfo(d->GetTypeInfo(),""),
+				     d->GetDataInfo(),
+				     widget,adaptor) )
+	{
+	  // command to create the widget
+	  (*s) << "  new "<<widget<<" "<<i->first<<"Widget"<<std::endl;
+	  // command to create the adaptor
+	  (*s) << "  new "<<adaptor<<" "<<i->first<<std::endl;
+	  // connect the two
+	  (*s) << "  connect "<<i->first<<"Widget.Out "
+	       <<i->first<<".In"<<std::endl;
+	  // Sets the label of the widget adaptor to the name of the input
+	  (*s) << "  set "<<i->first<<"Widget.Label "<<i->first<<std::endl;
+	  // Sets the initial value of the widget to the value of the input
+	  (*s) << "  set "<<i->first<<"Widget.In \" "
+	       <<box->bbGetInputAsString(i->first)<<"\""<< std::endl;
+	  // store the input name
+	  in.push_back(i->first);
+	  (*s) << "  connect "<<i->first<<"Widget.Widget layout.Widget"<<in.size()<<std::endl;
+	    //<i->first<<"'"<<std::endl;
+	  (*s) << "  connect "<<i->first<<"Widget.BoxChange change.In"<<in.size()<<std::endl;
+
+	}
+      // try to find an adaptor from string 
+      // If found then can create a text input which 
+      // will be automatically adapted 
+      else if (F->FindAdaptor(DataInfo(typeid(std::string),""),
+			       d->GetDataInfo(),
+			       adaptor))
+	{
+	  // command to create the adaptor
+	  (*s) << "  new InputText "<<i->first<<std::endl;
+	  // Sets the label of the widget adaptor to the name of the input
+	  (*s) << "  set "<<i->first<<".Title "<<i->first<<std::endl;
+	  // Sets the initial value of the widget to the value of the input
+	  (*s) << "  set "<<i->first<<".In \" "
+	       <<box->bbGetInputAsString(i->first)<<"\""<< std::endl;
+	  // store the input name
+	  in.push_back(i->first);
+	  (*s) << "  connect "<<i->first<<".Widget layout.Widget"<<in.size()<<std::endl;
+	    //<i->first<<"'"<<std::endl;
+	  (*s) << "  connect "<<i->first<<".BoxChange change.In"<<in.size()<<std::endl;
+
+	}
+      else 
+	{
+	  widok = false;
+	}
+      if (widok)
+	{
+	  // command to create the output
+	  (*s) << "  output "<<i->first<<" "
+	       <<i->first<<".Out "<<i->first<<std::endl;
+	    //	       <<" Output of the widget which allows to set "
+	  
+	}
+    }   
+  // Inputs for window properties
+  (*s) << "  input WinTitle layout.WinTitle Title"<<std::endl;
+  (*s) << "  input WinWidth layout.WinWidth Width"<<std::endl;
+  (*s) << "  input WinHeight layout.WinHeight Height"<<std::endl;
+  (*s) << "  input WinDialog layout.WinDialog Dialog"<<std::endl;
+  (*s) << "  input WinHide layout.WinHide Hide"<<std::endl;
+
+  
+  
+  // Execute the box executes the layout
+  (*s) << "  exec layout" << std::endl;
+  (*s) << "endefine" << std::endl;
+  // (*s) << "help "<< typeName<< std::endl;
+  // instanciate the box and connect it
+  (*s) << "new "<<typeName<<" "<<instanceName<<std::endl;
+  // connections
+  std::vector<std::string>::iterator j;
+  for (j=in.begin();j!=in.end();++j)
+    {
+      // connect
+      (*s) << "connect "<<instanceName<<"."<<*j<<" "
+	   << boxname<<"."<<*j<<std::endl;
+    }
+  // That's all folks ! now execute the commands :
+  SwitchToStream(s);
+}
+//=======================================================================
 
 
+
+ //==========================================================================
+  void Interpreter::Debug(const std::string& name)
+  {
+    if ((name.length()==2)&&(name[0]=='-'))
+      {
+	if (name[1]=='D')
+	  {
+	    bbtk::StaticInitTime::PrintObjectListInfo = true;
+	  }
+	if (name[1]=='C')
+	  {
+	    //	    int o = MessageManager::GetMessageLevel("debug");
+	    //	    if (o<2) MessageManager::SetMessageLevel("debug",2);
+	    mVirtualExecuter->GetFactory()->CheckPackages();
+	    //	    MessageManager::SetMessageLevel("debug",o);
+	  }
+      }
+    else 
+      {
+	Object:: PrintObjectListInfo(name);
+      }
+  }
+ //==========================================================================
+ //==========================================================================
+  std::string Interpreter::GetObjectName() const
+  {
+    return std::string("Interpreter");
+  }
+  //==========================================================================
+  
+  //==========================================================================
+  std::string  Interpreter::GetObjectInfo() const 
+  {
+    std::stringstream i;
+    return i.str();
+  }
+  //==========================================================================
+
+  //==========================================================================
+size_t  Interpreter::GetObjectSize() const 
+{
+  size_t s = Superclass::GetObjectSize();
+  s += Interpreter::GetObjectInternalSize();
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+size_t  Interpreter::GetObjectInternalSize() const 
+{
+  size_t s = sizeof(Interpreter);
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  Interpreter::GetObjectRecursiveSize() const 
+  {
+    size_t s = Superclass::GetObjectRecursiveSize();
+    s += Interpreter::GetObjectInternalSize();
+    s += mVirtualExecuter->GetObjectRecursiveSize();
+    return s;
+  }
+  //==========================================================================
 }//namespace