X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=fc5f3f18638104b9d3046cc162c02de60a6c5259;hb=cc134f89048428aca99fa855a7e1e87c815a3413;hp=674513f847edc62677042542069d0285351b42f0;hpb=6d2f79e0ff9b1c0b2db0d7f3d164f4f62434f08d;p=bbtk.git diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 674513f..fc5f3f1 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -1,30 +1,45 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk - Module: $RCSfile: bbtkInterpreter.cxx,v $ $ + Module: $RCSfile: bbtkInterpreter.cxx,v $ Language: C++ - Date: $Date: 2008/03/19 14:58:13 $ - Version: $Revision: 1.47 $ - - 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/12/12 12:11:21 $ + Version: $Revision: 1.79 $ =========================================================================*/ + +/* --------------------------------------------------------------------- + +* 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 : */ #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 @@ -37,244 +52,314 @@ 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); + mUser = 0; + mCommandLine = false; + mThrow = false; + bufferNb =0; + bbtk::MessageManager::RegisterMessageType("echo","Level>0 : Prints the output of the 'print' 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()" <SetInterpreter(this); + if (e) + { + mVirtualExecuter = e; + } + else if (cpp_file.size()!=0) + { + mVirtualExecuter = boost::static_pointer_cast(bbtk::Transcriptor::New(cpp_file)); + } + else + { + bbtk::Executer::Pointer exe = bbtk::Executer::New(); + mRealExecuter = exe; + mVirtualExecuter = boost::static_pointer_cast(exe); + } + + // Lock this pointer or will auto-destruct !! + if (!e) mVirtualExecuter->SetInterpreter(MakePointer(this,true)); // For the time being, comment out previous line, and // uncomment next line to check Transcriptor - //mExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); + //mVirtualExecuter = new bbtk::Transcriptor("GeneratedProgram.txt"); // 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 = "clear"; + info.argmin = 0; + info.argmax = 0; + info.code = cClear; + info.syntax = "clear"; + info.help = "Clears the currently defined complex box (deletes all its boxes and connections)"; + mCommandDict[info.keyword] = info; - info.category = "connect"; + 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; 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; + 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.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.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.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; + 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.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.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.category = "input"; + 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'|'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.category] = info; + mCommandDict[info.keyword] = info; - info.category = "reset"; + 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; + info.help = "Deletes all boxes and unloads all packages (reset to start state)"; + 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; + info.help = "Includes the file .\n 'source' : If the keyword 'source' is provided then informs the interpreter 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.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 = "debug"; + info.argmin = 0; + info.argmax = 1; + info.code = cDebug; + info.syntax = "debug [expr|-C|-D]"; + info.help = "Prints debug info on living bbtk objects containing the string 'expr' (default expr=''). -C checks the factory integrity. -D turns on objects debug info after main ends"; + 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; + 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; */ bbtkDebugDecTab("Interpreter",9); @@ -290,30 +375,197 @@ bufferNb =0; */ 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) { @@ -327,45 +579,18 @@ bufferNb =0; { str.erase(size-1,1); } + try + { + InterpretLine(str, insideComment); + } + CATCH_MACRO; - InterpretLine(str, insideComment); - - }//while + }//while !eof CloseCurrentFile(); - } - } - catch (QuitException e) - { - status = QUIT; - } - catch (bbtk::Exception e) - { - std::cerr << "* ERROR : "<0 + } // try + CATCH_MACRO; + CloseAllFiles(); bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""< words; SplitLine(line,words); @@ -565,7 +738,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) InterpretCommand(words,command); bbtkDebugMessage("Interpreter",9, - "Command='"<Define(words[1],"",filename); } else { - mExecuter->Define(words[1],words[2],filename); + mVirtualExecuter->Define(words[1],words[2],filename); } break; case cEndDefine : - mExecuter->EndDefine(); + mVirtualExecuter->EndDefine(); + break; + + case cKind : + mVirtualExecuter->Kind(words[1]); break; case cPrint : - Print(words[1]); /// \todo use generate command + mVirtualExecuter->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]); + { + 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 : Utilities::SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineInput(words[1],left,right,words[3]); + mVirtualExecuter->DefineInput(words[1],left,right,words[3]); break; case cOutput : Utilities::SplitAroundFirstDot(words[2],left,right); - mExecuter->DefineOutput(words[1],left,right,words[3]); + mVirtualExecuter->DefineOutput(words[1],left,right,words[3]); break; case cSet : Utilities::SplitAroundFirstDot(words[1],left,right); - mExecuter->Set(left,right,words[2]); + mVirtualExecuter->Set(left,right,words[2]); break; case cAuthor : - mExecuter->Author(words[1]); + mVirtualExecuter->Author(words[1]); + break; + + case cNewGUI : + NewGUI(words[1],words[2]); break; case cCategory : - mExecuter->Category(words[1]); + mVirtualExecuter->Category(words[1]); break; case cIndex : @@ -660,7 +854,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cDescription : - mExecuter->Description(words[1]); + mVirtualExecuter->Description(words[1]); break; case cHelp : @@ -670,12 +864,12 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) case cMessage : if (words.size()<3) { - bbtk::MessageManager::PrintInfo(); + mVirtualExecuter->HelpMessages(); } else { - sscanf(words[2].c_str(),"%d",&level); - bbtk::MessageManager::SetMessageLevel(words[1],level); + sscanf(words[2].c_str(),"%d",&level); + mVirtualExecuter->SetMessageLevel(words[1],level); } break; @@ -688,50 +882,55 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) break; case cReset : - this->mExecuter->Reset(); + Reset(); + break; + + case cClear : + mVirtualExecuter->Clear(); 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()->GetFactory()->LoadPackage(words[1]); + GetExecuter()->LoadPackage(words[1]); break; case cUnload: - GetExecuter()->GetFactory()->UnLoadPackage(words[1]); + GetExecuter()->UnLoadPackage(words[1]); break; case cQuit : - delete mExecuter; throw QuitException(); break; + case cDebug : + if (words.size()==2) Debug(words[1]); + else Debug(""); + break; + /* obsolete case cWorkspace : if (words.size() == 2) { - if (words[1]=="freeze") mExecuter->SetNoExecMode(true); - else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false); + if (words[1]=="freeze") mVirtualExecuter->SetNoExecMode(true); + else if (words[1]=="unfreeze") mVirtualExecuter->SetNoExecMode(false); } else { - mExecuter->SetWorkspaceName(words[2]); + mVirtualExecuter->SetWorkspaceName(words[2]); } break; - + */ default: bbtkInternalError("should not reach here !!!"); } @@ -782,29 +981,23 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& //======================================================================= - // Replaces substrings "\\n" by a real carriage return "\n" - void SubsBackslashN ( std::string& s ) + void Interpreter::Reset() { - 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); - } + // Cannot close all files if the reset command is read from a file ! + // CloseAllFiles(); + mFileNameHistory.clear(); + this->mVirtualExecuter->Reset(); } //======================================================================= - //======================================================================= /** * */ + /* void Interpreter::Print( const std::string& str) { - if (mExecuter->GetNoExecMode()) return; + if (mVirtualExecuter->GetNoExecMode()) return; bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<& std::string tok,box,output; tok = str.substr(lastPos, pos - lastPos); Utilities::SplitAroundFirstDot(tok,box,output); - chains.push_back( mExecuter->Get(box,output) ); + chains.push_back( mVirtualExecuter->Get(box,output) ); // InterpretLine("connect %tok% _C_.In%num%") @@ -863,22 +1056,22 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& 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); } +*/ //======================================================================= /** * */ -// =================================================================================== - - 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 @@ -904,134 +1097,131 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& bbtkMessage("Interpreter",1, "look for : [" << name << "]" << std::endl); - script_paths = ConfigurationFile::GetInstance().Get_bbs_paths(); + std::string upath; pkgname = Utilities::ExtractScriptName(name,upath); - bbtkMessage("Interpreter",1, - "extract : pkgname [" << pkgname - << "] upath [" << upath << "]" << std::endl); + bbtkMessage("Interpreter",3, + "package name:[" << pkgname + << "] path:[" << upath << "]" << std::endl); bool fullnameGiven = false; bool foundFile = false; - if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*) - { -// std::cout << "JPR================== * found, load all boxes " << std::endl; - int nbBssFiles; - - std::stringstream* stream = new std::stringstream; - //if (upath.size()!=0) // avoid troubles for "*" - - if (upath[0]=='/' || upath[1] == ':' ) // ==== absolute name, load all .bbs files - { -// std::cout << "JPR================== absolute name, load all .bbs files " << std::endl; - int nbFiles = Utilities::Explore(upath, false, Filenames); - nbBssFiles = 0; - for (std::vector::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) - { -// std::cout << "JPR================== iterate [" << *i << "]" << std::endl; - int lgr = (*i).size(); - if (lgr < 5) - continue; // ignore non .bbs file - if ((*i).substr(lgr-4, 4) != ".bbs") - continue; - /* - if (lgr > 10) // 10 -> '-appli.bbs' - { - if ((*i).substr(lgr-10, 10) == "-appli.bbs") - continue; // ignore '-appli.bbs' files - } - */ - - (*stream) << "include " << *i << "\n"; -//EED InterpretFile(*i); - - nbBssFiles++; - } // for vector - if (nbBssFiles==0){ - bbtkMessage("Interpreter",2, - "WARNING : No '.bbs' file found in [" - << upath << "]" << std::endl); - } else { - SwitchToStream(stream); - } - return; - } // if upath - - std::string path; - std::vector::iterator i; - std::string fullDirectoryName; - for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files + // ==== "*" provided : load all scripts in given path + // relative (e.g. std/boxes/*) or absolute + if (pkgname == "*") { - path = *i; - - // we *really* want '.' to be the current working directory - if (path == ".") { - char buf[2048]; // for getcwd - char * currentDir = getcwd(buf, 2048); - std::string cwd(currentDir); - path = currentDir; - } // if path - - fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false); - // without last slash "\" - std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1); - - // Check if library exists - if ( ! Utilities::IsDirectory( fullDirectoryNameClean ) ) - { - // The following is *NOT* a debug time message : - // It's a user intended message. - // Please don't remove it. - bbtkMessage("Interpreter",1," [" <::iterator i = Filenames.begin(); i!= Filenames.end(); ++i) - { -// std::cout << "JPR================== iterate [" << *i << "]" << std::endl; - int lgr = (*i).size(); - if (lgr < 5) - continue; // ignore non .bbs file - if ((*i).substr(lgr-4, 4) != ".bbs") - continue; - /* - if (lgr > 10) // 10 -> '-appli.bbs' - { - if ((*i).substr(lgr-10, 10) == "-appli.bbs") - continue; // ignore '-appli.bbs' files - } - */ - - (*stream) << "include " << *i << "\n"; -//EED InterpretFile(*i); - - nbBssFiles++; - } // for vector - if (nbBssFiles==0){ - bbtkMessage("Interpreter",1, - "WARNING : No '.bbs' file found in [" - << fullDirectoryName << "]" << std::endl); - } else { - SwitchToStream(stream); - } - - //break; // a directory was found; we stop iterating - // LG : No! We want all files included ! - } // for vector - return; - } // if * - - //std::string::size_type slash_position = name.find_last_of("/\\"); + 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, + // 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] == ':' ) + { + 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++) + { + bbtkMessage("Interpreter",1, + "--> Looking in '" << *i << "'" << std::endl); + + Filenames.clear(); + //int nbFiles = + Utilities::Explore(*i, false, Filenames); + + for (std::vector::iterator j = Filenames.begin(); + j!= Filenames.end(); ++j) + { + int lgr = (*j).size(); + 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); + + nbBssFiles++; + } // for (std::vector... + } // for (i=script_... + // === Result ... + if (nbBssFiles==0) + { + 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); - - // 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, - " [" <SetCurrentFileName(fullPathScriptName); + } + return; } + //======================================================================= + //======================================================================= void Interpreter::SwitchToStream( std::stringstream* stream ) { -//std::cout << "== 1 Entry in Interpreter::SwitchToStream " << std::endl; - - mFile.push_back(stream); - //std::cout << " mFile.size() " << mFile.size() << std::endl; + mFile.push_back(stream); std::ostringstream buffer_name; bufferNb++; - buffer_name << "buffer_" ; // << bufferNb; - -// std::cout << " mFile.size() " << mFile.size() << std::endl; -// std::cout << " mFileName.size() " << mFileName.size() << std::endl; -// std::cout << " mLine.size() " << mLine.size() << std::endl; - // std::vector::iterator j = mFileName.begin(); - // std::cout << " mFileName.begin() succeeded" << std::endl; - // std::cout << " mFileName[0] " << mFileName[0] << std::endl; - //std::cout << " mFileName.begin() " << mFileName.begin() << std::endl; -/* - for( std::vector::iterator i = mFileName.begin(); i!= mFileName.end(); ++i) - { - - std::cout << "Interpreter::SwitchToStream : mFileName [" << *i << "]" << std::endl; - } -*/ - // std::cout << " mLine.back() " << mLine.back() << std::endl; - // std::cout << " mFileName.back() " << mFileName.back() << std::endl; + buffer_name << "buffer_" ; - if (mFileName.size()>0 )// && (mFile.size()>0) ) // NO!!! + if (mFileName.size()>0 ) { - // std::cout << " mFileName.back() " << mFileName.back() << std::endl; - // std::cout << " mLine.back() " << mLine.back() << std::endl; buffer_name << mFileName.back() << "_" << mLine.back(); } -//std::cout << "3 in Interpreter::SwitchToStream buffer_name :[" << buffer_name.str() << "]" << std::endl; 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) { - Utilities::replace( fullPathScriptName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR); - - bool okScriptExist=false; - int iStrScript,sizeVecStricpt=mFileName.size(); - for ( iStrScript=0;iStrScriptclose(); - delete mFile.back(); - mFile.pop_back(); - bbtkDebugMessage("Interpreter",9, - " Closing file '"<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"); @@ -1327,50 +1519,46 @@ void Interpreter::Help(const std::vector& words) try { GetExecuter()->GetFactory()->HelpPackage(words[1]); -#ifdef _USE_WXWIDGETS_ - if ( mWxConsole != 0 ) + if ( mUser != 0 ) { std::string url = ConfigurationFile::GetInstance().Get_doc_path(); url += "/bbdoc/" + words[1] + "/index.html"; if (Utilities::FileExists(url)) { - mWxConsole->ShowHtmlPage(url); + mUser->InterpreterUserViewHtmlPage(url); } } -#endif } catch (bbtk::Exception f) { - try - { - std::string package; - GetExecuter()->GetFactory()->HelpBlackBox(words[1],package); -#ifdef _USE_WXWIDGETS_ - if ( mWxConsole != 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]; - mWxConsole->ShowHtmlPage(url); + mUser->InterpreterUserViewHtmlPage(url); } } -#endif - } - catch (bbtk::Exception g) - { - try - { - GetExecuter()->ShowRelations(words[1],"0","9999"); - } - catch (bbtk::Exception h){ - bbtkError("\""<ShowRelations(words[1],"0","9999"); + } + catch (bbtk::Exception h){ + bbtkError("\""<& 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(); @@ -1492,10 +1680,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); @@ -1503,7 +1691,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) @@ -1511,7 +1699,7 @@ void Interpreter::Help(const std::vector& words) c=0; read ( STDIN_FILENO, &c, 4) ; - bbtkDebugMessage("Debug",9,"[0x"<& words) std::string page; bool system_display = true; -#ifdef _USE_WXWIDGETS_ - if ( mWxConsole != 0 ) system_display = false; -#endif + if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) + system_display = false; if (words.size()==1) { - page = mExecuter->ShowGraph(".","0","0","","","",system_display); + page = mVirtualExecuter->ShowGraph(".","0","0","","","",system_display); } else if (words.size()==2) { - page = mExecuter->ShowGraph(words[1],"0","0","","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],"0","0","","","",system_display); } else if (words.size()==3) { - page = mExecuter->ShowGraph(words[1],words[2],"0","","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],"0","","","",system_display); } else if (words.size()==4) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],"","","",system_display); } else if (words.size()==5) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display); + page = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],"","",system_display); } else if (words.size()==6) { - page = mExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],"",system_display); + page = mVirtualExecuter->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 = mVirtualExecuter->ShowGraph(words[1],words[2],words[3],words[4],words[5],words[6],system_display); } -#ifdef _USE_WXWIDGETS_ - if ( mWxConsole != 0 ) - mWxConsole->ShowHtmlPage(page); -#endif + if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) ) + mUser->InterpreterUserViewHtmlPage(page); + } //======================================================================= @@ -1808,6 +1994,241 @@ void Interpreter::Index(const std::string& filename, } //======================================================================= + +//======================================================================= +void Interpreter::NewGUI(const std::string& boxname, + const std::string& instanceName) +{ + if (mRealExecuter.expired()) + { + bbtkError("command 'newgui' cannot be compiled yet"); + } + + std::string typeName = instanceName+"Type"; + std::stringstream* s = new std::stringstream; + // create the complex box + (*s) << "define "< in; + + Factory::Pointer F = mVirtualExecuter->GetFactory(); + /* + Package::Pointer user = F->GetPackage("user"); + */ + ComplexBlackBoxDescriptor::Pointer workspace = + mRealExecuter.lock()->GetCurrentDescriptor(); + + if (workspace==0) + { + delete s; + bbtkError("Interpreter::CreateGUI : could not access the executer currently defined complex box"); + } + + + /* + (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 "<GetFactory()->CheckPackages(); + // MessageManager::SetMessageLevel("debug",o); + } + } + else + { + Object:: PrintObjectListInfo(name); + } + } + //========================================================================== + //========================================================================== + std::string Interpreter::GetObjectName() const + { + return std::string("Interpreter"); + } + //========================================================================== + + //========================================================================== + std::string Interpreter::GetObjectInfo() const + { + std::stringstream i; + return i.str(); + } + //========================================================================== + + //========================================================================== +size_t Interpreter::GetObjectSize() const +{ + size_t s = Superclass::GetObjectSize(); + s += Interpreter::GetObjectInternalSize(); + return s; + } + //========================================================================== + //========================================================================== +size_t Interpreter::GetObjectInternalSize() const +{ + size_t s = sizeof(Interpreter); + return s; + } + //========================================================================== + //========================================================================== + size_t Interpreter::GetObjectRecursiveSize() const + { + size_t s = Superclass::GetObjectRecursiveSize(); + s += Interpreter::GetObjectInternalSize(); + s += mVirtualExecuter->GetObjectRecursiveSize(); + return s; + } + //========================================================================== }//namespace