-/*=========================================================================
-
+/*=========================================================================
Program: bbtk
- Module: $RCSfile: bbtkInterpreter.cxx,v $ $
+ Module: $RCSfile: bbtkInterpreter.cxx,v $
Language: C++
- Date: $Date: 2008/04/22 08:29:09 $
- Version: $Revision: 1.62 $
-
- 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 :
//=======================================================================
Interpreter::Pointer Interpreter::New(const std::string& cpp_file)
{
- bbtkDebugMessage("Kernel",9,"Interpreter::New()"<<std::endl);
+ bbtkDebugMessage("Kernel",9,"Interpreter::New('"<<cpp_file<<"')"<<std::endl);
return MakePointer(new Interpreter(cpp_file));
}
//=======================================================================
+ //=======================================================================
+ Interpreter::Pointer Interpreter::New(VirtualExec::Pointer e)
+ {
+ bbtkDebugMessage("Kernel",9,"Interpreter::New(VirtualExec)"<<std::endl);
+ return MakePointer(new Interpreter(e));
+ }
+ //=======================================================================
+
//=======================================================================
Interpreter::Interpreter(const std::string& cpp_file)
- :
- mUser(0),
- mCommandLine(false),
- mThrow(false)
{
+ Init(VirtualExec::Pointer(), cpp_file);
+ }
+ //=======================================================================
+ //=======================================================================
+ Interpreter::Interpreter(VirtualExec::Pointer e)
+ {
+ Init(e,"");
+ }
+ //=======================================================================
+
+ //=======================================================================
+ void Interpreter::Init(VirtualExec::Pointer e, const std::string& cpp_file)
+ {
+ mUser = 0;
+ mCommandLine = false;
+ mThrow = false;
bufferNb =0;
- bbtk::MessageManager::RegisterMessageType("Echo","Level>0 : Prints the 'echo' commands of the user.\n\tLevel>1 : Prints the command being interpreted",1);
+ 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()" <<std::endl);
-
- if (cpp_file.size()!=0)
+ if (e)
+ {
+ mVirtualExecuter = e;
+ }
+ else if (cpp_file.size()!=0)
{
- mExecuter = boost::static_pointer_cast<VirtualExec>(bbtk::Transcriptor::New(cpp_file));
+ mVirtualExecuter = boost::static_pointer_cast<VirtualExec>(bbtk::Transcriptor::New(cpp_file));
}
else
{
- mExecuter = boost::static_pointer_cast<VirtualExec>(bbtk::Executer::New());
+ bbtk::Executer::Pointer exe = bbtk::Executer::New();
+ mRealExecuter = exe;
+ mVirtualExecuter = boost::static_pointer_cast<VirtualExec>(exe);
}
// Lock this pointer or will auto-destruct !!
- mExecuter->SetInterpreter(MakePointer(this,true));
+ 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.help = "Deletes the black box of name <box>";
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.keyword = "newgui";
info.argmin = 2;
info.argmax = 2;
info.argmax = 1;
info.code = cPrint;
info.syntax = "print <string>";
- 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').";
+ 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.keyword = "exec";
info.argmin = 1;
info.argmax = 2;
info.code = cExec;
- info.syntax = "exec <box | 'freeze' | 'unfreeze' >";
- info.help = "Executes the black box of name <box> (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode.";
+ info.syntax = "exec <box | 'freeze' | 'unfreeze' | 'freeze_no_error' >";
+ info.help = "Executes the black box of name <box> (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode. 'freeze_no_error' is like freeze but also skips any error.";
mCommandDict[info.keyword] = info;
info.keyword = "package";
info.argmax = 2;
info.code = cDefine;
info.syntax = "define <type> [<package>]";
- info.help = "Begins the definition of a new type of complex black box called <type>. If <package> if provided will create it in the given package.";
+ info.help = "Begins the definition of a new type of complex black box called <type>. If <package> is provided will create it in the given package.";
mCommandDict[info.keyword] = info;
info.keyword = "endefine";
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)";
+ info.help = "Deletes all boxes and unloads all packages (reset to start state)";
mCommandDict[info.keyword] = info;
info.keyword = "author";
info.argmax = 2;
info.code = cMessage;
info.syntax = "message <kind> <level>";
- info.help = "Sets the level of the kind of messages <kind> to <level>.\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.help = "Sets the level of the kind of messages <kind> to <level>.\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 = 2;
info.code = cInclude;
info.syntax = "include <filename> [source]";
- info.help = "Includes the file <filename>.\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).";
+ info.help = "Includes the file <filename>.\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.keyword = "quit";
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.keyword = "debug";
info.argmin = 0;
info.argmax = 1;
- info.code = cObject;
- info.syntax = "object <object name>";
- info.help = "Provides debug info on object <object name>";
+ 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.argmax = 2;
info.code = cWorkspace;
info.syntax = "workspace < ( freeze | unfreeze ) | ( rename <newname> ) >";
- info.help = "Configures the workspace.\n 'freeze' allow to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n 'rename' allow to set a new name to the workspace.";
+ info.help = "Configures the workspace.\n 'freeze' allows to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n 'rename' allow to set a new name to the workspace.";
mCommandDict[info.keyword] = info;
*/
Interpreter::~Interpreter()
{
bbtkDebugMessageInc("Interpreter",9,"==> Interpreter::~Interpreter()" <<std::endl);
- mExecuter = VirtualExec::Pointer();
+ mVirtualExecuter = VirtualExec::Pointer();
bbtkDebugMessageInc("Interpreter",9,"<== Interpreter::~Interpreter()" <<std::endl);
}
//=======================================================================
mScriptLine(script_line)
{
}
+ //=======================================================================
+ void Interpreter::CatchInterpreterException( const InterpreterError& e )
+ {
+ if (mThrow)
+ {
+ CloseAllFiles();
+ throw InterpreterError(e);
+ }
+ else
+ {
+ std::stringstream mess;
+ mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
+ if (e.IsInScriptFile())
+ {
+ mess << "* FILE : \""<<e.GetScriptFile()<<"\""<<std::endl;
+ mess << "* LINE : "<<e.GetScriptLine()<<std::endl;
+ }
+ std::cerr << mess.str();
+ }
+ }
+ //=======================================================================
+
//=======================================================================
void Interpreter::CatchBbtkException( const bbtk::Exception& e )
{
else
{
std::stringstream mess;
- mess << "* ERROR : "<<e.GetMessage()<<std::endl;
+ mess << "* ERROR : "<<e.GetErrorMessage()<<std::endl;
if (mFileName.size()) {
mess << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
mess << "* LINE : "<<mLine.back()<<std::endl;
status = Interpreter_QUIT; \
if (mThrow) throw QuitException(); \
} \
+ catch (InterpreterError e) \
+ { \
+ status = Interpreter_ERROR; \
+ CatchInterpreterException(e); \
+ } \
catch (bbtk::Exception e) \
{ \
status = Interpreter_ERROR; \
/**
*
*/
- Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
+ Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename, bool source )
{
bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
try
{
- SwitchToFile(filename);
+ SwitchToFile(filename,source);
bool insideComment = false; // for multiline comment
while (mFile.size()>0)
{
str.erase(size-1,1);
}
+ try
+ {
+ InterpretLine(str, insideComment);
+ }
+ CATCH_MACRO;
- InterpretLine(str, insideComment);
-
- }//while
+ }//while !eof
CloseCurrentFile();
- }
- }
+ }//while >0
+ } // try
CATCH_MACRO;
CloseAllFiles();
{
str.erase(size-1,1);
}
-
- InterpretLine(str, insideComment);
-
+ try
+ {
+ InterpretLine(str, insideComment);
+ }
+ CATCH_MACRO;
}//while
-
CloseCurrentFile();
}
}
InterpretLine(line, insideComment);
}
CATCH_MACRO;
- /*
- catch (QuitException e)
- {
- status = Interpreter_QUIT;
- }
- catch (bbtk::Exception e)
- {
- std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
- status = Interpreter_ERROR;
- }
- catch (std::exception& e)
- {
- std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
- status = Interpreter_ERROR;
- }
- catch (...)
- {
- std::cerr
- << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
- status = Interpreter_ERROR;
- }
- */
+
bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
<<std::endl);
void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
{
bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
- bbtkMessage("Echo",2,line<<std::endl);
+ bbtkMessage("echo",2,line<<std::endl);
std::vector<std::string> words;
SplitLine(line,words);
switch (command.code)
{
case cNew :
- mExecuter->Create(words[1],words[2]);
+ mVirtualExecuter->Create(words[1],words[2]);
break;
case cDelete :
- mExecuter->Destroy(words[1]);
+ mVirtualExecuter->Destroy(words[1]);
break;
case cConnect :
Utilities::SplitAroundFirstDot(words[1],left,right);
Utilities::SplitAroundFirstDot(words[2],left2,right2);
- mExecuter->Connect(left,right,left2,right2);
+ mVirtualExecuter->Connect(left,right,left2,right2);
break;
case cPackage :
- mExecuter->BeginPackage(words[1]);
+ mVirtualExecuter->BeginPackage(words[1]);
break;
case cEndPackage :
- mExecuter->EndPackage();
+ mVirtualExecuter->EndPackage();
break;
case cDefine :
if (mFileName.size()>0)
{
- filename = mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
+ filename = mFileName.back(); //mIncludeFileName.back(); //Utilities::get_file_name(mFileName.back());
}
if (words.size()==2)
{
- mExecuter->Define(words[1],"",filename);
+ mVirtualExecuter->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 :
- mExecuter->Kind(words[1]);
+ mVirtualExecuter->Kind(words[1]);
break;
case cPrint :
- mExecuter->Print(words[1]);
+ mVirtualExecuter->Print(words[1]);
break;
case cExec :
if (words[1]=="freeze")
- mExecuter->SetNoExecMode(true);
- else if (words[1]=="unfreeze")
- mExecuter->SetNoExecMode(false);
- else
- mExecuter->Execute(words[1]);
+ {
+ mVirtualExecuter->SetNoExecMode(true);
+ mThrow = false;
+ }
+ else if (words[1]=="freeze_no_error ")
+ {
+ mVirtualExecuter->SetNoExecMode(true);
+ mVirtualExecuter->SetNoErrorMode(true);
+ mThrow = false;
+ }
+ else if (words[1]=="unfreeze")
+ {
+ mVirtualExecuter->SetNoExecMode(false);
+ mVirtualExecuter->SetNoErrorMode(false);
+ }
+ else
+ {
+ mVirtualExecuter->Execute(words[1]);
+ }
break;
case cInput :
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 :
break;
case cCategory :
- mExecuter->Category(words[1]);
+ mVirtualExecuter->Category(words[1]);
break;
case cIndex :
break;
case cDescription :
- mExecuter->Description(words[1]);
+ mVirtualExecuter->Description(words[1]);
break;
case cHelp :
case cMessage :
if (words.size()<3)
{
- mExecuter->HelpMessages();
+ mVirtualExecuter->HelpMessages();
}
else
{
sscanf(words[2].c_str(),"%d",&level);
- mExecuter->SetMessageLevel(words[1],level);
+ mVirtualExecuter->SetMessageLevel(words[1],level);
}
break;
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()->LoadPackage(words[1]);
throw QuitException();
break;
- case cObject :
- if (words.size()==2) ObjectInfo(words[1]);
- else ObjectInfo("");
+ 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;
*/
// Cannot close all files if the reset command is read from a file !
// CloseAllFiles();
mFileNameHistory.clear();
- this->mExecuter->Reset();
+ this->mVirtualExecuter->Reset();
}
//=======================================================================
/*
void Interpreter::Print( const std::string& str)
{
- if (mExecuter->GetNoExecMode()) return;
+ if (mVirtualExecuter->GetNoExecMode()) return;
bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<<str<<"\")"<<std::endl);
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%")
std::vector<std::string>::iterator i;
for (i= chains.begin(); i!=chains.end(); ++i)
{
- // bbtkMessage("Echo",1,*i);
+
Utilities::SubsBackslashN(*i);
std::cout << *i;
}
*/
// =========================================================================
- 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
pkgname = Utilities::ExtractScriptName(name,upath);
bbtkMessage("Interpreter",3,
- "extract : pkgname [" << pkgname
- << "] upath [" << upath << "]" << std::endl);
+ "package name:[" << pkgname
+ << "] path:[" << upath << "]" << std::endl);
bool fullnameGiven = false;
bool foundFile = false;
// relative (e.g. std/boxes/*) or absolute
if (pkgname == "*")
{
- int nbBssFiles;
-
+
std::stringstream* stream = new std::stringstream;
//if (upath.size()!=0) // avoid troubles for "*"
if (upath.size()==0)
{
// bbtkMessage("Interpreter",1,
- script_paths.push_back( ConfigurationFile::GetInstance().Get_root_bbs_path() );
+ // LG : add all bbs path
+ // script_paths.push_back( ConfigurationFile::GetInstance().Get_root_bbs_path() );
+ std::vector<std::string>::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] == ':' )
// the relative path provided
else
{
- std::vector<std::string>::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 '"<<upath<<"' subdir found in search paths"
- << std::endl);
- }
-
+ std::vector<std::string>::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 '"<<upath<<"' subdir found in search paths"
+ << std::endl);
+ }
}
+
+
// === search paths list complete : now explore it
-
-
+ int nbBssFiles = 0;
+ // ==== relative name, iterate + load all .bbs/.bbp files
std::vector<std::string>::iterator i;
- for (i=script_paths.begin();i!=script_paths.end();i++)// ==== relative name, iterate + load all .bbs files
+ for (i=script_paths.begin();i!=script_paths.end();i++)
{
bbtkMessage("Interpreter",1,
"--> Looking in '" << *i << "'" << std::endl);
-
Filenames.clear();
- int nbFiles = Utilities::Explore(*i, false, Filenames);
+ //int nbFiles =
+ Utilities::Explore(*i, false, Filenames);
- nbBssFiles = 0;
for (std::vector<std::string>::iterator j = Filenames.begin();
j!= Filenames.end(); ++j)
{
int lgr = (*j).size();
- if (lgr < 5)
- continue; // ignore non .bbs file
- if ((*j).substr(lgr-4, 4) != ".bbs")
- continue;
+ if (lgr < 5) continue;
+ // ignore non .bbp file
+ if ( (*j).substr(lgr-4, 4) != ".bbp") continue;
(*stream) << "include \"" << *j << "\"\n";
- bbtkMessage("Interpreter",2,
- " --> Found '" << *j << "'" << std::endl);
+ bbtkMessage("Interpreter",2," --> Found '" << *j << "'" << std::endl);
nbBssFiles++;
- } // for vector
-
- if (nbBssFiles==0)
- {
- bbtkMessage("Interpreter",1,
- " --> No .bbs found"<< std::endl);
- }
- else
- {
- bbtkMessage("Interpreter",1,
- " --> "<<nbBssFiles<<" .bbs found"<< std::endl);
- SwitchToStream(stream);
- }
-
- //break; // a directory was found; we stop iterating
- // LG : No! We want all files included !
- } // for vector
+ } // for (std::vector...
+ } // for (i=script_...
+
+ // === Result ...
+ if (nbBssFiles==0)
+ {
+ bbtkMessage("Interpreter",1,
+ " --> No .bbp found"<< std::endl);
+ }
+ else
+ {
+ bbtkMessage("Interpreter",1,
+ " --> "<<nbBssFiles<<" .bbp found"<< std::endl);
+ SwitchToStream(stream);
+ }
return;
}
//=============== end pkgname=="*" ===========
-
-
+
+
// if name starts with a / or a . or contains : user is assumed to have passed a relative/absolute name
// (not only a plain script name)
// we trust him, and try to expland the directory name
// 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<std::string>::iterator i;
for (i=script_paths.begin();i!=script_paths.end();++i)
- {
- path = *i;
- // we *really* want '.' to be the current working directory
- if (path == ".") {
- char buf[2048]; // for getcwd
- char * currentDir = getcwd(buf, 2048);
- std::string cwd(currentDir);
- path = currentDir;
- }
-
- fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
+ {
+ path = *i;
+ // we *really* want '.' to be the current working directory
+ if (path == ".")
+ {
+ char buf[2048]; // for getcwd
+ char * currentDir = getcwd(buf, 2048);
+ std::string cwd(currentDir);
+ path = currentDir;
+ }
- // Check if library exists
- if ( ! Utilities::FileExists(fullPathScriptName) )
- {
- // The following is *NOT* a debug time message :
- // It's a user intended message.
- // Please don't remove it.
- bbtkMessage("Interpreter",2,
- " [" <<fullPathScriptName <<"] : doesn't exist"
+ std::string tfullPathScriptName = Utilities::MakePkgnameFromPath(path, name, false);
+ if (tfullPathScriptName.substr(tfullPathScriptName.size()-4, 3)==".bb")
+ {
+ fullPathScriptName = tfullPathScriptName;
+ 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,
+ " [" <<fullPathScriptName <<"] : does not exist"
<<std::endl);
- continue; // try next path
- }
- bbtkMessage("Interpreter",2,
+ continue; // try next path
+ }
+ bbtkMessage("Interpreter",2,
+ " [" <<fullPathScriptName
+ <<"] : found" <<std::endl);
+ foundFile = true;
+ break; // a script was found; we stop iterating
+ }
+ else
+ {
+ fullPathScriptName = tfullPathScriptName + ".bbs";
+ // Check if library exists
+ if ( ! Utilities::FileExists(fullPathScriptName) )
+ {
+ fullPathScriptName = tfullPathScriptName + ".bbp";
+ 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,
+ " [" <<tfullPathScriptName <<".bbs/.bbp] : do not exist"
+ <<std::endl);
+ continue; // try next path
+ }
+ }
+ bbtkMessage("Interpreter",2,
" [" <<fullPathScriptName
<<"] : found" <<std::endl);
- foundFile = true;
- break; // a script was found; we stop iterating
-
+ foundFile = true;
+ break; // a script was found; we stop iterating
+ }
} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
- }
-
+ }
+
if (!foundFile)
{
if (fullnameGiven)
else
bbtkError("Script ["<<fullPathScriptName<<"] not found");
else
- bbtkError("No ["<<pkgname<<".bbs] script found");
+ bbtkError("No ["<<pkgname<<".bbs/.bbp] script found");
return;
}
else
+ {
LoadScript(fullPathScriptName,name);
+ if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
+ }
return;
}
mIncludeFileName.push_back(includeScriptName);
mLine.push_back(0);
- return;
+ return;
}
//=======================================================================
}
// tests the number of args
- if ( ( words.size()-1 < c->second.argmin ) ||
- ( words.size()-1 > c->second.argmax ) )
+ if ( ( ((int)words.size())-1 < c->second.argmin ) ||
+ ( ((int)words.size())-1 > c->second.argmax ) )
{
HelpCommand(words[0]);
bbtkError(words[0]<<" : wrong number of arguments");
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();
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);
memset(histline,0,MAX_LINE_SIZE);
char* line = newline;
- int hist = mHistory.size();
+ unsigned int hist = mHistory.size();
write(1,"> ",2);
while(1)
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);
}
if ( ( mUser != 0 ) && ( mUser->InterpreterUserHasOwnHtmlPageViewer() ) )
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
// vector which stores the list of inputs of the box which must be connected
std::vector<std::string> in;
- Factory::Pointer F = mExecuter->GetFactory();
+ Factory::Pointer F = mVirtualExecuter->GetFactory();
/*
Package::Pointer user = F->GetPackage("user");
*/
- ComplexBlackBoxDescriptor::Pointer workspace = mExecuter->GetWorkspace();
+ ComplexBlackBoxDescriptor::Pointer workspace =
+ mRealExecuter.lock()->GetCurrentDescriptor();
if (workspace==0)
{
delete s;
- bbtkError("Interpreter::CreateGUI : could not access the executer workspace");
+ bbtkError("Interpreter::CreateGUI : could not access the executer currently defined complex box");
}
BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname);
// BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap();
- int nb = 0;
+ // int nb = 0;
BlackBox::InputConnectorMapType::iterator i;
for (i=box->bbGetInputConnectorMap().begin();
i!=box->bbGetInputConnectorMap().end();
//==========================================================================
- void Interpreter::ObjectInfo(const std::string& name)
+ void Interpreter::Debug(const std::string& name)
{
if ((name.length()==2)&&(name[0]=='-'))
{
- if (name[1]=='S')
+ if (name[1]=='D')
{
bbtk::StaticInitTime::PrintObjectListInfo = true;
}
{
// int o = MessageManager::GetMessageLevel("debug");
// if (o<2) MessageManager::SetMessageLevel("debug",2);
- mExecuter->GetFactory()->CheckPackages();
+ mVirtualExecuter->GetFactory()->CheckPackages();
// MessageManager::SetMessageLevel("debug",o);
}
}
{
size_t s = Superclass::GetObjectRecursiveSize();
s += Interpreter::GetObjectInternalSize();
- s += mExecuter->GetObjectRecursiveSize();
+ s += mVirtualExecuter->GetObjectRecursiveSize();
return s;
}
//==========================================================================
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff