X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=c34a7855c3e81b7df6445dd90badee8e0fc08575;hb=b32d13b9d036af133a1697940f521cc5321ea35d;hp=18b3b763edca5e515271fab03d43cd33f59fb138;hpb=342c21bb6c5f2ba6ba76aacb403ce1201a10957c;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 18b3b76..c34a785 100644
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
-  Date:      $Date: 2008/01/28 09:12:49 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/01/29 14:11:03 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,6 +31,7 @@
 #define BBTK_USE_TERMIOS_BASED_PROMPT
 #endif
 
+#include <string>
 
 namespace bbtk
 {
@@ -98,6 +99,22 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     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.";
     mCommandDict[info.keyword] = info;
 
+    info.keyword = "package";
+    info.argmin = 1;
+    info.argmax = 1;
+    info.code = cPackage;
+    info.syntax = "package <name>";
+    info.help = "Begins the definition of a package.";
+    mCommandDict[info.keyword] = info;
+    
+    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.keyword] = info;
+
     info.keyword = "define";
     info.argmin = 1;
     info.argmax = 2;
@@ -419,6 +436,14 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         mExecuter->Connect(left,right,left2,right2);
         break;
         
+      case cPackage :
+        mExecuter->BeginPackage(words[1]);
+        break;
+
+      case cEndPackage :
+        mExecuter->EndPackage();
+        break;
+        
       case cDefine :
         if (mFileName.size()>0) 
         {
@@ -426,7 +451,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         }
         if (words.size()==2) 
         {
-           mExecuter->Define(words[1],"user",filename);
+           mExecuter->Define(words[1],"",filename);
         }
         else 
         {
@@ -696,7 +721,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
 // ===================================================================================
 
-
   void Interpreter::SwitchToFile( const std::string& name,
                                   bool use_configuration_file, bool verbose)
   {
@@ -707,45 +731,137 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   //      - absolute full name e.g.       /home/usrname/proj/dir/scr.bbs
   //          same for Windows, with      c:, d: ...
   //
+  // expression like directory/subdir/scrname.bbs is FORBIDDEN (*)
+  // use ./directory/subdir/scrname.bbs
+  //
+  //   (*) except when using packagename/boxes/*
+  
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 
+// 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::cout << "pkgname [" << pkgname << "] name [" << name << "]" << std::endl;
+    std::string fullPathScriptName;  // full path script name
+    std::string pkgname;             // e.g. <scriptname>.bbs
+
     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);
+    
     bool fullnameGiven = false; 
     bool foundFile     = false;
+
+    if(pkgname == "*") // =========================================== load all boxes (e.g. std/boxes/*)
+    {
+      std::string path;
+      std::vector<std::string>::iterator i;
+      std::string fullDirectoryName;
+      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;
+        }
+
+        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;
+
+        std::vector<std::string> Filenames;
+        int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
+// std::cout << "=================nbFiles " << nbFiles << std::endl;
+        int 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 (slash_position != std::string::npos)
-    {       // ------------------------------------- check user supplied location 
+
+    // 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 (slash_position != std::string::npos)
+    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);
-      if (libname != "") {
-        if ( Utilities::FileExists(libname))
+
+      fullPathScriptName =  Utilities::ExpandLibName(name, verbose);
+
+      // allow user to always forget ".bbs"
+      int l = fullPathScriptName.size();
+
+      if (l!=0) {
+      
+      if (l>4)
+      {
+         if (fullPathScriptName.substr(l-4, 4) != ".bbs")
+         {
+            fullPathScriptName = fullPathScriptName + ".bbs";
+         }
+      }
+      else
+      {
+         fullPathScriptName = fullPathScriptName + ".bbs";   
+      }
+
+        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
@@ -754,59 +870,70 @@ std::cout << "pkgname [" << pkgname << "] name [" << name << "]" << std::endl;
           path = currentDir;
         }
 
-        libname = Utilities::MakePkgnameFromPath(path, pkgname);
+       // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
 
-      // Check if library exists           
-        if ( ! Utilities::FileExists(libname) )
+	    fullPathScriptName = Utilities::MakePkgnameFromPath(path, pkgname, 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;  
+  }
 
   //=======================================================================
   /**
@@ -1137,19 +1264,18 @@ void Interpreter::Help(const std::vector<std::string>& words)
     // 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)) )
 	  {
@@ -1242,13 +1368,13 @@ void Interpreter::Help(const std::vector<std::string>& words)
 	    PrintChar(line[ind]);
 	    ind++;
 	  }
-	
+
 	// Arrow left
 	else if (ind>0 && c==BBTK_LEFT_ARROW_KBCODE)
 	  {
 	    PrintChar('\b');
 	    ind--;
-	    
+    
 	  }
 
       }