X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=ede613aae17a55c7142de17f212c98ed20d9a02e;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=7a7e08b47b0c25fd9827e64d4a6c0b2995808f85;hpb=0d9c3f691b5889816aea4d7e813f58e1950f81ed;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 7a7e08b..ede613a 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/14 20:26:54 $ - Version: $Revision: 1.32 $ + 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 @@ -21,11 +21,14 @@ */ #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 @@ -36,23 +39,38 @@ 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()); + } - mExecuter = new bbtk::Executer(); + // 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 @@ -62,215 +80,239 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL; // Builds the commands dict CommandInfoType info; - info.category = "new"; + info.keyword = "new"; info.argmin = 2; info.argmax = 2; info.code = cNew; info.syntax = "new "; info.help = "Creates a new black box of type with name "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "delete"; + info.keyword = "delete"; info.argmin = 1; info.argmax = 1; info.code = cDelete; info.syntax = "delete "; info.help = "Deletes the black box of name "; - mCommandDict[info.category] = info; + 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.category = "connect"; + info.keyword = "connect"; info.argmin = 2; info.argmax = 2; info.code = cConnect; info.syntax = "connect "; info.help = "Connects the ouput of black box to the input of black box "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "print"; + info.keyword = "print"; info.argmin = 1; 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')."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "exec"; + 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 category 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; - mCommandDict[info.category] = info; + 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.category = "package"; + 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.category] = info; + mCommandDict[info.keyword] = info; - info.category = "endpackage"; + 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.category] = info; + mCommandDict[info.keyword] = info; - info.category = "define"; + info.keyword = "define"; info.argmin = 1; 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."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "endefine"; + info.keyword = "endefine"; info.argmin = 0; info.argmax = 0; info.code = cEndDefine; info.syntax = "endefine"; info.help = "Ends the definition of a new type of complex black box"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "input"; + 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; info.code = cInput; info.syntax = "input "; info.help = "Defines the input of the current working black box as being an alias for the input of the black box . defines the help string for the newly created input"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "output"; + info.keyword = "output"; info.argmin = 3; info.argmax = 3; info.code = cOutput; info.syntax = "output "; info.help = "Defines the output of the current working black box as being an alias for the output of the black box . defines the help string for the newly created output"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "set"; + info.keyword = "set"; info.argmin = 2; info.argmax = 2; info.code = cSet; info.syntax = "set "; info.help = "Sets the value of the input of the black box to . There must exist a string to the value type adaptor"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "config"; // JPR + info.keyword = "config"; // JPR info.argmin = 0; info.argmax = 0; info.code = cConfig; info.syntax = "config"; info.help = "Prints the value of all configuration parameters"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "index"; // LG + info.keyword = "index"; // LG info.argmin = 0; info.argmax = 2; info.code = cIndex; - 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.category] = info; + 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.category = "reset"; //EED + info.keyword = "reset"; info.argmin = 0; 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)"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "author"; + info.keyword = "author"; info.argmin = 1; info.argmax = 1; info.code = cAuthor; info.syntax = "author "; info.help = "Adds the string to the author information of the black box being defined"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "category"; //JP + 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.category] = info; + mCommandDict[info.keyword] = info; - info.category = "description"; + info.keyword = "description"; info.argmin = 1; info.argmax = 1; info.code = cDescription; info.syntax = "description "; info.help = "Adds the string to the descriptive information of the black box being defined"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "help"; + info.keyword = "help"; info.argmin = 0; info.argmax = 2; info.code = cHelp; info.syntax = "help"; info.syntax = "\n (1) help \n (2) help \n (3) help packages [all]\n (4) help [all]\n (5) help \n (6) help "; info.help = "Effect :\n (1) Lists all available commands;\n (2) Prints help on a particular command; \n (3) Lists the packages loaded and their black boxes.\n Add 'all' to list adaptors; \n (4) Prints short help on the black boxes of a package.\n Add 'all' to include adaptors; \n (5) Prints full help on a black box type; \n (6) Prints information on the inputs, outputs and connections of a black box instance."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "message"; + info.keyword = "message"; info.argmin = 0; 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.category] = 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.category = "include"; + 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)."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "quit"; + info.keyword = "quit"; info.argmin = 0; info.argmax = 0; info.code = cQuit; info.syntax = "quit"; info.help = "Quits the program (during script execution it stops the complete execution)"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "load"; + info.keyword = "load"; info.argmin = 1; info.argmax = 1; info.code = cLoad; info.syntax = "load "; info.help = "Loads the black box package "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "unload"; + info.keyword = "unload"; info.argmin = 1; info.argmax = 1; info.code = cUnload; info.syntax = "unload "; info.help = "Unloads the black box package "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "graph"; + info.keyword = "graph"; info.argmin = 0; info.argmax = 6; info.code = cGraph; info.syntax = "graph [ BlackBoxName [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]] \n graph [ BlackBoxNameType [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]]"; 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.category] = info; + 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.category = "workspace"; + info.keyword = "workspace"; info.argmin = 1; 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."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; */ bbtkDebugDecTab("Interpreter",9); @@ -286,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_MACRO; + + CloseAllFiles(); + bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<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 (bbtk::Exception e) + CATCH_MACRO; + + CloseAllFiles(); + bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretBuffer()"< words; SplitLine(line,words); @@ -433,7 +682,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) InterpretCommand(words,command); bbtkDebugMessage("Interpreter",9, - "Command='"<SetNoExecMode(false); else - mExecuter->Update(words[1]); + mExecuter->Execute(words[1]); break; case cInput : @@ -514,6 +766,10 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) mExecuter->Author(words[1]); break; + case cNewGUI : + NewGUI(words[1],words[2]); + break; + case cCategory : mExecuter->Category(words[1]); break; @@ -538,12 +794,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; @@ -555,39 +811,44 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) Config(); break; - case cReset : // EED + case cReset : this->mExecuter->Reset(); + mFileNameHistory.clear(); break; case cInclude : if (mCommandLine) { - InterpretFile(words[1], true ); // true : better pass use_config_file + InterpretFile(words[1]); } else { - SwitchToFile(words[1], true ); // true : better pass use_config_file + SwitchToFile(words[1]); } // if 'source' was given if (words.size()==3) { - this->mExecuter->SetCurrentFileName(words[1]); + GetExecuter()->SetCurrentFileName(words[1]); } break; case cLoad: - LoadPackage(words[1], true ); // true : better pass use_config_file + GetExecuter()->LoadPackage(words[1]); break; case cUnload: - UnLoadPackage(words[1]); + GetExecuter()->UnLoadPackage(words[1]); break; case cQuit : - delete mExecuter; throw QuitException(); break; + case cObject : + if (words.size()==2) ObjectInfo(words[1]); + else ObjectInfo(""); + break; + /* obsolete case cWorkspace : if (words.size() == 2) { @@ -599,7 +860,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) mExecuter->SetWorkspaceName(words[2]); } break; - + */ default: bbtkInternalError("should not reach here !!!"); } @@ -649,32 +910,26 @@ 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; - 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("$"); @@ -693,14 +948,21 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& { // Found a text token, add it to the vector. chains.push_back(str.substr(lastPos, pos - lastPos)); + // std::string token = str.substr(lastPos, pos - lastPos) + // InterpretLine("set _C_.In%num% %token%") + } else { + // is an output (between $$) : decode std::string tok,box,output; tok = str.substr(lastPos, pos - lastPos); Utilities::SplitAroundFirstDot(tok,box,output); chains.push_back( mExecuter->Get(box,output) ); + +// InterpretLine("connect %tok% _C_.In%num%") + } // Skip delimiters. Note the "not_of" lastPos = str.find_first_not_of(delimiters, pos); @@ -708,17 +970,22 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& pos = str.find_first_of(delimiters, lastPos); // is_text = !is_text; +// num ++; } +// InterpretLine("exec _P_") +// if (IS_IN_WORKSPACE) InterpretLine("delete _C_; delete _P_"); + std::vector::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); } +*/ //======================================================================= /** @@ -727,8 +994,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& // =================================================================================== - void Interpreter::SwitchToFile( const std::string& name, - bool use_configuration_file ) + void Interpreter::SwitchToFile( const std::string& name ) { // Note : in the following : // name : the user supplied name @@ -748,97 +1014,132 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& 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 - << "] (use_configuration_file == TRUE)" << std::endl); - script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); - } + // 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; - if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*) - { - int nbBssFiles; - - 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) - { - if ((*i).substr((*i).size()-4, 4) != ".bbs") - continue; // ignore non .bbs files - 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; - 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; - } - - fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); - - // Check if library exists - if ( ! Utilities::IsDirectory(fullDirectoryName) ) - { - // The following is *NOT* a debug time message : - // It's a user intended message. - // Please don't remove it. - bbtkMessage("Interpreter",1," [" <::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 = Filenames.begin(); i!= Filenames.end(); ++i) - { + } + // === search paths list complete : now explore it - if ((*i).substr((*i).size()-4, 4) != ".bbs") - continue; // ignore non .bbs files - 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 ! - } - return; - } + std::vector::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, + " --> "<& int l = fullPathScriptName.size(); if (l!=0) { - + if (l>4) { if (fullPathScriptName.substr(l-4, 4) != ".bbs") @@ -870,90 +1171,107 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& fullPathScriptName = fullPathScriptName + ".bbs"; } - if ( Utilities::FileExists(fullPathScriptName)) - { - foundFile = true; - } - } // endif l != 0 - } - else - - // =============================================================== iterate on the paths + if ( Utilities::FileExists(fullPathScriptName)) { + foundFile = true; + } + } // endif l != 0 + } + else + // =============================== 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); //pkgname); - - 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. + { + 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); +} + //======================================================================= + //======================================================================= void Interpreter::LoadScript( std::string fullPathScriptName, std::string includeScriptName) { - if (find(mFileName.begin(),mFileName.end(),fullPathScriptName) - !=mFileName.end()) - { - bbtkMessage("Interpreter",1,"file '"<open(fullPathScriptName.c_str()); - if (!s->good()) + if (!s->good()) { bbtkError("Could not open file ["<& mFile.push_back(s); mFileName.push_back(fullPathScriptName); + mFileNameHistory.push_back(fullPathScriptName); mIncludeFileName.push_back(includeScriptName); mLine.push_back(0); + return; } @@ -984,15 +1304,17 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& return; } - mFile.back()->close(); + bbtkDebugMessage("Interpreter",9," Closing file '"<(mFile.back()); + if (file!=0) file->close(); + delete mFile.back(); mFile.pop_back(); - bbtkDebugMessage("Interpreter",9, - " Closing file '"<& while (mFile.size() != 0) { - mFile.back()->close(); - delete mFile.back(); - mFile.pop_back(); - bbtkDebugMessage("Interpreter",9, - " Closing file '"<& { bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretCommand(...)"<& words) { if (words[1]=="packages") { - PrintPackages(true); + GetExecuter()->GetFactory()->PrintPackages(true); return; } try @@ -1083,51 +1398,47 @@ void Interpreter::Help(const std::vector& words) { try { - HelpPackage(words[1]); -#ifdef _USE_WXWIDGETS_ - if ( WxConsole::GetInstance() != 0 ) + 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)) { - WxConsole::GetInstance()->ShowHtmlPage(url); + mUser->InterpreterUserViewHtmlPage(url); } } -#endif } catch (bbtk::Exception f) { - try - { - std::string package; - HelpBlackBox(words[1],package); -#ifdef _USE_WXWIDGETS_ - if ( WxConsole::GetInstance() != 0 ) + try + { + std::string package; + GetExecuter()->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)) + if (Utilities::FileExists(url)) { url += "#" + words[1]; - WxConsole::GetInstance()->ShowHtmlPage(url); + mUser->InterpreterUserViewHtmlPage(url); } } -#endif - } - catch (bbtk::Exception g) - { - try - { - this->mExecuter->ShowRelations(words[1],"0","9999"); - } - catch (bbtk::Exception h){ - bbtkError("\""<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) { @@ -1477,6 +1788,7 @@ void Interpreter::Help(const std::vector& words) } catch (QuitException e) { + bbtkMessage("Interpreter",1,"Interpreter : Quit"<& 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) { @@ -1542,10 +1853,9 @@ void Interpreter::Graph(const std::vector& words) page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display); } -#ifdef _USE_WXWIDGETS_ - if ( WxConsole::GetInstance() != 0 ) - WxConsole::GetInstance()->ShowHtmlPage(page); -#endif + if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) + mUser->InterpreterUserViewHtmlPage(page); + } //======================================================================= @@ -1558,11 +1868,224 @@ void Interpreter::Index(const std::string& filename, 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; - GetGlobalFactory()->CreateHtmlIndex(t,filename); + 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