X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreter.cxx;h=ca1bd896e3d918bbc82a4f77c881c10f889fadb5;hb=40b39757a6f9d5056bc08a59081ed19d0406837f;hp=ef03a40f986572635709764b305897bbfb162af2;hpb=6990a8aeeaf98fc901ed193b95365b2eee2fb950;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index ef03a40..ca1bd89 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/22 16:55:04 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/01/28 15:08:53 $
+  Version:   $Revision: 1.6 $
                                                                                 
   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;
@@ -324,7 +341,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
           std::cout << "* LINE  : "<<mLine.back()<<std::endl;
       }    
     }
-    
+
     CloseAllFiles();
     bbtkDebugMessage("Interpreter",9,"EO Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
     bbtkDecTab("Interpreter",9);
@@ -347,7 +364,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
 
     std::vector<std::string> words;
     SplitLine(line,words);
-    
+
     // Empty line
     if (words.size()<1) 
     {
@@ -391,158 +408,166 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
        bbtkMessage("Interpreter",9,"Multiline Comment"<<std::endl);
        return;
     }
-                
+
     // Command 
     CommandInfoType command;
     InterpretCommand(words,command);
 
     bbtkDebugMessage("Interpreter",9,
-                     "Command '"<<command.keyword
-                      <<" code="<<command.code<<std::endl); 
+                     "Command='"<<command.keyword
+                      <<"' code="<<command.code<<std::endl); 
     int level=0;
     std::string left,right,left2,right2;
     std::string filename;
     switch (command.code) 
     {
       case cNew :
-	     mExecuter->Create(words[1],words[2]);
-	     break;
+        mExecuter->Create(words[1],words[2]);
+        break;
         
       case cDelete :
-	     // TO DO !!
-	     // mExecuter->Remove(words[1]);
-	     break;
+        // TO DO !!
+        // mExecuter->Remove(words[1]);
+        break;
         
       case cConnect :
-	     Utilities::SplitAroundFirstDot(words[1],left,right);
-	     Utilities::SplitAroundFirstDot(words[2],left2,right2);      
-	     mExecuter->Connect(left,right,left2,right2);
-	     break;
+        Utilities::SplitAroundFirstDot(words[1],left,right);
+        Utilities::SplitAroundFirstDot(words[2],left2,right2);      
+        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) 
-	     {
-	        filename = Utilities::get_file_name(mFileName.back());
-	     }
-	     if (words.size()==2) 
-	     {
-	        mExecuter->Define(words[1],"user",filename);
-	     }
-	     else 
-	     {
-	       mExecuter->Define(words[1],words[2],filename);
-	     }
-	     break;
+        if (mFileName.size()>0) 
+        {
+           filename = Utilities::get_file_name(mFileName.back());
+        }
+        if (words.size()==2) 
+        {
+           mExecuter->Define(words[1],"",filename);
+        }
+        else 
+        {
+           mExecuter->Define(words[1],words[2],filename);
+        }
+        break;
         
       case cEndDefine :
-	     mExecuter->EndDefine();
-	     break;
+        mExecuter->EndDefine();
+        break;
         
       case cPrint :
-	     Print(words[1]); /// \todo use mExecuter 
-	     break;
+        Print(words[1]); /// \todo use mExecuter 
+        break;
         
       case cExec :
-	     if (words[1]=="freeze") 
-           mExecuter->SetNoExecMode(true);
-	     else if (words[1]=="unfreeze") 
-           mExecuter->SetNoExecMode(false);
-	     else 
-           mExecuter->Update(words[1]);
-	     break;
+        if (words[1]=="freeze") 
+          mExecuter->SetNoExecMode(true);
+        else if (words[1]=="unfreeze") 
+          mExecuter->SetNoExecMode(false);
+        else 
+          mExecuter->Update(words[1]);
+        break;
         
       case cInput :
-	     Utilities::SplitAroundFirstDot(words[2],left,right);
-	     mExecuter->DefineInput(words[1],left,right,words[3]);
-	     break;
+        Utilities::SplitAroundFirstDot(words[2],left,right);
+        mExecuter->DefineInput(words[1],left,right,words[3]);
+        break;
         
       case cOutput :
-	     Utilities::SplitAroundFirstDot(words[2],left,right);
-	     mExecuter->DefineOutput(words[1],left,right,words[3]);
-	     break;
+        Utilities::SplitAroundFirstDot(words[2],left,right);
+        mExecuter->DefineOutput(words[1],left,right,words[3]);
+        break;
         
       case cSet :
-	     Utilities::SplitAroundFirstDot(words[1],left,right);
-	     mExecuter->Set(left,right,words[2]);
-	     break;
+        Utilities::SplitAroundFirstDot(words[1],left,right);
+        mExecuter->Set(left,right,words[2]);
+        break;
         
       case cAuthor :
-	     mExecuter->Author(words[1]);
-	     break;
+        mExecuter->Author(words[1]);
+        break;
         
       case cDescription :
-	     mExecuter->Description(words[1]);
-	     break;
+        mExecuter->Description(words[1]);
+        break;
         
       case cHelp :
-	     Help(words);
-	     break;
+        Help(words);
+        break;
         
       case cMessage : 
-	     if (words.size()<3) 
-	     {
+        if (words.size()<3) 
+        {
             bbtk::MessageManager::PrintInfo();
-	     }
-	     else 
-	     {
+        }
+        else 
+        {
            sscanf(words[2].c_str(),"%d",&level);
            bbtk::MessageManager::SetMessageLevel(words[1],level);
-	     }
-	     break;
+        }
+        break;
         
       case cGraph : 
-	     Graph(words);
-	     break;
+        Graph(words);
+        break;
         
       case cConfig :
-	     if (words.size()>1) // any param for config means verbose = true
-	       verbose = true;
-	     else
-	       verbose = false;
-	     Config(verbose);            
-	     break;
+        if (words.size()>1) // any param for config means verbose = true
+          verbose = true;
+        else
+          verbose = false;
+        Config(verbose);            
+        break;
         
       case cReset :  // EED
-	     this->mExecuter->Reset();
-	     break;
+        this->mExecuter->Reset();
+        break;
         
       case cInclude :
-	     if (mCommandLine) 
-	     {
+        if (mCommandLine) 
+        {
            InterpretFile(words[1], true, verbose); // true : better pass use_config_file
-	     }
-	     else 
-	     {
+        }
+        else 
+        {
             SwitchToFile(words[1], true, verbose); // true : better pass use_config_file
-	     }
-	     break;
+        }
+        break;
         
       case cLoad:
-	     LoadPackage(words[1], true, verbose); // true : better pass use_config_file
-	     break;
+        LoadPackage(words[1], true, verbose); // true : better pass use_config_file
+        break;
         
       case cUnload:
-	     UnLoadPackage(words[1]);
-	     break;
+        UnLoadPackage(words[1]);
+        break;
         
       case cQuit :
-	     throw QuitException();
-	     break;
+        throw QuitException();
+        break;
         
-      case cWorkspace :
-	     if (words.size() == 2) 
-	     {
-	        if (words[1]=="freeze")        mExecuter->SetNoExecMode(true);
-	        else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
-	     }
-	     else 
-	     {
-	        mExecuter->SetWorkspaceName(words[2]);
-	     }
-	     break;
+         case cWorkspace :
+        if (words.size() == 2) 
+        {
+           if (words[1]=="freeze")        mExecuter->SetNoExecMode(true);
+           else if (words[1]=="unfreeze") mExecuter->SetNoExecMode(false);
+        }
+        else 
+        {
+           mExecuter->SetWorkspaceName(words[2]);
+        }
+        break;
         
       default:
-	     bbtkInternalError("should not reach here !!!");
+        bbtkInternalError("should not reach here !!!");
    }
     
    bbtkDecTab("Interpreter",9);
@@ -696,19 +721,24 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
 // ===================================================================================
 
-
   void Interpreter::SwitchToFile( const std::string& name,
                                   bool use_configuration_file, bool verbose)
   {
+  // Note : in the following :
+  // name : the user supplied name 
+  //      - abreviated name    e.g.       scr   scr.bbs
+  //      - relative full name e.g.       ./scr.bbs   ../../scr.bbs 
+  //      - absolute full name e.g.       /home/usrname/proj/dir/scr.bbs
+  //          same for Windows, with      c:, d: ...
+  //
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
-
+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);
-
     if (use_configuration_file)
     {
       if (verbose)
@@ -719,11 +749,26 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     bool fullnameGiven = false; 
     bool foundFile     = false;
     std::string::size_type slash_position = name.find_last_of("/\\");
-  
-    if (slash_position != std::string::npos)
-    {
-      fullnameGiven = true;     
+            
+    if (false) //slash_position != std::string::npos)
+    {       // ------------------------------------- check user supplied location 
+      fullnameGiven = true;
       libname =  Utilities::ExpandLibName(name, verbose);
+
+      // allow user to always forget ".bbs"
+      int l = libname.size();
+      if (l>4) 
+      {       
+         if (libname.substr(l-4, 4) != ".bbs")
+         {
+            libname = libname + ".bbs";    
+         }
+      }
+      else
+      {
+         libname = libname + ".bbs";
+      }
+
       if (libname != "") {
         if ( Utilities::FileExists(libname))
         {
@@ -731,9 +776,9 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         }
       }
     }
-    else    // ----------------------- iterate on the paths
+    else    // ------------------------------------- iterate on the paths
     {
-      std::string path;    
+      std::string path;
       std::vector<std::string>::iterator i;
       for (i=script_paths.begin();i!=script_paths.end();++i)
       {
@@ -743,18 +788,20 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         if (path == ".") {
           char buf[2048]; // for getcwd
           char * currentDir = getcwd(buf, 2048);
-          std::string cwd(currentDir);        
+          std::string cwd(currentDir);
           path = currentDir;
         }
 
-        libname = Utilities::MakePkgnameFromPath(path, pkgname);
-
+        libname = Utilities::MakePkgnameFromPath(path, name); //pkgname);
       // Check if library exists           
         if ( ! Utilities::FileExists(libname) )
         {
+        // 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;
-            continue;  // try next path
+          continue;  // try next path
         }
         foundFile = true;
         break; // a script was found; we stop iterating
@@ -768,11 +815,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     {
        if (fullnameGiven)
          if(libname == "")
-            bbtkError("Path \""<<name<<"\" doesn't exist");
+            bbtkError("Path ["<<name<<"] doesn't exist");
          else
-            bbtkError("Script \""<<libname<<"\" not found");
+            bbtkError("Script ["<<libname<<"] not found");
        else
-          bbtkError("No \""<<pkgname<<".bbs\" script found");
+          bbtkError("No ["<<pkgname<<".bbs] script found");
        return;    
     }
 
@@ -782,7 +829,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     s->open(libname.c_str());
     if (!s->good()) 
     {
-        bbtkError("Could not open file \""<<libname<<"\"");
+        bbtkError("Could not open file ["<<libname<<"]");
         return;     
     }
 
@@ -1307,7 +1354,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     bool insideComment = false; // for multiline comment  
     do 
     {
-      try 
+      try
       {
         std::string line;
         GetLineFromPrompt(line);
@@ -1323,7 +1370,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
       }
         catch (std::exception& e) 
       {
-        std::cerr << "* ERROR : "<<e.what()<<" (not in bbtk)"<<std::endl;
+        std::cerr << "* ERROR :: "<<e.what()<<" (not in bbtk)"<<std::endl;
       }
       catch (...)
       {