Program: bbtk
Module: $RCSfile: bbtkInterpreter.cxx,v $ $
Language: C++
- Date: $Date: 2008/01/28 15:08:53 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2008/01/30 15:29:07 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
info.syntax = "author <string>";
info.help = "Adds the string <string> to the author information of the black box being defined";
mCommandDict[info.keyword] = info;
+
+ info.keyword = "keyword"; //JP
+ info.argmin = 1;
+ info.argmax = 1;
+ info.code = cKeyword;
+ info.syntax = "keyword <list of items, separated by ;>";
+ info.help = "Adds the string <string> to the keyword information of the black box being defined";
+ mCommandDict[info.keyword] = info;
info.keyword = "description";
info.argmin = 1;
case cAuthor :
mExecuter->Author(words[1]);
break;
-
+
+ case cKeyword :
+ mExecuter->Keyword(words[1]);
+ break;
+
case cDescription :
mExecuter->Description(words[1]);
break;
// - absolute full name e.g. /home/usrname/proj/dir/scr.bbs
// same for Windows, with c:, d: ...
//
+ // use ./directory/subdir/scrname.bbs
+ //
+
bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
<<name<<"\")"<<std::endl);
-verbose = true;
+
+// to be remove in final version
+// use : Config v
+//verbose = true;
std::vector<std::string> script_paths;
- std::string libname; // full path library name
- std::string pkgname; // e.g. <scriptname>.bbs
-
- pkgname = Utilities::ExtractScriptName(name);
+ std::string fullPathScriptName; // full path script 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.
if (verbose)
std::cout << "look for : [" << name << "] (use_configuration_file == TRUE)" << std::endl;
script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
}
-
+ std::string upath;
+ pkgname = Utilities::ExtractScriptName(name,upath);
+//std::cout <<"name [" << name << "] pkgname [" << pkgname << "] upath [" << upath << "]" << std::endl;
bool fullnameGiven = false;
bool foundFile = false;
- std::string::size_type slash_position = name.find_last_of("/\\");
-
- if (false) //slash_position != std::string::npos)
- { // ------------------------------------- check user supplied location
+
+ if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*)
+ {
+ int nbBssFiles;
+
+ 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);
+ nbBssFiles++;
+ }
+ if (nbBssFiles==0)
+ if (verbose)
+ std::cout << "WARNING : No '.bbs' file found in [" << upath << "]" << std::endl;
+
+ return;
+ }
+
+
+ std::string path;
+ std::vector<std::string>::iterator i;
+ std::string fullDirectoryName;
+ for (i=script_paths.begin();i!=script_paths.end();++i)// ==== relative name, iterate + load all .bbs files
+ {
+ path = *i;
+
+ // we *really* want '.' to be the current working directory
+ if (path == ".") {
+ char buf[2048]; // for getcwd
+ char * currentDir = getcwd(buf, 2048);
+ std::string cwd(currentDir);
+ path = currentDir;
+ }
+
+ fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
+//std::cout <<"fullpath [" << fullDirectoryName << "]" <<std::endl;
+ // Check if library exists
+ if ( ! Utilities::IsDirectory(fullDirectoryName) )
+ {
+ // The following is *NOT* a debug time message :
+ // It's a user intended message.
+ // Please don't remove it.
+ if (verbose)
+ std::cout <<" [" <<fullDirectoryName <<"] : doesn't exist" <<std::endl;
+ continue; // try next path
+ }
+ foundFile = true;
+
+
+ int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
+// std::cout << "=================nbFiles " << nbFiles << std::endl;
+ 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);
+ nbBssFiles++;
+ }
+ if (nbBssFiles==0)
+ if (verbose)
+ std::cout << "WARNING : No '.bbs' file found in [" << fullDirectoryName << "]" << std::endl;
+
+ break; // a directory was found; we stop iterating
+ }
+ return;
+ }
+
+ //std::string::size_type slash_position = name.find_last_of("/\\");
+
+ // 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
+ // WARNING : starting from current local directory : ./whatYouWant (./ mandatory!)
+
+ if (name[0]=='/' || name[1] == ':' || name[0]=='.') // absolute path (linux/windows) or relative path
+ {
+
+ // ===========================================================check user supplied location
fullnameGiven = true;
- libname = Utilities::ExpandLibName(name, verbose);
+
+ fullPathScriptName = Utilities::ExpandLibName(name, verbose);
// allow user to always forget ".bbs"
- int l = libname.size();
- if (l>4)
- {
- if (libname.substr(l-4, 4) != ".bbs")
+ int l = fullPathScriptName.size();
+
+ if (l!=0) {
+
+ if (l>4)
+ {
+ if (fullPathScriptName.substr(l-4, 4) != ".bbs")
{
- libname = libname + ".bbs";
+ fullPathScriptName = fullPathScriptName + ".bbs";
}
}
else
{
- libname = libname + ".bbs";
+ fullPathScriptName = fullPathScriptName + ".bbs";
}
- if (libname != "") {
- if ( Utilities::FileExists(libname))
+ if ( Utilities::FileExists(fullPathScriptName))
{
foundFile = true;
}
- }
+ } // endif l != 0
}
- else // ------------------------------------- iterate on the paths
- {
+ 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;
+ path = *i;
// we *really* want '.' to be the current working directory
if (path == ".") {
char buf[2048]; // for getcwd
path = currentDir;
}
- libname = Utilities::MakePkgnameFromPath(path, name); //pkgname);
- // Check if library exists
- if ( ! Utilities::FileExists(libname) )
+ // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
+
+ fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
+//std::cout << "FULL PATH = "<<fullPathScriptName<<std::endl;
+
+ // 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.
if (verbose)
- std::cout <<" [" <<libname <<"] : doesn't exist" <<std::endl;
+ std::cout <<" [" <<fullPathScriptName <<"] : doesn't exist" <<std::endl;
continue; // try next path
}
+ if (verbose)
+ std::cout <<" [" <<fullPathScriptName <<"] : found" <<std::endl;
foundFile = true;
break; // a script was found; we stop iterating
} //------------------ // end for ( package_paths.begin();i!=package_paths.end() )
}
- std::ifstream* s;
-
if (!foundFile)
{
if (fullnameGiven)
- if(libname == "")
- bbtkError("Path ["<<name<<"] doesn't exist");
+ if(fullPathScriptName == "")
+ bbtkError("Path ["<<upath<<"] doesn't exist");
else
- bbtkError("Script ["<<libname<<"] not found");
+ bbtkError("Script ["<<fullPathScriptName<<"] not found");
else
bbtkError("No ["<<pkgname<<".bbs] script found");
return;
}
+ else
+ LoadScript(fullPathScriptName);
- bbtkMessage("Interpreter",1,pkgname<<" loaded"<<std::endl);
-
+ return;
+ }
+
+
+ //=======================================================================
+
+ void Interpreter::LoadScript( std::string fullPathScriptName)
+ {
+ bbtkMessage("Interpreter",1,fullPathScriptName<<" found"<<std::endl);
+
+ std::ifstream* s;
s = new std::ifstream;
- s->open(libname.c_str());
+ s->open(fullPathScriptName.c_str());
if (!s->good())
{
- bbtkError("Could not open file ["<<libname<<"]");
+ bbtkError("Could not open file ["<<fullPathScriptName<<"]");
return;
}
-
+
if (verbose)
- std::cout << " -->[" << libname << "] found" << std::endl;
+ std::cout << " -->[" << fullPathScriptName << "] found" << std::endl;
mFile.push_back(s);
- mFileName.push_back(libname);
+ mFileName.push_back(fullPathScriptName);
mLine.push_back(0);
- }
-
-
- //=======================================================================
-
+ return;
+ }
//=======================================================================
/**
// empty lines are not stored in from history
if (strlen(line))
{
- // if history too long : delete oldest command
- if (mHistory.size()>MAX_HISTORY_SIZE)
- {
- delete mHistory.front();
- mHistory.pop_front();
- }
- mHistory.push_back(line);
+ // if history too long : delete oldest command
+ if (mHistory.size()>MAX_HISTORY_SIZE)
+ {
+ delete mHistory.front();
+ mHistory.pop_front();
+ }
+ mHistory.push_back(line);
}
-
break;
}
- // Backspace
- else if ( (ind>0) &&
+ // Backspace
+ else if ( (ind>0) &&
((c == BBTK_BACKSPACE_KBCODE) ||
(c == BBTK_DEL_KBCODE)) )
{
PrintChar(line[ind]);
ind++;
}
-
+
// Arrow left
else if (ind>0 && c==BBTK_LEFT_ARROW_KBCODE)
{
PrintChar('\b');
ind--;
-
+
}
}
git://git.creatis.insa-lyon.fr / bbtk.git / blobdiff