X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=ab0075d2e84030d01bd0ac1bd3c5a16b0adf3d46;hb=b9da3baf83b7791357c78322e3280314ec782f40;hp=39eb9ce948a2b55632a69945b8677661df6f5c22;hpb=f0d396e8c3585edca83571ed0eeacef1b72828f1;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 39eb9ce..ab0075d 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/03/20 11:04:57 $ - Version: $Revision: 1.49 $ + Date: $Date: 2008/03/26 08:51:43 $ + Version: $Revision: 1.56 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,8 @@ namespace bbtk Interpreter::Interpreter() : mUser(0), - mCommandLine(false) + mCommandLine(false), + mThrow(false) { bufferNb =0; bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1); @@ -295,6 +296,146 @@ bufferNb =0; //======================================================================= + InterpreterError::InterpreterError( const std::string& message, + bool in_script_file, + const std::string& script_file, + int script_line + ) + : Exception("Interpreter",0,message), + mInScriptFile(in_script_file), + mScriptFile(script_file), + mScriptLine(script_line) + { + } + InterpreterError::InterpreterError( const Exception& excep, + bool in_script_file, + const std::string& script_file, + int script_line + ) + : Exception(excep), + mInScriptFile(in_script_file), + mScriptFile(script_file), + mScriptLine(script_line) + { + } + //======================================================================= + void Interpreter::CatchBbtkException( const bbtk::Exception& e ) + { + if (mThrow) + { + bool in_script = false; + std::string file(""); + int line = 0; + if (mFileName.size()) { + std::ifstream* fs = dynamic_cast(mFile.back()); + if (fs!=0) in_script = true; + file = mFileName.back(); + line = mLine.back(); + } + CloseAllFiles(); + throw InterpreterError(e,in_script,file,line); + } + else + { + std::stringstream mess; + mess << "* ERROR : "<(mFile.back()); + if (fs!=0) in_script = true; + file = mFileName.back(); + line = mLine.back(); + } + CloseAllFiles(); + throw InterpreterError(e.what(),in_script,file,line); + } + else + { + std::stringstream mess; + mess << "* ERROR : "<(mFile.back()); + if (fs!=0) in_script = true; + file = mFileName.back(); + line = mLine.back(); + } + CloseAllFiles(); + throw InterpreterError("Unknown exception caught", + in_script,file,line); + } + else + { + std::stringstream mess; + mess << "* UNDEFINED ERROR (not a bbtk nor a std exception)" + << std::endl; + if (mFileName.size()) { + mess << "* FILE : \""<Remove(words[1]); + mExecuter->Destroy(words[1]); break; case cConnect : @@ -613,7 +692,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cPrint : - Print(words[1]); /// \todo use generate command + mExecuter->Print(words[1]); break; case cExec : @@ -622,7 +701,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); else - mExecuter->Update(words[1]); + mExecuter->Execute(words[1]); break; case cInput : @@ -668,12 +747,12 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cMessage : if (words.size()<3) { - bbtk::MessageManager::PrintInfo(); + mExecuter->HelpMessages(); } else { - sscanf(words[2].c_str(),"%d",&level); - bbtk::MessageManager::SetMessageLevel(words[1],level); + sscanf(words[2].c_str(),"%d",&level); + mExecuter->SetMessageLevel(words[1],level); } break; @@ -706,18 +785,18 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cLoad: - GetExecuter()->GetFactory()->LoadPackage(words[1]); + GetExecuter()->LoadPackage(words[1]); break; case cUnload: - GetExecuter()->GetFactory()->UnLoadPackage(words[1]); + GetExecuter()->UnLoadPackage(words[1]); break; case cQuit : delete mExecuter; throw QuitException(); break; - + /* obsolete case cWorkspace : if (words.size() == 2) { @@ -729,7 +808,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) mExecuter->SetWorkspaceName(words[2]); } break; - + */ default: bbtkInternalError("should not reach here !!!"); } @@ -779,27 +858,13 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& //======================================================================= - //======================================================================= - // Replaces substrings "\\n" by a real carriage return "\n" - void SubsBackslashN ( std::string& s ) - { - std::string ss("\\n"); - std::string::size_type pos = 0; - pos = s.find(ss,0); - char* cr = "\n"; - while ( pos != std::string::npos ) - { - s.replace(pos,2,cr,1); - pos = s.find(ss, pos-1); - } - } - //======================================================================= - + //======================================================================= /** * */ + /* void Interpreter::Print( const std::string& str) { if (mExecuter->GetNoExecMode()) return; @@ -862,12 +927,13 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& for (i= chains.begin(); i!=chains.end(); ++i) { // bbtkMessage("Echo",1,*i); - SubsBackslashN(*i); + Utilities::SubsBackslashN(*i); std::cout << *i; } std::cout << std::endl; bbtkDebugDecTab("Interpreter",9); } +*/ //======================================================================= /** @@ -902,110 +968,125 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& bbtkMessage("Interpreter",1, "look for : [" << name << "]" << std::endl); - script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); + std::string upath; pkgname = Utilities::ExtractScriptName(name,upath); - bbtkMessage("Interpreter",1, + bbtkMessage("Interpreter",3, "extract : pkgname [" << pkgname << "] upath [" << upath << "]" << std::endl); bool fullnameGiven = false; bool foundFile = false; - if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*) - { - int nbBssFiles; - - std::stringstream* stream = new std::stringstream; - //if (upath.size()!=0) // avoid troubles for "*" - - if (upath[0]=='/' || upath[1] == ':' ) // ==== absolute name, load all .bbs files + // ==== "*" provided : load all scripts in given path + // relative (e.g. std/boxes/*) or absolute + if (pkgname == "*") { - int nbFiles = Utilities::Explore(upath, false, Filenames); - nbBssFiles = 0; - for (std::vector::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) - { - int lgr = (*i).size(); - if (lgr < 5) - continue; // ignore non .bbs file - if ((*i).substr(lgr-4, 4) != ".bbs") - continue; - - (*stream) << "include " << *i << "\n"; - - nbBssFiles++; - } // for vector - if (nbBssFiles==0){ - bbtkMessage("Interpreter",2, - "WARNING : No '.bbs' file found in [" - << upath << "]" << std::endl); - } else { - SwitchToStream(stream); - } - return; - } // if upath - - std::string path; - std::vector::iterator i; - std::string fullDirectoryName; - for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files - { - 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; - } // if path - - fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); + int nbBssFiles; + + std::stringstream* stream = new std::stringstream; + //if (upath.size()!=0) // avoid troubles for "*" + + // ==== no path provided : look in root bbs path + if (upath.size()==0) + { + // bbtkMessage("Interpreter",1, + script_paths.push_back( ConfigurationFile::GetInstance().Get_root_bbs_path() ); + } + // ==== absolute path provided + else if (upath[0]=='/' || upath[1] == ':' ) + { + if ( Utilities::IsDirectory( upath ) ) + { + script_paths.push_back(upath); + } + else + { + bbtkError("'"<::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); + } + } + } + // === search paths list complete : now explore it + if (script_paths.empty()) + { + bbtkMessage("Interpreter",1, + "'"<::iterator i; + for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files + { + bbtkMessage("Interpreter",1, + "--> Looking in '" << *i << "'" << std::endl); + + + Filenames.clear(); + 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; + + (*stream) << "include \"" << *j << "\"\n"; + 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, + " --> "<::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) - { - int lgr = (*i).size(); - if (lgr < 5) - continue; // ignore non .bbs file - if ((*i).substr(lgr-4, 4) != ".bbs") - continue; - - (*stream) << "include " << *i << "\n"; - nbBssFiles++; - } // for vector - if (nbBssFiles==0){ - bbtkMessage("Interpreter",1, - "WARNING : No '.bbs' file found in [" - << fullDirectoryName << "]" << std::endl); - } else { - SwitchToStream(stream); - } - - //break; // a directory was found; we stop iterating - // LG : No! We want all files included ! - } // for vector - return; - } // if * // if name starts with a / or a . or contains : user is assumed to have passed a relative/absolute name // (not only a plain script name) @@ -1044,61 +1125,64 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } // 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); - - // 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, - " [" <