Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $ $
Language: C++
- Date: $Date: 2008/04/22 06:59:31 $
- Version: $Revision: 1.61 $
+ Date: $Date: 2008/07/23 11:46:11 $
+ Version: $Revision: 1.69 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//=======================================================================
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.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.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;
/*
Interpreter::~Interpreter()
{
bbtkDebugMessageInc("Interpreter",9,"==> Interpreter::~Interpreter()" <<std::endl);
- mExecuter = VirtualExec::Pointer();
+ mVirtualExecuter = VirtualExec::Pointer();
bbtkDebugMessageInc("Interpreter",9,"<== Interpreter::~Interpreter()" <<std::endl);
}
//=======================================================================
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 (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);
+ mVirtualExecuter->SetNoExecMode(true);
else if (words[1]=="unfreeze")
- mExecuter->SetNoExecMode(false);
+ mVirtualExecuter->SetNoExecMode(false);
else
- mExecuter->Execute(words[1]);
+ 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;
break;
case cReset :
- this->mExecuter->Reset();
- mFileNameHistory.clear();
+ Reset();
break;
case cInclude :
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;
*/
//=======================================================================
-
+ //=======================================================================
+ void Interpreter::Reset()
+ {
+ // 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(\""<<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 )
{
// Note : in the following :
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();
}
// 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");
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)
c=0;
read ( STDIN_FILENO, &c, 4) ;
- bbtkDebugMessage("Debug",9,"[0x"<<std::hex<<c<<"]\n");
+ bbtkDebugMessage("debug",9,"[0x"<<std::hex<<c<<"]\n");
// Printable character
if ( (ind<MAX_LINE_SIZE-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)
{
- Object:: PrintObjectInfo(name);
+ if ((name.length()==2)&&(name[0]=='-'))
+ {
+ if (name[1]=='D')
+ {
+ bbtk::StaticInitTime::PrintObjectListInfo = true;
+ }
+ if (name[1]=='C')
+ {
+ // int o = MessageManager::GetMessageLevel("debug");
+ // if (o<2) MessageManager::SetMessageLevel("debug",2);
+ mVirtualExecuter->GetFactory()->CheckPackages();
+ // MessageManager::SetMessageLevel("debug",o);
+ }
+ }
+ else
+ {
+ Object:: PrintObjectListInfo(name);
+ }
}
//==========================================================================
//==========================================================================
{
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