From 4cb6c59ce12259b0f61bd465aac75fe8c822952f Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sat, 18 Sep 2010 22:31:40 +0000 Subject: [PATCH] no message --- kernel/src/bbtkInterpreter.cxx | 43 +++++++------- kernel/src/bbtkInterpreter.h | 42 +++++++------- kernel/src/bbtkInterpreterVirtual.cxx | 81 ++++++++------------------- kernel/src/bbtkInterpreterVirtual.h | 40 ++++++------- 4 files changed, 86 insertions(+), 120 deletions(-) diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 649c2a6..749d11a 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/17 15:56:51 $ - Version: $Revision: 1.90 $ + Date: $Date: 2010/09/18 22:31:40 $ + Version: $Revision: 1.91 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -374,22 +374,22 @@ namespace bbtk */ - 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); } @@ -399,7 +399,7 @@ namespace bbtk 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); } @@ -409,18 +409,18 @@ namespace bbtk 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") { @@ -445,32 +445,32 @@ namespace bbtk } - 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); } @@ -481,7 +481,7 @@ namespace bbtk 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 @@ -496,12 +496,12 @@ namespace bbtk } - 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); } @@ -529,8 +529,7 @@ namespace bbtk 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); @@ -1281,7 +1280,7 @@ namespace bbtk */ //======================================================================= - void Interpreter::SetCurrentFileName(std::string fullPathScriptName) // virtual + void Interpreter::SetCurrentFileName(const std::string &fullPathScriptName) // virtual { GetExecuter()->SetCurrentFileName(fullPathScriptName); } diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index ab4d3fd..a402908 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/17 15:56:52 $ - Version: $Revision: 1.43 $ + Date: $Date: 2010/09/18 22:31:40 $ + Version: $Revision: 1.44 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -338,31 +338,31 @@ namespace bbtk /// 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 diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 88e8f52..d49124b 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -578,8 +578,6 @@ namespace bbtk //======================================================================= InterpreterVirtual::ExitStatus InterpreterVirtual::InterpretFile( const std::string& filename, bool source ) { - - printf("EED InterpreterVirtual::InterpretFile 1\n"); bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretFile(\""< InterpreterVirtual::DoInterpretLine(\"" < words; SplitLine(line,words); -printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() ); // Empty line @@ -859,7 +850,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int) return; } -printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() ); // Command CommandInfoType command; @@ -872,7 +862,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int std::string left,right,left2,right2; std::string filename; -//ups1 EED borrame // message command if (command.code==cMessage) { @@ -931,12 +920,10 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int //std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<Create(words[1],words[2]); break; @@ -971,7 +958,8 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 5 %s %s\n", this, words[1]. } if (words.size()==2) { - commandDefine(words[1],"",filename); + std::string packTmp = ""; + commandDefine(words[1],packTmp,filename); //EED Borrame mVirtualExecuter->Define(words[1],"",filename); } else @@ -1135,10 +1123,7 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 5 %s %s\n", this, words[1]. bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\"" <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()" < InterpreterVirtual::InterpretCommand(...)"<& words,"<second; - -printf("EED InterpreterVirtual::InterpretCommand 4 \n" ); bbtkDebugMessage("interpreter",9,"<== InterpreterVirtual::InterpretCommand(...)"<& words); /// @@ -298,31 +298,31 @@ namespace bbtk /// 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(); -- 2.45.1