X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=b5ca18f3d168b349e071155f4eb53a76c83d8b41;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=9f7c60e16b788e9353a8efaf506082895be70143;hpb=2b7ac5ab18a67097a812e20a5ecba3dac63f29cc;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index 9f7c60e..b5ca18f 100644
--- a/kernel/src/bbtkInterpreter.h
+++ b/kernel/src/bbtkInterpreter.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/03/20 15:27:56 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/04/18 12:59:15 $
+  Version:   $Revision: 1.26 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,8 +28,6 @@
 #define __bbtkInterpreter_h__
 
 #include "bbtkVirtualExec.h"
-#include "bbtkExecuter.h"
-#include "bbtkTranscriptor.h"
 
 #include <fstream>
 #include <deque>
@@ -41,80 +39,62 @@ namespace bbtk
   class WxConsole;
 #endif
   
+  //=======================================================================
   class BBTK_EXPORT InterpreterUser
   {
   public: 
-    InterpreterUser() {};
-    ~InterpreterUser() {};
+    InterpreterUser() {}
+    ~InterpreterUser() {}
 
     virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; }
     virtual void InterpreterUserViewHtmlPage(const std::string&) {}
 
 
   };
+  //=======================================================================
 
-  class BBTK_EXPORT Interpreter
-  {
 
-  private:
-
-    /// The enumeration of command codes == Command name
-    typedef enum
-    {
-      cNew,
-      cDelete,
-      cConnect,
-      cExec,
-      cPackage,
-      cEndPackage,
-      cDefine,
-      cEndDefine,
-      cInput,
-      cOutput,
-      cSet,
-      cConfig,  // JPR
-      cReset,   // EED
-      cAuthor, 
-      cCategory, // JPR
-      cDescription,
-      cHelp,
-      cMessage,
-      cInclude,
-      cQuit,
-      cLoad,
-      cUnload,
-      cGraph,
-      cPrint,
-      cIndex,
-      cWorkspace // LG
-    } CommandCodeType;
-
-    /// The structure storing the informations on a command 
-    typedef struct 
-    {
-      std::string category;
-      int argmin, argmax;
-      CommandCodeType code;
-      std::string syntax;
-      std::string help;
-    } CommandInfoType;
-
-    /// The type of dictionnary of commands 
-    typedef std::map<std::string,CommandInfoType> CommandDictType;
 
+  //=======================================================================
+  class BBTK_EXPORT InterpreterError : public Exception
+  {
   public:
-    /// Constructor
-    Interpreter();
+    InterpreterError( const std::string& message,
+		      bool in_script_file,
+		      const std::string& script_file,
+		      int script_line 
+		      );
+    InterpreterError( const Exception& excep,
+		      bool in_script_file,
+		      const std::string& script_file,
+		      int script_line 
+		      );
+    ~InterpreterError() throw() {}
+
+    bool IsInScriptFile() const { return mInScriptFile; }
+    const std::string& GetScriptFile() const { return mScriptFile; }
+    int GetScriptLine() const { return mScriptLine; }
+  private:
+    bool mInScriptFile;
+    std::string mScriptFile;
+    int mScriptLine;
+  };
+  //=======================================================================
 
-    /// Destructor
-    ~Interpreter();
 
+  //=======================================================================
+  class BBTK_EXPORT Interpreter : public Object
+  {
+    BBTK_OBJECT_INTERFACE(Interpreter);
+    typedef Object Superclass;
+  public:
+    static Pointer New(const std::string& cpp_file = "");
 
     typedef enum 
       {
-	OK,
-	ERROR,
-	QUIT
+	Interpreter_OK,
+	Interpreter_ERROR,
+	Interpreter_QUIT
       }
       ExitStatus;
 
@@ -153,8 +133,6 @@ namespace bbtk
 
     void SetThrow(bool b) { mThrow = b; }
 
- 
-    
 #ifdef _USE_WXWIDGETS_
     /// Sets the user of the interpreter (if any)
     void SetUser(InterpreterUser* c) { mUser = c; }
@@ -166,12 +144,59 @@ namespace bbtk
 #endif
 
     /// Gets the Executer 
-    VirtualExec* GetExecuter() { return mExecuter; }
-    /// Gets the Executer (const)
-    const VirtualExec* GetExecuter() const { return mExecuter; }
+    VirtualExec::Pointer GetExecuter() const { return mExecuter; }
 
 
   protected:
+
+    /// The enumeration of command codes == Command name
+    typedef enum
+    {
+      cNew,
+      cDelete,
+      cConnect,
+      cExec,
+      cPackage,
+      cEndPackage,
+      cDefine,
+      cEndDefine,
+      cInput,
+      cOutput,
+      cSet,
+      cConfig,  // JPR
+      cReset,   // EED
+      cAuthor, 
+      cCategory, // JPR
+      cDescription,
+      cHelp,
+      cMessage,
+      cInclude,
+      cQuit,
+      cLoad,
+      cUnload,
+      cGraph,
+      cPrint,
+      cIndex,
+      cKind, // LG
+      cNewGUI, // LG
+      cWorkspace, // LG
+      cObject
+    } CommandCodeType;
+
+    /// The structure storing the informations on a command 
+    typedef struct 
+    {
+      std::string keyword;
+      int argmin, argmax;
+      CommandCodeType code;
+      std::string syntax;
+      std::string help;
+    } CommandInfoType;
+
+    /// The type of dictionnary of commands 
+    typedef std::map<std::string,CommandInfoType> CommandDictType;
+
+
     /// Interprets a line 
     void InterpretLine( const std::string& line, bool &insideComment );
 
@@ -213,7 +238,7 @@ namespace bbtk
     ///
     void Config() const; 
     /// 
-    void Print(const std::string&);
+    //    void Print(const std::string&);
 
     void Index(const std::string& filename, 
 	       const std::string& type = "Initials");
@@ -222,22 +247,38 @@ namespace bbtk
 				 int n,
 				 std::vector<std::string>& commands );
 
+    /// Creates and connects the piece of pipeline which defines a GUI 
+    /// for the box box. 
+    /// Define it as a complex box type with name instanceName+"Type"
+    /// The instance is called instanceName
+    /// and connected to the existing pipeline
+    void NewGUI(const std::string& box, 
+		const std::string& instanceName);
 
+    void ObjectInfo(const std::string& name);
 
   private:
 
+    /// Constructor
+    Interpreter(const std::string& cpp_file = "");
+
     /// Opens the file fullPathScriptName 
     /// includeScriptName is the name as given to the include command 
     void LoadScript( std::string fullPathScriptName,
 		     std::string includeScriptName);
 
-  private:
+    /// 
+    void CatchBbtkException( const bbtk::Exception& e );
+    void CatchStdException( const std::exception& e );
+    void CatchUnknownException();
 
+
+  
     //==================================================================
     // ATTRIBUTES
 
     /// The command executer used
-    bbtk::VirtualExec* mExecuter;
+    bbtk::VirtualExec::Pointer mExecuter;
 
     /// The user of  the interpreter (0 if none)
     bbtk::InterpreterUser* mUser;
@@ -248,6 +289,11 @@ namespace bbtk
     /// Vector of names of open files with full path (as open)
     std::vector<std::string> mFileName;
 
+    /// Vector of names of files which have been open 
+    /// before (and may closed then which are no more in mFileName)
+    /// with full path (as open)
+    std::vector<std::string> mFileNameHistory;
+
     /// Vector of names of open files as given to the include command
     std::vector<std::string> mIncludeFileName;