Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $
Language: C++
- Date: $Date: 2009/06/08 14:50:03 $
- Version: $Revision: 1.86 $
+ Date: $Date: 2012/05/30 17:17:00 $
+ Version: $Revision: 1.92 $
=========================================================================*/
/* ---------------------------------------------------------------------
//=======================================================================
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()" <<std::endl);
if (e)
{
mVirtualExecuter = e;
mVirtualExecuter = boost::static_pointer_cast<VirtualExec>(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 <type> <name>";
- info.help = "Creates a new black box of type <type> with name <name>";
- mCommandDict[info.keyword] = info;
-
- info.keyword = "delete";
- info.argmin = 1;
- info.argmax = 1;
- info.code = cDelete;
- info.syntax = "delete <box>";
- info.help = "Deletes the black box of name <box>";
- 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 <box> <name>";
- info.help = "Automatically creates a graphical user interface with name <name> for the black box <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 <box1.output> <box2.input>";
- info.help = "Connects the ouput <output> of black box <box1> to the input <input> of black box <box2>";
- mCommandDict[info.keyword] = info;
-
- info.keyword = "print";
- info.argmin = 1;
- info.argmax = 1;
- info.code = cPrint;
- info.syntax = "print <string>";
- 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 <box | 'freeze' | 'unfreeze' | 'freeze_no_error' >";
- info.help = "Executes the black box of name <box> (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 <name>";
- 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 <type> [<package>]";
- info.help = "Begins the definition of a new type of complex black box called <type>. If <package> 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 <ADAPTOR|DEFAULT_ADAPTOR|GUI|DEFAULT_GUI>";
- 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 <name> <box.input> <help>";
- info.help = "Defines the input <name> of the current working black box as being an alias for the input <input> of the black box <box>. <help> 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 <name> <box.output> <help>";
- info.help = "Defines the output <name> of the current working black box as being an alias for the output <output> of the black box <box>. <help> 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 <box.input> <value>";
- info.help = "Sets the value of the input <input> of the black box <box> to <value>. 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 [<filename> ['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 <string>";
- info.help = "Adds the string <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 <list of items, separated by ;>";
- info.help = "Adds the string <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 <string>";
- info.help = "Adds the string <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 <command name> \n (3) help packages [all]\n (4) help <package name> [all]\n (5) help <black box type> \n (6) help <black box name>";
- 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 <kind> <level>";
- info.help = "Sets the level of the kind of messages <kind> to <level>.\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 <filename> [source]";
- info.help = "Includes the file <filename>.\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 <packagename>";
- info.help = "Loads the black box package <packagename>";
- mCommandDict[info.keyword] = info;
-
- info.keyword = "unload";
- info.argmin = 1;
- info.argmax = 1;
- info.code = cUnload;
- info.syntax = "unload <packagename>";
- info.help = "Unloads the black box package <packagename>";
- 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 <newname> ) >";
- 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();
}
//=======================================================================
}
//=======================================================================
-
+/*EED Borrame
//=======================================================================
InterpreterException::InterpreterException( const std::string& message,
bool in_script_file,
{
}
//=======================================================================
-
+*/
//=======================================================================
void Interpreter::CatchInterpreterException( const InterpreterException& e )
return;
}
- if (mThrow)
- {
- if (e.GetErrorMessage()!="break")
- {
- mStatus = Interpreter_ERROR;
- CloseAllFiles();
- }
- throw InterpreterException(e);
- }
- else
- {
- std::stringstream mess;
- mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
- if (e.IsInScriptFile())
- {
- mess << "* FILE : \""<<e.GetScriptFile()<<"\""<<std::endl;
- mess << "* LINE : "<<e.GetScriptLine()<<std::endl;
- }
- CloseAllFiles();
- std::cerr << mess.str();
- }
+
+ bbtk::InterpreterVirtual::CatchInterpreterException( e );
}
//=======================================================================
return;
}
- mStatus = Interpreter_ERROR;
- if (mThrow)
- {
- bool in_script = false;
- std::string file("");
- int line = 0;
- if (mFileName.size()) {
- std::ifstream* fs = dynamic_cast<std::ifstream*>(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 : "<<e.GetErrorMessage()<<std::endl;
- if (mFileName.size()) {
- mess << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
- mess << "* LINE : "<<mLine.back()<<std::endl;
- }
- CloseAllFiles();
- std::cerr << mess.str();
- }
+
+ bbtk::InterpreterVirtual::CatchBbtkException( e );
}
//=======================================================================
//=======================================================================
void Interpreter::CatchStdException( const std::exception& e )
{
- if (GetExecuter()->GetNoErrorMode())
- {
- std::string file("?");
- int line = 0;
- if (mFileName.size()) {
- file = mFileName.back();
- line = mLine.back();
- }
- bbtkWarning("ERROR '"<<e.what()
- <<"' ("<<file<<":"<<line<<") skipped");
-
- return;
- }
- mStatus = Interpreter_ERROR;
- if (mThrow)
- {
- bool in_script = false;
- std::string file("");
- int line = 0;
- if (mFileName.size()) {
- std::ifstream* fs = dynamic_cast<std::ifstream*>(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 : "<<e.what()<<std::endl;
- if (mFileName.size()) {
- mess << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
- mess << "* LINE : "<<mLine.back()<<std::endl;
- }
- CloseAllFiles();
- std::cerr << mess.str();
+ if (GetExecuter()->GetNoErrorMode())
+ {
+ std::string file("?");
+ int line = 0;
+ if (mFileName.size())
+ {
+ file = mFileName.back();
+ line = mLine.back();
+ }
+ bbtkWarning("ERROR '"<<e.what() <<"' ("<<file<<":"<<line<<") skipped");
+ return;
}
+ bbtk::InterpreterVirtual::CatchStdException( e );
}
//=======================================================================
//=======================================================================
void Interpreter::CatchUnknownException()
{
- if (GetExecuter()->GetNoErrorMode())
- {
- std::string file("?");
- int line = 0;
- if (mFileName.size()) {
- file = mFileName.back();
- line = mLine.back();
- }
- bbtkWarning("UNDEFINED ERROR "
- <<"("<<file<<":"<<line<<") skipped");
- return;
- }
- mStatus = Interpreter_ERROR;
- if (mThrow)
- {
- bool in_script = false;
- std::string file("");
- int line = 0;
- if (mFileName.size()) {
- std::ifstream* fs = dynamic_cast<std::ifstream*>(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 : \""<<mFileName.back()<<"\""<<std::endl;
- mess << "* LINE : "<<mLine.back()<<std::endl;
- }
- CloseAllFiles();
- std::cerr << mess.str();
- }
+ if (GetExecuter()->GetNoErrorMode())
+ {
+ std::string file("?");
+ int line = 0;
+ if (mFileName.size())
+ {
+ file = mFileName.back();
+ line = mLine.back();
+ }
+ bbtkWarning("UNDEFINED ERROR " <<"("<<file<<":"<<line<<") skipped");
+ return;
+ }
+
+ bbtk::InterpreterVirtual::CatchUnknownException( );
}
//=======================================================================
}
//=======================================================================
-
+/*EED Borrame
//=======================================================================
Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename, bool source )
{
char buf[500];
mFile.back()->getline(buf,500);
std::string str(buf);
-
+ //size 0 JCP 21-09-2009
int size=str.length();
- if ( str[ size-1 ]==13 )
+ if(size != 0){
+ if ( str[ size-1 ]==13 )
{
str.erase(size-1,1);
}
- try
- {
- DoInterpretLine(str);
- }
- CATCH_MACRO;
+ try
+ {
+ DoInterpretLine(str);
+ }
+ CATCH_MACRO;
+ }
+
}
CloseCurrentFile();
}
{
mStatus = Interpreter_OK;
mInsideComment = false;
+//std::cout<<"JCP bbtkInterpreter.cxx Interpreter::InterpretLine("<<std::endl;
DoInterpretLine(line );
}
CATCH_MACRO;
return mStatus;
}
//=======================================================================
-
+*/
+
+
+ void Interpreter::commandNew(const std::string &boxType,const std::string &boxName) //virtual
+ {
+ mVirtualExecuter->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("
+ <<in_script<<","
+ <<file<<","
+ <<line<<")"<<std::endl;
+ */
+ bbtkError("break");//,in_script,file,line);
+ // throw BreakException(in_script,file,line);
+ }
+
+ void Interpreter::commandQuit() //virtual
+ {
+ bbtkError("quit");//,in_script,file,line);
+ //throw QuitException(in_script,file,line);
+ }
+
+ void Interpreter::commandMessage() //virtual
+ {
+ mVirtualExecuter->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(\""
<<line<<"\")"<<std::endl);
-
std::vector<std::string> words;
SplitLine(line,words);
return;
}
- // Multi line comment ( /* ... */ ) -delimiters on different lines !-
+ // Multi line comment ( / * ... * / ) -delimiters on different lines !- <<<<<<< / * * /
if (words[0][0]=='/' && words[0][1]=='*')
{
bbtkMessage("interpreter",9,"Out multiline comment"<<std::endl);
if ( !mInsideComment ) {
bbtkDebugDecTab("interpreter",9);
- bbtkMessage("interpreter",9,"Comment mismatch : '*/' with no matching '/*'"<<std::endl);
+ bbtkMessage("interpreter",9,"Comment mismatch : '* /' with no matching '/ *'"<<std::endl); <<<<<<<<< * / / *
}
mInsideComment = false;
return;
// Command
CommandInfoType command;
InterpretCommand(words,command);
-
+//std::cout<<"JCP bbtkInterpreter command.keyword ="<<command.keyword<<std::endl;
bbtkDebugMessage("interpreter",9,
"Command='"<<command.keyword
<<"' code="<<command.code<<std::endl);
- int level=0;
+
std::string left,right,left2,right2;
std::string filename;
+//ups1 EED borrame
// message command
if (command.code==cMessage)
{
if (words.size()<3)
{
- mVirtualExecuter->HelpMessages();
+ commandMessage();
+//EED Borrame mVirtualExecuter->HelpMessages();
}
else
{
- sscanf(words[2].c_str(),"%d",&level);
- mVirtualExecuter->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;
}
bool in_script = false;
std::string file("");
int line = 0;
+
if (mFileName.size())
{
std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
}
if (command.code==cBreak)
{
- /*
- std::cout << "BreakException("
- <<in_script<<","
- <<file<<","
- <<line<<")"<<std::endl;
- */
- bbtkError("break");//,in_script,file,line);
+// std::cout << "BreakException("
+// <<in_script<<","
+// <<file<<","
+// <<line<<")"<<std::endl;
+ commandBreak();
+//EED Borrame bbtkError("break");//,in_script,file,line);
// throw BreakException(in_script,file,line);
}
else
{
- bbtkError("quit");//,in_script,file,line);
+ commandQuit();
+//EED Borrame bbtkError("quit");//,in_script,file,line);
//throw QuitException(in_script,file,line);
}
return;
}
-
+//std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<<line<<std::endl;
// other cammands
+
switch (command.code)
{
case cNew :
- mVirtualExecuter->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 !!!");
}
-
//=======================================================================
void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>& tokens)
{
}
//=======================================================================
+*/
//=======================================================================
- void Interpreter::Reset()
+ void Interpreter::commandReset() // virtual
{
// Cannot close all files if the reset command is read from a file !
CloseAllFiles();
/**
*
*/
-
+/*EED Borrame
// =========================================================================
void Interpreter::SwitchToFile( const std::string& name , bool source )
{
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 == "*")
{
}
std::string tfullPathScriptName = Utilities::MakePkgnameFromPath(path, name, false);
- if (tfullPathScriptName.substr(tfullPathScriptName.size()-4, 3)==".bb")
- {
- fullPathScriptName = tfullPathScriptName;
- if ( ! Utilities::FileExists(fullPathScriptName) )
+//Addition JCP tfullPathScriptName.size()>=4
+ if(tfullPathScriptName.size()>=4){
+ if (tfullPathScriptName.substr(tfullPathScriptName.size()-4, 3)==".bb")
{
- // The following is *NOT* a debug time message :
- // It's a user intended message.
- // Please don't remove it.
- bbtkMessage("interpreter",2,
- " [" <<fullPathScriptName <<"] : does not exist"
- <<std::endl);
- continue; // try next path
- }
- bbtkMessage("interpreter",2,
- " [" <<fullPathScriptName
- <<"] : found" <<std::endl);
- foundFile = true;
- break; // a script was found; we stop iterating
- }
- else
- {
- fullPathScriptName = tfullPathScriptName + ".bbs";
- // Check if library exists
- if ( ! Utilities::FileExists(fullPathScriptName) )
- {
- fullPathScriptName = tfullPathScriptName + ".bbp";
+ fullPathScriptName = tfullPathScriptName;
if ( ! Utilities::FileExists(fullPathScriptName) )
{
// The following is *NOT* a debug time message :
// It's a user intended message.
// Please don't remove it.
bbtkMessage("interpreter",2,
- " [" <<tfullPathScriptName <<".bbs/.bbp] : do not exist"
- <<std::endl);
+ " [" <<fullPathScriptName <<"] : does not exist"
+ <<std::endl);
continue; // try next path
}
+ bbtkMessage("interpreter",2,
+ " [" <<fullPathScriptName
+ <<"] : found" <<std::endl);
+ foundFile = true;
+ break; // a script was found; we stop iterating
}
- bbtkMessage("interpreter",2,
- " [" <<fullPathScriptName
- <<"] : found" <<std::endl);
- foundFile = true;
- break; // a script was found; we stop iterating
- }
+ else
+ {
+ fullPathScriptName = tfullPathScriptName + ".bbs";
+ // Check if library exists
+ if ( ! Utilities::FileExists(fullPathScriptName) )
+ {
+ fullPathScriptName = tfullPathScriptName + ".bbp";
+ if ( ! Utilities::FileExists(fullPathScriptName) )
+ {
+ // The following is *NOT* a debug time message :
+ // It's a user intended message.
+ // Please don't remove it.
+ bbtkMessage("interpreter",2,
+ " [" <<tfullPathScriptName <<".bbs/.bbp] : do not exist"
+ <<std::endl);
+ continue; // try next path
+ }
+ }
+ bbtkMessage("interpreter",2,
+ " [" <<fullPathScriptName
+ <<"] : found" <<std::endl);
+ foundFile = true;
+ break; // a script was found; we stop iterating
+ }
+ }
} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
}
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 )
{
mLine.push_back(0);
}
//=======================================================================
-
+*/
+
+/*
//=======================================================================
-
void Interpreter::LoadScript( std::string fullPathScriptName,
std::string includeScriptName)
{
return;
}
//=======================================================================
+*/
+/*EED Borrame
//=======================================================================
void Interpreter::CloseCurrentFile()
{
//=======================================================================
-
//=======================================================================
void Interpreter::InterpretCommand( const std::vector<std::string>& words,
CommandInfoType& info )
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<std::string>& words,"<<std::endl;
info = c->second;
bbtkDebugMessage("interpreter",9,"<== Interpreter::InterpretCommand(...)"<<std::endl);
}
//=======================================================================
+ */
//=======================================================================
/// Displays help on all the commands
-void Interpreter::Help(const std::vector<std::string>& words)
+void Interpreter::commandHelp(const std::vector<std::string>& words)
{
unsigned int nbarg = words.size()-1;
}
try
{
- HelpCommand(words[1]);
+ commandHelp(words[1]);
}
catch (bbtk::Exception e)
{
}
else
{
- HelpCommand(words[0]);
+ commandHelp(words[0]);
bbtkError(words[0]<<" : syntax error");
}
}
//===================================================================
/// Displays the Configuration
- void Interpreter::Config() const
+ void Interpreter::commandConfig() const
{
ConfigurationFile::GetInstance().GetHelp(1);
}
//=======================================================================
+
//=======================================================================
/// 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);
}
//=======================================================================
-
+/*EED Borrame
//=======================================================================
/// Fills the vector commands with the commands which
/// have the first n chars of buf for prefix
}
}
//=======================================================================
+*/
+
-
-
+/*EED Borrame
//=======================================================================
#ifdef BBTK_USE_TERMIOS_BASED_PROMPT
//=======================================================================
#endif
+*/
-
-
+
+
+
+
+
+/*EED Borrame
//=======================================================================
void Interpreter::CommandLineInterpreter()
{
GetLineFromPrompt(line);
DoInterpretLine(line); //, insideComment);
}
- /*
- catch (QuitException e)
- {
- bbtkMessage("interpreter",1,"Interpreter : Quit"<<std::endl);
- again = false;
+ // catch (QuitException e)
+ // {
+ // bbtkMessage("interpreter",1,"Interpreter : Quit"<<std::endl);
+ // again = false;
}
- */
catch (bbtk::Exception e)
{
e.Print();
bbtkDebugDecTab("interpreter",9);
}
-
+*/
+
//=======================================================================
-void Interpreter::Graph(const std::vector<std::string>& words)
+void Interpreter::commandGraph(const std::vector<std::string>& words)
{
std::string page;
bool system_display = true;
//=======================================================================
-void Interpreter::Index(const std::string& filename,
+void Interpreter::commandIndex(const std::string& filename,
const std::string& type)
{
Factory::IndexEntryType t;
//=======================================================================
-void Interpreter::NewGUI(const std::string& boxname,
+void Interpreter::commandNewGUI(const std::string& boxname,
const std::string& instanceName)
{
if (mRealExecuter.expired())
//==========================================================================
- void Interpreter::Debug(const std::string& name)
+ void Interpreter::commandDebug(const std::string& name)
{
if ((name.length()==2)&&(name[0]=='-'))
{
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff