X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.h;h=48bd0ae2c22cd492ce927a5faf544a458cbb2807;hb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;hp=a5e66f424f3ec0e18ce7c3a903ed2f1414c489cc;hpb=b253812964e57b9592fe64bb3bc97f2aac72d3a7;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index a5e66f4..48bd0ae 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/14 14:58:53 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/04/09 11:16:57 $ + Version: $Revision: 1.25 $ 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 #include @@ -41,6 +39,45 @@ namespace bbtk class WxConsole; #endif + class BBTK_EXPORT InterpreterUser + { + public: + InterpreterUser() {} + ~InterpreterUser() {} + + virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; } + virtual void InterpreterUserViewHtmlPage(const std::string&) {} + + + }; + + /// + class BBTK_EXPORT InterpreterError : public Exception + { + public: + 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; + }; + + + /// class BBTK_EXPORT Interpreter { @@ -74,13 +111,15 @@ namespace bbtk cGraph, cPrint, cIndex, + cKind, // LG + cNewGUI, // LG cWorkspace // LG } CommandCodeType; /// The structure storing the informations on a command typedef struct { - std::string category; + std::string keyword; int argmin, argmax; CommandCodeType code; std::string syntax; @@ -92,14 +131,35 @@ namespace bbtk public: /// Constructor - Interpreter(); + Interpreter(const std::string& cpp_file = ""); /// Destructor ~Interpreter(); + + typedef enum + { + Interpreter_OK, + Interpreter_ERROR, + Interpreter_QUIT + } + ExitStatus; + + /// Runs the interpretation of a file + ExitStatus InterpretFile( const std::string& filename); + + /// Runs the interpretation of a buffer and deletes it ! + ExitStatus InterpretBuffer( std::stringstream* buffer ); + + /// Runs the interpretation of a command + ExitStatus InterpretLine( const std::string& line ); + + /// Launches a command line interpreter (with a prompt) void CommandLineInterpreter(); + + /// Sets the inputs of the workspace : /// the map is passed as is to the Executer void SetInputs(const std::map& m) @@ -115,10 +175,29 @@ namespace bbtk void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); } - /// Runs the interpretation of a file - void InterpretFile( const std::string& filename); + /// Sets the bool that indicates wether we are in command line context + void SetCommandLine(bool v = true) { mCommandLine = v; } + + void SetThrow(bool b) { mThrow = b; } - /// Interprets a line (either from a file or typed interactively) +#ifdef _USE_WXWIDGETS_ + /// Sets the user of the interpreter (if any) + void SetUser(InterpreterUser* c) { mUser = c; } + /// Gets the InterpreterUser of this + InterpreterUser* GetUser() { return mUser; } + /// Gets the InterpreterUser of this (const) + const InterpreterUser* GetUser() const { return mUser; } + +#endif + + /// Gets the Executer + VirtualExec* GetExecuter() { return mExecuter; } + /// Gets the Executer (const) + const VirtualExec* GetExecuter() const { return mExecuter; } + + + protected: + /// Interprets a line void InterpretLine( const std::string& line, bool &insideComment ); /// Reads a line from prompt @@ -159,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"); @@ -168,22 +247,13 @@ namespace bbtk int n, std::vector& commands ); - /// Sets the bool that indicates wether we are in command line context - void SetCommandLine(bool v = true) { mCommandLine = v; } - -#ifdef _USE_WXWIDGETS_ - /// Sets the WxConsole that created the interpreter (if any) - void SetWxConsole(WxConsole* c) { mWxConsole = c; } - /// Gets the WxConsole that created the interpreter (if any) - WxConsole* GetWxConsole() { return mWxConsole; } - /// Gets the WxConsole that created the interpreter (if any) - const - const WxConsole* GetWxConsole() const { return mWxConsole; } -#endif - - /// Gets the Executer - VirtualExec* GetExecuter() { return mExecuter; } - /// Gets the Executer (const) - const VirtualExec* GetExecuter() const { return mExecuter; } + /// 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); private: @@ -192,6 +262,11 @@ namespace bbtk void LoadScript( std::string fullPathScriptName, std::string includeScriptName); + /// + void CatchBbtkException( const bbtk::Exception& e ); + void CatchStdException( const std::exception& e ); + void CatchUnknownException(); + private: //================================================================== @@ -200,10 +275,8 @@ namespace bbtk /// The command executer used bbtk::VirtualExec* mExecuter; -#ifdef _USE_WXWIDGETS_ - /// The WxConsole which uses the interpreter (0 if none) - bbtk::WxConsole* mWxConsole; -#endif + /// The user of the interpreter (0 if none) + bbtk::InterpreterUser* mUser; /// Vector of open files / buffers (can be stringstream) std::vector mFile; @@ -211,6 +284,11 @@ namespace bbtk /// Vector of names of open files with full path (as open) std::vector 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 mFileNameHistory; + /// Vector of names of open files as given to the include command std::vector mIncludeFileName; @@ -227,6 +305,9 @@ namespace bbtk std::deque< char* > mHistory; int bufferNb; + + bool mThrow; + }; // EO class Interpreter @@ -234,7 +315,7 @@ namespace bbtk // The "Quit" exception struct QuitException : public bbtk::Exception { - QuitException() : bbtk::Exception("","","") {} + QuitException() : bbtk::Exception("Interpreter","","Quit") {} }; }