X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=ede613aae17a55c7142de17f212c98ed20d9a02e;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=f500e92fde9d125becaecee6a8ccbe9203c41779;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index f500e92..ede613a 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,13 +3,13 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/18 12:59:15 $ + Version: $Revision: 1.60 $ 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. @@ -17,46 +17,65 @@ =========================================================================*/ /** * \file - * \brief class Interpreter : + * \brief class Interpreter : */ -#include "bbtkInterpreter.h" +#include "bbtkInterpreter.h" +#include "bbtkExecuter.h" +#include "bbtkTranscriptor.h" #include "bbtkMessageManager.h" #include "bbtkConfigurationFile.h" -#include "bbtkWxConsole.h" #include "bbtkUtilities.h" +#include "bbtkWxBlackBox.h" #include +#include #ifdef CMAKE_HAVE_TERMIOS_H #include #define BBTK_USE_TERMIOS_BASED_PROMPT #endif +#include namespace bbtk { -Interpreter* Interpreter::mGlobalInterpreter = NULL; - - + //======================================================================= + 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("Interpreter","Messages of the interpreter",0); bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <(bbtk::Transcriptor::New(cpp_file)); + } + else + { + mExecuter = boost::static_pointer_cast(bbtk::Executer::New()); + } - mGlobalInterpreter = this; + // Lock this pointer or will auto-destruct !! + mExecuter->SetInterpreter(MakePointer(this,true)); + + // For the time being, comment out previous line, and + // uncomment next line to check Transcriptor - // mFactory = new bbtk::Factory(); - mExecuter = new bbtk::Executer(); - //mExecuter->SetFactory(mFactory); + //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); // Builds the commands dict CommandInfoType info; @@ -77,6 +96,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.help = "Deletes the black box of name "; mCommandDict[info.keyword] = info; + info.keyword = "newgui"; + info.argmin = 2; + info.argmax = 2; + info.code = cNewGUI; + info.syntax = "newgui "; + info.help = "Automatically creates a graphical user interface with name for the black box and connects it to the box inputs"; + mCommandDict[info.keyword] = info; + info.keyword = "connect"; info.argmin = 2; info.argmax = 2; @@ -101,6 +128,22 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; 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."; mCommandDict[info.keyword] = info; + info.keyword = "package"; + info.argmin = 1; + info.argmax = 1; + info.code = cPackage; + info.syntax = "package "; + info.help = "Begins the definition of a package."; + mCommandDict[info.keyword] = info; + + info.keyword = "endpackage"; + info.argmin = 0; + info.argmax = 0; + info.code = cEndPackage; + info.syntax = "endpackage"; + info.help = "Ends the definition of a package."; + mCommandDict[info.keyword] = info; + info.keyword = "define"; info.argmin = 1; info.argmax = 2; @@ -117,6 +160,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.help = "Ends the definition of a new type of complex black box"; mCommandDict[info.keyword] = info; + info.keyword = "kind"; + info.argmin = 1; + info.argmax = 1; + info.code = cKind; + info.syntax = "kind "; + info.help = "Sets the kind of the currently defined complex black box"; + mCommandDict[info.keyword] = info; + info.keyword = "input"; info.argmin = 3; info.argmax = 3; @@ -143,13 +194,22 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.keyword = "config"; // JPR info.argmin = 0; - info.argmax = 1; + info.argmax = 0; info.code = cConfig; - info.syntax = "config [|]"; + info.syntax = "config"; info.help = "Prints the value of all configuration parameters"; mCommandDict[info.keyword] = info; - info.keyword = "reset"; //EED + info.keyword = "index"; // LG + info.argmin = 0; + info.argmax = 2; + info.code = cIndex; + + info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories'|'Adaptors']]"; + 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. If 'Adaptors' is provided then an alphabetical index of all adaptors is created."; + mCommandDict[info.keyword] = info; + + info.keyword = "reset"; info.argmin = 0; info.argmax = 0; info.code = cReset; @@ -164,6 +224,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.syntax = "author "; info.help = "Adds the string to the author information of the black box being defined"; mCommandDict[info.keyword] = info; + + info.keyword = "category"; //JP + info.argmin = 1; + info.argmax = 1; + info.code = cCategory; + info.syntax = "category "; + info.help = "Adds the string to the category information of the black box being defined"; + mCommandDict[info.keyword] = info; info.keyword = "description"; info.argmin = 1; @@ -186,16 +254,15 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; info.argmin = 0; info.argmax = 2; info.code = cMessage; - info.syntax = "message "; - info.help = "Sets the level of the category of messages to .\n If category='All' then sets the level for all categories. If no category nor level is passed then prints info on available categories of messages and their current level."; - mCommandDict[info.keyword] = info; + 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.keyword = "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.keyword] = info; info.keyword = "quit"; @@ -230,6 +297,14 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; 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.argmin = 0; + info.argmax = 1; + info.code = cObject; + info.syntax = "object "; + info.help = "Provides debug info on object "; + mCommandDict[info.keyword] = info; + /* info.keyword = "workspace"; info.argmin = 1; @@ -253,90 +328,298 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; */ Interpreter::~Interpreter() { - bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" < Interpreter::~Interpreter()" <(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 : \""<0) { - while ((mFile.size()>0) && - (!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 ) + 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); + str.erase(size-1,1); } - - InterpretLine(str, insideComment); - } - //if (mFile.size()>0) - CloseCurrentFile(); + + InterpretLine(str, insideComment); + + }//while + CloseCurrentFile(); } } - catch (QuitException e) - { - } - catch (bbtk::Exception e) - { - std::cerr << "* ERROR : "<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(); + } + } + CATCH_MACRO; + + CloseAllFiles(); + bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"< words; SplitLine(line,words); - + // Empty line if (words.size()<1) { @@ -394,204 +676,220 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) bbtkMessage("Interpreter",9,"Multiline Comment"<Define(words[1],words[2],filename); - } - break; - + if (mFileName.size()>0) + { + filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back()); + } + if (words.size()==2) + { + mExecuter->Define(words[1],"",filename); + } + else + { + mExecuter->Define(words[1],words[2],filename); + } + break; + case cEndDefine : - mExecuter->EndDefine(); - break; - + mExecuter->EndDefine(); + break; + + case cKind : + mExecuter->Kind(words[1]); + break; + case cPrint : - Print(words[1]); - break; + mExecuter->Print(words[1]); + break; case cExec : - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); - else mExecuter->Update(words[1]); - break; - + if (words[1]=="freeze") + mExecuter->SetNoExecMode(true); + else if (words[1]=="unfreeze") + mExecuter->SetNoExecMode(false); + else + mExecuter->Execute(words[1]); + break; + case cInput : - SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineInput(words[1],left,right,words[3]); - break; - + Utilities::SplitAroundFirstDot(words[2],left,right); + mExecuter->DefineInput(words[1],left,right,words[3]); + break; + case cOutput : - SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineOutput(words[1],left,right,words[3]); - break; - + Utilities::SplitAroundFirstDot(words[2],left,right); + mExecuter->DefineOutput(words[1],left,right,words[3]); + break; + case cSet : - SplitAroundFirstDot(words[1],left,right); - mExecuter->Set(left,right,words[2]); - break; - + Utilities::SplitAroundFirstDot(words[1],left,right); + mExecuter->Set(left,right,words[2]); + break; + case cAuthor : - mExecuter->Author(words[1]); - break; - + mExecuter->Author(words[1]); + break; + + case cNewGUI : + NewGUI(words[1],words[2]); + 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]); - break; - + mExecuter->Description(words[1]); + break; + case cHelp : - Help(words); - break; - + Help(words); + break; + case cMessage : - if (words.size()<3) - { - bbtk::MessageManager::PrintInfo(); - } - else - { - sscanf(words[2].c_str(),"%d",&level); - bbtk::MessageManager::SetMessageLevel(words[1],level); - } - break; - - case cGraph : - Graph(words); - break; - + if (words.size()<3) + { + mExecuter->HelpMessages(); + } + else + { + sscanf(words[2].c_str(),"%d",&level); + mExecuter->SetMessageLevel(words[1],level); + } + break; + + case cGraph : + Graph(words); + break; + case cConfig : - if (words.size()>1) // any param for config means verbose = true - verbose = true; - else - verbose = false; - Config(verbose); - break; - - case cReset : // EED - this->mExecuter->Reset(); - break; - + Config(); + break; + + case cReset : + this->mExecuter->Reset(); + mFileNameHistory.clear(); + break; + case cInclude : - if (mCommandLine) - { - InterpretFile(words[1], true, verbose); // true : better pass use_config_file - } - else - { - SwitchToFile(words[1], true, verbose); // true : better pass use_config_file - } - break; - + if (mCommandLine) + { + InterpretFile(words[1]); + } + else + { + SwitchToFile(words[1]); + } + // if 'source' was given + if (words.size()==3) + { + GetExecuter()->SetCurrentFileName(words[1]); + } + break; + case cLoad: - LoadPackage(words[1], true, verbose); // true : better pass use_config_file - break; - + GetExecuter()->LoadPackage(words[1]); + break; + case cUnload: - UnLoadPackage(words[1]); - break; - + GetExecuter()->UnLoadPackage(words[1]); + break; + case cQuit : - throw QuitException(); - break; - + throw QuitException(); + break; + + case cObject : + if (words.size()==2) ObjectInfo(words[1]); + else ObjectInfo(""); + break; + /* obsolete case cWorkspace : - if (words.size() == 2) - { - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); - } - else - { - mExecuter->SetWorkspaceName(words[2]); - } - break; - + if (words.size() == 2) + { + if (words[1]=="freeze") mExecuter->SetNoExecMode(true); + else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); + } + else + { + mExecuter->SetWorkspaceName(words[2]); + } + break; + */ default: - bbtkInternalError("should not reach here !!!"); + bbtkInternalError("should not reach here !!!"); } - + bbtkDecTab("Interpreter",9); } //======================================================================= - //======================================================================= - void SplitString ( const std::string& str, const std::string& delimiters, - std::vector& tokens) - { - // Skip delimiters at beginning. - std::string::size_type lastPos = str.find_first_not_of(delimiters, 0); - // Find first delimiter. - std::string::size_type pos = str.find_first_of(delimiters, lastPos); - - while (std::string::npos != pos || std::string::npos != lastPos) - { - // Found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos)); - // Skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(delimiters, pos); - // Find next delimiter - pos = str.find_first_of(delimiters, lastPos); - } - - } - //======================================================================= - //======================================================================= /** - * + * */ void Interpreter::SplitLine ( const std::string& str, std::vector& tokens) { bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""< quote; - SplitString(str,delimiters,quote); + Utilities::SplitString(str,delimiters,quote); delimiters = " \t"; std::vector::iterator i; for (i=quote.begin(); i!=quote.end(); ) { - SplitString(*i,delimiters,tokens); + Utilities::SplitString(*i,delimiters,tokens); ++i; if (i!=quote.end()) { @@ -607,41 +905,31 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } bbtkDebugMessageCont("Interpreter",9,std::endl); - bbtkDebugDecTab("Interpreter",9); + bbtkDebugDecTab("Interpreter",9); } //======================================================================= - //======================================================================= - // Replaces substrings "\\n" by a real carriage return "\n" - void SubsBackslashN ( std::string& s ) - { - // std::cout << "BEFORE=["<GetNoExecMode()) return; - bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""< trouver un nom unique : # commande + // InterpretLine("new Print _P_") + // InterpretLine("connect _C_.Out _P_.In") + // int num = 1 + std::vector chains; std::string delimiters("$"); @@ -650,26 +938,31 @@ 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) { // Found a text token, add it to the vector. chains.push_back(str.substr(lastPos, pos - lastPos)); - // std::cout << "text='"<Get(box,output) ); - // std::cout << "outp='"<& pos = str.find_first_of(delimiters, lastPos); // is_text = !is_text; +// num ++; } - // std::cout << "nb="<::iterator i; 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); + bbtkDebugDecTab("Interpreter",9); } +*/ - //======================================================================= - /** - * - */ - - -// --> usefull in many places (at least : ConfigurationFile, Factory, Interpreter) -// should be factorized ( "bbtk::Util class ?) -/* -bool Interpreter::FileExists(std::string strFilename) -bool Interpreter::IsAtRoot(std::string cwd) -std::string Interpreter::ExtractPackageName(const std::string &name) -std::string Interpreter::ExpandLibName(const std::string &name, bool verbose) -std::string Interpreter::MakeLibnameFromPath(std::string path, std::string pkgname) -*/ -// =================================================================================== - -// See : http://www.techbytes.ca/techbyte103.html for more O.S. -bool Interpreter::FileExists(std::string strFilename) { - struct stat stFileInfo; - bool blnReturn; - int intStat; - - // Attempt to get the file attributes - intStat = stat(strFilename.c_str(),&stFileInfo); - if(intStat == 0) { - // We were able to get the file attributes - // so the file obviously exists. - blnReturn = true; - } else { - // We were not able to get the file attributes. - // This may mean that we don't have permission to - // access the folder which contains this file. If you - // need to do that level of checking, lookup the - // return values of stat which will give you - // more details on why stat failed. - blnReturn = false; - } + //======================================================================= + /** + * + */ - return(blnReturn); -} - // =================================================================================== - std::string Interpreter::ExtractScriptName(const std::string &name) + void Interpreter::SwitchToFile( const std::string& name ) { - std::string pkgname; - - std::string::size_type slash_position = name.find_last_of("/\\"); - if (slash_position != std::string::npos) { - pkgname =name.substr(slash_position+1,std::string::npos); - } else { - pkgname = name; - } - - // remove {.bbs } if any - std::string::size_type dot_position = pkgname.find_last_of('.'); - if (dot_position != std::string::npos){ - pkgname = pkgname.substr(0,dot_position); - } - return pkgname; - } - -// =================================================================================== + // Note : in the following : + // name : the user supplied name + // - abreviated name e.g. scr scr.bbs + // - relative full name e.g. ./scr.bbs ../../scr.bbs + // - absolute full name e.g. /home/usrname/proj/dir/scr.bbs + // same for Windows, with c:, d: ... + // + // use ./directory/subdir/scrname.bbs + // - std::string Interpreter::ExpandLibName(const std::string &name, bool verbose) - { - // ----- Think of expanding path name ( ./ ../ ../../ ) + bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \"" + < script_paths; + std::string fullPathScriptName; // full path script name + std::string pkgname; // e.g. .bbs + std::vector Filenames; - if ( name[0] == '/' || name[0] == '\\' ) - { - return(libname); - } - else if (name[0] == '.' && (name[1] == '/' || name[1] == '\\') ) - { - libname = cwd + ConfigurationFile::GetInstance().Get_file_separator () + name.substr(2, name.length()); - return(libname); - } - else if ( name[0] == '.' && name[1] == '.' && (name[2] == '/' || name[2] == '\\') ) - { - if ( IsAtRoot(cwd) ) // hope it gets / (for Linux), C: D: (for Windows) - { - // if we are already at / or c: --> hopeless - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - } - else + // 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 + << "]" << std::endl); + + + std::string upath; + pkgname = Utilities::ExtractScriptName(name,upath); + + bbtkMessage("Interpreter",3, + "extract : pkgname [" << pkgname + << "] upath [" << upath << "]" << std::endl); + bool fullnameGiven = false; + bool foundFile = false; + + // ==== "*" provided : load all scripts in given path + // relative (e.g. std/boxes/*) or absolute + if (pkgname == "*") { - // iterate on ../ and go up from the current working dir! - std::string a(name); - bool alreadyProcessRoot = false; - for(;;) - { - std::string::size_type slash_position = cwd.find_last_of(ConfigurationFile::GetInstance().Get_file_separator ()); - if (slash_position != std::string::npos) { - if (slash_position == 0) - slash_position = 1; - cwd = cwd.substr(0,slash_position/*+1*/); - a = a.substr(3, name.length()); // remove ../ - if (a == "" || alreadyProcessRoot) - { - if (verbose) - std::cout << " File path [" << name << "] doesn't exist" << std::endl; - tooHigh = true; - break; - } - // std::string b = cwd + a; - libname = cwd; - char c = cwd[cwd.size()-1]; - if (c != '/' && c != '\\' ) - libname += ConfigurationFile::GetInstance().Get_file_separator (); - libname += a; - - if ( a[0] != '.' ) // if . (probabely ../), loop again - break; - - if (IsAtRoot(cwd)) - alreadyProcessRoot = true; - } - } // end iterating on ../ - } - if (tooHigh) - libname=""; - return (libname); - - } // ----- End of expanding path name ( ./ ../ ../../ ) - - // To avoid warning - return(""); // Will never get here! - } + 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); + } + } + 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 + { + 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, + " --> "< script_paths; - std::string libname; // full path library name - std::string pkgname; // e.g. .bbs - - pkgname = ExtractScriptName(name); + // ===========================================================check user supplied location + fullnameGiven = true; - if (use_configuration_file) - { - if (verbose) - std::cout << "look for : [" << name << "] (use_configuration_file == TRUE)" << std::endl; - script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); - } + fullPathScriptName = Utilities::ExpandLibName(name, false); - bool fullnameGiven = false; - bool foundFile = false; - std::string::size_type slash_position = name.find_last_of("/\\"); - - if (slash_position != std::string::npos) - { - fullnameGiven = true; - libname = ExpandLibName(name, verbose); - if (libname != "") { - if (FileExists(libname)) - { - foundFile = true; - } + // allow user to always forget ".bbs" + int l = fullPathScriptName.size(); + + if (l!=0) { + + if (l>4) + { + if (fullPathScriptName.substr(l-4, 4) != ".bbs") + { + fullPathScriptName = fullPathScriptName + ".bbs"; + } } - } - else // ----------------------- iterate on the paths + else + { + fullPathScriptName = fullPathScriptName + ".bbs"; + } + + if ( Utilities::FileExists(fullPathScriptName)) + { + foundFile = true; + } + } // endif l != 0 + } + else + // =============================== iterate on the paths { - std::string path; + 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, + " [" <0 ) + { + buffer_name << mFileName.back() << "_" << mLine.back(); } + mFileName.push_back(buffer_name.str()); + mIncludeFileName.push_back(buffer_name.str()); + mLine.push_back(0); +} + //======================================================================= - std::ifstream* s; + //======================================================================= - if (!foundFile) - { - if (fullnameGiven) - if(libname == "") - bbtkError("Path \""<open(libname.c_str()); - if (!s->good()) + s->open(fullPathScriptName.c_str()); + if (!s->good()) { - bbtkError("Could not open file \""<[" << libname << "] found" << std::endl; + bbtkMessage("Interpreter",1," -->[" << fullPathScriptName + << "] found" << std::endl); mFile.push_back(s); - mFileName.push_back(libname); + mFileName.push_back(fullPathScriptName); + mFileNameHistory.push_back(fullPathScriptName); + mIncludeFileName.push_back(includeScriptName); mLine.push_back(0); - } - - - //======================================================================= + return; + } //======================================================================= /** @@ -968,21 +1297,24 @@ bool Interpreter::FileExists(std::string strFilename) { { bbtkDebugMessage("Interpreter",9,"Interpreter::CloseCurrentFile()" < no file left open"<close(); + bbtkDebugMessage("Interpreter",9," Closing file '"<(mFile.back()); + if (file!=0) file->close(); + delete mFile.back(); mFile.pop_back(); - bbtkDebugMessage("Interpreter",9, - " Closing file '"<close(); - delete mFile.back(); - mFile.pop_back(); - bbtkDebugMessage("Interpreter",9, - " Closing file '"<& words) { unsigned int nbarg = words.size()-1; - + if (nbarg==0) { HelpCommands(); @@ -1061,7 +1387,7 @@ void Interpreter::Help(const std::vector& words) { if (words[1]=="packages") { - PrintPackages(true); + GetExecuter()->GetFactory()->PrintPackages(true); return; } try @@ -1072,27 +1398,49 @@ void Interpreter::Help(const std::vector& words) { try { - HelpPackage(words[1]); + GetExecuter()->GetFactory()->HelpPackage(words[1]); + if ( mUser != 0 ) + { + std::string url = + ConfigurationFile::GetInstance().Get_doc_path(); + url += "/bbdoc/" + words[1] + "/index.html"; + if (Utilities::FileExists(url)) + { + mUser->InterpreterUserViewHtmlPage(url); + } + } } 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("\""<GetFactory()->HelpBlackBox(words[1],package); + if ( mUser != 0 ) + { + std::string url = + ConfigurationFile::GetInstance().Get_doc_path(); + url += "/bbdoc/" + package + "/index.html"; + if (Utilities::FileExists(url)) + { + url += "#" + words[1]; + mUser->InterpreterUserViewHtmlPage(url); + } + } + } + catch (bbtk::Exception g) + { + try + { + GetExecuter()->ShowRelations(words[1],"0","9999"); + } + catch (bbtk::Exception h){ + bbtkError("\""<& words) { if ( words[1]=="packages" ) { - PrintPackages(true,true); + GetExecuter()->GetFactory()->PrintPackages(true,true); return; } try { - HelpPackage(words[1],true); + GetExecuter()->GetFactory()->HelpPackage(words[1],true); } catch (bbtk::Exception f) { @@ -1126,46 +1474,11 @@ void Interpreter::Help(const std::vector& words) //=================================================================== /// Displays the Configuration - void Interpreter::Config( bool verbose ) const + 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 +1514,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 +1538,7 @@ void Interpreter::Help(const std::vector& words) //======================================================================= - + //======================================================================= #ifdef BBTK_USE_TERMIOS_BASED_PROMPT @@ -1248,19 +1561,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) { @@ -1289,19 +1601,18 @@ void Interpreter::Help(const std::vector& words) // empty lines are not stored in from history if (strlen(line)) { - // if history too long : delete oldest command - if (mHistory.size()>MAX_HISTORY_SIZE) - { - delete mHistory.front(); - mHistory.pop_front(); - } - mHistory.push_back(line); + // if history too long : delete oldest command + if (mHistory.size()>MAX_HISTORY_SIZE) + { + delete mHistory.front(); + mHistory.pop_front(); + } + mHistory.push_back(line); } - break; } - // Backspace - else if ( (ind>0) && + // Backspace + else if ( (ind>0) && ((c == BBTK_BACKSPACE_KBCODE) || (c == BBTK_DEL_KBCODE)) ) { @@ -1394,13 +1705,13 @@ void Interpreter::Help(const std::vector& words) PrintChar(line[ind]); ind++; } - + // Arrow left else if (ind>0 && c==BBTK_LEFT_ARROW_KBCODE) { PrintChar('\b'); ind--; - + } } @@ -1450,7 +1761,7 @@ void Interpreter::Help(const std::vector& words) { bbtkDebugMessageInc("Interpreter",9, "Interpreter::CommandLineInterpreter()"<& words) bool insideComment = false; // for multiline comment do { - try + try { std::string line; GetLineFromPrompt(line); @@ -1477,6 +1788,7 @@ void Interpreter::Help(const std::vector& words) } catch (QuitException e) { + bbtkMessage("Interpreter",1,"Interpreter : Quit"<& words) } catch (std::exception& e) { - std::cerr << "* ERROR : "<& words) } } while (again); - + #ifdef BBTK_USE_TERMIOS_BASED_PROMPT tcsetattr(0,TCSANOW,&oter); #endif - + std::cout << "Good bye !" << std::endl; - - bbtkDebugDecTab("Interpreter",9); - } - //======================================================================= - - - //======================================================================= - void Interpreter::SplitAroundFirstDot( const std::string& in, - std::string& left, - std::string& right) - { - bbtkDebugMessageInc("Interpreter",9, - "Interpreter::SplitAroundFirstDot(\"" - <& words) - { - std::string page; +//======================================================================= +void Interpreter::Graph(const std::vector& words) +{ + std::string page; bool system_display = true; -#ifdef _USE_WXWIDGETS_ - if ( WxConsole::GetInstance() != 0 ) system_display = false; -#endif + if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) + system_display = false; if (words.size()==1) { @@ -1569,18 +1849,243 @@ void Interpreter::Help(const std::vector& words) page = mExecuter->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 = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display); + } + + if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) + mUser->InterpreterUserViewHtmlPage(page); -#ifdef _USE_WXWIDGETS_ - if ( WxConsole::GetInstance() != 0 ) - WxConsole::GetInstance()->ShowHtmlPage(page); -#endif } - //======================================================================= +//======================================================================= + + +//======================================================================= +void Interpreter::Index(const std::string& filename, + const std::string& type) +{ + Factory::IndexEntryType t; + if (type=="Initials") t = Factory::Initials; + else if (type=="Categories") t = Factory::Categories; + else if (type=="Packages") t = Factory::Packages; + else if (type=="Adaptors") t = Factory::Adaptors; + + GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename); +} +//======================================================================= + + +//======================================================================= +void Interpreter::NewGUI(const std::string& boxname, + const std::string& instanceName) +{ + std::string typeName = instanceName+"Type"; + std::stringstream* s = new std::stringstream; + // create the complex box + (*s) << "define "< in; + + Factory::Pointer F = mExecuter->GetFactory(); + /* + Package::Pointer user = F->GetPackage("user"); + */ + ComplexBlackBoxDescriptor::Pointer workspace = mExecuter->GetWorkspace(); + + if (workspace==0) + { + delete s; + bbtkError("Interpreter::CreateGUI : could not access the executer workspace"); + } + + + /* + (ComplexBlackBoxDescriptor::Pointer)(user->GetBlackBoxMap().find("workspace")->second.get()); + */ + + BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname); + // BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap(); + int nb = 0; + BlackBox::InputConnectorMapType::iterator i; + for (i=box->bbGetInputConnectorMap().begin(); + i!=box->bbGetInputConnectorMap().end(); + ++i) + { + // If the input is connected : continue + if (i->second->IsConnected()) continue; + // Get the input descriptor + const BlackBoxInputDescriptor* d = box->bbGetDescriptor()->GetInputDescriptor(i->first); + // If it is a "system" input : skip it + if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) || + ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) ) + continue; + bool widok = true; + std::string widget,adaptor; + // try to find a widget adaptor + if (F->FindWidgetAdaptor(DataInfo(d->GetTypeInfo(),""), + d->GetDataInfo(), + adaptor)) + { + // command to create the adaptor + (*s) << " new "<first<first<<".Label "<first<first<<".In \" " + <bbGetInputAsString(i->first)<<"\"" + << std::endl; + // store the input name + in.push_back(i->first); + (*s) << " connect "<first<<".Widget layout.Widget"<first<<"'"<first<<".BoxChange change.In"<FindWidgetAdaptor2(DataInfo(d->GetTypeInfo(),""), + d->GetDataInfo(), + widget,adaptor) ) + { + // command to create the widget + (*s) << " new "<first<<"Widget"<first<first<<"Widget.Out " + <first<<".In"<first<<"Widget.Label "<first<first<<"Widget.In \" " + <bbGetInputAsString(i->first)<<"\""<< std::endl; + // store the input name + in.push_back(i->first); + (*s) << " connect "<first<<"Widget.Widget layout.Widget"<first<<"'"<first<<"Widget.BoxChange change.In"<FindAdaptor(DataInfo(typeid(std::string),""), + d->GetDataInfo(), + adaptor)) + { + // command to create the adaptor + (*s) << " new InputText "<first<first<<".Title "<first<first<<".In \" " + <bbGetInputAsString(i->first)<<"\""<< std::endl; + // store the input name + in.push_back(i->first); + (*s) << " connect "<first<<".Widget layout.Widget"<first<<"'"<first<<".BoxChange change.In"<first<<" " + <first<<".Out "<first<::iterator j; + for (j=in.begin();j!=in.end();++j) + { + // connect + (*s) << "connect "<GetObjectRecursiveSize(); + return s; + } + //========================================================================== }//namespace