*** empty log message ***

[bbtk.git] / kernel / src / bbtkInterpreter.cxx

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 5f6b3e65b9853a38c5f2e6316faf8e3a003a227c..09954ef4fe723b386243bcfb143ffb6a9b9a7211 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $ $
   Language:  C++

-  Date:      $Date: 2008/02/04 13:02:58 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/02/05 11:39:32 $
+  Version:   $Revision: 1.23 $

                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or


@@ -44,7 +44,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::Interpreter() 
     :
    */
   Interpreter::Interpreter() 
     :

-    mCommandLine(false), verbose(false)
+    mCommandLine(false)

   {
     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("Interpreter","Messages of the interpreter",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("Interpreter","Messages of the interpreter",0);


@@ -157,9 +157,9 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    
     info.keyword = "config";  // JPR
     info.argmin = 0;
    
     info.keyword = "config";  // JPR
     info.argmin = 0;

-    info.argmax = 1;
+    info.argmax = 0;

     info.code = cConfig;
     info.code = cConfig;

-    info.syntax = "config [<verbose>|<v>]";
+    info.syntax = "config";

     info.help = "Prints the value of all configuration parameters";
     mCommandDict[info.keyword] = info;
 
     info.help = "Prints the value of all configuration parameters";
     mCommandDict[info.keyword] = info;
 


@@ -167,8 +167,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmin = 0;
     info.argmax = 2;
     info.code = cIndex;
     info.argmin = 0;
     info.argmax = 2;
     info.code = cIndex;

-    info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Keywords']]";
-    info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Keywords' is provided then the entries are either the package names or the keywords";
+    info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Categories']]";
+    info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories";

     mCommandDict[info.keyword] = info;
 
     info.keyword = "reset";  //EED
     mCommandDict[info.keyword] = info;
 
     info.keyword = "reset";  //EED


@@ -216,9 +216,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmin = 0;
     info.argmax = 2;
     info.code = cMessage;
     info.argmin = 0;
     info.argmax = 2;
     info.code = cMessage;

-    info.syntax = "message <category> <level>";
-    info.help = "Sets the level of the category of messages <category> to <level>.\n  If category='All' then sets the level for all categories. If no category nor level is passed then prints info on available categories of messages and their current level.";
-    mCommandDict[info.keyword] = info;
+    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.keyword = "include";
     info.argmin = 1;
 
     info.keyword = "include";
     info.argmin = 1;


@@ -287,7 +286,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     delete mExecuter;
     //delete mFactory;
 
     delete mExecuter;
     //delete mFactory;
 

-    //    std::cout <<"EO Interpreter::~Interpreter()"<<std::endl;

     bbtkDebugDecTab("Interpreter",9);
   }
   //=======================================================================
     bbtkDebugDecTab("Interpreter",9);
   }
   //=======================================================================


@@ -297,7 +295,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
   /**
    *  
    */
   /**
    *  
    */

-  void Interpreter::InterpretFile( const std::string& filename,  bool use_configuration_file, bool verbose)
+  void Interpreter::InterpretFile( const std::string& filename,  
+                                  bool use_configuration_file)

   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
   {
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::InterpretFile(\""<<filename<<"\")"<<std::endl);
 


@@ -306,7 +305,7 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
 
     try 
     {
 
     try 
     {

-      SwitchToFile(filename, use_configuration_file, verbose);
+      SwitchToFile(filename, use_configuration_file);

       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
       {
       bool insideComment = false; // for multiline comment
       while (mFile.size()>0) 
       {


@@ -548,11 +547,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
         break;
         
       case cConfig :
         break;
         
       case cConfig :

-        if (words.size()>1) // any param for config means verbose = true
-          verbose = true;
-        else
-          verbose = false;
-        Config(verbose);            
+        Config();            

         break;
         
       case cReset :  // EED
         break;
         
       case cReset :  // EED


@@ -562,16 +557,16 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
       case cInclude :
         if (mCommandLine) 
         {
       case cInclude :
         if (mCommandLine) 
         {

-           InterpretFile(words[1], true, verbose); // true : better pass use_config_file
+           InterpretFile(words[1], true ); // true : better pass use_config_file

         }
         else 
         {
         }
         else 
         {

-            SwitchToFile(words[1], true, verbose); // true : better pass use_config_file
+            SwitchToFile(words[1], true ); // true : better pass use_config_file

         }
         break;
         
       case cLoad:
         }
         break;
         
       case cLoad:

-        LoadPackage(words[1], true, verbose); // true : better pass use_config_file
+        LoadPackage(words[1], true ); // true : better pass use_config_file

         break;
         
       case cUnload:
         break;
         
       case cUnload:


@@ -647,18 +642,15 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   // Replaces substrings "\\n" by a real carriage return "\n"
   void SubsBackslashN ( std::string& s )
   {
   // Replaces substrings "\\n" by a real carriage return "\n"
   void SubsBackslashN ( std::string& s )
   {

-    //   std::cout << "BEFORE=["<<s<<"]"<<std::endl;

     std::string ss("\\n");
     std::string::size_type pos = 0;
     pos = s.find(ss,0);
     char* cr = "\n";
     while ( pos != std::string::npos )
    {
     std::string ss("\\n");
     std::string::size_type pos = 0;
     pos = s.find(ss,0);
     char* cr = "\n";
     while ( pos != std::string::npos )
    {

-      //  std::cout << "*** find one "<<std::endl;

       s.replace(pos,2,cr,1);
       pos = s.find(ss, pos-1);
    } 
       s.replace(pos,2,cr,1);
       pos = s.find(ss, pos-1);
    } 

-    //    std::cout << "AFTER=["<<s<<"]"<<std::endl;

   }
   //=======================================================================
 
   }
   //=======================================================================
 


@@ -690,7 +682,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        {
           // Found a text token, add it to the vector.
           chains.push_back(str.substr(lastPos, pos - lastPos));
        {
           // Found a text token, add it to the vector.
           chains.push_back(str.substr(lastPos, pos - lastPos));

-          // std::cout << "text='"<<chains.back()<<"'"<<std::endl;

        }
        else 
        {
        }
        else 
        {


@@ -699,7 +690,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
          tok = str.substr(lastPos, pos - lastPos);
          Utilities::SplitAroundFirstDot(tok,box,output);
          chains.push_back( mExecuter->Get(box,output) );
          tok = str.substr(lastPos, pos - lastPos);
          Utilities::SplitAroundFirstDot(tok,box,output);
          chains.push_back( mExecuter->Get(box,output) );

-    //    std::cout << "outp='"<<chains.back()<<"'"<<std::endl;

        }
         // Skip delimiters.  Note the "not_of"
        lastPos = str.find_first_not_of(delimiters, pos);
        }
         // Skip delimiters.  Note the "not_of"
        lastPos = str.find_first_not_of(delimiters, pos);


@@ -708,7 +698,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     //
        is_text = !is_text;
      }
     //
        is_text = !is_text;
      }

-    //    std::cout << "nb="<<chains.size()<<std::endl;

      std::vector<std::string>::iterator i;
      for (i= chains.begin(); i!=chains.end(); ++i) 
      {
      std::vector<std::string>::iterator i;
      for (i= chains.begin(); i!=chains.end(); ++i) 
      {


@@ -728,7 +717,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 use_configuration_file, bool verbose)
+                                  bool use_configuration_file )

   {
   // Note : in the following :
   // name : the user supplied name 
   {
   // Note : in the following :
   // name : the user supplied name 


@@ -743,9 +732,6 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::SwitchToFile( \""
                          <<name<<"\")"<<std::endl);
 

-// to be removed in final version
-// use : Config v
-//verbose = true;

     std::vector<std::string> script_paths;
     std::string fullPathScriptName;  // full path script name
     std::string pkgname;             // e.g. <scriptname>.bbs
     std::vector<std::string> script_paths;
     std::string fullPathScriptName;  // full path script name
     std::string pkgname;             // e.g. <scriptname>.bbs


@@ -756,13 +742,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
         // 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;
+      bbtkMessage("Interpreter",1,
+                 "look for : [" << name 
+                 << "] (use_configuration_file == TRUE)" << std::endl);

       script_paths = ConfigurationFile::GetInstance().Get_bbs_paths();
     }
     std::string upath;
     pkgname = Utilities::ExtractScriptName(name,upath);
       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;
 
     bool fullnameGiven = false; 
     bool foundFile     = false;
 


@@ -782,8 +769,9 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
            nbBssFiles++;
         }
         if (nbBssFiles==0)
            nbBssFiles++;
         }
         if (nbBssFiles==0)

-           if (verbose)
-              std::cout << "WARNING : No '.bbs' file found in [" << upath << "]" << std::endl;
+           bbtkMessage("Interpreter",2,
+                      "WARNING : No '.bbs' file found in [" 
+                      << upath << "]" << std::endl);

 
         return;
       }
 
         return;
       }


@@ -805,35 +793,38 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         }
 
         fullDirectoryName = Utilities::MakePkgnameFromPath(path, upath, false);
         }
 
         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.
       // 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;
+         bbtkMessage("Interpreter",1,"   [" <<fullDirectoryName 
+                     <<"] : doesn't exist" <<std::endl);

           continue;  // try next path
         }
         foundFile = true;
 
 
         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
           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)
         {
         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 ((*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;
+         bbtkMessage("Interpreter",1,
+                     "WARNING : No '.bbs' file found in [" 
+                     << fullDirectoryName << "]" << std::endl);

            
            

-        break; // a directory was found; we stop iterating
+        //break; // a directory was found; we stop iterating
+       // LG : No! We want all files included !

        }
        return;
     }
        }
        return;
     }


@@ -851,7 +842,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       // ===========================================================check user supplied location
       fullnameGiven = true;
 
       // ===========================================================check user supplied location
       fullnameGiven = true;
 

-      fullPathScriptName =  Utilities::ExpandLibName(name, verbose);
+      
+      fullPathScriptName =  Utilities::ExpandLibName(name, false);

 
       // allow user to always forget ".bbs"
       int l = fullPathScriptName.size();
 
       // allow user to always forget ".bbs"
       int l = fullPathScriptName.size();


@@ -897,7 +889,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
        // fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true); //pkgname);
 
            fullPathScriptName = Utilities::MakePkgnameFromPath(path, name, true);
        // 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) )
 
       // Check if library exists
         if ( ! Utilities::FileExists(fullPathScriptName) )


@@ -905,12 +897,14 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.
         // The following is *NOT* a debug time message :
         // It's a user intended message.
         // Please don't remove it.

-          if (verbose)
-            std::cout <<"   [" <<fullPathScriptName <<"] : doesn't exist" <<std::endl;
+         bbtkMessage("Interpreter",2,
+                     "   [" <<fullPathScriptName <<"] : doesn't exist" 
+                     <<std::endl);

           continue;  // try next path
         }
           continue;  // try next path
         }

-        if (verbose)
-           std::cout <<"   [" <<fullPathScriptName <<"] : found" <<std::endl;        
+       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
 


@@ -939,7 +933,13 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
 
   void Interpreter::LoadScript( std::string fullPathScriptName)
   {
 
   void Interpreter::LoadScript( std::string fullPathScriptName)
   {

-    bbtkMessage("Interpreter",1,fullPathScriptName<<" found"<<std::endl);
+    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
+       !=mFileName.end()) 
+      {
+       bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
+                   <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
+       return;
+      }

 
     std::ifstream* s;      
     s = new std::ifstream;
 
     std::ifstream* s;      
     s = new std::ifstream;


@@ -950,8 +950,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         return;     
     }
     
         return;     
     }
     

-    if (verbose)
-       std::cout << "   -->[" << fullPathScriptName << "] found" << std::endl;
+    bbtkMessage("Interpreter",1,"   -->[" << fullPathScriptName 
+               << "] found" << std::endl);

 
     mFile.push_back(s);
     mFileName.push_back(fullPathScriptName);
 
     mFile.push_back(s);
     mFileName.push_back(fullPathScriptName);


@@ -1125,7 +1125,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
 
    //===================================================================    
   /// Displays the Configuration
 
    //===================================================================    
   /// Displays the Configuration

-  void Interpreter::Config( bool verbose ) const
+  void Interpreter::Config() const

   {
     bbtkDebugMessageInc("Core",9,"Factory::Config"<<std::endl);
     
   {
     bbtkDebugMessageInc("Core",9,"Factory::Config"<<std::endl);
     


@@ -1554,7 +1554,7 @@ void  Interpreter::Index(const std::string& filename,
 {
   Factory::IndexEntryType t;
   if (type=="Initials") t = Factory::Initials;
 {
   Factory::IndexEntryType t;
   if (type=="Initials") t = Factory::Initials;

-  else if (type=="Keywords") t = Factory::Keywords;
+  else if (type=="Categories") t = Factory::Categories;

   else if (type=="Packages") t = Factory::Packages;
   
   GetGlobalFactory()->CreateHtmlIndex(t,filename);
   else if (type=="Packages") t = Factory::Packages;
   
   GetGlobalFactory()->CreateHtmlIndex(t,filename);