X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=24dbd89f29079743afdb46b14a5f0374f5b14f76;hb=4ed16591c3477d51dfc8961131440da786907386;hp=b078a5884d5c5f8a579a89e6a39bae0427332be5;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index b078a58..24dbd89 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 15:02:00 $
-  Version:   $Revision: 1.1 $
-                                                                                
+  Date:      $Date: 2008/01/30 09:28:15 $
+  Version:   $Revision: 1.6 $
+
   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,31 +23,33 @@
  *  \class bbtk::Interpreter 
  *  \brief The bbtk language interpreter
  */
-  
+
 #ifndef __bbtkInterpreter_h__
 #define __bbtkInterpreter_h__
 
-
+#include "bbtkVirtualExec.h"
 #include "bbtkExecuter.h"
+#include "bbtkTranscriptor.h"
+
 #include <fstream>
 #include <deque>
 
 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,
@@ -55,7 +57,8 @@ namespace bbtk
       cSet,
       cConfig,  // JPR
       cReset,   // EED
-      cAuthor,
+      cAuthor, 
+      cKeyword, // JPR
       cDescription,
       cHelp,
       cMessage,
@@ -65,9 +68,9 @@ namespace bbtk
       cUnload,
       cGraph,
       cPrint,
-      cWorkspace // LG 
+      cWorkspace // LG
     } CommandCodeType;
-    
+
     /// The structure storing the informations on a command 
     typedef struct 
     {
@@ -78,33 +81,33 @@ namespace bbtk
       std::string help;
     } CommandInfoType;
 
-
-
     /// The type of dictionnary of commands 
     typedef std::map<std::string,CommandInfoType> CommandDictType;
 
   public:
     /// Constructor
-    Interpreter();  
+    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 Executer::DialogModeType DialogModeType;
+    typedef VirtualExec::DialogModeType DialogModeType;
 
     void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); }
 
@@ -121,77 +124,77 @@ 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
     /// 
     void Print(const std::string&);
-    
-    /// Splits the string in around the first dot encountered
-    void SplitAroundFirstDot( const std::string& in,
-                              std::string& left,
-                              std::string& right);
+
     ///
     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:
-  /// the methods for include bbs
-  bool FileExists(std::string strFilename);
-  std::string ExtractScriptName(const std::string &name);
-  std::string ExpandLibName(const std::string &name, bool v);  
-  std::string MakeLibnameFromPath(std::string path, std::string pkgname);
-  bool IsAtRoot(std::string cwd);       
-    
+
+  void LoadScript( std::string fullPathScriptName);
+
   private:
-  
+
     //==================================================================
     // ATTRIBUTES
+
     /// The factory
     //    bbtk::Factory* mFactory;
-    /// The command executer  
-    bbtk::Executer* mExecuter;
-    /// Vector of opened files  
-    std::vector<std::ifstream*> mFile; 
-    /// Vector of names of open files  
-    std::vector<std::string> mFileName; 
+
+    /// The command executer
+    bbtk::VirtualExec* mExecuter;
+
+    /// Vector of opened files 
+    std::vector<std::ifstream*> mFile;
+
+    /// Vector of names of open files
+    std::vector<std::string> mFileName;
+
     /// Stores the current line number in each open file
-    std::vector<int> mLine; 
+    std::vector<int> mLine;
+
     /// The dictionnary of commands
     CommandDictType mCommandDict;
+
     /// 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 +205,5 @@ namespace bbtk
     QuitException() : bbtk::Exception("","","") {}
   };
 
-
-
 }
 #endif