X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=d112f73bdb4f4c19c065bde7e511962c235c2caa;hb=4234999264604da013c2574feef3816c75b3034e;hp=2964c08c4821e0242d2bc93e27dcb9de42b95ac9;hpb=439be4f386a34363bf4487cc1e95b360b36007fc;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 2964c08..d112f73 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/07/03 13:59:32 $ - Version: $Revision: 1.68 $ - - 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/10/17 08:18:13 $ + Version: $Revision: 1.77 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 : @@ -149,8 +162,8 @@ namespace bbtk 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"; @@ -174,7 +187,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"; @@ -337,7 +350,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; */ @@ -403,7 +416,7 @@ namespace bbtk else { std::stringstream mess; - mess << "* ERROR : "<0) @@ -531,13 +544,16 @@ namespace bbtk { str.erase(size-1,1); } + try + { + InterpretLine(str, insideComment); + } + CATCH_MACRO; - InterpretLine(str, insideComment); - - }//while + }//while !eof CloseCurrentFile(); - } - } + }//while >0 + } // try CATCH_MACRO; CloseAllFiles(); @@ -582,11 +598,12 @@ namespace bbtk { str.erase(size-1,1); } - - InterpretLine(str, insideComment); - + try + { + InterpretLine(str, insideComment); + } + CATCH_MACRO; }//while - CloseCurrentFile(); } } @@ -718,7 +735,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) 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) { @@ -744,11 +761,25 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cExec : if (words[1]=="freeze") - mVirtualExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") - mVirtualExecuter->SetNoExecMode(false); - else - mVirtualExecuter->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 : @@ -820,20 +851,17 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) 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]); @@ -1004,7 +1032,7 @@ 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 @@ -1036,8 +1064,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; @@ -1045,8 +1073,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 "*" @@ -1054,7 +1081,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] == ':' ) @@ -1072,85 +1107,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; } @@ -1296,7 +1367,7 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) mIncludeFileName.push_back(includeScriptName); mLine.push_back(0); - return; + return; } //======================================================================= @@ -1370,8 +1441,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"); @@ -1516,7 +1587,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(); @@ -1570,10 +1641,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); @@ -1581,7 +1652,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) @@ -1934,7 +2005,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();