X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=ef8be1b5f84ebb664c0fd51a7c10f2cfb0ba5a32;hb=ab0cfcfdd031ff179ed1550874c648a54d8e1023;hp=4b2e86615be05108e85c3ef3b810670b3252edb8;hpb=7dea96c3fd3343fc15372ae61573ad5354b19ffc;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 4b2e866..ef8be1b 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/26 12:36:42 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2009/04/08 07:56:11 $
+  Version:   $Revision: 1.83 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -39,6 +39,7 @@
 #include "bbtkMessageManager.h"
 #include "bbtkConfigurationFile.h"
 #include "bbtkUtilities.h"
+#include "bbtkAtomicBlackBox.h"
 #include "bbtkWxBlackBox.h"
 #include <sys/stat.h>
 #include <algorithm>
@@ -134,6 +135,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;
@@ -374,7 +391,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 
@@ -385,7 +403,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 
@@ -397,12 +417,27 @@ namespace bbtk
   {
   }
   //=======================================================================
-  void Interpreter::CatchInterpreterException( const InterpreterError& e )
+
+
+  //=======================================================================
+  void Interpreter::CatchInterpreterException( const InterpreterException& e )
   {
+    if (GetExecuter()->GetNoErrorMode()) 
+      {
+	bbtkWarning("ERROR :"<<e.GetErrorMessage()
+		    <<" ("<<e.GetScriptFile()<<":"<<e.GetScriptLine()
+		    <<" skipped");
+
+	return;
+      }
     if (mThrow) 
       {
-	CloseAllFiles();
- 	throw InterpreterError(e);
+	if (e.GetErrorMessage()!="break")
+	  {
+	    mStatus = Interpreter_ERROR;	       
+	    CloseAllFiles();
+	  }
+ 	throw InterpreterException(e);
       }
     else
       {
@@ -413,6 +448,7 @@ namespace bbtk
 	    mess << "* FILE  : \""<<e.GetScriptFile()<<"\""<<std::endl;
 	    mess << "* LINE  : "<<e.GetScriptLine()<<std::endl;
 	  }
+ 	CloseAllFiles();
 	std::cerr << mess.str();
       }
   }
@@ -421,6 +457,20 @@ namespace bbtk
   //=======================================================================
   void Interpreter::CatchBbtkException( const bbtk::Exception& e )
   {
+    if (GetExecuter()->GetNoErrorMode()) 
+      {
+	std::string file("?");
+	int line = 0;
+	if (mFileName.size()) {
+	  file = mFileName.back();
+	  line = mLine.back();
+	}    
+	bbtkWarning("ERROR '"<<e.GetErrorMessage()
+		    <<"' ("<<file<<":"<<line<<") skipped");
+	
+	return;
+      }
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -432,8 +482,9 @@ 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
       {
@@ -443,6 +494,7 @@ namespace bbtk
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
 	}    
+ 	CloseAllFiles();
 	std::cerr << mess.str();
       }
   }
@@ -451,6 +503,20 @@ namespace bbtk
   //=======================================================================
   void Interpreter::CatchStdException( const std::exception& e )
   {  
+   if (GetExecuter()->GetNoErrorMode()) 
+      {
+	std::string file("?");
+	int line = 0;
+	if (mFileName.size()) {
+	  file = mFileName.back();
+	  line = mLine.back();
+	}    
+	bbtkWarning("ERROR '"<<e.what()
+		    <<"' ("<<file<<":"<<line<<") skipped");
+
+	return;
+      }
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -463,7 +529,7 @@ namespace bbtk
 	  line = mLine.back();
 	}    
  	CloseAllFiles();
-	throw InterpreterError(e.what(),in_script,file,line);
+	throw InterpreterException(e.what(),in_script,file,line);
       }
     else
       {
@@ -473,6 +539,7 @@ namespace bbtk
 	  mess << "* FILE  : \""<<mFileName.back()<<"\""<<std::endl;
 	  mess << "* LINE  : "<<mLine.back()<<std::endl;
 	}    
+ 	CloseAllFiles();
 	std::cerr << mess.str();
       }
   }
@@ -481,6 +548,19 @@ namespace bbtk
   //=======================================================================
   void Interpreter::CatchUnknownException()
   {
+   if (GetExecuter()->GetNoErrorMode()) 
+      {
+	std::string file("?");
+	int line = 0;
+	if (mFileName.size()) {
+	  file = mFileName.back();
+	  line = mLine.back();
+	}  
+  	bbtkWarning("UNDEFINED ERROR "
+		    <<"("<<file<<":"<<line<<") skipped");
+	return;
+      }
+    mStatus = Interpreter_ERROR;	       
     if (mThrow) 
       {
 	bool in_script = false;
@@ -493,7 +573,7 @@ namespace bbtk
 	  line = mLine.back();
 	}    
  	CloseAllFiles();
-	throw InterpreterError("Unknown exception caught",
+	throw InterpreterException("Unknown exception caught",
 				   in_script,file,line);
       }
     else
@@ -505,46 +585,35 @@ 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 (InterpreterError e)			\
-    {						\
-      status = Interpreter_ERROR;		\
+  
+#define CATCH_MACRO					\
+  catch (InterpreterException e)			\
+    {							\
       CatchInterpreterException(e);			\
-    }						\
-  catch (bbtk::Exception e)			\
-    {						\
-      status = Interpreter_ERROR;		\
-      CatchBbtkException(e);			\
-    }						\
-  catch (std::exception& e)			\
-    {						\
-      status = Interpreter_ERROR;		\
-      CatchStdException(e);			\
-    }						\
-  catch (...)					\
-    {						\
-      status = Interpreter_ERROR;		\
-      CatchUnknownException();			\
+    }							\
+  catch (bbtk::Exception e)				\
+    {							\
+      CatchBbtkException(e);				\
+    }							\
+  catch (std::exception& e)				\
+    {							\
+      CatchStdException(e);				\
+    }							\
+  catch (...)						\
+    {							\
+      CatchUnknownException();				\
     }						
   //=======================================================================
    
 
   //=======================================================================
-  /**
-   *  
-   */
   Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename, bool source )
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
@@ -552,52 +621,28 @@ namespace bbtk
     bool exm = mCommandLine;
     mCommandLine = false;
 
-    ExitStatus status = Interpreter_OK;
-
     try 
     {
+      mStatus = Interpreter_OK;
       SwitchToFile(filename,source);
-
-      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);
-            }
-	  try
-	    {
-	      InterpretLine(str, insideComment);
-	    }
-	  CATCH_MACRO;
-	  
-       }//while !eof
-       CloseCurrentFile();
-      }//while >0
-    } // try
+      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 )
   {
@@ -606,13 +651,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()++;
@@ -627,21 +691,13 @@ namespace bbtk
             }
 	  try
 	    {
-	      InterpretLine(str, insideComment);
+	      DoInterpretLine(str);
 	    }
 	  CATCH_MACRO;
-	}//while
+	} 
 	CloseCurrentFile();
       }
-    }
-    CATCH_MACRO;
-    
-    CloseAllFiles();
-    bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<<std::endl);
-    bbtkDecTab("Interpreter",9);
-    
-    mCommandLine = exm;
-    return status;
+    return mStatus;
   }
   //=======================================================================
 
@@ -651,33 +707,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);
 
@@ -702,7 +754,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;
     }
 
@@ -710,15 +762,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);
@@ -735,8 +787,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;
@@ -792,7 +897,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 	    mVirtualExecuter->SetNoExecMode(true);
 	    mThrow = false;
 	  }
-	else if (words[1]=="freeze_no_error ") 
+	else if (words[1]=="freeze_no_error") 
 	  {
 	    mVirtualExecuter->SetNoExecMode(true);
 	    mVirtualExecuter->SetNoErrorMode(true);
@@ -853,17 +958,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);
@@ -876,6 +970,10 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cReset :  
 	Reset();
         break;
+	
+      case cClear :  
+	mVirtualExecuter->Clear();
+        break;
 
       case cInclude :
 		// if 'source' was given (words.size()==3) then tell to set the 
@@ -898,10 +996,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("");
@@ -932,10 +1026,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);
 
@@ -972,7 +1063,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();
   }
@@ -1396,11 +1487,9 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
 
 	return;
   }
+  //=======================================================================
 
   //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::CloseCurrentFile()
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()"
@@ -1432,9 +1521,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
   //=======================================================================
 
  //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::CloseAllFiles()
   {
     bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()"
@@ -1452,9 +1538,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
 
 
   //=======================================================================
-  /**
-   *  
-   */
   void Interpreter::InterpretCommand( const std::vector<std::string>& words,
                                       CommandInfoType& info )
   {
@@ -1885,20 +1968,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();
@@ -2043,9 +2129,14 @@ void  Interpreter::NewGUI(const std::string& boxname,
       // Get the input descriptor 
       const BlackBoxInputDescriptor* d = box->bbGetDescriptor()->GetInputDescriptor(i->first);
       // If it is a "system" input : skip it
+#ifdef USE_WXWIDGETS
       if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) ||
 	   ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) )
 	continue;
+#else
+      if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) )
+	continue;
+#endif
       bool widok = true;
       std::string widget,adaptor;
       // try to find a widget adaptor
@@ -2178,6 +2269,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
   {