Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $ $
Language: C++
- Date: $Date: 2008/02/18 10:41:02 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2008/03/25 06:22:53 $
+ Version: $Revision: 1.53 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "bbtkInterpreter.h"
#include "bbtkMessageManager.h"
#include "bbtkConfigurationFile.h"
-#include "bbtkWxConsole.h"
#include "bbtkUtilities.h"
#include <sys/stat.h>
#include <algorithm>
namespace bbtk
{
-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+ //Interpreter* Interpreter::mGlobalInterpreter = NULL;
//=======================================================================
/**
*/
Interpreter::Interpreter()
:
- mCommandLine(false)
+ 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("Interpreter","Messages of the interpreter",0);
bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);
- mGlobalInterpreter = this;
-
mExecuter = new bbtk::Executer();
+ mExecuter->SetInterpreter(this);
// For the time being, comment out previous line, and
// uncomment next line to check Transcriptor
info.argmax = 2;
info.code = cIndex;
- info.syntax = "index [<filename> ['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";
+ info.syntax = "index [<filename> ['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;
- info.category = "reset"; //EED
+ info.category = "reset";
info.argmin = 0;
info.argmax = 0;
info.code = cReset;
{
bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
delete mExecuter;
- //delete mFactory;
bbtkDebugDecTab("Interpreter",9);
}
//=======================================================================
+ InterpreterError::InterpreterError( const std::string& message,
+ bool in_script_file,
+ const std::string& script_file,
+ int script_line
+ )
+ : Exception("Interpreter",0,message),
+ mInScriptFile(in_script_file),
+ mScriptFile(script_file),
+ mScriptLine(script_line)
+ {
+ }
+ InterpreterError::InterpreterError( const Exception& excep,
+ bool in_script_file,
+ const std::string& script_file,
+ int script_line
+ )
+ : Exception(excep),
+ mInScriptFile(in_script_file),
+ mScriptFile(script_file),
+ mScriptLine(script_line)
+ {
+ }
+ //=======================================================================
+ void Interpreter::CatchBbtkException( const bbtk::Exception& e )
+ {
+ if (mThrow)
+ {
+ bool in_script = false;
+ std::string file("");
+ int line = 0;
+ if (mFileName.size()) {
+ std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+ if (fs!=0) in_script = true;
+ file = mFileName.back();
+ line = mLine.back();
+ }
+ throw InterpreterError(e,in_script,file,line);
+ }
+ else
+ {
+ std::stringstream mess;
+ mess << "* ERROR : "<<e.GetMessage()<<std::endl;
+ if (mFileName.size()) {
+ mess << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
+ mess << "* LINE : "<<mLine.back()<<std::endl;
+ }
+ std::cerr << mess.str();
+ }
+ }
+ //=======================================================================
+
+ //=======================================================================
+ void Interpreter::CatchStdException( const std::exception& e )
+ {
+ if (mThrow)
+ {
+ bool in_script = false;
+ std::string file("");
+ int line = 0;
+ if (mFileName.size()) {
+ std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+ if (fs!=0) in_script = true;
+ file = mFileName.back();
+ line = mLine.back();
+ }
+ throw InterpreterError(e.what(),in_script,file,line);
+ }
+ else
+ {
+ std::stringstream mess;
+ mess << "* ERROR : "<<e.what()<<std::endl;
+ if (mFileName.size()) {
+ mess << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
+ mess << "* LINE : "<<mLine.back()<<std::endl;
+ }
+ std::cerr << mess.str();
+ }
+ }
+ //=======================================================================
+
+ //=======================================================================
+ void Interpreter::CatchUnknownException()
+ {
+ if (mThrow)
+ {
+ bool in_script = false;
+ std::string file("");
+ int line = 0;
+ if (mFileName.size()) {
+ std::ifstream* fs = dynamic_cast<std::ifstream*>(mFile.back());
+ if (fs!=0) in_script = true;
+ file = mFileName.back();
+ line = mLine.back();
+ }
+ 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 : \""<<mFileName.back()<<"\""<<std::endl;
+ mess << "* LINE : "<<mLine.back()<<std::endl;
+ }
+ std::cerr << mess.str();
+ }
+ }
+ //=======================================================================
+
+ //=======================================================================
+
+#define CATCH_MACRO \
+ catch (QuitException e) \
+ { \
+ status = Interpreter_QUIT; \
+ if (mThrow) throw QuitException(); \
+ } \
+ catch (bbtk::Exception e) \
+ { \
+ status = Interpreter_ERROR; \
+ CatchBbtkException(e); \
+ } \
+ catch (std::exception& e) \
+ { \
+ status = Interpreter_ERROR; \
+ CatchStdException(e); \
+ } \
+ catch (...) \
+ { \
+ status = Interpreter_ERROR; \
+ CatchUnknownException(); \
+ }
+ //=======================================================================
+
+
//=======================================================================
/**
*
*/
- void Interpreter::InterpretFile( const std::string& filename,
- bool use_configuration_file)
+ Interpreter::ExitStatus Interpreter::InterpretFile( const std::string& filename )
{
bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
bool exm = mCommandLine;
mCommandLine = false;
+ ExitStatus status = Interpreter_OK;
try
{
-printf("EED: Interpreter::InterpretFile 01\n");
-InterpretLine("message ALL 9", exm);
- SwitchToFile(filename, use_configuration_file);
+ SwitchToFile(filename);
+
bool insideComment = false; // for multiline comment
while (mFile.size()>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(\""<<filename<<"\")"<<std::endl);
+ bbtkDecTab("Interpreter",9);
+
+ mCommandLine = exm;
+
+ return status;
+ }
+ //=======================================================================
+
+
+ //=======================================================================
+ /**
+ *
+ */
+ Interpreter::ExitStatus
+ Interpreter::InterpretBuffer( std::stringstream* buffer )
+ {
+ bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretBuffer()"<<std::endl);
+
+ bool exm = mCommandLine;
+ mCommandLine = false;
+
+ ExitStatus status = Interpreter_OK;
+
+ try
{
+ SwitchToStream(buffer);
+ bool insideComment = false; // for multiline comment
+ while (mFile.size()>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()"<<std::endl);
+ bbtkDecTab("Interpreter",9);
+
+ mCommandLine = exm;
+ return status;
+ }
+ //=======================================================================
+
+ //=======================================================================
+ /// Runs the interpretation of a command
+ Interpreter::ExitStatus Interpreter::InterpretLine( const std::string& line )
+ {
+printf("EED Interpreter::InterpretLine %s \n", line.c_str() );
+ bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine('"<<line<<"')"<<std::endl);
+
+ ExitStatus status = Interpreter_OK;
+
+ try
{
- std::cerr << "* ERROR : "<<e.GetMessage()<<std::endl;
- if (mFileName.size()) {
- std::cerr << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
- std::cerr << "* LINE : "<<mLine.back()<<std::endl;
- }
+ bool insideComment = false;
+ 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;
- if (mFileName.size()) {
- std::cerr << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
- std::cerr << "* LINE : "<<mLine.back()<<std::endl;
- }
+ {
+ std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+ status = Interpreter_ERROR;
}
catch (...)
- {
- std::cout << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
- if (mFileName.size()) {
- std::cout << "* FILE : \""<<mFileName.back()<<"\""<<std::endl;
- std::cout << "* LINE : "<<mLine.back()<<std::endl;
- }
- }
+ {
+ std::cerr
+ << "* UNDEFINED ERROR (not a bbtk nor a std exception)"<<std::endl;
+ status = Interpreter_ERROR;
+ }
+ */
- CloseAllFiles();
- bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
+ bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretLine()"
+ <<std::endl);
bbtkDecTab("Interpreter",9);
-
- mCommandLine = exm;
- printf("EED: Interpreter::InterpretFile 02\n");
+
+ return status;
}
- //=======================================================================
-
-
+
//=======================================================================
/**
*/
void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
{
-
bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretLine(\""<<line<<"\")"<<std::endl);
bbtkMessage("Echo",2,"\""<<line<<"\""<<std::endl);
break;
case cPrint :
- Print(words[1]); /// \todo use mExecuter
+ Print(words[1]); /// \todo use generate command
break;
case cExec :
Config();
break;
- case cReset : // EED
+ case cReset :
this->mExecuter->Reset();
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()->GetFactory()->LoadPackage(words[1]);
break;
case cUnload:
- UnLoadPackage(words[1]);
+ GetExecuter()->GetFactory()->UnLoadPackage(words[1]);
break;
case cQuit :
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);
- }
+ }
}
//=======================================================================
{
if (mExecuter->GetNoExecMode()) return;
- bbtkDebugMessageInc("Interpreter",9,"Interpreter::SplitLine(\""<<str<<"\")"<<std::endl);
+ bbtkDebugMessageInc("Interpreter",9,"Interpreter::Print(\""<<str<<"\")"<<std::endl);
+
+ // TO DO :
+ // InterpretLine ("load std")
+ // InterpretLine("new ConcatStrings _C_ ") -> trouver un nom unique : # commande
+ // InterpretLine("new Print _P_")
+ // InterpretLine("connect _C_.Out _P_.In")
+ // int num = 1
+
std::vector<std::string> chains;
std::string delimiters("$");
{
// 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);
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<std::string>::iterator i;
for (i= chains.begin(); i!=chains.end(); ++i)
{
// ===================================================================================
- 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
std::string pkgname; // e.g. <scriptname>.bbs
std::vector<std::string> 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);
+ 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);
bool fullnameGiven = false;
bool foundFile = false;
{
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
{
int nbFiles = Utilities::Explore(upath, false, Filenames);
nbBssFiles = 0;
for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
{
- if ((*i).substr((*i).size()-4, 4) != ".bbs")
- continue; // ignore non .bbs files
- LoadScript(*i,name);
+ int lgr = (*i).size();
+ if (lgr < 5)
+ continue; // ignore non .bbs file
+ if ((*i).substr(lgr-4, 4) != ".bbs")
+ continue;
+
+printf("EED Interpreter::SwitchToFile flag01 %s \n", (*i).c_str() );
+ (*stream) << "include \"" << *i << "\"\n";
+
nbBssFiles++;
- }
- if (nbBssFiles==0)
+ } // 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<std::string>::iterator i;
char * currentDir = getcwd(buf, 2048);
std::string cwd(currentDir);
path = currentDir;
- }
+ } // if path
fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
- //EED 18 Fev 2008
- // without last slash "\"
- std::string fullDirectoryNameClean = fullDirectoryName.substr(0,fullDirectoryName.size()-1);
+ // 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," [" <<fullDirectoryName
+ bbtkMessage("Interpreter",1," [" <<fullDirectoryName
<<"] : doesn't exist" <<std::endl);
continue; // try next path
- }
+ } // if IsDirectory
foundFile = true;
-
+ Filenames.clear();
int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
nbBssFiles = 0;
for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
{
- if ((*i).substr((*i).size()-4, 4) != ".bbs")
- continue; // ignore non .bbs files
- LoadScript(*i,name);
+ int lgr = (*i).size();
+ if (lgr < 5)
+ continue; // ignore non .bbs file
+ if ((*i).substr(lgr-4, 4) != ".bbs")
+ continue;
+
+printf("EED Interpreter::SwitchToFile flag02 %s \n", (*i).c_str() );
+ (*stream) << "include \"" << *i << "\"\n";
+
nbBssFiles++;
- }
- if (nbBssFiles==0)
- bbtkMessage("Interpreter",1,
+ } // 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;
- }
-
- //std::string::size_type slash_position = name.find_last_of("/\\");
+ } // if *
// 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)
int l = fullPathScriptName.size();
if (l!=0) {
-
+
if (l>4)
{
if (fullPathScriptName.substr(l-4, 4) != ".bbs")
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
+ {
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 == ".") {
path = currentDir;
}
- // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
-
- fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
-
+ 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,
- " [" <<fullPathScriptName <<"] : doesn't exist"
- <<std::endl);
+ bbtkMessage("Interpreter",2,
+ " [" <<fullPathScriptName <<"] : doesn't exist"
+ <<std::endl);
continue; // try next path
}
- bbtkMessage("Interpreter",2,
+ bbtkMessage("Interpreter",2,
" [" <<fullPathScriptName
<<"] : found" <<std::endl);
foundFile = true;
}
+void Interpreter::SwitchToStream( std::stringstream* stream )
+{
+ mFile.push_back(stream);
+ std::ostringstream buffer_name;
+ bufferNb++;
+ buffer_name << "buffer_" ;
+
+ if (mFileName.size()>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 '"<<fullPathScriptName
+ Utilities::replace( fullPathScriptName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
+ bool okScriptExist=false;
+ int iStrScript,sizeVecStricpt=mFileName.size();
+ for ( iStrScript=0;iStrScript<sizeVecStricpt;iStrScript++)
+ {
+ if (mFileName[iStrScript] == fullPathScriptName )
+ {
+ okScriptExist=true;
+ } // if
+ } // for
+
+ if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)!=mFileName.end())
+// if (okScriptExist==true)
+ {
+ bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
<<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
- return;
- }
+ return;
+ }
std::ifstream* s;
s = new std::ifstream;
s->open(fullPathScriptName.c_str());
- if (!s->good())
+ if (!s->good())
{
bbtkError("Could not open file ["<<fullPathScriptName<<"]");
return;
mFileName.push_back(fullPathScriptName);
mIncludeFileName.push_back(includeScriptName);
mLine.push_back(0);
+
return;
}
return;
}
- mFile.back()->close();
+ bbtkDebugMessage("Interpreter",9," Closing file '"<<mFileName.back()<<"'"<<std::endl);
+
+ std::ifstream* file = dynamic_cast<std::ifstream*>(mFile.back());
+ if (file!=0) file->close();
+
delete mFile.back();
mFile.pop_back();
- bbtkDebugMessage("Interpreter",9,
- " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-
mFileName.pop_back();
mIncludeFileName.pop_back();
mLine.pop_back();
+
bbtkDebugMessage("Interpreter",9," Remains "
<<mFile.size()
<<" open"<<std::endl);
while (mFile.size() != 0)
{
+ CloseCurrentFile();
+ /*
mFile.back()->close();
delete mFile.back();
mFile.pop_back();
mFileName.pop_back();
mIncludeFileName.pop_back();
mLine.pop_back();
+*/
}
bbtkDebugMessage("Interpreter",9,"EO Interpreter::CloseAllFiles()"
<<std::endl);
{
if (words[1]=="packages")
{
- PrintPackages(true);
+ GetExecuter()->GetFactory()->PrintPackages(true);
return;
}
try
{
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("\""<<words[1].c_str()
- <<"\" is not a known command, package, black box type or black box name");
- }
- }
+ }
+ catch (bbtk::Exception g)
+ {
+ try
+ {
+ GetExecuter()->ShowRelations(words[1],"0","9999");
+ }
+ catch (bbtk::Exception h){
+ bbtkError("\""<<words[1].c_str()
+ <<"\" is not a known command, package, black box type or black box name");
+ }
+ }
}
}
}
{
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)
{
}
catch (QuitException e)
{
+ bbtkMessage("Interpreter",1,"Interpreter : Quit"<<std::endl);
again = false;
}
catch (bbtk::Exception e)
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)
{
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);
+
}
//=======================================================================
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);
}
//=======================================================================
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff