X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=732e8f725144e0aff6683f102b7749b1c337729f;hb=199c06090fb628b9f75572e79c6a9ff939856f0b;hp=4d81c655d54406aa42dc5ee63510e0abe9b38bfa;hpb=6990a8aeeaf98fc901ed193b95365b2eee2fb950;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index 4d81c65..732e8f7 100644
--- a/kernel/src/bbtkInterpreter.h
+++ b/kernel/src/bbtkInterpreter.h
@@ -1,19 +1,19 @@
 /*=========================================================================
-                                                                                
+
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.h,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/22 16:55:04 $
-  Version:   $Revision: 1.2 $
-                                                                                
+  Date:      $Date: 2008/01/29 10:12:45 $
+  Version:   $Revision: 1.5 $
+
   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.
-                                                                                
+
 =========================================================================*/
 /**
  *  \file 
@@ -23,7 +23,7 @@
  *  \class bbtk::Interpreter 
  *  \brief The bbtk language interpreter
  */
-  
+
 #ifndef __bbtkInterpreter_h__
 #define __bbtkInterpreter_h__
 
@@ -36,19 +36,20 @@
 
 namespace bbtk
 {
- 
   class BBTK_EXPORT Interpreter
   {
 
   private:
-    
+
     /// The enumeration of command codes == Command name
-    typedef enum 
+    typedef enum
     {
-      cNew, 
+      cNew,
       cDelete,
       cConnect,
       cExec,
+      cPackage,
+      cEndPackage,
       cDefine,
       cEndDefine,
       cInput,
@@ -66,7 +67,7 @@ namespace bbtk
       cUnload,
       cGraph,
       cPrint,
-      cWorkspace // LG 
+      cWorkspace // LG
     } CommandCodeType;
 
     /// The structure storing the informations on a command 
@@ -85,25 +86,25 @@ namespace bbtk
   public:
     /// Constructor
     Interpreter();
- 
+
     /// Destructor
     ~Interpreter();
-      
+
    static Interpreter* mGlobalInterpreter;
 
     /// Launches a command line interpreter (with a prompt)
     void CommandLineInterpreter();
-    
-    /// Sets the inputs of the workspace : 
+
+    /// 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); }
- 
-    /// Puts the executer in "no exec" mode, 
+
+    /// Puts the executer in "no exec" mode,
     /// which creates but does not execute pipelines.
     void SetNoExecMode(bool b) { mExecuter->SetNoExecMode(b); }
 
-    /// 
+    ///
     //typedef Executer::DialogModeType DialogModeType;
     typedef VirtualExec::DialogModeType DialogModeType;
 
@@ -122,31 +123,31 @@ namespace bbtk
     void SplitLine ( const std::string& line,
                      std::vector<std::string>& words );
 
-    /// Executes the right action depending on the command name  
-    void InterpretCommand( const std::vector<std::string>& words, 
+    /// Executes the right action depending on the command name
+    void InterpretCommand( const std::vector<std::string>& words,
                            CommandInfoType& info );
-    
+
     /// Switch to the interpretation of a file
     void SwitchToFile( const std::string& filename, bool use_configuration_file=true, bool verbose=false );
-    
+
     /// Closes the currently open file
     void CloseCurrentFile();
-    
+
     /// Closes all open files
     void CloseAllFiles();
 
     /// Displays help (entry point of any help)
     void Help(const std::vector<std::string>& words);
-    
+
     /// Displays help on all the commands
     void HelpCommands();
-    
+
     /// Displays help on a particular command 
     void HelpCommand( const std::string& command );
-    
+
     ///
     void Graph(const std::vector<std::string>& words);
-    
+
     ///
     void Config(bool verbose) const; // JPR
     /// 
@@ -156,28 +157,29 @@ namespace bbtk
     void FindCommandsWithPrefix( char* buf,
 				 int n,
 				 std::vector<std::string>& commands );
-             
+
     /// Sets the bool that indicates wether we are in command line context
     void SetCommandLine(bool v = true) { mCommandLine = v; }
 
-  private: 
-    
   private:
-  
+
+  void LoadScript( std::string fullPathScriptName);
+
+  private:
+
     //==================================================================
     // ATTRIBUTES
 
     /// The factory
     //    bbtk::Factory* mFactory;
 
-    /// The command executer  
-   // bbtk::Executer* mExecuter;
+    /// The command executer
     bbtk::VirtualExec* mExecuter;
 
-    /// Vector of opened files  
+    /// Vector of opened files 
     std::vector<std::ifstream*> mFile;
 
-    /// Vector of names of open files  
+    /// Vector of names of open files
     std::vector<std::string> mFileName;
 
     /// Stores the current line number in each open file
@@ -188,10 +190,10 @@ namespace bbtk
 
     /// Are we in a command line context ?
     bool mCommandLine;
-    
-    /// The history of commands 
-    std::deque< char* > mHistory; 
-    
+
+    /// The history of commands
+    std::deque< char* > mHistory;
+
     bool verbose; // true -> displays the search results (for packages)
   };
 
@@ -202,7 +204,5 @@ namespace bbtk
     QuitException() : bbtk::Exception("","","") {}
   };
 
-
-
 }
 #endif