X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=62f523319641ce16d9e5e447d22207fcbd2ebc81;hb=dad2f344cba135eec67eba321b29ffd61975e9c9;hp=febbd934840929bd6dc0002b8ca00ab0d83bd772;hpb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index febbd93..62f5233 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/04/09 11:16:57 $ - Version: $Revision: 1.59 $ + Date: $Date: 2008/04/25 08:05:23 $ + Version: $Revision: 1.65 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -39,37 +39,45 @@ namespace bbtk { - //Interpreter* Interpreter::mGlobalInterpreter = NULL; + //======================================================================= + Interpreter::Pointer Interpreter::New(const std::string& cpp_file) + { + bbtkDebugMessage("Kernel",9,"Interpreter::New()"<0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1); + + 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()" <(bbtk::Transcriptor::New(cpp_file)); } else { - mExecuter = new bbtk::Executer(); + bbtk::Executer::Pointer exe = bbtk::Executer::New(); + mRealExecuter = exe; + mVirtualExecuter = boost::static_pointer_cast(exe); } - mExecuter->SetInterpreter(this); + + // Lock this pointer or will auto-destruct !! + mVirtualExecuter->SetInterpreter(MakePointer(this,true)); // For the time being, comment out previous line, and // uncomment next line to check Transcriptor - //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); + //mVirtualExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); // Builds the commands dict CommandInfoType info; @@ -111,7 +119,7 @@ bufferNb =0; 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')."; + 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"; @@ -291,6 +299,14 @@ bufferNb =0; 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; @@ -314,10 +330,9 @@ bufferNb =0; */ Interpreter::~Interpreter() { - bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" < Interpreter::~Interpreter()" < words; SplitLine(line,words); @@ -677,25 +670,25 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) switch (command.code) { case cNew : - mExecuter->Create(words[1],words[2]); + mVirtualExecuter->Create(words[1],words[2]); break; case cDelete : - mExecuter->Destroy(words[1]); + mVirtualExecuter->Destroy(words[1]); break; case cConnect : Utilities::SplitAroundFirstDot(words[1],left,right); Utilities::SplitAroundFirstDot(words[2],left2,right2); - mExecuter->Connect(left,right,left2,right2); + mVirtualExecuter->Connect(left,right,left2,right2); break; case cPackage : - mExecuter->BeginPackage(words[1]); + mVirtualExecuter->BeginPackage(words[1]); break; case cEndPackage : - mExecuter->EndPackage(); + mVirtualExecuter->EndPackage(); break; case cDefine : @@ -705,52 +698,52 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) } if (words.size()==2) { - mExecuter->Define(words[1],"",filename); + mVirtualExecuter->Define(words[1],"",filename); } else { - mExecuter->Define(words[1],words[2],filename); + mVirtualExecuter->Define(words[1],words[2],filename); } break; case cEndDefine : - mExecuter->EndDefine(); + mVirtualExecuter->EndDefine(); break; case cKind : - mExecuter->Kind(words[1]); + mVirtualExecuter->Kind(words[1]); break; case cPrint : - mExecuter->Print(words[1]); + mVirtualExecuter->Print(words[1]); break; case cExec : if (words[1]=="freeze") - mExecuter->SetNoExecMode(true); + mVirtualExecuter->SetNoExecMode(true); else if (words[1]=="unfreeze") - mExecuter->SetNoExecMode(false); + mVirtualExecuter->SetNoExecMode(false); else - mExecuter->Execute(words[1]); + mVirtualExecuter->Execute(words[1]); break; case cInput : Utilities::SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineInput(words[1],left,right,words[3]); + mVirtualExecuter->DefineInput(words[1],left,right,words[3]); break; case cOutput : Utilities::SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineOutput(words[1],left,right,words[3]); + mVirtualExecuter->DefineOutput(words[1],left,right,words[3]); break; case cSet : Utilities::SplitAroundFirstDot(words[1],left,right); - mExecuter->Set(left,right,words[2]); + mVirtualExecuter->Set(left,right,words[2]); break; case cAuthor : - mExecuter->Author(words[1]); + mVirtualExecuter->Author(words[1]); break; case cNewGUI : @@ -758,7 +751,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cCategory : - mExecuter->Category(words[1]); + mVirtualExecuter->Category(words[1]); break; case cIndex : @@ -771,7 +764,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cDescription : - mExecuter->Description(words[1]); + mVirtualExecuter->Description(words[1]); break; case cHelp : @@ -781,12 +774,12 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cMessage : if (words.size()<3) { - mExecuter->HelpMessages(); + mVirtualExecuter->HelpMessages(); } else { sscanf(words[2].c_str(),"%d",&level); - mExecuter->SetMessageLevel(words[1],level); + mVirtualExecuter->SetMessageLevel(words[1],level); } break; @@ -799,8 +792,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cReset : - this->mExecuter->Reset(); - mFileNameHistory.clear(); + Reset(); break; case cInclude : @@ -828,19 +820,23 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cQuit : - delete mExecuter; throw QuitException(); break; + + case cDebug : + if (words.size()==2) Debug(words[1]); + else Debug(""); + break; /* obsolete case cWorkspace : if (words.size() == 2) { - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); + if (words[1]=="freeze") mVirtualExecuter->SetNoExecMode(true); + else if (words[1]=="unfreeze") mVirtualExecuter->SetNoExecMode(false); } else { - mExecuter->SetWorkspaceName(words[2]); + mVirtualExecuter->SetWorkspaceName(words[2]); } break; */ @@ -893,7 +889,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& //======================================================================= - + //======================================================================= + void Interpreter::Reset() + { + // Cannot close all files if the reset command is read from a file ! + // CloseAllFiles(); + mFileNameHistory.clear(); + this->mVirtualExecuter->Reset(); + } + //======================================================================= //======================================================================= /** @@ -902,7 +906,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& /* void Interpreter::Print( const std::string& str) { - if (mExecuter->GetNoExecMode()) return; + if (mVirtualExecuter->GetNoExecMode()) return; bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<& std::string tok,box,output; tok = str.substr(lastPos, pos - lastPos); Utilities::SplitAroundFirstDot(tok,box,output); - chains.push_back( mExecuter->Get(box,output) ); + chains.push_back( mVirtualExecuter->Get(box,output) ); // InterpretLine("connect %tok% _C_.In%num%") @@ -961,7 +965,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& std::vector::iterator i; for (i= chains.begin(); i!=chains.end(); ++i) { - // bbtkMessage("Echo",1,*i); + Utilities::SubsBackslashN(*i); std::cout << *i; } @@ -975,8 +979,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& * */ -// =================================================================================== - + // ========================================================================= void Interpreter::SwitchToFile( const std::string& name ) { // Note : in the following : @@ -1562,7 +1565,7 @@ void Interpreter::Help(const std::vector& words) c=0; read ( STDIN_FILENO, &c, 4) ; - bbtkDebugMessage("Debug",9,"[0x"<& words) if (words.size()==1) { - page = mExecuter->ShowGraph(".","0","0","","","",system_display); + page = mVirtualExecuter->ShowGraph(".","0","0","","","",system_display); } else if (words.size()==2) { - page = mExecuter->ShowGraph(words[1],"0","0","","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],"0","0","","","",system_display); } else if (words.size()==3) { - page = mExecuter->ShowGraph(words[1],words[2],"0","","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],"0","","","",system_display); } else if (words.size()==4) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display); } else if (words.size()==5) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display); } else if (words.size()==6) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],"",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],"",system_display); } else if (words.size()==7) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display); } if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) @@ -1862,6 +1865,11 @@ void Interpreter::Index(const std::string& filename, void Interpreter::NewGUI(const std::string& boxname, const std::string& instanceName) { + if (mRealExecuter.expired()) + { + bbtkError("command 'newgui' cannot be compiled yet"); + } + std::string typeName = instanceName+"Type"; std::stringstream* s = new std::stringstream; // create the complex box @@ -1881,17 +1889,26 @@ void Interpreter::NewGUI(const std::string& boxname, // connected and can be adapted from a widget adaptor // vector which stores the list of inputs of the box which must be connected std::vector in; - Factory* F = mExecuter->GetFactory(); - if (F==0) + + Factory::Pointer F = mVirtualExecuter->GetFactory(); + /* + Package::Pointer user = F->GetPackage("user"); + */ + ComplexBlackBoxDescriptor::Pointer workspace = + mRealExecuter.lock()->GetCurrentDescriptor(); + + if (workspace==0) { delete s; - bbtkError("Interpreter::CreateGUI : could not access the executer factory"); + bbtkError("Interpreter::CreateGUI : could not access the executer currently defined complex box"); } - Package* user = F->GetPackage("user"); - ComplexBlackBoxDescriptor* workspace - = (ComplexBlackBoxDescriptor*)user->GetBlackBoxMap().find("workspace")->second; - - BlackBox* box = workspace->GetPrototype()->bbGetBlackBox(boxname); + + + /* + (ComplexBlackBoxDescriptor::Pointer)(user->GetBlackBoxMap().find("workspace")->second.get()); + */ + + BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname); // BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap(); int nb = 0; BlackBox::InputConnectorMapType::iterator i; @@ -1919,7 +1936,7 @@ void Interpreter::NewGUI(const std::string& boxname, // Sets the label of the widget adaptor to the name of the input (*s) << " set "<first<<".Label "<first<first<<".In \"" + (*s) << " set "<first<<".In \" " <bbGetInputAsString(i->first)<<"\"" << std::endl; // store the input name @@ -1943,7 +1960,7 @@ void Interpreter::NewGUI(const std::string& boxname, // Sets the label of the widget adaptor to the name of the input (*s) << " set "<first<<"Widget.Label "<first<first<<"Widget.In \"" + (*s) << " set "<first<<"Widget.In \" " <bbGetInputAsString(i->first)<<"\""<< std::endl; // store the input name in.push_back(i->first); @@ -1964,7 +1981,7 @@ void Interpreter::NewGUI(const std::string& boxname, // Sets the label of the widget adaptor to the name of the input (*s) << " set "<first<<".Title "<first<first<<".In \"" + (*s) << " set "<first<<".In \" " <bbGetInputAsString(i->first)<<"\""<< std::endl; // store the input name in.push_back(i->first); @@ -2014,6 +2031,70 @@ void Interpreter::NewGUI(const std::string& boxname, } //======================================================================= + + + //========================================================================== + void Interpreter::Debug(const std::string& name) + { + if ((name.length()==2)&&(name[0]=='-')) + { + if (name[1]=='D') + { + bbtk::StaticInitTime::PrintObjectListInfo = true; + } + if (name[1]=='C') + { + // int o = MessageManager::GetMessageLevel("debug"); + // if (o<2) MessageManager::SetMessageLevel("debug",2); + mVirtualExecuter->GetFactory()->CheckPackages(); + // MessageManager::SetMessageLevel("debug",o); + } + } + else + { + Object:: PrintObjectListInfo(name); + } + } + //========================================================================== + //========================================================================== + std::string Interpreter::GetObjectName() const + { + return std::string("Interpreter"); + } + //========================================================================== + + //========================================================================== + std::string Interpreter::GetObjectInfo() const + { + std::stringstream i; + return i.str(); + } + //========================================================================== + + //========================================================================== +size_t Interpreter::GetObjectSize() const +{ + size_t s = Superclass::GetObjectSize(); + s += Interpreter::GetObjectInternalSize(); + return s; + } + //========================================================================== + //========================================================================== +size_t Interpreter::GetObjectInternalSize() const +{ + size_t s = sizeof(Interpreter); + return s; + } + //========================================================================== + //========================================================================== + size_t Interpreter::GetObjectRecursiveSize() const + { + size_t s = Superclass::GetObjectRecursiveSize(); + s += Interpreter::GetObjectInternalSize(); + s += mVirtualExecuter->GetObjectRecursiveSize(); + return s; + } + //========================================================================== }//namespace