X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=0bb789483e372f35b596a5e87f28c034a660770c;hb=d7e710c3fe8bd9c8c5fb79073bd5667b24c048f8;hp=f908f65155cf2c42396d08a64f2b98edd2a265b6;hpb=857e5e5bd003d20cb8bc4539b6fca4ca9d50929c;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index f908f65..0bb7894 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
-  Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
+  Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/15 08:02:36 $
-  Version:   $Revision: 1.66 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/12/15 09:04:47 $
+  Version:   $Revision: 1.81 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *  \file 
  *  \brief class Interpreter :
@@ -121,6 +134,22 @@ namespace bbtk
     info.help = "Deletes the black box of name <box>";
     mCommandDict[info.keyword] = info;
 
+    info.keyword = "clear";
+    info.argmin = 0;
+    info.argmax = 0;
+    info.code = cClear;
+    info.syntax = "clear";
+    info.help = "Clears the currently defined complex box (deletes all its boxes and connections)";
+    mCommandDict[info.keyword] = info;
+
+    info.keyword = "break";
+    info.argmin = 0;
+    info.argmax = 0;
+    info.code = cBreak;
+    info.syntax = "break";
+    info.help = "Breaks the current execution";
+    mCommandDict[info.keyword] = info;
+
     info.keyword = "newgui";
     info.argmin = 2;
     info.argmax = 2;
@@ -149,8 +178,8 @@ namespace bbtk
     info.argmin = 1;
     info.argmax = 2;
     info.code = cExec;
-    info.syntax = "exec <box | 'freeze' | 'unfreeze' >";
-    info.help = "Executes the black box of name <box> (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode.";
+    info.syntax = "exec <box | 'freeze' | 'unfreeze' | 'freeze_no_error' >";
+    info.help = "Executes the black box of name <box> (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode. 'freeze_no_error' is like freeze but also skips any error.";
     mCommandDict[info.keyword] = info;
 
     info.keyword = "package";
@@ -174,7 +203,7 @@ namespace bbtk
     info.argmax = 2;
     info.code = cDefine;
     info.syntax = "define <type> [<package>]";
-    info.help = "Begins the definition of a new type of complex black box called <type>. If <package> if provided will create it in the given package.";
+    info.help = "Begins the definition of a new type of complex black box called <type>. If <package> is provided will create it in the given package.";
     mCommandDict[info.keyword] = info;
     
     info.keyword = "endefine";
@@ -239,7 +268,7 @@ namespace bbtk
     info.argmax = 0;
     info.code = cReset;
     info.syntax = "reset";
-    info.help = "Deletes all boxes and unloads all packages (bbi is reset to its start state)";
+    info.help = "Deletes all boxes and unloads all packages (reset to start state)";
     mCommandDict[info.keyword] = info;
 
     info.keyword = "author";
@@ -280,14 +309,15 @@ namespace bbtk
     info.argmax = 2;
     info.code = cMessage;
     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.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 = 2;
     info.code = cInclude;
     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).";
+    info.help = "Includes the file <filename>.\n  'source' : If the keyword 'source' is provided then informs the interpreter 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";
@@ -336,7 +366,7 @@ namespace bbtk
     info.argmax = 2;
     info.code = cWorkspace;
     info.syntax = "workspace < ( freeze | unfreeze ) | ( rename <newname> ) >";
-    info.help = "Configures the workspace.\n        'freeze' allow to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n      'rename' allow to set a new name to the workspace.";
+    info.help = "Configures the workspace.\n        'freeze' allows to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n      'rename' allow to set a new name to the workspace.";
     mCommandDict[info.keyword] = info;
     */
 
@@ -360,7 +390,8 @@ namespace bbtk
   //=======================================================================
 
 
-  InterpreterError::InterpreterError( const std::string& message,
+  //=======================================================================
+  InterpreterException::InterpreterException( const std::string& message,
 				      bool in_script_file,
 				      const std::string& script_file,
 				      int script_line 
@@ -371,7 +402,9 @@ namespace bbtk
       mScriptLine(script_line)
   {
   }
-  InterpreterError::InterpreterError( const Exception& excep,
+  //=======================================================================
+  //=======================================================================
+  InterpreterException::InterpreterException( const Exception& excep,
 		      bool in_script_file,
 		      const std::string& script_file,
 		      int script_line 
@@ -383,8 +416,39 @@ namespace bbtk
   {
   }
   //=======================================================================
+
+
+  //=======================================================================
+  void Interpreter::CatchInterpreterException( const InterpreterException& e )
+  {
+    if (mThrow) 
+      {
+	if (e.GetErrorMessage()!="break")
+	  {
+	    mStatus = Interpreter_ERROR;	       
+	    CloseAllFiles();
+	  }
+ 	throw InterpreterException(e);
+      }
+    else
+      {
+	std::stringstream mess;
+	mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
+	if (e.IsInScriptFile())
+	  {
+	    mess << "* FILE  : \""<<e.GetScriptFile()<<"\""<<std::endl;
+	    mess << "* LINE  : "<<e.GetScriptLine()<<std::endl;
+	  }
+ 	CloseAllFiles();
+	std::cerr << mess.str();
+      }
+  }
+  //=======================================================================
+
+  //=======================================================================
   void Interpreter::CatchBbtkException( const bbtk::Exception& e )
   {
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -396,17 +460,19 @@ namespace bbtk
 	  file = mFileName.back();
 	  line = mLine.back();
 	}   
-	CloseAllFiles();
- 	throw InterpreterError(e,in_script,file,line);
+	if (e.GetErrorMessage()!="break")
+	  CloseAllFiles();
+ 	throw InterpreterException(e,in_script,file,line);
       }
     else
       {
 	std::stringstream mess;
-	mess << "* ERROR : "<<e.GetMessage()<<std::endl;
+	mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
 	if (mFileName.size()) {
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
 	}    
+ 	CloseAllFiles();
 	std::cerr << mess.str();
       }
   }
@@ -415,6 +481,7 @@ namespace bbtk
   //=======================================================================
   void Interpreter::CatchStdException( const std::exception& e )
   {  
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -427,7 +494,7 @@ namespace bbtk
 	  line = mLine.back();
 	}    
  	CloseAllFiles();
-	throw InterpreterError(e.what(),in_script,file,line);
+	throw InterpreterException(e.what(),in_script,file,line);
       }
     else
       {
@@ -437,6 +504,7 @@ namespace bbtk
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
 	}    
+ 	CloseAllFiles();
 	std::cerr << mess.str();
       }
   }
@@ -445,6 +513,7 @@ namespace bbtk
   //=======================================================================
   void Interpreter::CatchUnknownException()
   {
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -457,7 +526,7 @@ namespace bbtk
 	  line = mLine.back();
 	}    
  	CloseAllFiles();
-	throw InterpreterError("Unknown exception caught",
+	throw InterpreterException("Unknown exception caught",
 				   in_script,file,line);
       }
     else
@@ -469,91 +538,64 @@ namespace bbtk
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
 	}    
+ 	CloseAllFiles();
 	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();			\
+  
+#define CATCH_MACRO					\
+  catch (InterpreterException e)			\
+    {							\
+      CatchInterpreterException(e);			\
+    }							\
+  catch (bbtk::Exception e)				\
+    {							\
+      CatchBbtkException(e);				\
+    }							\
+  catch (std::exception& e)				\
+    {							\
+      CatchStdException(e);				\
+    }							\
+  catch (...)						\
+    {							\
+      CatchUnknownException();				\
     }						
   //=======================================================================
    
 
   //=======================================================================
-  /**
-   *  
-   */
-  Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
+  Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename, bool source )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
     mCommandLine = false;
 
-    ExitStatus status = Interpreter_OK;
-
     try 
     {
-      SwitchToFile(filename);
-
-      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();
-      }
-    }
+      mStatus = Interpreter_OK;
+      SwitchToFile(filename,source);
+      mInsideComment = false;
+      InterpretCurrentStreams();
+    } 
     CATCH_MACRO;
     
-    CloseAllFiles();
-    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
+    bbtkDebugMessage("Interpreter",9,
+		     "EO Interpreter::InterpretFile(\""
+		     <<filename<<"\")"<<std::endl);
     bbtkDecTab("Interpreter",9);
 
     mCommandLine = exm;
     
-    return status;
+    return mStatus;
   }
   //=======================================================================
 
 
   //=======================================================================
-  /**
-   *  
-   */
   Interpreter::ExitStatus 
   Interpreter::InterpretBuffer( std::stringstream* buffer )
   {
@@ -562,13 +604,32 @@ namespace bbtk
     bool exm = mCommandLine;
     mCommandLine = false;
 
-    ExitStatus status = Interpreter_OK;
-
     try 
     {
+      mStatus = Interpreter_OK;
       SwitchToStream(buffer);
-      bool insideComment = false; // for multiline comment
-      while (mFile.size()>0) 
+      mInsideComment = false;
+      InterpretCurrentStreams();
+    }
+    CATCH_MACRO;
+    
+    //    CloseAllFiles();
+    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
+    bbtkDecTab("Interpreter",9);
+    
+    mCommandLine = exm;
+    return mStatus;
+  }
+  //=======================================================================
+
+  //=======================================================================
+  /// Interprets the currently open streams
+  Interpreter::ExitStatus Interpreter::InterpretCurrentStreams()
+  {
+    bbtkDebugMessageInc("Interpreter",9,
+			"Interpreter::InterpretCurrentStreams()"<<std::endl);
+
+    while (mFile.size()>0) 
       {
 	while (!mFile.back()->eof()) {
 	  mLine.back()++;
@@ -581,22 +642,15 @@ namespace bbtk
             {
 	      str.erase(size-1,1);
             }
-	  
-	  InterpretLine(str, insideComment);
-	  
-	}//while
-	
+	  try
+	    {
+	      DoInterpretLine(str);
+	    }
+	  CATCH_MACRO;
+	} 
 	CloseCurrentFile();
       }
-    }
-    CATCH_MACRO;
-    
-    CloseAllFiles();
-    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
-    bbtkDecTab("Interpreter",9);
-    
-    mCommandLine = exm;
-    return status;
+    return mStatus;
   }
   //=======================================================================
 
@@ -606,33 +660,29 @@ namespace bbtk
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine('"<<line<<"')"<<std::endl);
 
-    ExitStatus status = Interpreter_OK;
-
     try 
     {
-      bool insideComment = false;
-      InterpretLine(line, insideComment);
+      mStatus = Interpreter_OK;
+      mInsideComment = false;
+      DoInterpretLine(line );
     }
     CATCH_MACRO;
-  
-
+    
+    
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
 		     <<std::endl);
     bbtkDecTab("Interpreter",9);
     
-    return status;
+    return mStatus;
   }
+  //=======================================================================  
   
 
   //=======================================================================  
-  /**
-   *
-   */
-void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
-{
-    bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
-    bbtkMessage("echo",2,line<<std::endl);
-
+  void Interpreter::DoInterpretLine( const std::string& line )
+  {
+    bbtkDebugMessageInc("Interpreter",9,"Interpreter::DoInterpretLine(\""<<line<<"\")"<<std::endl);
+    
     std::vector<std::string> words;
     SplitLine(line,words);
 
@@ -657,7 +707,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
     {  
        bbtkDebugDecTab("Interpreter",9);
        bbtkMessage("Interpreter",9,"In multiline comment"<<std::endl);
-       insideComment = true;
+       mInsideComment = true;
        return;
     }
 
@@ -665,15 +715,15 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
     {  
        bbtkDebugDecTab("Interpreter",9);
        bbtkMessage("Interpreter",9,"Out multiline comment"<<std::endl);
-       if ( !insideComment ) {
+       if ( !mInsideComment ) {
           bbtkDebugDecTab("Interpreter",9);
           bbtkMessage("Interpreter",9,"Comment mismatch : '*/' with no matching '/*'"<<std::endl);       
        }
-       insideComment = false;
+       mInsideComment = false;
        return;
     }
 
-    if (insideComment) 
+    if (mInsideComment) 
     {  
        bbtkDebugDecTab("Interpreter",9);
        bbtkMessage("Interpreter",9,"Multiline Comment"<<std::endl);
@@ -690,8 +740,61 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
     int level=0;
     std::string left,right,left2,right2;
     std::string filename;
+
+    // message command
+    if (command.code==cMessage)
+      {
+	if (words.size()<3)
+	  {
+	    mVirtualExecuter->HelpMessages();
+	  }
+        else
+	  {
+	    sscanf(words[2].c_str(),"%d",&level);
+	    mVirtualExecuter->SetMessageLevel(words[1],level);
+	  }
+	return;
+      }
+    else 
+      {
+	bbtkMessage("echo",2,line<<std::endl);
+      }
+
+    // break and quit commands
+    if ((command.code==cBreak) || (command.code==cQuit))
+      {
+	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();
+	  } 
+	if (command.code==cBreak)
+	  {
+	    /*
+	    std::cout << "BreakException(" 
+		      <<in_script<<","
+		      <<file<<","
+		      <<line<<")"<<std::endl;
+	    */
+	    bbtkError("break");//,in_script,file,line);
+	    //	    throw BreakException(in_script,file,line);
+	  }	  
+	else 
+	  {
+	    bbtkError("quit");//,in_script,file,line);
+	      //throw QuitException(in_script,file,line);
+	  }
+	return;
+      }   
+
+    // other cammands
     switch (command.code) 
-    {
+      {
       case cNew :
         mVirtualExecuter->Create(words[1],words[2]);
         break;
@@ -717,7 +820,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cDefine :
         if (mFileName.size()>0) 
         {
-	  filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
+		   filename = mFileName.back(); //mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
         }
         if (words.size()==2) 
         {
@@ -743,11 +846,25 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         
       case cExec :
         if (words[1]=="freeze") 
-          mVirtualExecuter->SetNoExecMode(true);
-        else if (words[1]=="unfreeze") 
-          mVirtualExecuter->SetNoExecMode(false);
-        else
-          mVirtualExecuter->Execute(words[1]);
+	  {
+	    mVirtualExecuter->SetNoExecMode(true);
+	    mThrow = false;
+	  }
+	else if (words[1]=="freeze_no_error ") 
+	  {
+	    mVirtualExecuter->SetNoExecMode(true);
+	    mVirtualExecuter->SetNoErrorMode(true);
+	    mThrow = false;
+	  }
+	else if (words[1]=="unfreeze") 
+	  {
+	    mVirtualExecuter->SetNoExecMode(false);
+	    mVirtualExecuter->SetNoErrorMode(false);
+	  }
+	else
+	  {
+	    mVirtualExecuter->Execute(words[1]);
+	  }
         break;
 
       case cInput :
@@ -794,17 +911,6 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         Help(words);
         break;
 
-      case cMessage : 
-        if (words.size()<3)
-        {
-	  mVirtualExecuter->HelpMessages();
-        }
-        else
-        {
-	  sscanf(words[2].c_str(),"%d",&level);
-          mVirtualExecuter->SetMessageLevel(words[1],level);
-        }
-        break;
 
       case cGraph :
         Graph(words);
@@ -817,22 +923,23 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cReset :  
 	Reset();
         break;
+	
+      case cClear :  
+	mVirtualExecuter->Clear();
+        break;
 
       case cInclude :
-        if (mCommandLine)
+		// if 'source' was given (words.size()==3) then tell to set the 
+		// source file name of the current complex box with the full file name included
+  		if (mCommandLine)
         {
-           InterpretFile(words[1]); 
+           InterpretFile(words[1],(words.size()==3)); 
         }
         else
         {
-            SwitchToFile(words[1]);
+            SwitchToFile(words[1],(words.size()==3) );
         }
-	// if 'source' was given
-	if (words.size()==3) 
-	  {
-	    GetExecuter()->SetCurrentFileName(words[1]);
-	  }
-        break;
+		break;
 
       case cLoad:
         GetExecuter()->LoadPackage(words[1]);
@@ -842,10 +949,6 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         GetExecuter()->UnLoadPackage(words[1]);
         break;
 
-      case cQuit :
-        throw QuitException();
-        break;
-
       case cDebug :
 	if (words.size()==2) Debug(words[1]);
 	else Debug("");
@@ -876,10 +979,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 
 
   //=======================================================================
-  /**
-   *
-   */
-void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>& tokens)
+  void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>& tokens)
 {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""<<str<<"\")"<<std::endl);
 
@@ -916,7 +1016,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   void Interpreter::Reset()
   {
     // Cannot close all files if the reset command is read from a file !
-    //    CloseAllFiles();
+    CloseAllFiles();
     mFileNameHistory.clear();
     this->mVirtualExecuter->Reset();
   }
@@ -1003,7 +1103,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
    */
 
   // =========================================================================
-  void Interpreter::SwitchToFile( const std::string& name )
+  void Interpreter::SwitchToFile( const std::string& name , bool source )
   {
   // Note : in the following :
   // name : the user supplied name 
@@ -1035,8 +1135,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     pkgname = Utilities::ExtractScriptName(name,upath);
 
     bbtkMessage("Interpreter",3,
-		"extract : pkgname [" << pkgname
-		 << "] upath [" << upath << "]" << std::endl);
+		"package name:[" << pkgname
+		 << "] path:[" << upath << "]" << std::endl);
     bool fullnameGiven = false; 
     bool foundFile     = false;
 
@@ -1044,8 +1144,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     // relative (e.g. std/boxes/*) or absolute 
     if (pkgname == "*") 
       {
-	int nbBssFiles;
-	
+
 	std::stringstream* stream = new std::stringstream;
 	//if (upath.size()!=0) // avoid troubles for "*"
 	
@@ -1053,7 +1152,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 	if (upath.size()==0)
 	  {
 	    //	    bbtkMessage("Interpreter",1,
-	    script_paths.push_back(  ConfigurationFile::GetInstance().Get_root_bbs_path() );
+	    // LG : add all bbs path
+	    //  script_paths.push_back(  ConfigurationFile::GetInstance().Get_root_bbs_path() );
+	    std::vector<std::string>::const_iterator i;
+	    for (i=ConfigurationFile::GetInstance().Get_bbs_paths().begin();
+		 i!=ConfigurationFile::GetInstance().Get_bbs_paths().end();
+		 i++)
+	      {
+		script_paths.push_back(*i);
+	      }
 	  }
 	// ==== absolute path provided 
 	else if (upath[0]=='/' || upath[1] == ':' ) 
@@ -1071,85 +1178,82 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 	// 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);
-	       }
-
+	    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);
+	      }
 	  }
+	
+	
 	// === search paths list complete : now explore it
-
-
+	int nbBssFiles = 0;	
+	// ==== relative name, iterate + load all .bbs/.bbp files
 	std::vector<std::string>::iterator i;
-	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++)
 	  {
 	    bbtkMessage("Interpreter",1,
 			"--> Looking in '" << *i << "'" << std::endl);
-	 
 	    
 	    Filenames.clear();
-	    int nbFiles = Utilities::Explore(*i, false, Filenames);
+	    //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;
+		if (lgr < 5) continue;  
+		// ignore non .bbp file
+		if ( (*j).substr(lgr-4, 4) != ".bbp") continue; 
 		
 		(*stream) << "include \"" << *j << "\"\n";
-		bbtkMessage("Interpreter",2,
-			    "  --> Found '" << *j << "'" << std::endl);
+		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
+	      } // for (std::vector...
+	  } // for (i=script_...
+
+	// === Result ...
+	if (nbBssFiles==0)
+	  {
+	    bbtkMessage("Interpreter",1,
+			"  --> No .bbp found"<< std::endl);
+	  } 
+	else 
+	  {
+	    bbtkMessage("Interpreter",1,
+			"  --> "<<nbBssFiles<<" .bbp found"<< std::endl);
+	    SwitchToStream(stream);
+	  }
 	return;
       }  
     //=============== end pkgname=="*" ===========
-
-
+    
+    
     // 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 expland the directory name
@@ -1166,65 +1270,101 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       // allow user to always forget ".bbs"
       int l = fullPathScriptName.size();
 
-      if (l!=0) {
-
-      if (l>4)
-      {
-         if (fullPathScriptName.substr(l-4, 4) != ".bbs")
+      if (l!=0) 
+	  {
+         if ((fullPathScriptName.substr(l-4, 4) != ".bbs")&&
+			 (fullPathScriptName.substr(l-4, 4) != ".bbp"))
          {
-            fullPathScriptName = fullPathScriptName + ".bbs";
-         }
-      }
-      else
-      {
-         fullPathScriptName = fullPathScriptName + ".bbs";   
-      }
-
-      if ( Utilities::FileExists(fullPathScriptName))
-      {
-        foundFile = true;
-      }
-    } // endif l != 0
+			std::string tfullPathScriptName = fullPathScriptName + ".bbs";
+			if ( Utilities::FileExists(tfullPathScriptName) )
+			{
+				fullPathScriptName = tfullPathScriptName;
+				foundFile = true;
+			}
+			else 
+			{
+				tfullPathScriptName = fullPathScriptName + ".bbp";
+				if ( Utilities::FileExists(tfullPathScriptName) )
+				{
+					fullPathScriptName = tfullPathScriptName;
+					foundFile = true;
+				}
+			}
+		 }
+		 else 
+		 {
+			if ( Utilities::FileExists(fullPathScriptName) )
+			{
+				foundFile = true;
+			}
+		 }
+	  } // endif l != 0
   }
   else
-    // =============================== iterate on the paths
-    {
+  // =============================== 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);
+	  {
+		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;
+		}
 	  
-	  // 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::string tfullPathScriptName = Utilities::MakePkgnameFromPath(path, name, false);
+		if (tfullPathScriptName.substr(tfullPathScriptName.size()-4, 3)==".bb")
+		{
+		  fullPathScriptName = tfullPathScriptName;
+			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 <<"] : does not exist" 
 			  <<std::endl);
-	      continue;  // try next path
-	    }
-	  bbtkMessage("Interpreter",2,
+				continue;  // try next path
+			}
+			bbtkMessage("Interpreter",2,
+			      "   [" <<fullPathScriptName 
+				  <<"] : found" <<std::endl);
+			foundFile = true;
+			break; // a script was found; we stop iterating
+		}
+		else 
+		{
+			fullPathScriptName = tfullPathScriptName + ".bbs";
+			// Check if library exists
+			if ( ! Utilities::FileExists(fullPathScriptName) )
+			{
+				fullPathScriptName = tfullPathScriptName + ".bbp";
+				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,
+					"   [" <<tfullPathScriptName <<".bbs/.bbp] : do not exist" 
+					<<std::endl);
+					continue;  // try next path
+				}
+			}
+			bbtkMessage("Interpreter",2,
 		      "   [" <<fullPathScriptName 
 		      <<"] : found" <<std::endl);
-	  foundFile = true;
-	  break; // a script was found; we stop iterating
-
+			foundFile = true;
+			break; // a script was found; we stop iterating
+		}
 	} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
-    }
-    
+  }
+
     if (!foundFile)
       {
 	if (fullnameGiven)
@@ -1233,11 +1373,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 	  else
             bbtkError("Script ["<<fullPathScriptName<<"] not found");
 	else
-          bbtkError("No ["<<pkgname<<".bbs] script found");
+          bbtkError("No ["<<pkgname<<".bbs/.bbp] script found");
 	return;
       }
     else
+	{
       LoadScript(fullPathScriptName,name);
+	  if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
+	}
     
     return;
   }
@@ -1295,13 +1438,11 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
     mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);
 
-    return;
+	return;
   }
+  //=======================================================================
 
   //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::CloseCurrentFile()
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()"
@@ -1333,9 +1474,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
   //=======================================================================
 
  //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::CloseAllFiles()
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()"
@@ -1353,9 +1491,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
 
 
   //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::InterpretCommand( const std::vector<std::string>& words,
                                       CommandInfoType& info )
   {
@@ -1369,8 +1504,8 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
     }
 
     // tests the number of args 
-    if ( ( words.size()-1 < c->second.argmin ) ||
-         ( words.size()-1 > c->second.argmax ) )
+    if ( ( ((int)words.size())-1 < c->second.argmin ) ||
+         ( ((int)words.size())-1 > c->second.argmax ) )
     {
        HelpCommand(words[0]);
        bbtkError(words[0]<<" : wrong number of arguments");
@@ -1515,7 +1650,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     c = mCommandDict.find(s);
     if ( c == mCommandDict.end() ) {
       bbtkError(s<<" : Unknown command");
-    }
+    }	
     //    std::cout << " " << s << " : "<<  std::endl;
     //    CommandParamDictType::iterator i;
     //    for ( i =  c->second.begin();
@@ -1569,10 +1704,10 @@ void Interpreter::Help(const std::vector<std::string>& words)
   void Interpreter::GetLineFromPrompt(std::string& s)
   {
     int c;
-    int ind=0;
+    unsigned int ind=0;
 
-    int MAX_LINE_SIZE = 160;
-    int MAX_HISTORY_SIZE = 100;
+    unsigned int MAX_LINE_SIZE = 160;
+    unsigned int MAX_HISTORY_SIZE = 100;
 
     char* newline = new char[MAX_LINE_SIZE];
     memset(newline,0,MAX_LINE_SIZE);
@@ -1580,7 +1715,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     memset(histline,0,MAX_LINE_SIZE);
 
     char* line = newline;
-    int hist = mHistory.size();
+    unsigned int hist = mHistory.size();
 
     write(1,"> ",2);
     while(1)
@@ -1786,20 +1921,23 @@ void Interpreter::Help(const std::vector<std::string>& words)
     
     mCommandLine = true;
     bool again = true;
-    bool insideComment = false; // for multiline comment  
+    // bool insideComment = false; // for multiline comment  
+    mInsideComment = false;
     do 
     {
       try
       {
         std::string line;
         GetLineFromPrompt(line);
-        InterpretLine(line, insideComment);
+        DoInterpretLine(line); //, insideComment);
       }
+      /*
       catch (QuitException e)
       {
 	bbtkMessage("Interpreter",1,"Interpreter : Quit"<<std::endl);
         again = false;
       }
+      */
       catch (bbtk::Exception e) 
       {
         e.Print();
@@ -1933,7 +2071,7 @@ void  Interpreter::NewGUI(const std::string& boxname,
 
   BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname);
   //  BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap();
-  int nb = 0;
+  // int nb = 0;
   BlackBox::InputConnectorMapType::iterator i;
   for (i=box->bbGetInputConnectorMap().begin();
        i!=box->bbGetInputConnectorMap().end();
@@ -2079,6 +2217,17 @@ void  Interpreter::NewGUI(const std::string& boxname,
       }
   }
  //==========================================================================
+
+  /*
+  //==========================================================================
+  // Adds a callback when 'break' command issued
+  void Interpreter::AddBreakObserver( BreakCallbackType c )
+  {
+    mBreakSignal.connect(c);
+  }
+ //==========================================================================
+ */
+
  //==========================================================================
   std::string Interpreter::GetObjectName() const
   {