X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=0bb789483e372f35b596a5e87f28c034a660770c;hb=10038b32bc97ccdd4cf6cec3a48cc7113840c5af;hp=ff2fbb17d123e2769ea1bf56a5c35a3f3ef48565;hpb=d7a6d341e2d11c175351212f0bf4812784dc57e5;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index ff2fbb1..0bb7894 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -1,20 +1,33 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk - Module: $RCSfile: bbtkInterpreter.cxx,v $ $ + Module: $RCSfile: bbtkInterpreter.cxx,v $ Language: C++ - Date: $Date: 2008/04/22 06:59:31 $ - Version: $Revision: 1.61 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - + Date: $Date: 2008/12/15 09:04:47 $ + Version: $Revision: 1.81 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* or in the file LICENSE.txt. +* +* As a counterpart to the access to the source code and rights to copy, +* modify and redistribute granted by the license, users are provided only +* with a limited warranty and the software's author, the holder of the +* economic rights, and the successive licensors have only limited +* liability. +* +* The fact that you are presently reading this means that you have had +* knowledge of the CeCILL-B license and that you accept its terms. +* ------------------------------------------------------------------------ */ + /** * \file * \brief class Interpreter : @@ -42,40 +55,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 = e; + } + else if (cpp_file.size()!=0) + { + 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; @@ -96,6 +134,22 @@ namespace bbtk info.help = "Deletes the black box of name "; 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; @@ -117,15 +171,15 @@ 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"; info.argmin = 1; info.argmax = 2; info.code = cExec; - info.syntax = "exec "; - info.help = "Executes the black box of name (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; + info.syntax = "exec "; + info.help = "Executes the black box of name (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"; @@ -149,7 +203,7 @@ namespace bbtk info.argmax = 2; info.code = cDefine; info.syntax = "define []"; - info.help = "Begins the definition of a new type of complex black box called . If if provided will create it in the given package."; + info.help = "Begins the definition of a new type of complex black box called . If is provided will create it in the given package."; mCommandDict[info.keyword] = info; info.keyword = "endefine"; @@ -214,7 +268,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 +309,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 +352,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; /* @@ -311,7 +366,7 @@ namespace bbtk info.argmax = 2; info.code = cWorkspace; info.syntax = "workspace < ( freeze | unfreeze ) | ( rename ) >"; - info.help = "Configures the workspace.\n 'freeze' allow 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."; + 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; */ @@ -329,13 +384,14 @@ namespace bbtk Interpreter::~Interpreter() { bbtkDebugMessageInc("Interpreter",9,"==> Interpreter::~Interpreter()" <0) - { - while (!mFile.back()->eof()) { - mLine.back()++; - char buf[500]; - mFile.back()->getline(buf,500); - std::string str(buf); - int size=str.length(); - if ( str[ size-1 ]==13 ) - { - str.erase(size-1,1); - } - - InterpretLine(str, insideComment); - - }//while - CloseCurrentFile(); - } - } + mStatus = Interpreter_OK; + SwitchToFile(filename,source); + mInsideComment = false; + InterpretCurrentStreams(); + } CATCH_MACRO; - CloseAllFiles(); - bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<0) + mInsideComment = false; + InterpretCurrentStreams(); + } + CATCH_MACRO; + + // CloseAllFiles(); + bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"<0) { while (!mFile.back()->eof()) { mLine.back()++; @@ -556,22 +642,15 @@ namespace bbtk { str.erase(size-1,1); } - - InterpretLine(str, insideComment); - - }//while - + try + { + DoInterpretLine(str); + } + CATCH_MACRO; + } CloseCurrentFile(); } - } - CATCH_MACRO; - - CloseAllFiles(); - bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"< words; SplitLine(line,words); @@ -653,7 +707,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) { bbtkDebugDecTab("Interpreter",9); bbtkMessage("Interpreter",9,"In multiline comment"<HelpMessages(); + } + else + { + sscanf(words[2].c_str(),"%d",&level); + mVirtualExecuter->SetMessageLevel(words[1],level); + } + return; + } + else + { + bbtkMessage("echo",2,line<(mFile.back()); + if (fs!=0) in_script = true; + file = mFileName.back(); + line = mLine.back(); + } + if (command.code==cBreak) + { + /* + std::cout << "BreakException(" + <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 : if (mFileName.size()>0) { - filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back()); + filename = mFileName.back(); //mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back()); } 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); - else if (words[1]=="unfreeze") - mExecuter->SetNoExecMode(false); - else - mExecuter->Execute(words[1]); + { + 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]); + } 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 +891,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,24 +904,13 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cDescription : - mExecuter->Description(words[1]); + mVirtualExecuter->Description(words[1]); break; case cHelp : Help(words); break; - case cMessage : - if (words.size()<3) - { - mExecuter->HelpMessages(); - } - else - { - sscanf(words[2].c_str(),"%d",&level); - mExecuter->SetMessageLevel(words[1],level); - } - break; case cGraph : Graph(words); @@ -811,25 +921,25 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cReset : - this->mExecuter->Reset(); - mFileNameHistory.clear(); + Reset(); + break; + + case cClear : + mVirtualExecuter->Clear(); break; case cInclude : - if (mCommandLine) + // 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]); + InterpretFile(words[1],(words.size()==3)); } else { - SwitchToFile(words[1]); + SwitchToFile(words[1],(words.size()==3) ); } - // if 'source' was given - if (words.size()==3) - { - GetExecuter()->SetCurrentFileName(words[1]); - } - break; + break; case cLoad: GetExecuter()->LoadPackage(words[1]); @@ -839,24 +949,20 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) GetExecuter()->UnLoadPackage(words[1]); break; - case cQuit : - 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; */ @@ -873,10 +979,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) //======================================================================= - /** - * - */ -void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) + void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) { bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""<& //======================================================================= - + //======================================================================= + void Interpreter::Reset() + { + // Cannot close all files if the reset command is read from a file ! + CloseAllFiles(); + mFileNameHistory.clear(); + this->mVirtualExecuter->Reset(); + } + //======================================================================= //======================================================================= /** @@ -918,7 +1029,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 +1088,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,9 +1102,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& * */ -// =================================================================================== - - void Interpreter::SwitchToFile( const std::string& name ) + // ========================================================================= + void Interpreter::SwitchToFile( const std::string& name , bool source ) { // Note : in the following : // name : the user supplied name @@ -1025,8 +1135,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& pkgname = Utilities::ExtractScriptName(name,upath); bbtkMessage("Interpreter",3, - "extract : pkgname [" << pkgname - << "] upath [" << upath << "]" << std::endl); + "package name:[" << pkgname + << "] path:[" << upath << "]" << std::endl); bool fullnameGiven = false; bool foundFile = false; @@ -1034,8 +1144,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // relative (e.g. std/boxes/*) or absolute if (pkgname == "*") { - int nbBssFiles; - + std::stringstream* stream = new std::stringstream; //if (upath.size()!=0) // avoid troubles for "*" @@ -1043,7 +1152,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& if (upath.size()==0) { // bbtkMessage("Interpreter",1, - script_paths.push_back( ConfigurationFile::GetInstance().Get_root_bbs_path() ); + // LG : add all bbs path + // script_paths.push_back( ConfigurationFile::GetInstance().Get_root_bbs_path() ); + std::vector::const_iterator i; + for (i=ConfigurationFile::GetInstance().Get_bbs_paths().begin(); + i!=ConfigurationFile::GetInstance().Get_bbs_paths().end(); + i++) + { + script_paths.push_back(*i); + } } // ==== absolute path provided else if (upath[0]=='/' || upath[1] == ':' ) @@ -1061,85 +1178,82 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // the relative path provided else { - std::vector::const_iterator i; - for (i=ConfigurationFile::GetInstance().Get_bbs_paths().begin(); - i!=ConfigurationFile::GetInstance().Get_bbs_paths().end(); - i++) - { - std::string full_path(*i); - // we *really* want '.' to be the current working directory - if (full_path == ".") { - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - full_path = currentDir; - } // if full_path - - full_path += ConfigurationFile::GetInstance().Get_file_separator(); - full_path += upath; - - if ( Utilities::IsDirectory( full_path ) ) - { - script_paths.push_back(full_path); - } - } - if (script_paths.empty()) - { - bbtkError("no '"<::const_iterator i; + for (i=ConfigurationFile::GetInstance().Get_bbs_paths().begin(); + i!=ConfigurationFile::GetInstance().Get_bbs_paths().end(); + i++) + { + std::string full_path(*i); + // we *really* want '.' to be the current working directory + if (full_path == ".") + { + char buf[2048]; // for getcwd + char * currentDir = getcwd(buf, 2048); + std::string cwd(currentDir); + full_path = currentDir; + } // if full_path + + full_path += ConfigurationFile::GetInstance().Get_file_separator(); + full_path += upath; + + if ( Utilities::IsDirectory( full_path ) ) + { + script_paths.push_back(full_path); + } + } + if (script_paths.empty()) + { + bbtkError("no '"<::iterator i; - for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files + for (i=script_paths.begin();i!=script_paths.end();i++) { bbtkMessage("Interpreter",1, "--> Looking in '" << *i << "'" << std::endl); - 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(); j!= Filenames.end(); ++j) { int lgr = (*j).size(); - if (lgr < 5) - continue; // ignore non .bbs file - if ((*j).substr(lgr-4, 4) != ".bbs") - continue; + if (lgr < 5) continue; + // ignore non .bbp file + if ( (*j).substr(lgr-4, 4) != ".bbp") continue; (*stream) << "include \"" << *j << "\"\n"; - bbtkMessage("Interpreter",2, - " --> Found '" << *j << "'" << std::endl); + bbtkMessage("Interpreter",2," --> Found '" << *j << "'" << std::endl); nbBssFiles++; - } // for vector - - if (nbBssFiles==0) - { - bbtkMessage("Interpreter",1, - " --> No .bbs found"<< std::endl); - } - else - { - bbtkMessage("Interpreter",1, - " --> "< No .bbp found"<< std::endl); + } + else + { + bbtkMessage("Interpreter",1, + " --> "<& // allow user to always forget ".bbs" int l = fullPathScriptName.size(); - if (l!=0) { - - if (l>4) - { - if (fullPathScriptName.substr(l-4, 4) != ".bbs") + if (l!=0) + { + if ((fullPathScriptName.substr(l-4, 4) != ".bbs")&& + (fullPathScriptName.substr(l-4, 4) != ".bbp")) { - fullPathScriptName = fullPathScriptName + ".bbs"; - } - } - else - { - fullPathScriptName = fullPathScriptName + ".bbs"; - } - - if ( Utilities::FileExists(fullPathScriptName)) - { - foundFile = true; - } - } // endif l != 0 + std::string tfullPathScriptName = fullPathScriptName + ".bbs"; + if ( Utilities::FileExists(tfullPathScriptName) ) + { + fullPathScriptName = tfullPathScriptName; + foundFile = true; + } + else + { + tfullPathScriptName = fullPathScriptName + ".bbp"; + if ( Utilities::FileExists(tfullPathScriptName) ) + { + fullPathScriptName = tfullPathScriptName; + foundFile = true; + } + } + } + else + { + if ( Utilities::FileExists(fullPathScriptName) ) + { + foundFile = true; + } + } + } // endif l != 0 } else - // =============================== iterate on the paths - { + // =============================== iterate on the paths + { script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); std::string path; std::vector::iterator i; for (i=script_paths.begin();i!=script_paths.end();++i) - { - path = *i; - // we *really* want '.' to be the current working directory - if (path == ".") { - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - path = currentDir; - } - - fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); + { + path = *i; + // we *really* want '.' to be the current working directory + if (path == ".") + { + char buf[2048]; // for getcwd + char * currentDir = getcwd(buf, 2048); + std::string cwd(currentDir); + path = currentDir; + } - // Check if library exists - 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, - " [" <& else bbtkError("Script ["<SetCurrentFileName(fullPathScriptName); + } return; } @@ -1285,13 +1438,11 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) mIncludeFileName.push_back(includeScriptName); mLine.push_back(0); - return; + return; } + //======================================================================= //======================================================================= - /** - * - */ void Interpreter::CloseCurrentFile() { bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()" @@ -1323,9 +1474,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) //======================================================================= //======================================================================= - /** - * - */ void Interpreter::CloseAllFiles() { bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()" @@ -1343,9 +1491,6 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) //======================================================================= - /** - * - */ void Interpreter::InterpretCommand( const std::vector& words, CommandInfoType& info ) { @@ -1359,8 +1504,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"); @@ -1505,7 +1650,7 @@ void Interpreter::Help(const std::vector& words) c = mCommandDict.find(s); if ( c == mCommandDict.end() ) { bbtkError(s<<" : Unknown command"); - } + } // std::cout << " " << s << " : "<< std::endl; // CommandParamDictType::iterator i; // for ( i = c->second.begin(); @@ -1559,10 +1704,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 +1715,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 +1723,7 @@ void Interpreter::Help(const std::vector& words) c=0; read ( STDIN_FILENO, &c, 4) ; - bbtkDebugMessage("Debug",9,"[0x"<& words) mCommandLine = true; bool again = true; - bool insideComment = false; // for multiline comment + // bool insideComment = false; // for multiline comment + mInsideComment = false; do { try { std::string line; GetLineFromPrompt(line); - InterpretLine(line, insideComment); + DoInterpretLine(line); //, insideComment); } + /* catch (QuitException e) { bbtkMessage("Interpreter",1,"Interpreter : Quit"<& 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 +2026,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 +2051,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 +2071,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,11 +2195,39 @@ void Interpreter::NewGUI(const std::string& boxname, //========================================================================== - void Interpreter::ObjectInfo(const std::string& name) + 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); + } + } + //========================================================================== + + /* + //========================================================================== + // Adds a callback when 'break' command issued + void Interpreter::AddBreakObserver( BreakCallbackType c ) { - Object:: PrintObjectInfo(name); + mBreakSignal.connect(c); } //========================================================================== + */ + //========================================================================== std::string Interpreter::GetObjectName() const { @@ -2081,7 +2263,7 @@ size_t Interpreter::GetObjectInternalSize() const { size_t s = Superclass::GetObjectRecursiveSize(); s += Interpreter::GetObjectInternalSize(); - s += mExecuter->GetObjectRecursiveSize(); + s += mVirtualExecuter->GetObjectRecursiveSize(); return s; } //==========================================================================