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

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index b5ca18f..bdf3da9 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/04/18 12:59:15 $
-  Version:   $Revision: 1.26 $
+  Date:      $Date: 2008/10/08 13:39:33 $
+  Version:   $Revision: 1.34 $
 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,6 +28,7 @@
 #define __bbtkInterpreter_h__
 
 #include "bbtkVirtualExec.h"
+#include "bbtkExecuter.h"
 
 #include <fstream>
 #include <deque>
@@ -44,7 +45,7 @@ namespace bbtk
   {
   public: 
     InterpreterUser() {}
-    ~InterpreterUser() {}
+    virtual ~InterpreterUser() {}
 
     virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; }
     virtual void InterpreterUserViewHtmlPage(const std::string&) {}
@@ -85,10 +86,11 @@ namespace bbtk
   //=======================================================================
   class BBTK_EXPORT Interpreter : public Object
   {
-    BBTK_OBJECT_INTERFACE(Interpreter);
+    BBTK_OBJECT_INTERFACE_NO_CONDES(Interpreter);
     typedef Object Superclass;
   public:
     static Pointer New(const std::string& cpp_file = "");
+    static Pointer New(VirtualExec::Pointer);
 
     typedef enum 
       {
@@ -99,7 +101,7 @@ namespace bbtk
       ExitStatus;
 
     /// Runs the interpretation of a file
-    ExitStatus InterpretFile( const std::string& filename);
+    ExitStatus InterpretFile( const std::string& filename, bool source = false);
 
     /// Runs the interpretation of a buffer and deletes it !
     ExitStatus InterpretBuffer( std::stringstream* buffer );
@@ -116,17 +118,20 @@ namespace bbtk
     /// Sets the inputs of the workspace :
     /// the map is passed as is to the Executer
     void SetInputs(const std::map<std::string,std::string>& m)
-    { mExecuter->SetInputs(m); }
+    { mVirtualExecuter->SetInputs(m); }
 
     /// Puts the executer in "no exec" mode,
     /// which creates but does not execute pipelines.
-    void SetNoExecMode(bool b) { mExecuter->SetNoExecMode(b); }
+    void SetNoExecMode(bool m) { mVirtualExecuter->SetNoExecMode(m); }
 
+    /// Puts the executer in "no error" mode, 
+    /// Errors do not stop execution (but warnings are produced)
+    void SetNoErrorMode(bool m) { mVirtualExecuter->SetNoErrorMode(m);}
     ///
     //typedef Executer::DialogModeType DialogModeType;
     typedef VirtualExec::DialogModeType DialogModeType;
 
-    void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); }
+    void SetDialogMode(DialogModeType t) { mVirtualExecuter->SetDialogMode(t);}
 
     /// Sets the bool that indicates wether we are in command line context
     void SetCommandLine(bool v = true) { mCommandLine = v; }
@@ -144,7 +149,7 @@ namespace bbtk
 #endif
 
     /// Gets the Executer 
-    VirtualExec::Pointer GetExecuter() const { return mExecuter; }
+    VirtualExec::Pointer GetExecuter() const { return mVirtualExecuter; }
 
 
   protected:
@@ -180,7 +185,7 @@ namespace bbtk
       cKind, // LG
       cNewGUI, // LG
       cWorkspace, // LG
-      cObject
+      cDebug // LG
     } CommandCodeType;
 
     /// The structure storing the informations on a command 
@@ -212,7 +217,7 @@ namespace bbtk
                            CommandInfoType& info );
 
     /// Switch to the interpretation of a file
-    void SwitchToFile( const std::string& filename );
+    void SwitchToFile( const std::string& filename, bool source = false );
 
    /// Switch to the interpretation of a stringstream
     void SwitchToStream( std::stringstream* stream );
@@ -223,6 +228,9 @@ namespace bbtk
     /// Closes all open files
     void CloseAllFiles();
 
+    /// Resets all
+    void Reset();
+
     /// Displays help (entry point of any help)
     void Help(const std::vector<std::string>& words);
 
@@ -255,13 +263,17 @@ namespace bbtk
     void NewGUI(const std::string& box, 
 		const std::string& instanceName);
 
-    void ObjectInfo(const std::string& name);
+    void Debug(const std::string& arg);
 
   private:
 
     /// Constructor
     Interpreter(const std::string& cpp_file = "");
 
+    Interpreter(VirtualExec::Pointer);
+
+    void Init(VirtualExec::Pointer, const std::string& cpp_file);
+
     /// Opens the file fullPathScriptName 
     /// includeScriptName is the name as given to the include command 
     void LoadScript( std::string fullPathScriptName,
@@ -278,7 +290,8 @@ namespace bbtk
     // ATTRIBUTES
 
     /// The command executer used
-    bbtk::VirtualExec::Pointer mExecuter;
+    bbtk::VirtualExec::Pointer mVirtualExecuter;
+    bbtk::Executer::WeakPointer mRealExecuter;
 
     /// The user of  the interpreter (0 if none)
     bbtk::InterpreterUser* mUser;
@@ -313,6 +326,9 @@ namespace bbtk
     
     bool mThrow;
 
+	protected:
+	~Interpreter();
+
   };
   // EO class Interpreter