]> Creatis software - bbtk.git/blobdiff - kernel/src/bbtkInterpreter.cxx
*** empty log message ***
[bbtk.git] / kernel / src / bbtkInterpreter.cxx
index bea63728626faabcdae6009474d972f275aac958..fc5f3f18638104b9d3046cc162c02de60a6c5259 100644 (file)
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
-  Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
+  Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/06 09:11:21 $
-  Version:   $Revision: 1.73 $
-                                                                                
-  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 :
@@ -121,6 +134,14 @@ namespace bbtk
     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;
@@ -383,6 +404,28 @@ namespace bbtk
       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 )
   {
@@ -483,6 +526,11 @@ namespace bbtk
       status = Interpreter_QUIT;               \
       if (mThrow) throw QuitException();       \
     }                                          \
+  catch (InterpreterError e)                   \
+    {                                          \
+      status = Interpreter_ERROR;              \
+      CatchInterpreterException(e);                    \
+    }                                          \
   catch (bbtk::Exception e)                    \
     {                                          \
       status = Interpreter_ERROR;              \
@@ -505,7 +553,7 @@ namespace bbtk
   /**
    *  
    */
-  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);
 
@@ -516,7 +564,7 @@ namespace bbtk
 
     try 
     {
-      SwitchToFile(filename);
+      SwitchToFile(filename,source);
 
       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
@@ -537,10 +585,10 @@ namespace bbtk
            }
          CATCH_MACRO;
          
-       }//while
+       }//while !eof
        CloseCurrentFile();
-      }
-    }
+      }//while >0
+    } // try
     CATCH_MACRO;
     
     CloseAllFiles();
@@ -722,7 +770,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       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) 
         {
@@ -837,21 +885,22 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
        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]);
@@ -1022,7 +1071,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
    */
 
   // =========================================================================
-  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 
@@ -1054,8 +1103,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     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;
 
@@ -1063,8 +1112,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     // relative (e.g. std/boxes/*) or absolute 
     if (pkgname == "*") 
       {
-       int nbBssFiles;
-       
+
        std::stringstream* stream = new std::stringstream;
        //if (upath.size()!=0) // avoid troubles for "*"
        
@@ -1072,7 +1120,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        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] == ':' ) 
@@ -1090,86 +1146,82 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        // 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);
            
-           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
@@ -1186,65 +1238,101 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       // 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)
@@ -1253,11 +1341,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
          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;
   }
@@ -1315,7 +1406,7 @@ void Interpreter::SwitchToStream( std::stringstream* stream )
     mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);
 
-    return;
+       return;
   }
 
   //=======================================================================