X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=5bee02dceb52e0be35b0201ccafa322982fdebe8;hb=d325fab57e4ef788ab6cca976407c61e58e3ecff;hp=ff2fbb17d123e2769ea1bf56a5c35a3f3ef48565;hpb=d7a6d341e2d11c175351212f0bf4812784dc57e5;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index ff2fbb1..5bee02d 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/22 06:59:31 $ - Version: $Revision: 1.61 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.69 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,40 +42,65 @@ namespace bbtk //======================================================================= 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); + 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)); + mVirtualExecuter = boost::static_pointer_cast(bbtk::Transcriptor::New(cpp_file)); } else { - mExecuter = boost::static_pointer_cast(bbtk::Executer::New()); + bbtk::Executer::Pointer exe = bbtk::Executer::New(); + mRealExecuter = exe; + mVirtualExecuter = boost::static_pointer_cast(exe); } // Lock this pointer or will auto-destruct !! - mExecuter->SetInterpreter(MakePointer(this,true)); + if (!e) 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; @@ -117,7 +142,7 @@ namespace bbtk 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"; @@ -214,7 +239,7 @@ namespace bbtk info.argmax = 0; info.code = cReset; info.syntax = "reset"; - info.help = "Deletes all boxes and unloads all packages (bbi is reset to its start state)"; + info.help = "Deletes all boxes and unloads all packages (reset to start state)"; mCommandDict[info.keyword] = info; info.keyword = "author"; @@ -255,14 +280,15 @@ namespace bbtk 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.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 bbi 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)."; + 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"; @@ -297,12 +323,12 @@ namespace bbtk 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 = "object"; + info.keyword = "debug"; info.argmin = 0; info.argmax = 1; - info.code = cObject; - info.syntax = "object "; - info.help = "Provides debug info on object "; + 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; /* @@ -329,7 +355,7 @@ namespace bbtk Interpreter::~Interpreter() { bbtkDebugMessageInc("Interpreter",9,"==> Interpreter::~Interpreter()" < words; SplitLine(line,words); @@ -689,25 +694,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 : @@ -717,52 +722,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 : @@ -770,7 +775,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cCategory : - mExecuter->Category(words[1]); + mVirtualExecuter->Category(words[1]); break; case cIndex : @@ -783,7 +788,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cDescription : - mExecuter->Description(words[1]); + mVirtualExecuter->Description(words[1]); break; case cHelp : @@ -793,12 +798,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; @@ -811,8 +816,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cReset : - this->mExecuter->Reset(); - mFileNameHistory.clear(); + Reset(); break; case cInclude : @@ -843,20 +847,20 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) throw QuitException(); break; - case cObject : - if (words.size()==2) ObjectInfo(words[1]); - else ObjectInfo(""); + 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; */ @@ -909,7 +913,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(); + } + //======================================================================= //======================================================================= /** @@ -918,7 +930,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%") @@ -977,7 +989,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; } @@ -991,8 +1003,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& * */ -// =================================================================================== - + // ========================================================================= void Interpreter::SwitchToFile( const std::string& name ) { // Note : in the following : @@ -1101,7 +1112,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& Filenames.clear(); - int nbFiles = Utilities::Explore(*i, false, Filenames); + //int nbFiles = + Utilities::Explore(*i, false, Filenames); nbBssFiles = 0; for (std::vector::iterator j = Filenames.begin(); @@ -1359,8 +1371,8 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) } // tests the number of args - if ( ( words.size()-1 < c->second.argmin ) || - ( words.size()-1 > c->second.argmax ) ) + if ( ( ((int)words.size())-1 < c->second.argmin ) || + ( ((int)words.size())-1 > c->second.argmax ) ) { HelpCommand(words[0]); bbtkError(words[0]<<" : wrong number of arguments"); @@ -1559,10 +1571,10 @@ void Interpreter::Help(const std::vector& words) void Interpreter::GetLineFromPrompt(std::string& s) { int c; - int ind=0; + unsigned int ind=0; - int MAX_LINE_SIZE = 160; - int MAX_HISTORY_SIZE = 100; + unsigned int MAX_LINE_SIZE = 160; + unsigned int MAX_HISTORY_SIZE = 100; char* newline = new char[MAX_LINE_SIZE]; memset(newline,0,MAX_LINE_SIZE); @@ -1570,7 +1582,7 @@ void Interpreter::Help(const std::vector& words) memset(histline,0,MAX_LINE_SIZE); char* line = newline; - int hist = mHistory.size(); + unsigned int hist = mHistory.size(); write(1,"> ",2); while(1) @@ -1578,7 +1590,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() ) ) @@ -1878,6 +1890,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 @@ -1898,16 +1915,17 @@ void Interpreter::NewGUI(const std::string& boxname, // vector which stores the list of inputs of the box which must be connected std::vector in; - Factory::Pointer F = mExecuter->GetFactory(); + Factory::Pointer F = mVirtualExecuter->GetFactory(); /* Package::Pointer user = F->GetPackage("user"); */ - ComplexBlackBoxDescriptor::Pointer workspace = mExecuter->GetWorkspace(); + ComplexBlackBoxDescriptor::Pointer workspace = + mRealExecuter.lock()->GetCurrentDescriptor(); if (workspace==0) { delete s; - bbtkError("Interpreter::CreateGUI : could not access the executer workspace"); + bbtkError("Interpreter::CreateGUI : could not access the executer currently defined complex box"); } @@ -1917,7 +1935,7 @@ void Interpreter::NewGUI(const std::string& boxname, BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname); // BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap(); - int nb = 0; + // int nb = 0; BlackBox::InputConnectorMapType::iterator i; for (i=box->bbGetInputConnectorMap().begin(); i!=box->bbGetInputConnectorMap().end(); @@ -2041,9 +2059,26 @@ void Interpreter::NewGUI(const std::string& boxname, //========================================================================== - void Interpreter::ObjectInfo(const std::string& name) + void Interpreter::Debug(const std::string& name) { - Object:: PrintObjectInfo(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); + } } //========================================================================== //========================================================================== @@ -2081,7 +2116,7 @@ size_t Interpreter::GetObjectInternalSize() const { size_t s = Superclass::GetObjectRecursiveSize(); s += Interpreter::GetObjectInternalSize(); - s += mExecuter->GetObjectRecursiveSize(); + s += mVirtualExecuter->GetObjectRecursiveSize(); return s; } //==========================================================================