X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=7a7e08b47b0c25fd9827e64d4a6c0b2995808f85;hb=0d9c3f691b5889816aea4d7e813f58e1950f81ed;hp=c5a69ca1a5f6f44060f4f38c71161d7a32730e2f;hpb=998354bb81a4f450cae3a2263838d7d3b6024bac;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index c5a69ca..7a7e08b 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/02/05 12:16:55 $ - Version: $Revision: 1.24 $ + Date: $Date: 2008/02/14 20:26:54 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,10 +17,10 @@ =========================================================================*/ /** * \file - * \brief class Interpreter : + * \brief class Interpreter : */ -#include "bbtkInterpreter.h" +#include "bbtkInterpreter.h" #include "bbtkMessageManager.h" #include "bbtkConfigurationFile.h" #include "bbtkWxConsole.h" @@ -40,7 +40,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; //======================================================================= /** - * + * */ Interpreter::Interpreter() : @@ -52,9 +52,12 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; mGlobalInterpreter = this; - // mFactory = new bbtk::Factory(); mExecuter = new bbtk::Executer(); - //mExecuter->SetFactory(mFactory); + + // For the time being, comment out previous line, and + // uncomment next line to check Transcriptor + + //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); // Builds the commands dict CommandInfoType info; @@ -170,7 +173,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories']]"; info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories"; - mCommandDict[info.keyword] = info; + mCommandDict[info.category] = info; info.category = "reset"; //EED info.argmin = 0; @@ -222,10 +225,10 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.category = "include"; info.argmin = 1; - info.argmax = 1; + info.argmax = 2; info.code = cInclude; - info.syntax = "include "; - info.help = "Includes the file "; + 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)."; mCommandDict[info.category] = info; info.category = "quit"; @@ -297,7 +300,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; * */ void Interpreter::InterpretFile( const std::string& filename, - bool use_configuration_file) + bool use_configuration_file) { bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<Create(words[1],words[2]); break; - + case cDelete : // TO DO !! // mExecuter->Remove(words[1]); break; - + case cConnect : Utilities::SplitAroundFirstDot(words[1],left,right); Utilities::SplitAroundFirstDot(words[2],left2,right2); mExecuter->Connect(left,right,left2,right2); break; - + case cPackage : mExecuter->BeginPackage(words[1]); break; @@ -459,26 +462,26 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cEndPackage : mExecuter->EndPackage(); break; - + case cDefine : if (mFileName.size()>0) { - filename = Utilities::get_file_name(mFileName.back()); + filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back()); } if (words.size()==2) { mExecuter->Define(words[1],"",filename); } - else + else { mExecuter->Define(words[1],words[2],filename); } break; - + case cEndDefine : mExecuter->EndDefine(); break; - + case cPrint : Print(words[1]); /// \todo use mExecuter break; @@ -488,103 +491,110 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) mExecuter->SetNoExecMode(true); else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); - else + else mExecuter->Update(words[1]); break; - + case cInput : Utilities::SplitAroundFirstDot(words[2],left,right); mExecuter->DefineInput(words[1],left,right,words[3]); break; - + case cOutput : Utilities::SplitAroundFirstDot(words[2],left,right); mExecuter->DefineOutput(words[1],left,right,words[3]); break; - + case cSet : Utilities::SplitAroundFirstDot(words[1],left,right); mExecuter->Set(left,right,words[2]); break; - + case cAuthor : mExecuter->Author(words[1]); break; - case cCategory : - mExecuter->Category(words[1]); - break; - - case cIndex : - if (words.size()==1) - Index("tmp_index.html"); - else if (words.size()==2) - Index(words[1]); - else if (words.size()==3) - Index(words[1],words[2]); - break; - case cDescription : - mExecuter->Description(words[1]); + case cCategory : + mExecuter->Category(words[1]); break; - + + case cIndex : + if (words.size()==1) + Index("tmp_index.html"); + else if (words.size()==2) + Index(words[1]); + else if (words.size()==3) + Index(words[1],words[2]); + break; + + case cDescription : + mExecuter->Description(words[1]); + break; + case cHelp : Help(words); break; - + case cMessage : - if (words.size()<3) + if (words.size()<3) { - bbtk::MessageManager::PrintInfo(); + bbtk::MessageManager::PrintInfo(); } - else + else { sscanf(words[2].c_str(),"%d",&level); bbtk::MessageManager::SetMessageLevel(words[1],level); } break; - - case cGraph : + + case cGraph : Graph(words); break; - + case cConfig : - Config(); + Config(); break; - + case cReset : // EED this->mExecuter->Reset(); break; - + case cInclude : - if (mCommandLine) + if (mCommandLine) { InterpretFile(words[1], true ); // true : better pass use_config_file } - else + else { SwitchToFile(words[1], true ); // true : better pass use_config_file } + // if 'source' was given + if (words.size()==3) + { + this->mExecuter->SetCurrentFileName(words[1]); + } break; - + case cLoad: LoadPackage(words[1], true ); // true : better pass use_config_file break; - + case cUnload: UnLoadPackage(words[1]); break; - + case cQuit : + delete mExecuter; throw QuitException(); break; - - case cWorkspace : + + case cWorkspace : if (words.size() == 2) { if (words[1]=="freeze") mExecuter->SetNoExecMode(true); else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); } - else + else { mExecuter->SetWorkspaceName(words[2]); } @@ -593,7 +603,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) default: bbtkInternalError("should not reach here !!!"); } - + bbtkDecTab("Interpreter",9); } //======================================================================= @@ -604,12 +614,12 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) //======================================================================= /** - * + * */ void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) { bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""< quote; Utilities::SplitString(str,delimiters,quote); @@ -634,7 +644,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } bbtkDebugMessageCont("Interpreter",9,std::endl); - bbtkDebugDecTab("Interpreter",9); + bbtkDebugDecTab("Interpreter",9); } //======================================================================= @@ -651,14 +661,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& { s.replace(pos,2,cr,1); pos = s.find(ss, pos-1); - } + } } //======================================================================= //======================================================================= /** - * + * */ void Interpreter::Print( const std::string& str) { @@ -673,10 +683,10 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& std::string::size_type lastPos = str.find_first_not_of(delimiters, 0); bool is_text = true; if (lastPos>0) is_text = false; - + // Find first delimiter. std::string::size_type pos = str.find_first_of(delimiters, lastPos); - + while (std::string::npos != pos || std::string::npos != lastPos) { if (is_text) @@ -707,12 +717,12 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& std::cout << *i; } std::cout << std::endl; - bbtkDebugDecTab("Interpreter",9); + bbtkDebugDecTab("Interpreter",9); } //======================================================================= /** - * + * */ // =================================================================================== @@ -729,7 +739,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // // use ./directory/subdir/scrname.bbs // - + bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \"" <& std::string fullPathScriptName; // full path script name std::string pkgname; // e.g. .bbs std::vector Filenames; - + if (use_configuration_file) { // The following is *NOT* a debug time message : // It's a user intended message. // Please don't remove it. bbtkMessage("Interpreter",1, - "look for : [" << name + "look for : [" << name << "] (use_configuration_file == TRUE)" << std::endl); script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); } @@ -766,17 +776,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& { if ((*i).substr((*i).size()-4, 4) != ".bbs") continue; // ignore non .bbs files - LoadScript(*i); + LoadScript(*i,name); nbBssFiles++; } if (nbBssFiles==0) bbtkMessage("Interpreter",2, "WARNING : No '.bbs' file found in [" << upath << "]" << std::endl); - return; } - std::string path; std::vector::iterator i; @@ -795,7 +803,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); - // Check if library exists + // Check if library exists if ( ! Utilities::IsDirectory(fullDirectoryName) ) { // The following is *NOT* a debug time message : @@ -816,14 +824,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& if ((*i).substr((*i).size()-4, 4) != ".bbs") continue; // ignore non .bbs files - LoadScript(*i); + LoadScript(*i,name); nbBssFiles++; } if (nbBssFiles==0) bbtkMessage("Interpreter",1, "WARNING : No '.bbs' file found in [" << fullDirectoryName << "]" << std::endl); - + //break; // a directory was found; we stop iterating // LG : No! We want all files included ! } @@ -843,7 +851,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // ===========================================================check user supplied location fullnameGiven = true; - fullPathScriptName = Utilities::ExpandLibName(name, false); // allow user to always forget ".bbs" @@ -905,7 +912,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } bbtkMessage("Interpreter",2, " [" <& bbtkError("Script ["<& return; } - std::ifstream* s; + std::ifstream* s; s = new std::ifstream; s->open(fullPathScriptName.c_str()); if (!s->good()) { bbtkError("Could not open file ["<[" << fullPathScriptName << "] found" << std::endl); mFile.push_back(s); mFileName.push_back(fullPathScriptName); + mIncludeFileName.push_back(includeScriptName); mLine.push_back(0); - return; + return; } //======================================================================= @@ -968,8 +977,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& { bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()" < no file left open"<& mFile.pop_back(); bbtkDebugMessage("Interpreter",9, " Closing file '"<& { bbtkDebugMessage("Interpreter",9,"Interpreter::CloseAllFiles()" <close(); @@ -1008,6 +1018,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& bbtkDebugMessage("Interpreter",9, " Closing file '"<& CommandInfoType& info ) { bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretCommand(...)"<& void Interpreter::Help(const std::vector& words) { unsigned int nbarg = words.size()-1; - + if (nbarg==0) { HelpCommands(); @@ -1073,26 +1084,52 @@ void Interpreter::Help(const std::vector& words) try { HelpPackage(words[1]); +#ifdef _USE_WXWIDGETS_ + if ( WxConsole::GetInstance() != 0 ) + { + std::string url = + ConfigurationFile::GetInstance().Get_doc_path(); + url += "/bbdoc/" + words[1] + "/index.html"; + if (Utilities::FileExists(url)) + { + WxConsole::GetInstance()->ShowHtmlPage(url); + } + } +#endif } catch (bbtk::Exception f) { try { - HelpBlackBox(words[1]); - } - catch (bbtk::Exception g) - { - try - { - this->mExecuter->ShowRelations(words[1],"0","9999"); - } - catch (bbtk::Exception h){ - bbtkError("\""<ShowHtmlPage(url); + } + } +#endif + } + catch (bbtk::Exception g) + { + try + { + this->mExecuter->ShowRelations(words[1],"0","9999"); + } + catch (bbtk::Exception h){ + bbtkError("\""<& words) /// Displays the Configuration void Interpreter::Config() const { - bbtkDebugMessageInc("Core",9,"Factory::Config"<bbs_paths = cf.Get_bbs_paths(); - const std::vectorpackage_paths = cf.Get_package_paths(); - - bbtkMessage("Help",1, "=============" << std::endl); - bbtkMessage("Help",1, "Configuration" << std::endl); - bbtkMessage("Help",1, "=============" << std::endl); - bbtkMessage("Help",1, "bbtk_config.xml : [" << config_xml_full_path << "]" << std::endl); - bbtkMessage("Help",1, "Documentation Url : [" << url << "]" << std::endl); - bbtkMessage("Help",1, "Data Path : [" << data_path << "]" << std::endl); - bbtkMessage("Help",1, "Default Doc_tmp : [" << default_doc_tmp << "]" << std::endl); - bbtkMessage("Help",1, "File Separator : [" << file_separator << "]" << std::endl); - - std::vector::const_iterator i; - - bbtkMessage("Help",1, "BBS Paths " << std::endl); - for (i = bbs_paths.begin(); i!=bbs_paths.end(); ++i ) - { - bbtkMessage("Help",1,"--- ["<<*i<<"]"<& words) std::cout << " " << i->first << std::endl; // std::cout << " usage : " << i->second.syntax << std::endl; // std::cout << " " << i->second.help << std::endl; - + } } //======================================================================= @@ -1201,7 +1203,7 @@ void Interpreter::Help(const std::vector& words) // ++i) { std::cout << " usage : " << c->second.syntax << std::endl; std::cout << " " << c->second.help << std::endl; - + } //======================================================================= @@ -1225,7 +1227,7 @@ void Interpreter::Help(const std::vector& words) //======================================================================= - + //======================================================================= #ifdef BBTK_USE_TERMIOS_BASED_PROMPT @@ -1248,19 +1250,18 @@ void Interpreter::Help(const std::vector& words) { int c; int ind=0; - + int MAX_LINE_SIZE = 160; int MAX_HISTORY_SIZE = 100; - + char* newline = new char[MAX_LINE_SIZE]; memset(newline,0,MAX_LINE_SIZE); char* histline = new char[MAX_LINE_SIZE]; memset(histline,0,MAX_LINE_SIZE); - + char* line = newline; int hist = mHistory.size(); - - + write(1,"> ",2); while(1) { @@ -1449,7 +1450,7 @@ void Interpreter::Help(const std::vector& words) { bbtkDebugMessageInc("Interpreter",9, "Interpreter::CommandLineInterpreter()"<& words) } } while (again); - + #ifdef BBTK_USE_TERMIOS_BASED_PROMPT tcsetattr(0,TCSANOW,&oter); #endif - + std::cout << "Good bye !" << std::endl; - + bbtkDebugDecTab("Interpreter",9); }