BUG slash

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

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index d563f1989422be408919d81226e9280d42c23d6c..ab194e90913eb95ebf7b8e4ec58c7064dc6d48ff 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/03/03 11:43:52 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2008/03/10 06:24:13 $
+  Version:   $Revision: 1.42 $

                                                                                 
   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


@@ -37,7 +37,7 @@
 namespace bbtk
 {
 
 namespace bbtk
 {
 

-Interpreter* Interpreter::mGlobalInterpreter = NULL;
+  //Interpreter* Interpreter::mGlobalInterpreter = NULL;

 
  //=======================================================================
  /**
 
  //=======================================================================
  /**


@@ -45,15 +45,17 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
    */
   Interpreter::Interpreter() 
     :
    */
   Interpreter::Interpreter() 
     :

+#ifdef _USE_WXWIDGETS_
+    mWxConsole(0),
+#endif

     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);
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);
  
     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);
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <<std::endl);
  

-    mGlobalInterpreter = this;
-

     mExecuter = new bbtk::Executer();
     mExecuter = new bbtk::Executer();

+    mExecuter->SetInterpreter(this);

     
     // For the time being, comment out previous line, and
     // uncomment next line to check Transcriptor
     
     // For the time being, comment out previous line, and
     // uncomment next line to check Transcriptor


@@ -172,8 +174,8 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
     info.argmax = 2;
     info.code = cIndex;
 
     info.argmax = 2;
     info.code = cIndex;
 

-    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";
+    info.syntax = "index [<filename> ['Initials'(default)|'Packages'|'Categories'|'Adaptors']]";
+    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. If 'Adaptors' is provided then an alphabetical index of all adaptors is created.";

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


@@ -291,7 +293,6 @@ Interpreter* Interpreter::mGlobalInterpreter = NULL;
 std::cout << "=========================================~Interpreter()" << std::endl;
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;
 std::cout << "=========================================~Interpreter()" << std::endl;
     bbtkDebugMessageInc("Interpreter",9,"Interpreter::~Interpreter()" <<std::endl);
     delete mExecuter;

-    //delete mFactory;

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


@@ -312,15 +313,26 @@ std::cout << "=========================================~Interpreter()" << std::e
     try 
     {
       SwitchToFile(filename);
     try 
     {
       SwitchToFile(filename);

+
+printf("EED Interpreter::InterpretFile 0001\n" );
+int ii,ssize = mFileName.size();
+for (ii=0;ii<ssize;ii++)
+{
+       printf("EED RRR Interpreter::InterpretFile %s\n", mFileName[ii].c_str() );
+}
+

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

+printf("EED --- %s --- Interpreter::InterpretFile \n", mFileName[0].c_str() );

          while ((mFile.size()>0) && 
                 (!mFile.back()->eof()))
          while ((mFile.size()>0) && 
                 (!mFile.back()->eof()))

+//EED3                                 (!mFile[0]->eof()))

          {
             mLine.back()++;
             char buf[500];
             mFile.back()->getline(buf,500);
          {
             mLine.back()++;
             char buf[500];
             mFile.back()->getline(buf,500);

+//EED3            mFile[0]->getline(buf,500);

       
             std::string str(buf);
             int size=str.length();
       
             std::string str(buf);
             int size=str.length();


@@ -330,6 +342,7 @@ std::cout << "=========================================~Interpreter()" << std::e
             }
       
             InterpretLine(str, insideComment);
             }
       
             InterpretLine(str, insideComment);

+printf("EED Interpreter::InterpretFile %s\n", str.c_str() );

          }
         //if (mFile.size()>0) 
         CloseCurrentFile();
          }
         //if (mFile.size()>0) 
         CloseCurrentFile();


@@ -573,16 +586,16 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment )
        // if 'source' was given
        if (words.size()==3) 
          {
        // if 'source' was given
        if (words.size()==3) 
          {

-           this->mExecuter->SetCurrentFileName(words[1]);
+           GetExecuter()->SetCurrentFileName(words[1]);

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

-        LoadPackage(words[1]);
+        GetExecuter()->GetFactory()->LoadPackage(words[1]);

         break;
 
       case cUnload:
         break;
 
       case cUnload:

-        UnLoadPackage(words[1]);
+        GetExecuter()->GetFactory()->UnLoadPackage(words[1]);

         break;
 
       case cQuit :
         break;
 
       case cQuit :


@@ -794,7 +807,11 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         {
            if ((*i).substr((*i).size()-4, 4) != ".bbs")
               continue;      // ignore non .bbs files
         {
            if ((*i).substr((*i).size()-4, 4) != ".bbs")
               continue;      // ignore non .bbs files

-           LoadScript(*i,name);
+          std::string command("include ");
+          command += *i;
+          //  LoadScript(*i,name);
+          bool tmp;
+          InterpretLine(command,tmp);

            nbBssFiles++;
         }
         if (nbBssFiles==0)
            nbBssFiles++;
         }
         if (nbBssFiles==0)


@@ -837,15 +854,20 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
         }
         foundFile = true;
 
         }
         foundFile = true;
 

-
+               Filenames.clear();

         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
 
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {
         int nbFiles = Utilities::Explore(fullDirectoryName, false, Filenames);
 
         nbBssFiles = 0;
         for (std::vector<std::string>::iterator i = Filenames.begin(); i!= Filenames.end(); ++i)
         {

+//EEDprintf("EED Interpreter::SwitchToFile %s\n",(*i).c_str() );

            if ((*i).substr((*i).size()-4, 4) != ".bbs")
               continue;      // ignore non .bbs files
            if ((*i).substr((*i).size()-4, 4) != ".bbs")
               continue;      // ignore non .bbs files

-           LoadScript(*i,name);
+          std::string command("include ");
+          command += *i;
+          bool tmp;
+          InterpretLine(command,tmp);
+          //           LoadScript(*i,name);

            nbBssFiles++;
         }
         if (nbBssFiles==0)
            nbBssFiles++;
         }
         if (nbBssFiles==0)


@@ -963,9 +985,25 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
   void Interpreter::LoadScript( std::string fullPathScriptName,
                                std::string includeScriptName)
   {
   void Interpreter::LoadScript( std::string fullPathScriptName,
                                std::string includeScriptName)
   {

-    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)
-       !=mFileName.end()) 
+//EED printf("EED Interpreter::LoadScript >>01\n");
+       Utilities::replace( fullPathScriptName , INVALID_FILE_SEPARATOR , VALID_FILE_SEPARATOR);
+
+       bool okScriptExist=false;
+       int iStrScript,sizeVecStricpt=mFileName.size();
+       for ( iStrScript=0;iStrScript<sizeVecStricpt;iStrScript++)
+       {
+//EED printf("  EED %d Interpreter::LoadScript %s __>>__ %s\n", iStrScript,mFileName[iStrScript].c_str(),fullPathScriptName.c_str() );
+               if (mFileName[iStrScript] == fullPathScriptName )
+               {
+                       printf("  EED %d Interpreter::LoadScript iguales\n",iStrScript ); 
+                       okScriptExist=true;
+               } // if
+       } // for
+
+    if (find(mFileName.begin(),mFileName.end(),fullPathScriptName)!=mFileName.end()) 
+//    if (okScriptExist==true) 

       {
       {

+//EED printf("EED Interpreter::LoadScript Exit method\n");

        bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
                    <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
        return;
        bbtkMessage("Interpreter",1,"file '"<<fullPathScriptName
                    <<"' already open : I do not open it once more to prevent recursive inclusion"<<std::endl);
        return;


@@ -987,6 +1025,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
     mFileName.push_back(fullPathScriptName);
     mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);
     mFileName.push_back(fullPathScriptName);
     mIncludeFileName.push_back(includeScriptName);
     mLine.push_back(0);

+//EED printf("EED Interpreter::LoadScript >>02\n");

     return;
   }
 
     return;
   }
 


@@ -1005,15 +1044,23 @@ void Interpreter::SplitLine ( const std::string& str, std::vector<std::string>&
       return;
     }
 
       return;
     }
 

+    bbtkDebugMessage("Interpreter",9," Closing file '"<<mFileName.back()<<"'"<<std::endl);

     mFile.back()->close();
     delete mFile.back();
     mFile.pop_back();
     mFile.back()->close();
     delete mFile.back();
     mFile.pop_back();

-    bbtkDebugMessage("Interpreter",9,
-                     " Closing file '"<<mFileName.back()<<"'"<<std::endl);
-

     mFileName.pop_back();
     mIncludeFileName.pop_back();
     mFileName.pop_back();
     mIncludeFileName.pop_back();

-    mLine.pop_back();
+       mLine.pop_back();
+/*EED3
+       bbtkDebugMessage("Interpreter",9," Closing file '"<<mFileName[0]<<"'"<<std::endl);
+       mFile[0]->close();
+    delete mFile[0];
+    mFile.erase( mFile.begin() );
+       mFileName.erase( mFileName.begin() );
+    mIncludeFileName.erase( mIncludeFileName.begin() );
+    mLine.erase( mLine.begin() );
+*/
+

     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);
     bbtkDebugMessage("Interpreter",9," Remains "
                      <<mFile.size()
                      <<" open"<<std::endl);


@@ -1093,7 +1140,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
     {
       if (words[1]=="packages") 
       {
     {
       if (words[1]=="packages") 
       {

-         PrintPackages(true);
+         GetExecuter()->GetFactory()->PrintPackages(true);

          return;
       }
       try 
          return;
       }
       try 


@@ -1104,16 +1151,16 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          try 
          {
       {
          try 
          {

-            HelpPackage(words[1]);
+            GetExecuter()->GetFactory()->HelpPackage(words[1]);

 #ifdef _USE_WXWIDGETS_
 #ifdef _USE_WXWIDGETS_

-           if ( WxConsole::GetInstance() != 0 )
+           if ( mWxConsole != 0 )

              {
                std::string url = 
                  ConfigurationFile::GetInstance().Get_doc_path();
                url += "/bbdoc/" + words[1] + "/index.html";
                if (Utilities::FileExists(url)) 
                  {
              {
                std::string url = 
                  ConfigurationFile::GetInstance().Get_doc_path();
                url += "/bbdoc/" + words[1] + "/index.html";
                if (Utilities::FileExists(url)) 
                  {

-                   WxConsole::GetInstance()->ShowHtmlPage(url);
+                   mWxConsole->ShowHtmlPage(url);

                  }
              }
 #endif     
                  }
              }
 #endif     


@@ -1123,9 +1170,9 @@ void Interpreter::Help(const std::vector<std::string>& words)
             try 
             {
              std::string package;
             try 
             {
              std::string package;

-             HelpBlackBox(words[1],package);
+             GetExecuter()->GetFactory()->HelpBlackBox(words[1],package);

 #ifdef _USE_WXWIDGETS_
 #ifdef _USE_WXWIDGETS_

-              if ( WxConsole::GetInstance() != 0 )
+              if ( mWxConsole != 0 )

                 {
                   std::string url = 
                     ConfigurationFile::GetInstance().Get_doc_path();
                 {
                   std::string url = 
                     ConfigurationFile::GetInstance().Get_doc_path();


@@ -1133,7 +1180,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
                   if (Utilities::FileExists(url))
                     {
                       url += "#" + words[1];
                   if (Utilities::FileExists(url))
                     {
                       url += "#" + words[1];

-                      WxConsole::GetInstance()->ShowHtmlPage(url);
+                      mWxConsole->ShowHtmlPage(url);

                     }
                 }
 #endif
                     }
                 }
 #endif


@@ -1142,7 +1189,7 @@ void Interpreter::Help(const std::vector<std::string>& words)
              {
                try
                  {
              {
                try
                  {

-                   this->mExecuter->ShowRelations(words[1],"0","9999");
+                   GetExecuter()->ShowRelations(words[1],"0","9999");

                  }
                catch (bbtk::Exception h){
                  bbtkError("\""<<words[1].c_str()
                  }
                catch (bbtk::Exception h){
                  bbtkError("\""<<words[1].c_str()


@@ -1158,12 +1205,12 @@ void Interpreter::Help(const std::vector<std::string>& words)
       {
          if ( words[1]=="packages" )
          {
       {
          if ( words[1]=="packages" )
          {

-            PrintPackages(true,true);
+            GetExecuter()->GetFactory()->PrintPackages(true,true);

             return;
           }
          try 
          {
             return;
           }
          try 
          {

-            HelpPackage(words[1],true);
+            GetExecuter()->GetFactory()->HelpPackage(words[1],true);

          }
          catch (bbtk::Exception f) 
          {
          }
          catch (bbtk::Exception f) 
          {


@@ -1531,7 +1578,7 @@ void Interpreter::Graph(const std::vector<std::string>& words)
     bool system_display = true;
 
 #ifdef _USE_WXWIDGETS_
     bool system_display = true;
 
 #ifdef _USE_WXWIDGETS_

-    if ( WxConsole::GetInstance() != 0 ) system_display = false; 
+    if ( mWxConsole != 0 ) system_display = false; 

 #endif
  
     if (words.size()==1) 
 #endif
  
     if (words.size()==1) 


@@ -1564,8 +1611,8 @@ void Interpreter::Graph(const std::vector<std::string>& words)
       } 
     
 #ifdef _USE_WXWIDGETS_
       } 
     
 #ifdef _USE_WXWIDGETS_

-    if ( WxConsole::GetInstance() != 0 )
-      WxConsole::GetInstance()->ShowHtmlPage(page);
+    if ( mWxConsole != 0 )
+      mWxConsole->ShowHtmlPage(page);

 #endif
   }
 //=======================================================================
 #endif
   }
 //=======================================================================


@@ -1579,8 +1626,9 @@ void  Interpreter::Index(const std::string& filename,
   if (type=="Initials") t = Factory::Initials;
   else if (type=="Categories") t = Factory::Categories;
   else if (type=="Packages") t = Factory::Packages;
   if (type=="Initials") t = Factory::Initials;
   else if (type=="Categories") t = Factory::Categories;
   else if (type=="Packages") t = Factory::Packages;

+  else if (type=="Adaptors") t = Factory::Adaptors;

   
   

-  GetGlobalFactory()->CreateHtmlIndex(t,filename);
+  GetExecuter()->GetFactory()->CreateHtmlIndex(t,filename);

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