Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $
Language: C++
- Date: $Date: 2010/09/17 15:56:51 $
- Version: $Revision: 1.90 $
+ Date: $Date: 2010/09/18 22:31:40 $
+ Version: $Revision: 1.91 $
=========================================================================*/
/* ---------------------------------------------------------------------
*/
- void Interpreter::commandNew(std::string boxType, std::string boxName) //virtual
+ void Interpreter::commandNew(const std::string &boxType,const std::string &boxName) //virtual
{
mVirtualExecuter->Create(boxType,boxName);
}
- void Interpreter::commandDelete(std::string boxName) //virtual
+ void Interpreter::commandDelete(const std::string &boxName) //virtual
{
mVirtualExecuter->Destroy(boxName);
}
- void Interpreter::commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel) //virtual
+ 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(std::string packageName) //virtual
+ void Interpreter::commandPackage(const std::string &packageName) //virtual
{
mVirtualExecuter->BeginPackage(packageName);
}
mVirtualExecuter->EndPackage();
}
- void Interpreter::commandDefine(std::string name, std::string pack, std::string scriptfilename) //virtual
+ void Interpreter::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename) //virtual
{
mVirtualExecuter->Define(name,pack,scriptfilename);
}
mVirtualExecuter->EndDefine();
}
- void Interpreter::commandKind(std::string kind) //virtual
+ void Interpreter::commandKind(const std::string &kind) //virtual
{
mVirtualExecuter->Kind(kind);
}
- void Interpreter::commandPrint(std::string value) //virtual
+ void Interpreter::commandPrint(const std::string &value) //virtual
{
mVirtualExecuter->Print(value);
}
- void Interpreter::commandExec(std::string word) //virtual
+ void Interpreter::commandExec(const std::string &word) //virtual
{
if (word=="freeze")
{
}
- void Interpreter::commandInput(std::string name, std::string box, std::string input,std::string help) //virtual
+ 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(std::string name, std::string box, std::string output,std::string help) //virtual
+ 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(std::string box, std::string input, std::string value) //virtual
+ void Interpreter::commandSet(const std::string &box,const std::string &input,const std::string &value) //virtual
{
mVirtualExecuter->Set(box,input,value);
}
- void Interpreter::commandAuthor(std::string author) //virtual
+ void Interpreter::commandAuthor(const std::string &author) //virtual
{
mVirtualExecuter->Author(author);
}
- void Interpreter::commandCategory(std::string categorytype) //virtual
+ void Interpreter::commandCategory(const std::string &categorytype) //virtual
{
mVirtualExecuter->Category(categorytype);
}
- void Interpreter::commandDescription(std::string description) //virtual
+ void Interpreter::commandDescription(const std::string &description) //virtual
{
mVirtualExecuter->Description(description);
}
mVirtualExecuter->Clear();
}
- void Interpreter::commandInclude(std::string word, bool ok) //virtual
+ 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
}
- void Interpreter::commandLoad(std::string packageName) //virtual
+ void Interpreter::commandLoad(const std::string &packageName) //virtual
{
GetExecuter()->LoadPackage(packageName);
}
- void Interpreter::commandUnload(std::string packageName) //virtual
+ void Interpreter::commandUnload(const std::string &packageName) //virtual
{
GetExecuter()->UnLoadPackage(packageName);
}
mVirtualExecuter->HelpMessages();
}
-//ups2 EED Borrame
- void Interpreter::commandMessage(std::string kind, std::string levelstr) //virtual
+ void Interpreter::commandMessage(const std::string &kind,const std::string &levelstr) //virtual
{
int level=0;
sscanf(levelstr.c_str(),"%d",&level);
*/
//=======================================================================
- void Interpreter::SetCurrentFileName(std::string fullPathScriptName) // virtual
+ void Interpreter::SetCurrentFileName(const std::string &fullPathScriptName) // virtual
{
GetExecuter()->SetCurrentFileName(fullPathScriptName);
}
Program: bbtk
Module: $RCSfile: bbtkInterpreter.h,v $
Language: C++
- Date: $Date: 2010/09/17 15:56:52 $
- Version: $Revision: 1.43 $
+ Date: $Date: 2010/09/18 22:31:40 $
+ Version: $Revision: 1.44 $
=========================================================================*/
/* ---------------------------------------------------------------------
/// and connected to the existing pipeline
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 commandNew(const std::string &boxType,const std::string &boxName);
+ virtual void commandDelete(const std::string &boxName);
+ virtual void commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel);
+ virtual void commandPackage(const std::string &packageName);
virtual void commandEndPackage();
- virtual void commandDefine(std::string name, std::string pack, std::string scriptfilename);
+ virtual void commandDefine(const std::string &name,const std::string &pack,const 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 commandKind(const std::string &kind);
+ virtual void commandPrint(const std::string &value);
+ virtual void commandExec(const std::string &word);
+ virtual void commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string &help);
+ virtual void commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string &help);
+ virtual void commandSet(const std::string &box,const std::string &input,const std::string &value);
+ virtual void commandAuthor(const std::string &author);
+ virtual void commandCategory(const std::string &categorytype);
+ virtual void commandDescription(const 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 commandInclude(const std::string &word, bool ok);
+ virtual void commandLoad(const std::string &packageName);
+ virtual void commandUnload(const 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);
+ virtual void commandMessage(const std::string &kind,const std::string &levelstr);
+ virtual void SetCurrentFileName(const std::string &fullPathScriptName);
/// Constructor
//=======================================================================
InterpreterVirtual::ExitStatus InterpreterVirtual::InterpretFile( const std::string& filename, bool source )
{
-
- printf("EED InterpreterVirtual::InterpretFile 1\n");
bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretFile(\""<<filename<<"\")"<<std::endl);
bool exm = mCommandLine;
mCommandLine = exm;
- printf("EED InterpreterVirtual::InterpretFile 2\n");
-
return mStatus;
}
//=======================================================================
}
//=======================================================================
- void InterpreterVirtual::commandNew(std::string boxType, std::string boxName) // virtual
+ void InterpreterVirtual::commandNew(const std::string &boxType, const std::string &boxName) // virtual
{
- printf("EED %p InterpreterVirtual::commandNew 1 %s %s\n", this, boxType.c_str(),boxName.c_str() );
}
- void InterpreterVirtual::commandDelete(std::string boxName)
+ void InterpreterVirtual::commandDelete(const std::string &boxName)
{
}
- void InterpreterVirtual::commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel)
+ void InterpreterVirtual::commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel)
{
}
- void InterpreterVirtual::commandPackage(std::string packageName)
+ void InterpreterVirtual::commandPackage(const std::string &packageName)
{
}
{
}
- void InterpreterVirtual::commandDefine(std::string name, std::string pack, std::string scriptfilename)
+ void InterpreterVirtual::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename)
{
}
{
}
- void InterpreterVirtual::commandKind(std::string kind)
+ void InterpreterVirtual::commandKind(const std::string &kind)
{
}
- void InterpreterVirtual::commandPrint(std::string value)
+ void InterpreterVirtual::commandPrint(const std::string &value)
{
}
- void InterpreterVirtual::commandExec(std::string word)
+ void InterpreterVirtual::commandExec(const std::string &word)
{
}
- void InterpreterVirtual::commandInput(std::string name, std::string box, std::string input,std::string help)
+ void InterpreterVirtual::commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string &help)
{
}
- void InterpreterVirtual::commandOutput(std::string name, std::string box, std::string output,std::string help)
+ void InterpreterVirtual::commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string &help)
{
}
- void InterpreterVirtual::commandSet(std::string box, std::string input, std::string value)
+ void InterpreterVirtual::commandSet(const std::string &box,const std::string &input,const std::string &value)
{
}
- void InterpreterVirtual::commandAuthor(std::string author)
+ void InterpreterVirtual::commandAuthor(const std::string &author)
{
}
- void InterpreterVirtual::commandCategory(std::string categorytype)
+ void InterpreterVirtual::commandCategory(const std::string &categorytype)
{
}
- void InterpreterVirtual::commandDescription(std::string description)
+ void InterpreterVirtual::commandDescription(const std::string &description)
{
}
{
}
- void InterpreterVirtual::commandInclude(std::string word, bool ok)
+ void InterpreterVirtual::commandInclude(const std::string &word, bool ok)
{
}
- void InterpreterVirtual::commandLoad(std::string packageName)
+ void InterpreterVirtual::commandLoad(const std::string &packageName)
{
}
- void InterpreterVirtual::commandUnload(std::string packageName)
+ void InterpreterVirtual::commandUnload(const std::string &packageName)
{
}
{
}
-//ups2 EED Borrame
- void InterpreterVirtual::commandMessage(std::string kind, std::string levelstr)
+ void InterpreterVirtual::commandMessage(const std::string &kind,const std::string &levelstr)
{
}
void InterpreterVirtual::DoInterpretLine( const std::string& line )
{
- printf("EED %p InterpreterVirtual::DoInterpretLine 0 \n", this);
- printf("EED %p InterpreterVirtual::DoInterpretLine line=%s \n", this, line.c_str() );
bbtkDebugMessage("interpreter",6,"==> InterpreterVirtual::DoInterpretLine(\""
<<line<<"\")"<<std::endl);
std::vector<std::string> words;
SplitLine(line,words);
-printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() );
// Empty line
return;
}
-printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() );
// Command
CommandInfoType command;
std::string left,right,left2,right2;
std::string filename;
-//ups1 EED borrame
// message command
if (command.code==cMessage)
{
//std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<<line<<std::endl;
// other cammands
-printf("EED %p InterpreterVirtual::DoInterpretLine 4 command.code=%d\n", this, (int)command.code);
switch (command.code)
{
case cNew :
-printf("EED %p InterpreterVirtual::DoInterpretLine 5 %s %s\n", this, words[1].c_str() , words[2].c_str() );
commandNew(words[1],words[2]);
//EED Borrame mVirtualExecuter->Create(words[1],words[2]);
break;
}
if (words.size()==2)
{
- commandDefine(words[1],"",filename);
+ std::string packTmp = "";
+ commandDefine(words[1],packTmp,filename);
//EED Borrame mVirtualExecuter->Define(words[1],"",filename);
}
else
bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\""
<<line<<"\")"<<std::endl);
-
-printf("EED %p InterpreterVirtual::DoInterpretLine 10\n", this);
-
-
+
}
//=======================================================================
// =========================================================================
void InterpreterVirtual::SwitchToFile( const std::string& name , bool source )
{
- printf("EED InterpreterVirtual::SwitchToFile 1\n");
- printf("EED InterpreterVirtual::SwitchToFile name=%s\n", name.c_str() );
-
// Note : in the following :
// name : the user supplied name
// - abreviated name e.g. scr scr.bbs
std::stringstream* stream = new std::stringstream;
//if (upath.size()!=0) // avoid troubles for "*"
-
-printf("EED InterpreterVirtual::SwitchToFile 2\n");
// ==== no path provided : look in root bbs path
if (upath.size()==0)
}
}
-printf("EED InterpreterVirtual::SwitchToFile 3\n");
-
// === search paths list complete : now explore it
int nbBssFiles = 0;
// ==== relative name, iterate + load all .bbs/.bbp files
//EED Borrame if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
if (source) SetCurrentFileName(fullPathScriptName);
}
-
-printf("EED InterpreterVirtual::SwitchToFile 4\n");
-
+
return;
}
//=======================================================================
//=======================================================================
- void InterpreterVirtual::SetCurrentFileName(std::string fullPathScriptName) // virtual
+ void InterpreterVirtual::SetCurrentFileName(const 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()"
<<std::endl);
mFile.push_back(stream);
CommandInfoType& info )
{
- printf("EED InterpreterVirtual::InterpretCommand 1 \n");
bbtkDebugMessage("interpreter",9,"==> InterpreterVirtual::InterpretCommand(...)"<<std::endl);
// searches the command keyword
CommandDictType::iterator c;
c = mCommandDict.find(words[0]);
if ( c == mCommandDict.end() ) {
-printf("EED InterpreterVirtual::InterpretCommand 2 \n");
bbtkError(words[0]<<" : unknown command");
}
//EED HelpCommand(words[0]);
commandHelp(words[0]);
-printf("EED InterpreterVirtual::InterpretCommand 3 \n");
-
bbtkError(words[0]<<" : wrong number of arguments");
}
//std::cout<<"InterpreterVirtual::InterpretCommand( const std::vector<std::string>& words,"<<std::endl;
info = c->second;
-
-printf("EED InterpreterVirtual::InterpretCommand 4 \n" );
bbtkDebugMessage("interpreter",9,"<== InterpreterVirtual::InterpretCommand(...)"<<std::endl);
}
{
}
//=======================================================================
- void InterpreterVirtual::commandHelp(const std::string words)
+ void InterpreterVirtual::commandHelp(const std::string &words)
{
}
//=======================================================================
virtual void commandReset();
/// Displays help (entry point of any help)
- virtual void commandHelp(const std::string words);
+ virtual void commandHelp(const std::string &words);
virtual void commandHelp(const std::vector<std::string>& words);
///
/// and connected to the existing pipeline
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 commandNew(const std::string &boxType, const std::string &boxName);
+ virtual void commandDelete(const std::string &boxName);
+ virtual void commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel);
+ virtual void commandPackage(const std::string &packageName);
virtual void commandEndPackage();
- virtual void commandDefine(std::string name, std::string pack, std::string scriptfilename);
+ virtual void commandDefine(const std::string &name,const std::string &pack,const 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 commandKind(const std::string &kind);
+ virtual void commandPrint(const std::string &value);
+ virtual void commandExec(const std::string &word);
+ virtual void commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string &help);
+ virtual void commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string &help);
+ virtual void commandSet(const std::string &box,const std::string &input,const std::string &value);
+ virtual void commandAuthor(const std::string &author);
+ virtual void commandCategory(const std::string &categorytype);
+ virtual void commandDescription(const 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 commandInclude(const std::string &word, bool ok);
+ virtual void commandLoad(const std::string &packageName);
+ virtual void commandUnload(const 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);
+ virtual void commandMessage(const std::string &kind,const std::string &levelstr);
+ virtual void SetCurrentFileName(const std::string &fullPathScriptName);
/// Constructor
InterpreterVirtual();
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff