From: Eduardo Davila Date: Fri, 17 Sep 2010 15:56:51 +0000 (+0000) Subject: no message X-Git-Tag: CREATOOLS.2-0-3~16 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=5141e057598cdcde059d180c8cee02e1011f205d;p=bbtk.git no message --- diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 6771d77..649c2a6 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ Language: C++ - Date: $Date: 2010/09/15 14:17:17 $ - Version: $Revision: 1.89 $ + Date: $Date: 2010/09/17 15:56:51 $ + Version: $Revision: 1.90 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -90,13 +90,6 @@ namespace bbtk //======================================================================= void Interpreter::Init(VirtualExec::Pointer e, const std::string& cpp_file) { - mUser = 0; - mCommandLine = false; - mThrow = false; - bufferNb =0; - bbtk::MessageManager::RegisterMessageType("echo","Level>0 : Prints the output of the 'print' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1); - bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0); - bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <(exe); } + + // Lock this pointer or will auto-destruct !! if (!e) mVirtualExecuter->SetInterpreter(MakePointer(this,true)); - - // For the time being, comment out previous line, and - // uncomment next line to check Transcriptor - - //mVirtualExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); - - // Builds the commands dict - CommandInfoType info; - - info.keyword = "new"; - info.argmin = 2; - info.argmax = 2; - info.code = cNew; - info.syntax = "new "; - info.help = "Creates a new black box of type with name "; - mCommandDict[info.keyword] = info; - - info.keyword = "delete"; - info.argmin = 1; - info.argmax = 1; - info.code = cDelete; - info.syntax = "delete "; - info.help = "Deletes the black box of name "; - mCommandDict[info.keyword] = info; - - info.keyword = "clear"; - info.argmin = 0; - info.argmax = 0; - info.code = cClear; - info.syntax = "clear"; - info.help = "Clears the currently defined complex box (deletes all its boxes and connections)"; - mCommandDict[info.keyword] = info; - - info.keyword = "break"; - info.argmin = 0; - info.argmax = 0; - info.code = cBreak; - info.syntax = "break"; - info.help = "Breaks the current execution"; - mCommandDict[info.keyword] = info; - - info.keyword = "newgui"; - info.argmin = 2; - info.argmax = 2; - info.code = cNewGUI; - info.syntax = "newgui "; - info.help = "Automatically creates a graphical user interface with name for the black box and connects it to the box inputs"; - mCommandDict[info.keyword] = info; - - info.keyword = "connect"; - info.argmin = 2; - info.argmax = 2; - info.code = cConnect; - info.syntax = "connect "; - info.help = "Connects the ouput of black box to the input of black box "; - mCommandDict[info.keyword] = info; - - info.keyword = "print"; - info.argmin = 1; - info.argmax = 1; - info.code = cPrint; - info.syntax = "print "; - info.help = "Prints the string. Substitutes any token of the form '$box.output$' by the string adaptation of the output of the box (requires the right adaptor). No carriage return is issued at the end, use '\\n' to add carriage returns. The level of 'echo' messages must be greater than 1 (see the command 'message')."; - mCommandDict[info.keyword] = info; - - info.keyword = "exec"; - info.argmin = 1; - info.argmax = 2; - info.code = cExec; - info.syntax = "exec "; - info.help = "Executes the black box of name (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode. 'freeze_no_error' is like freeze but also skips any error."; - mCommandDict[info.keyword] = info; - - info.keyword = "package"; - info.argmin = 1; - info.argmax = 1; - info.code = cPackage; - info.syntax = "package "; - info.help = "Begins the definition of a package."; - mCommandDict[info.keyword] = info; - - info.keyword = "endpackage"; - info.argmin = 0; - info.argmax = 0; - info.code = cEndPackage; - info.syntax = "endpackage"; - info.help = "Ends the definition of a package."; - mCommandDict[info.keyword] = info; - - info.keyword = "define"; - info.argmin = 1; - info.argmax = 2; - info.code = cDefine; - info.syntax = "define []"; - info.help = "Begins the definition of a new type of complex black box called . If is provided will create it in the given package."; - mCommandDict[info.keyword] = info; - - info.keyword = "endefine"; - info.argmin = 0; - info.argmax = 0; - info.code = cEndDefine; - info.syntax = "endefine"; - info.help = "Ends the definition of a new type of complex black box"; - mCommandDict[info.keyword] = info; - - info.keyword = "kind"; - info.argmin = 1; - info.argmax = 1; - info.code = cKind; - info.syntax = "kind "; - info.help = "Sets the kind of the currently defined complex black box"; - mCommandDict[info.keyword] = info; - - info.keyword = "input"; - info.argmin = 3; - info.argmax = 3; - info.code = cInput; - info.syntax = "input "; - info.help = "Defines the input of the current working black box as being an alias for the input of the black box . defines the help string for the newly created input"; - mCommandDict[info.keyword] = info; - - info.keyword = "output"; - info.argmin = 3; - info.argmax = 3; - info.code = cOutput; - info.syntax = "output "; - info.help = "Defines the output of the current working black box as being an alias for the output of the black box . defines the help string for the newly created output"; - mCommandDict[info.keyword] = info; - - info.keyword = "set"; - info.argmin = 2; - info.argmax = 2; - info.code = cSet; - info.syntax = "set "; - info.help = "Sets the value of the input of the black box to . There must exist a string to the value type adaptor"; - mCommandDict[info.keyword] = info; - - info.keyword = "config"; // JPR - info.argmin = 0; - info.argmax = 0; - info.code = cConfig; - info.syntax = "config"; - info.help = "Prints the value of all configuration parameters"; - mCommandDict[info.keyword] = info; - - info.keyword = "index"; // LG - info.argmin = 0; - info.argmax = 2; - info.code = cIndex; - - info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories'|'Adaptors']]"; - info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories. If 'Adaptors' is provided then an alphabetical index of all adaptors is created."; - mCommandDict[info.keyword] = info; - - info.keyword = "reset"; - info.argmin = 0; - info.argmax = 0; - info.code = cReset; - info.syntax = "reset"; - info.help = "Deletes all boxes and unloads all packages (reset to start state)"; - mCommandDict[info.keyword] = info; - - info.keyword = "author"; - info.argmin = 1; - info.argmax = 1; - info.code = cAuthor; - info.syntax = "author "; - info.help = "Adds the string to the author information of the black box being defined"; - mCommandDict[info.keyword] = info; - - info.keyword = "category"; //JP - info.argmin = 1; - info.argmax = 1; - info.code = cCategory; - info.syntax = "category "; - info.help = "Adds the string to the category information of the black box being defined"; - mCommandDict[info.keyword] = info; - - info.keyword = "description"; - info.argmin = 1; - info.argmax = 1; - info.code = cDescription; - info.syntax = "description "; - info.help = "Adds the string to the descriptive information of the black box being defined"; - mCommandDict[info.keyword] = info; - - info.keyword = "help"; - info.argmin = 0; - info.argmax = 2; - info.code = cHelp; - info.syntax = "help"; - info.syntax = "\n (1) help \n (2) help \n (3) help packages [all]\n (4) help [all]\n (5) help \n (6) help "; - info.help = "Effect :\n (1) Lists all available commands;\n (2) Prints help on a particular command; \n (3) Lists the packages loaded and their black boxes.\n Add 'all' to list adaptors; \n (4) Prints short help on the black boxes of a package.\n Add 'all' to include adaptors; \n (5) Prints full help on a black box type; \n (6) Prints information on the inputs, outputs and connections of a black box instance."; - mCommandDict[info.keyword] = info; - - info.keyword = "message"; - info.argmin = 0; - info.argmax = 2; - info.code = cMessage; - info.syntax = "message "; - info.help = "Sets the level of the kind of messages to .\n If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level."; - mCommandDict[info.keyword] = info; - - info.keyword = "include"; - info.argmin = 1; - info.argmax = 2; - info.code = cInclude; - info.syntax = "include [source]"; - info.help = "Includes the file .\n 'source' : If the keyword 'source' is provided then informs the interpreter that the included file is the source of the current box definition (Advanced; used to get the right 'Include' field in html doc of packages 'appli' scripts)."; - mCommandDict[info.keyword] = info; - - info.keyword = "quit"; - info.argmin = 0; - info.argmax = 0; - info.code = cQuit; - info.syntax = "quit"; - info.help = "Quits the program (during script execution it stops the complete execution)"; - mCommandDict[info.keyword] = info; - - info.keyword = "load"; - info.argmin = 1; - info.argmax = 1; - info.code = cLoad; - info.syntax = "load "; - info.help = "Loads the black box package "; - mCommandDict[info.keyword] = info; - - info.keyword = "unload"; - info.argmin = 1; - info.argmax = 1; - info.code = cUnload; - info.syntax = "unload "; - info.help = "Unloads the black box package "; - mCommandDict[info.keyword] = info; - - info.keyword = "graph"; - info.argmin = 0; - info.argmax = 6; - info.code = cGraph; - info.syntax = "graph [ BlackBoxName [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]] \n graph [ BlackBoxNameType [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]]"; - info.help = "Shows a graphical view of a bbtk pipeline.\n- BlackBoxName : name of the box to view. Default '.' : current box.\n- BlackBoxNameType : name of the type of box to view, ex : 'workspace')"; - mCommandDict[info.keyword] = info; - - info.keyword = "debug"; - info.argmin = 0; - info.argmax = 1; - info.code = cDebug; - info.syntax = "debug [expr|-C|-D]"; - info.help = "Prints debug info on living bbtk objects containing the string 'expr' (default expr=''). -C checks the factory integrity. -D turns on objects debug info after main ends"; - mCommandDict[info.keyword] = info; - - /* - info.keyword = "workspace"; - info.argmin = 1; - info.argmax = 2; - info.code = cWorkspace; - info.syntax = "workspace < ( freeze | unfreeze ) | ( rename ) >"; - info.help = "Configures the workspace.\n 'freeze' allows to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n 'rename' allow to set a new name to the workspace."; - mCommandDict[info.keyword] = info; - */ - - + + bbtk::InterpreterVirtual::Init(); } //======================================================================= @@ -394,7 +129,7 @@ namespace bbtk } //======================================================================= - +/*EED Borrame //======================================================================= InterpreterException::InterpreterException( const std::string& message, bool in_script_file, @@ -421,7 +156,7 @@ namespace bbtk { } //======================================================================= - +*/ //======================================================================= void Interpreter::CatchInterpreterException( const InterpreterException& e ) @@ -434,27 +169,8 @@ namespace bbtk return; } - if (mThrow) - { - if (e.GetErrorMessage()!="break") - { - mStatus = Interpreter_ERROR; - CloseAllFiles(); - } - throw InterpreterException(e); - } - else - { - std::stringstream mess; - mess << "* ERROR : "<(mFile.back()); - if (fs!=0) in_script = true; - file = mFileName.back(); - line = mLine.back(); - } - if (e.GetErrorMessage()!="break") - CloseAllFiles(); - throw InterpreterException(e,in_script,file,line); - } - else - { - std::stringstream mess; - mess << "* ERROR : "<GetNoErrorMode()) - { - std::string file("?"); - int line = 0; - if (mFileName.size()) { - file = mFileName.back(); - line = mLine.back(); - } - bbtkWarning("ERROR '"<(mFile.back()); - if (fs!=0) in_script = true; - file = mFileName.back(); - line = mLine.back(); - } - CloseAllFiles(); - throw InterpreterException(e.what(),in_script,file,line); - } - else - { - std::stringstream mess; - mess << "* ERROR : "<GetNoErrorMode()) + { + std::string file("?"); + int line = 0; + if (mFileName.size()) + { + file = mFileName.back(); + line = mLine.back(); + } + bbtkWarning("ERROR '"<GetNoErrorMode()) - { - std::string file("?"); - int line = 0; - if (mFileName.size()) { - file = mFileName.back(); - line = mLine.back(); - } - bbtkWarning("UNDEFINED ERROR " - <<"("<(mFile.back()); - if (fs!=0) in_script = true; - file = mFileName.back(); - line = mLine.back(); - } - CloseAllFiles(); - throw InterpreterException("Unknown exception caught", - in_script,file,line); - } - else - { - std::stringstream mess; - mess << "* UNDEFINED ERROR (not a bbtk nor a std exception)" - << std::endl; - if (mFileName.size()) { - mess << "* FILE : \""<GetNoErrorMode()) + { + std::string file("?"); + int line = 0; + if (mFileName.size()) + { + file = mFileName.back(); + line = mLine.back(); + } + bbtkWarning("UNDEFINED ERROR " <<"("<Create(boxType,boxName); } - void Interpreter::commandDelete(std::string boxName) + void Interpreter::commandDelete(std::string boxName) //virtual { mVirtualExecuter->Destroy(boxName); } - void Interpreter::commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel) + void Interpreter::commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel) //virtual { mVirtualExecuter->Connect(nodeFrom,outputLabel,nodeTo,inputLabel); } - void Interpreter::commandPackage(std::string packageName) + void Interpreter::commandPackage(std::string packageName) //virtual { mVirtualExecuter->BeginPackage(packageName); } - void Interpreter::commandEndPackage() + void Interpreter::commandEndPackage() //virtual { mVirtualExecuter->EndPackage(); } - void Interpreter::commandDefine(std::string name, std::string pack, std::string scriptfilename) + void Interpreter::commandDefine(std::string name, std::string pack, std::string scriptfilename) //virtual { mVirtualExecuter->Define(name,pack,scriptfilename); } - void Interpreter::commandEndDefine() + void Interpreter::commandEndDefine() //virtual { mVirtualExecuter->EndDefine(); } - void Interpreter::commandKind(std::string kind) + void Interpreter::commandKind(std::string kind) //virtual { mVirtualExecuter->Kind(kind); } - void Interpreter::commandPrint(std::string value) + void Interpreter::commandPrint(std::string value) //virtual { mVirtualExecuter->Print(value); } - void Interpreter::commandExec(std::string word) + void Interpreter::commandExec(std::string word) //virtual { if (word=="freeze") { @@ -804,45 +445,43 @@ namespace bbtk } - void Interpreter::commandInput(std::string name, std::string box, std::string input,std::string help) + void Interpreter::commandInput(std::string name, std::string box, std::string input,std::string help) //virtual { mVirtualExecuter->DefineInput(name,box,input,help); } - void Interpreter::commandOutput(std::string name, std::string box, std::string output,std::string help) + void Interpreter::commandOutput(std::string name, std::string box, std::string output,std::string help) //virtual { mVirtualExecuter->DefineOutput(name,box,output,help); } - void Interpreter::commandSet(std::string box, std::string input, std::string value) + void Interpreter::commandSet(std::string box, std::string input, std::string value) //virtual { mVirtualExecuter->Set(box,input,value); } - void Interpreter::commandAuthor(std::string author) + void Interpreter::commandAuthor(std::string author) //virtual { mVirtualExecuter->Author(author); } - void Interpreter::commandCategory(std::string categorytype) + void Interpreter::commandCategory(std::string categorytype) //virtual { mVirtualExecuter->Category(categorytype); } - - - void Interpreter::commandDescription(std::string description) + void Interpreter::commandDescription(std::string description) //virtual { mVirtualExecuter->Description(description); } - void Interpreter::commandClear() + void Interpreter::commandClear() //virtual { mVirtualExecuter->Clear(); } - void Interpreter::commandInclude(std::string word, bool ok) + void Interpreter::commandInclude(std::string word, bool ok) //virtual { // if 'source' was given (words.size()==3) then tell to set the // source file name of the current complex box with the full file name included @@ -857,17 +496,17 @@ namespace bbtk } - void Interpreter::commandLoad(std::string packageName) + void Interpreter::commandLoad(std::string packageName) //virtual { GetExecuter()->LoadPackage(packageName); } - void Interpreter::commandUnload(std::string packageName) + void Interpreter::commandUnload(std::string packageName) //virtual { GetExecuter()->UnLoadPackage(packageName); } - void Interpreter::commandBreak() + void Interpreter::commandBreak() //virtual { /* std::cout << "BreakException(" @@ -879,19 +518,19 @@ namespace bbtk // throw BreakException(in_script,file,line); } - void Interpreter::commandQuit() + void Interpreter::commandQuit() //virtual { bbtkError("quit");//,in_script,file,line); //throw QuitException(in_script,file,line); } - void Interpreter::commandMessage() + void Interpreter::commandMessage() //virtual { mVirtualExecuter->HelpMessages(); } //ups2 EED Borrame - void Interpreter::commandMessage(std::string kind, std::string levelstr) + void Interpreter::commandMessage(std::string kind, std::string levelstr) //virtual { int level=0; sscanf(levelstr.c_str(),"%d",&level); @@ -900,10 +539,10 @@ namespace bbtk } - +/*EED Borrame //======================================================================= - void Interpreter::DoInterpretLine( const std::string& line ) - { + void Interpreter::DoInterpretLine( const std::string& line ) //virtual + { bbtkDebugMessage("interpreter",6,"==> Interpreter::DoInterpretLine(\"" < words; @@ -924,7 +563,7 @@ namespace bbtk return; } - // Multi line comment ( /* ... */ ) -delimiters on different lines !- + // Multi line comment ( / * ... * / ) -delimiters on different lines !- <<<<<<< / * * / if (words[0][0]=='/' && words[0][1]=='*') { @@ -940,7 +579,7 @@ namespace bbtk bbtkMessage("interpreter",9,"Out multiline comment"<SetNoExecMode(true); - else if (words[1]=="unfreeze") mVirtualExecuter->SetNoExecMode(false); - } - else - { - mVirtualExecuter->SetWorkspaceName(words[2]); - } - break; - */ - default: + // obsolete + // case cWorkspace : + // if (words.size() == 2) + // { + // if (words[1]=="freeze") mVirtualExecuter->SetNoExecMode(true); + // else if (words[1]=="unfreeze") mVirtualExecuter->SetNoExecMode(false); + // } + // else + // { + // mVirtualExecuter->SetWorkspaceName(words[2]); + // } + // break; + + default: bbtkInternalError("should not reach here !!!"); } @@ -1231,7 +868,6 @@ namespace bbtk - //======================================================================= void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) { @@ -1263,10 +899,11 @@ namespace bbtk } //======================================================================= +*/ //======================================================================= - void Interpreter::commandReset() + void Interpreter::commandReset() // virtual { // Cannot close all files if the reset command is read from a file ! CloseAllFiles(); @@ -1354,7 +991,7 @@ namespace bbtk /** * */ - +/*EED Borrame // ========================================================================= void Interpreter::SwitchToFile( const std::string& name , bool source ) { @@ -1394,7 +1031,7 @@ namespace bbtk bool foundFile = false; // ==== "*" provided : load all scripts in given path - // relative (e.g. std/boxes/*) or absolute + // relative (e.g. std/boxes/ *) or absolute <<<<<<<< / * if (pkgname == "*") { @@ -1635,14 +1272,22 @@ namespace bbtk else { LoadScript(fullPathScriptName,name); - if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName); + if (source) SetCurrentFileName(fullPathScriptName); } return; } //======================================================================= +*/ - + //======================================================================= + void Interpreter::SetCurrentFileName(std::string fullPathScriptName) // virtual + { + GetExecuter()->SetCurrentFileName(fullPathScriptName); + } + //======================================================================= + +/*EED Borrame //======================================================================= void Interpreter::SwitchToStream( std::stringstream* stream ) { @@ -1662,9 +1307,10 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) mLine.push_back(0); } //======================================================================= - +*/ + +/* //======================================================================= - void Interpreter::LoadScript( std::string fullPathScriptName, std::string includeScriptName) { @@ -1703,7 +1349,9 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) return; } //======================================================================= +*/ +/*EED Borrame //======================================================================= void Interpreter::CloseCurrentFile() { @@ -1751,7 +1399,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) //======================================================================= - //======================================================================= void Interpreter::InterpretCommand( const std::vector& words, CommandInfoType& info ) @@ -1769,7 +1416,7 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) if ( ( ((int)words.size())-1 < c->second.argmin ) || ( ((int)words.size())-1 > c->second.argmax ) ) { - HelpCommand(words[0]); + commandHelp(words[0]); bbtkError(words[0]<<" : wrong number of arguments"); } //std::cout<<"Interpreter::InterpretCommand( const std::vector& words,"<& words) } try { - HelpCommand(words[1]); + commandHelp(words[1]); } catch (bbtk::Exception e) { @@ -1870,7 +1518,7 @@ void Interpreter::commandHelp(const std::vector& words) } else { - HelpCommand(words[0]); + commandHelp(words[0]); bbtkError(words[0]<<" : syntax error"); } } @@ -1907,9 +1555,10 @@ void Interpreter::commandHelp(const std::vector& words) //======================================================================= + //======================================================================= /// Displays help on a particular commands - void Interpreter::HelpCommand(const std::string& s) + void Interpreter::commandHelp(const std::string& s) { CommandDictType::iterator c; c = mCommandDict.find(s); @@ -1927,7 +1576,7 @@ void Interpreter::commandHelp(const std::vector& words) } //======================================================================= - +/*EED Borrame //======================================================================= /// Fills the vector commands with the commands which /// have the first n chars of buf for prefix @@ -1945,9 +1594,10 @@ void Interpreter::commandHelp(const std::vector& words) } } //======================================================================= +*/ + - - +/*EED Borrame //======================================================================= #ifdef BBTK_USE_TERMIOS_BASED_PROMPT @@ -2162,9 +1812,14 @@ void Interpreter::commandHelp(const std::vector& words) //======================================================================= #endif +*/ - - + + + + + +/*EED Borrame //======================================================================= void Interpreter::CommandLineInterpreter() { @@ -2196,13 +1851,11 @@ void Interpreter::commandHelp(const std::vector& words) GetLineFromPrompt(line); DoInterpretLine(line); //, insideComment); } - /* - catch (QuitException e) - { - bbtkMessage("interpreter",1,"Interpreter : Quit"<& words) bbtkDebugDecTab("interpreter",9); } - +*/ + //======================================================================= void Interpreter::commandGraph(const std::vector& words) { diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 355e0fe..ab4d3fd 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ Language: C++ - Date: $Date: 2010/09/15 14:17:17 $ - Version: $Revision: 1.42 $ + Date: $Date: 2010/09/17 15:56:52 $ + Version: $Revision: 1.43 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -42,6 +42,7 @@ #include "bbtkVirtualExec.h" #include "bbtkExecuter.h" +#include "bbtkInterpreterVirtual.h" #include #include @@ -57,6 +58,7 @@ namespace bbtk class WxConsole; #endif +/* EED Borrame //======================================================================= class BBTK_EXPORT InterpreterUser { @@ -66,13 +68,12 @@ namespace bbtk virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; } virtual void InterpreterUserViewHtmlPage(const std::string&) {} - - }; //======================================================================= +*/ + - - +/* EED Borrame //======================================================================= class BBTK_EXPORT InterpreterException : public Exception { @@ -98,7 +99,10 @@ namespace bbtk int mScriptLine; }; //======================================================================= - +*/ + + + /* //======================================================================= // The "Quit" exception @@ -132,14 +136,15 @@ namespace bbtk */ //======================================================================= - class BBTK_EXPORT Interpreter : public Object + class BBTK_EXPORT Interpreter : public InterpreterVirtual { BBTK_OBJECT_INTERFACE_NO_CONDES(Interpreter); - typedef Object Superclass; + typedef Object InterpreterVirtual; public: static Pointer New(const std::string& cpp_file = ""); static Pointer New(VirtualExec::Pointer); +/* EED Borrame typedef enum { Interpreter_OK, @@ -163,7 +168,7 @@ namespace bbtk /// Launches a command line interpreter (with a prompt) void CommandLineInterpreter(); - +*/ /// Sets the inputs of the workspace : @@ -184,11 +189,12 @@ namespace bbtk void SetDialogMode(DialogModeType t) { mVirtualExecuter->SetDialogMode(t);} +/*EED Borrame /// 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; } - + #ifdef USE_WXWIDGETS /// Sets the user of the interpreter (if any) void SetUser(InterpreterUser* c) { mUser = c; } @@ -198,6 +204,7 @@ namespace bbtk const InterpreterUser* GetUser() const { return mUser; } #endif + */ /// Gets the Executer VirtualExec::Pointer GetExecuter() const { return mVirtualExecuter; } @@ -214,6 +221,7 @@ namespace bbtk protected: +/* EED Borrame /// The enumeration of command codes == Command name typedef enum { @@ -289,89 +297,89 @@ namespace bbtk /// Closes all open files void CloseAllFiles(); - +*/ + /// Resets all - void commandReset(); + virtual void commandReset(); + /// Displays help (entry point of any help) - void commandHelp(const std::vector& words); + virtual void commandHelp(const std::vector& words); /// Displays help on all the commands void HelpCommands(); + /// Displays help on a particular command - void HelpCommand( const std::string& command ); + virtual void commandHelp( const std::string& command ); /// - void commandGraph(const std::vector& words); + virtual void commandGraph(const std::vector& words); /// - void commandConfig() const; + virtual void commandConfig() const; /// // void Print(const std::string&); - void commandIndex(const std::string& filename, + virtual void commandIndex(const std::string& filename, const std::string& type = "Initials"); + +/*EED Borrame /// void FindCommandsWithPrefix( char* buf, int n, std::vector& 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 commandNewGUI(const std::string& box,const std::string& instanceName); - void commandDebug(const std::string& arg); - void commandNew(std::string boxType, std::string boxName); - void commandDelete(std::string boxName); - void commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel); - void commandPackage(std::string packageName); - void commandEndPackage(); - void commandDefine(std::string name, std::string pack, std::string scriptfilename); - void commandEndDefine(); - void commandKind(std::string kind); - void commandPrint(std::string value); - void commandExec(std::string word); - void commandInput(std::string name, std::string box, std::string input,std::string help); - void commandOutput(std::string name, std::string box, std::string output,std::string help); - void commandSet(std::string box, std::string input, std::string value); - void commandAuthor(std::string author); - void commandCategory(std::string categorytype); - void commandDescription(std::string description); - void commandClear(); - void commandInclude(std::string word, bool ok); - void commandLoad(std::string packageName); - void commandUnload(std::string packageName); - void commandBreak(); - void commandQuit(); - void commandMessage(); - void commandMessage(std::string kind, std::string levelstr); + virtual void commandNewGUI(const std::string& box,const std::string& instanceName); + virtual void commandDebug(const std::string& arg); + virtual void commandNew(std::string boxType, std::string boxName); + virtual void commandDelete(std::string boxName); + virtual void commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel); + virtual void commandPackage(std::string packageName); + virtual void commandEndPackage(); + virtual void commandDefine(std::string name, std::string pack, std::string scriptfilename); + virtual void commandEndDefine(); + virtual void commandKind(std::string kind); + virtual void commandPrint(std::string value); + virtual void commandExec(std::string word); + virtual void commandInput(std::string name, std::string box, std::string input,std::string help); + virtual void commandOutput(std::string name, std::string box, std::string output,std::string help); + virtual void commandSet(std::string box, std::string input, std::string value); + virtual void commandAuthor(std::string author); + virtual void commandCategory(std::string categorytype); + virtual void commandDescription(std::string description); + virtual void commandClear(); + virtual void commandInclude(std::string word, bool ok); + virtual void commandLoad(std::string packageName); + virtual void commandUnload(std::string packageName); + virtual void commandBreak(); + virtual void commandQuit(); + virtual void commandMessage(); + virtual void commandMessage(std::string kind, std::string levelstr); + virtual void SetCurrentFileName(std::string fullPathScriptName); + /// Constructor Interpreter(const std::string& cpp_file = ""); - Interpreter(VirtualExec::Pointer); private: - + void Init(VirtualExec::Pointer, const std::string& cpp_file); +/*EED Borrame /// Opens the file fullPathScriptName /// includeScriptName is the name as given to the include command void LoadScript( std::string fullPathScriptName, std::string includeScriptName); - - /// - void CatchInterpreterException( const InterpreterException& e ); - void CatchBbtkException( const bbtk::Exception& e ); - void CatchStdException( const std::exception& e ); - void CatchUnknownException(); - - - +*/ //================================================================== // ATTRIBUTES @@ -379,9 +387,9 @@ namespace bbtk bbtk::VirtualExec::Pointer mVirtualExecuter; bbtk::Executer::WeakPointer mRealExecuter; +/*EED Borrame /// The user of the interpreter (0 if none) bbtk::InterpreterUser* mUser; - /// Vector of open files / buffers (can be stringstream) std::vector mFile; @@ -420,10 +428,19 @@ namespace bbtk /// The break signal // BreakSignalType mBreakSignal; + + */ protected: - ~Interpreter(); + ~Interpreter(); + /// + virtual void CatchInterpreterException( const InterpreterException& e ); + virtual void CatchBbtkException( const bbtk::Exception& e ); + virtual void CatchStdException( const std::exception& e ); + virtual void CatchUnknownException(); + + }; // EO class Interpreter diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 85354e6..88e8f52 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -578,7 +578,9 @@ namespace bbtk //======================================================================= InterpreterVirtual::ExitStatus InterpreterVirtual::InterpretFile( const std::string& filename, bool source ) { - bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretFile(\""< InterpreterVirtual::InterpretFile(\""< InterpreterVirtual::DoInterpretLine(\"" < words; SplitLine(line,words); +printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() ); + + // Empty line if (words.size()<1) { @@ -847,6 +858,8 @@ namespace bbtk bbtkMessage("interpreter",9,"Multiline Comment"<Create(words[1],words[2]); "<Create(words[1],words[2]); break; @@ -1120,6 +1136,9 @@ namespace bbtk bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\"" <SetCurrentFileName(fullPathScriptName); if (source) SetCurrentFileName(fullPathScriptName); } + +printf("EED InterpreterVirtual::SwitchToFile 4\n"); + return; } //======================================================================= @@ -1534,12 +1562,15 @@ namespace bbtk //======================================================================= void InterpreterVirtual::SetCurrentFileName(std::string fullPathScriptName) // virtual { + printf("EED InterpreterVirtual::SetCurrentFileName 1\n"); } //======================================================================= //======================================================================= void InterpreterVirtual::SwitchToStream( std::stringstream* stream ) { +printf("EED InterpreterVirtual::SwitchToStream 1\n"); + bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::SwitchToStream()" <& words, CommandInfoType& info ) { + + printf("EED InterpreterVirtual::InterpretCommand 1 \n"); bbtkDebugMessage("interpreter",9,"==> InterpreterVirtual::InterpretCommand(...)"<& words,"<second; +printf("EED InterpreterVirtual::InterpretCommand 4 \n" ); bbtkDebugMessage("interpreter",9,"<== InterpreterVirtual::InterpretCommand(...)"< mFileName; + + + /// Stores the current line number in each open file + std::vector mLine; + + bool mThrow; + + /// Are we in a command line context ? + bool mCommandLine; + + + /// 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; + + /// The user of the interpreter (0 if none) + bbtk::InterpreterUser* mUser; + + /// The dictionnary of commands + CommandDictType mCommandDict; + private: - void Init(); /// Opens the file fullPathScriptName /// includeScriptName is the name as given to the include command @@ -342,31 +369,14 @@ namespace bbtk // ATTRIBUTES - /// The user of the interpreter (0 if none) - bbtk::InterpreterUser* mUser; /// Vector of open files / buffers (can be stringstream) std::vector mFile; - /// 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; - /// Stores the current line number in each open file - std::vector mLine; - - /// The dictionnary of commands - CommandDictType mCommandDict; - - /// Are we in a command line context ? - bool mCommandLine; /// Are we inside a commented-out zone ? bool mInsideComment; @@ -379,7 +389,6 @@ namespace bbtk int bufferNb; - bool mThrow; /// The break signal // BreakSignalType mBreakSignal;