X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=99a751447ae18c3cf0be902e357fd4a7dab8c8a3;hb=bf1bdd88621c0556024de37768c2d17d12f2a265;hp=ea9adc9ba8f1ef9bae578080dc75dcf682a015a9;hpb=f5d5e297c656fb1304cccd72e9ac347c0bddbd09;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index ea9adc9..99a7514 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: 2009/10/05 22:44:48 $ - Version: $Revision: 1.87 $ + Date: $Date: 2012/05/30 17:17:00 $ + Version: $Revision: 1.92 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -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(const std::string &boxName) //virtual + { + mVirtualExecuter->Destroy(boxName); + } + + void Interpreter::commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel) //virtual + { + mVirtualExecuter->Connect(nodeFrom,outputLabel,nodeTo,inputLabel); + } + + void Interpreter::commandPackage(const std::string &packageName) //virtual + { + mVirtualExecuter->BeginPackage(packageName); + } + + void Interpreter::commandEndPackage() //virtual + { + mVirtualExecuter->EndPackage(); + } + + void Interpreter::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename) //virtual + { + mVirtualExecuter->Define(name,pack,scriptfilename); + } + + void Interpreter::commandEndDefine() //virtual + { + mVirtualExecuter->EndDefine(); + } + + void Interpreter::commandKind(const std::string &kind) //virtual + { + mVirtualExecuter->Kind(kind); + } + + void Interpreter::commandPrint(const std::string &value) //virtual + { + mVirtualExecuter->Print(value); + } + + + void Interpreter::commandExec(const std::string &word) //virtual + { + if (word=="freeze") + { + mVirtualExecuter->SetNoExecMode(true); + mThrow = false; + } + else if (word=="freeze_no_error") + { + mVirtualExecuter->SetNoExecMode(true); + mVirtualExecuter->SetNoErrorMode(true); + mThrow = false; + } + else if (word=="unfreeze") + { + mVirtualExecuter->SetNoExecMode(false); + mVirtualExecuter->SetNoErrorMode(false); + } + else + { + mVirtualExecuter->Execute(word); + } // if + } + + + void Interpreter::commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string &help) //virtual + { + mVirtualExecuter->DefineInput(name,box,input,help); + } + + void Interpreter::commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string &help) //virtual + { + mVirtualExecuter->DefineOutput(name,box,output,help); + } + + void Interpreter::commandSet(const std::string &box,const std::string &input,const std::string &value) //virtual + { + mVirtualExecuter->Set(box,input,value); + } + + void Interpreter::commandAuthor(const std::string &author) //virtual + { + mVirtualExecuter->Author(author); + } + + void Interpreter::commandCategory(const std::string &categorytype) //virtual + { + mVirtualExecuter->Category(categorytype); + } + + void Interpreter::commandDescription(const std::string &description) //virtual + { + mVirtualExecuter->Description(description); + } + + + void Interpreter::commandClear() //virtual + { + mVirtualExecuter->Clear(); + } + + void Interpreter::commandInclude(const 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 + if (mCommandLine) + { + InterpretFile(word, ok ); + } + else + { + SwitchToFile(word , ok ); + } + } + + + void Interpreter::commandLoad(const std::string &packageName) //virtual + { + printf("EED Interpreter::commandLoad %s\n", packageName.c_str()); + GetExecuter()->LoadPackage(packageName); + } + + void Interpreter::commandUnload(const std::string &packageName) //virtual + { + GetExecuter()->UnLoadPackage(packageName); + } + + void Interpreter::commandBreak() //virtual + { + /* + std::cout << "BreakException(" + <HelpMessages(); + } + + void Interpreter::commandMessage(const std::string &kind,const std::string &levelstr) //virtual + { + int level=0; + sscanf(levelstr.c_str(),"%d",&level); + mVirtualExecuter->SetMessageLevel(kind,level); + } + + +/*EED Borrame //======================================================================= - void Interpreter::DoInterpretLine( const std::string& line ) - { + void Interpreter::DoInterpretLine( const std::string& line ) //virtual + { bbtkDebugMessage("interpreter",6,"==> Interpreter::DoInterpretLine(\"" < words; @@ -757,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]=='*') { @@ -773,7 +579,7 @@ namespace bbtk bbtkMessage("interpreter",9,"Out multiline comment"<SetMessageLevel(words[1],level); + commandMessage(words[1],words[2]); +//EED Borrame sscanf(words[2].c_str(),"%d",&level); +//EED Borrame mVirtualExecuter->SetMessageLevel(words[1],level); } return; } @@ -832,198 +641,221 @@ namespace bbtk } if (command.code==cBreak) { - /* - std::cout << "BreakException(" - <Create(words[1],words[2]); "<Create(words[1],words[2]); + commandNew(words[1],words[2]); +//EED Borrame mVirtualExecuter->Create(words[1],words[2]); break; case cDelete : - mVirtualExecuter->Destroy(words[1]); + commandDelete(words[1]); +//EED Borrame mVirtualExecuter->Destroy(words[1]); break; case cConnect : Utilities::SplitAroundFirstDot(words[1],left,right); Utilities::SplitAroundFirstDot(words[2],left2,right2); - mVirtualExecuter->Connect(left,right,left2,right2); + commandConnection(left,right,left2,right2); +//EED Borrame mVirtualExecuter->Connect(left,right,left2,right2); break; case cPackage : - mVirtualExecuter->BeginPackage(words[1]); + commandPackage(words[1]); +//EED Borrame mVirtualExecuter->BeginPackage(words[1]); break; case cEndPackage : - mVirtualExecuter->EndPackage(); + commandEndPackage(); +//EED Borrame mVirtualExecuter->EndPackage(); break; case cDefine : if (mFileName.size()>0) { +//??? commandDefine(????); filename = mFileName.back(); //mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back()); } if (words.size()==2) { - mVirtualExecuter->Define(words[1],"",filename); + commandDefine(words[1],"",filename); +//EED Borrame mVirtualExecuter->Define(words[1],"",filename); } else { - mVirtualExecuter->Define(words[1],words[2],filename); + commandDefine(words[1],words[2],filename); +//EED Borrame mVirtualExecuter->Define(words[1],words[2],filename); } break; case cEndDefine : - mVirtualExecuter->EndDefine(); + commandEndDefine(); +//EED Borrame mVirtualExecuter->EndDefine(); break; case cKind : - mVirtualExecuter->Kind(words[1]); + commandKind(words[1]); +//EED Borrame mVirtualExecuter->Kind(words[1]); break; case cPrint : - mVirtualExecuter->Print(words[1]); + commandPrint(words[1]); +//EED Borrame mVirtualExecuter->Print(words[1]); break; - + case cExec : - if (words[1]=="freeze") - { - mVirtualExecuter->SetNoExecMode(true); - mThrow = false; - } - else if (words[1]=="freeze_no_error") - { - mVirtualExecuter->SetNoExecMode(true); - mVirtualExecuter->SetNoErrorMode(true); - mThrow = false; - } - else if (words[1]=="unfreeze") - { - mVirtualExecuter->SetNoExecMode(false); - mVirtualExecuter->SetNoErrorMode(false); - } - else - { - mVirtualExecuter->Execute(words[1]); - } + commandExec(words[1]); +//EED Borrame if (words[1]=="freeze") +//EED Borrame { +//EED Borrame mVirtualExecuter->SetNoExecMode(true); +//EED Borrame mThrow = false; +//EED Borrame } +//EED Borrame else if (words[1]=="freeze_no_error") +//EED Borrame { +//EED Borrame mVirtualExecuter->SetNoExecMode(true); +//EED Borrame mVirtualExecuter->SetNoErrorMode(true); +//EED Borrame mThrow = false; +//EED Borrame } +//EED Borrame else if (words[1]=="unfreeze") +//EED Borrame { +//EED Borrame mVirtualExecuter->SetNoExecMode(false); +//EED Borrame mVirtualExecuter->SetNoErrorMode(false); +//EED Borrame } +//EED Borrame else +//EED Borrame { +//EED Borrame mVirtualExecuter->Execute(words[1]); +//EED Borrame } + break; case cInput : Utilities::SplitAroundFirstDot(words[2],left,right); - mVirtualExecuter->DefineInput(words[1],left,right,words[3]); + commandInput(words[1],left,right,words[3]); +//EED Borrame mVirtualExecuter->DefineInput(words[1],left,right,words[3]); break; case cOutput : Utilities::SplitAroundFirstDot(words[2],left,right); - mVirtualExecuter->DefineOutput(words[1],left,right,words[3]); + commandOutput(words[1],left,right,words[3]); +//EED Borrame mVirtualExecuter->DefineOutput(words[1],left,right,words[3]); break; case cSet : Utilities::SplitAroundFirstDot(words[1],left,right); - mVirtualExecuter->Set(left,right,words[2]); + commandSet(left,right,words[2]); +//EED Borrame mVirtualExecuter->Set(left,right,words[2]); break; case cAuthor : - mVirtualExecuter->Author(words[1]); + commandAuthor(words[1]); +//EED Borrame mVirtualExecuter->Author(words[1]); break; case cNewGUI : - NewGUI(words[1],words[2]); + commandNewGUI(words[1],words[2]); break; case cCategory : - mVirtualExecuter->Category(words[1]); + commandCategory(words[1]); +//EED Borrame mVirtualExecuter->Category(words[1]); break; case cIndex : if (words.size()==1) - Index("tmp_index.html"); + commandIndex("tmp_index.html"); else if (words.size()==2) - Index(words[1]); + commandIndex(words[1]); else if (words.size()==3) - Index(words[1],words[2]); + commandIndex(words[1],words[2]); break; case cDescription : - mVirtualExecuter->Description(words[1]); + commandDescription(words[1]); +//EED Borrame mVirtualExecuter->Description(words[1]); break; case cHelp : - Help(words); + commandHelp(words); break; case cGraph : - Graph(words); + commandGraph(words); break; case cConfig : - Config(); + commandConfig(); break; case cReset : - Reset(); + commandReset(); break; case cClear : - mVirtualExecuter->Clear(); + commandClear(); +//EED Borrame mVirtualExecuter->Clear(); break; case cInclude : - // 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 - if (mCommandLine) - { - InterpretFile(words[1],(words.size()==3)); - } - else - { - SwitchToFile(words[1],(words.size()==3) ); - } + commandInclude( words[1] , (words.size()==3) ); +//EED Borrame // if 'source' was given (words.size()==3) then tell to set the +//EED Borrame // source file name of the current complex box with the full file name included +//EED Borrame if (mCommandLine) +//EED Borrame { +//EED Borrame InterpretFile(words[1],(words.size()==3)); +//EED Borrame } else{ +//EED Borrame SwitchToFile(words[1],(words.size()==3) ); +//EED Borrame } break; case cLoad: - GetExecuter()->LoadPackage(words[1]); + commandLoad( words[1] ); +//EED Borrame GetExecuter()->LoadPackage(words[1]); break; case cUnload: - GetExecuter()->UnLoadPackage(words[1]); + commandUnload( words[1] ); +//EED Borrame GetExecuter()->UnLoadPackage(words[1]); break; case cDebug : - if (words.size()==2) Debug(words[1]); - else Debug(""); - break; - /* 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]); - } + if (words.size()==2) commandDebug(words[1]); + else commandDebug(""); 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 !!!"); } @@ -1036,7 +868,6 @@ namespace bbtk - //======================================================================= void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) { @@ -1068,10 +899,11 @@ namespace bbtk } //======================================================================= +*/ //======================================================================= - void Interpreter::Reset() + void Interpreter::commandReset() // virtual { // Cannot close all files if the reset command is read from a file ! CloseAllFiles(); @@ -1159,7 +991,7 @@ namespace bbtk /** * */ - +/*EED Borrame // ========================================================================= void Interpreter::SwitchToFile( const std::string& name , bool source ) { @@ -1199,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 == "*") { @@ -1440,14 +1272,22 @@ namespace bbtk else { LoadScript(fullPathScriptName,name); - if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName); + if (source) SetCurrentFileName(fullPathScriptName); } return; } //======================================================================= +*/ - + //======================================================================= + void Interpreter::SetCurrentFileName(const std::string &fullPathScriptName) // virtual + { + GetExecuter()->SetCurrentFileName(fullPathScriptName); + } + //======================================================================= + +/*EED Borrame //======================================================================= void Interpreter::SwitchToStream( std::stringstream* stream ) { @@ -1467,9 +1307,10 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) mLine.push_back(0); } //======================================================================= - +*/ + +/* //======================================================================= - void Interpreter::LoadScript( std::string fullPathScriptName, std::string includeScriptName) { @@ -1508,7 +1349,9 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) return; } //======================================================================= +*/ +/*EED Borrame //======================================================================= void Interpreter::CloseCurrentFile() { @@ -1556,7 +1399,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) //======================================================================= - //======================================================================= void Interpreter::InterpretCommand( const std::vector& words, CommandInfoType& info ) @@ -1574,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) +void Interpreter::commandHelp(const std::vector& words) { unsigned int nbarg = words.size()-1; @@ -1605,7 +1448,7 @@ void Interpreter::Help(const std::vector& words) } try { - HelpCommand(words[1]); + commandHelp(words[1]); } catch (bbtk::Exception e) { @@ -1675,7 +1518,7 @@ void Interpreter::Help(const std::vector& words) } else { - HelpCommand(words[0]); + commandHelp(words[0]); bbtkError(words[0]<<" : syntax error"); } } @@ -1688,7 +1531,7 @@ void Interpreter::Help(const std::vector& words) //=================================================================== /// Displays the Configuration - void Interpreter::Config() const + void Interpreter::commandConfig() const { ConfigurationFile::GetInstance().GetHelp(1); } @@ -1712,9 +1555,10 @@ void Interpreter::Help(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); @@ -1732,7 +1576,7 @@ void Interpreter::Help(const std::vector& words) } //======================================================================= - +/*EED Borrame //======================================================================= /// Fills the vector commands with the commands which /// have the first n chars of buf for prefix @@ -1750,9 +1594,10 @@ void Interpreter::Help(const std::vector& words) } } //======================================================================= +*/ + - - +/*EED Borrame //======================================================================= #ifdef BBTK_USE_TERMIOS_BASED_PROMPT @@ -1967,9 +1812,14 @@ void Interpreter::Help(const std::vector& words) //======================================================================= #endif +*/ - - + + + + + +/*EED Borrame //======================================================================= void Interpreter::CommandLineInterpreter() { @@ -2001,13 +1851,11 @@ void Interpreter::Help(const std::vector& words) GetLineFromPrompt(line); DoInterpretLine(line); //, insideComment); } - /* - catch (QuitException e) - { - bbtkMessage("interpreter",1,"Interpreter : Quit"<& words) bbtkDebugDecTab("interpreter",9); } - +*/ + //======================================================================= -void Interpreter::Graph(const std::vector& words) +void Interpreter::commandGraph(const std::vector& words) { std::string page; bool system_display = true; @@ -2078,7 +1927,7 @@ void Interpreter::Graph(const std::vector& words) //======================================================================= -void Interpreter::Index(const std::string& filename, +void Interpreter::commandIndex(const std::string& filename, const std::string& type) { Factory::IndexEntryType t; @@ -2093,7 +1942,7 @@ void Interpreter::Index(const std::string& filename, //======================================================================= -void Interpreter::NewGUI(const std::string& boxname, +void Interpreter::commandNewGUI(const std::string& boxname, const std::string& instanceName) { if (mRealExecuter.expired()) @@ -2270,7 +2119,7 @@ void Interpreter::NewGUI(const std::string& boxname, //========================================================================== - void Interpreter::Debug(const std::string& name) + void Interpreter::commandDebug(const std::string& name) { if ((name.length()==2)&&(name[0]=='-')) {