X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreterVirtual.cxx;h=d49124b09bbb407119b2ce2de452f84890b6c551;hb=73c50056dc4c352c2cc2209a12533e5566a32b06;hp=88e8f52e3d1dcabbb47e7271071910550ca543ce;hpb=5141e057598cdcde059d180c8cee02e1011f205d;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index 88e8f52..d49124b 100644
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -578,8 +578,6 @@ namespace bbtk
   //=======================================================================
   InterpreterVirtual::ExitStatus InterpreterVirtual::InterpretFile( const std::string& filename, bool source )
   {
-
-	  printf("EED InterpreterVirtual::InterpretFile 1\n");
 	  bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretFile(\""<<filename<<"\")"<<std::endl);
 
     bool exm = mCommandLine;
@@ -601,8 +599,6 @@ namespace bbtk
 
     mCommandLine = exm;
 
-	  printf("EED InterpreterVirtual::InterpretFile 2\n");
-
     return mStatus;
   }
   //=======================================================================
@@ -695,20 +691,19 @@ namespace bbtk
   }
   //=======================================================================  
   
-	void InterpreterVirtual::commandNew(std::string boxType, std::string boxName) // virtual 
+	void InterpreterVirtual::commandNew(const std::string &boxType, const std::string &boxName) // virtual 
     {
-		printf("EED %p InterpreterVirtual::commandNew 1  %s %s\n", this,  boxType.c_str(),boxName.c_str() );	  	
     }
 	
-	void InterpreterVirtual::commandDelete(std::string boxName)
+	void InterpreterVirtual::commandDelete(const std::string &boxName)
     {
     }
 
-	void InterpreterVirtual::commandConnection(std::string nodeFrom, std::string outputLabel, std::string nodeTo, std::string inputLabel)
+	void InterpreterVirtual::commandConnection(const std::string &nodeFrom,const std::string &outputLabel,const std::string &nodeTo,const std::string &inputLabel)
     {
     }
 		
-	void InterpreterVirtual::commandPackage(std::string packageName)
+	void InterpreterVirtual::commandPackage(const std::string &packageName)
     {
     }
 	
@@ -716,7 +711,7 @@ namespace bbtk
     {
     }
 	
-	void InterpreterVirtual::commandDefine(std::string name, std::string pack, std::string scriptfilename)
+	void InterpreterVirtual::commandDefine(const std::string &name,const std::string &pack,const std::string &scriptfilename)
     {
     }
 
@@ -724,43 +719,43 @@ namespace bbtk
     {
     }
 
-	void InterpreterVirtual::commandKind(std::string kind)
+	void InterpreterVirtual::commandKind(const std::string &kind)
     {
     }
 	
-	void InterpreterVirtual::commandPrint(std::string value)
+	void InterpreterVirtual::commandPrint(const std::string &value)
     {
     }
 	
 	
-	void InterpreterVirtual::commandExec(std::string word)
+	void InterpreterVirtual::commandExec(const std::string &word)
     {
     }
 	
 	
-	void InterpreterVirtual::commandInput(std::string name, std::string box, std::string input,std::string  help)
+	void InterpreterVirtual::commandInput(const std::string &name,const std::string &box,const std::string &input,const std::string  &help)
     {
     }
 	
-	void InterpreterVirtual::commandOutput(std::string name, std::string box, std::string output,std::string  help)
+	void InterpreterVirtual::commandOutput(const std::string &name,const std::string &box,const std::string &output,const std::string  &help)
     {
     }
 	
-	void InterpreterVirtual::commandSet(std::string box, std::string input, std::string value)
+	void InterpreterVirtual::commandSet(const std::string &box,const std::string &input,const std::string &value)
     {
     }
 
-	void InterpreterVirtual::commandAuthor(std::string author)
+	void InterpreterVirtual::commandAuthor(const std::string &author)
     {
     }
 
-	void InterpreterVirtual::commandCategory(std::string categorytype)
+	void InterpreterVirtual::commandCategory(const std::string &categorytype)
     {
     }
 	
 	
 	
-	void InterpreterVirtual::commandDescription(std::string description)
+	void InterpreterVirtual::commandDescription(const std::string &description)
     {
     }
 
@@ -769,16 +764,16 @@ namespace bbtk
     {
     }
 	
-	void InterpreterVirtual::commandInclude(std::string word, bool ok)
+	void InterpreterVirtual::commandInclude(const std::string &word, bool ok)
     {
     }
 	
 	
-	void InterpreterVirtual::commandLoad(std::string packageName)
+	void InterpreterVirtual::commandLoad(const std::string &packageName)
     {
     }
 
-	void InterpreterVirtual::commandUnload(std::string packageName)
+	void InterpreterVirtual::commandUnload(const std::string &packageName)
     {
     }
 	
@@ -794,8 +789,7 @@ namespace bbtk
     {
     }
 	
-//ups2 EED Borrame	
-	void InterpreterVirtual::commandMessage(std::string kind, std::string levelstr)
+	void InterpreterVirtual::commandMessage(const std::string &kind,const std::string &levelstr)
     {
     }
 	
@@ -805,14 +799,11 @@ namespace bbtk
   void InterpreterVirtual::DoInterpretLine( const std::string& line )
   {
 	  
-	  printf("EED %p InterpreterVirtual::DoInterpretLine 0 \n", this);	  
-	  printf("EED %p InterpreterVirtual::DoInterpretLine line=%s \n", this, line.c_str() );	  
     bbtkDebugMessage("interpreter",6,"==> InterpreterVirtual::DoInterpretLine(\""
 		     <<line<<"\")"<<std::endl);
     std::vector<std::string> words;
     SplitLine(line,words);
 
-printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)words.size() );	  
 	  
 	  
     // Empty line
@@ -859,7 +850,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this, (int)
        return;
     }
 	  
-printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this,  (int)words.size() );	  
 
     // Command 
     CommandInfoType command;
@@ -872,7 +862,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this,  (int
     std::string left,right,left2,right2;
     std::string filename;
 
-//ups1 EED borrame	  
     // message command
     if (command.code==cMessage)
       {
@@ -931,12 +920,10 @@ printf("EED %p InterpreterVirtual::DoInterpretLine word.size %d \n", this,  (int
 //std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<<line<<std::endl;
     // other cammands
 
-printf("EED %p InterpreterVirtual::DoInterpretLine 4  command.code=%d\n", this, (int)command.code);	  
 	  
     switch (command.code) 
       {
       case cNew :
-printf("EED %p InterpreterVirtual::DoInterpretLine 5  %s %s\n", this,  words[1].c_str() , words[2].c_str() );	  
 		commandNew(words[1],words[2]);
 //EED Borrame        mVirtualExecuter->Create(words[1],words[2]);
         break;
@@ -971,7 +958,8 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 5  %s %s\n", this,  words[1].
         }
         if (words.size()==2) 
         {
-			commandDefine(words[1],"",filename);
+			std::string packTmp = "";
+			commandDefine(words[1],packTmp,filename);
 //EED Borrame           mVirtualExecuter->Define(words[1],"",filename);
         }
         else
@@ -1135,10 +1123,7 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 5  %s %s\n", this,  words[1].
 
     bbtkDebugMessage("interpreter",6,"<== InterpreterVirtual::DoInterpretLine(\""
 		     <<line<<"\")"<<std::endl);
-    
-printf("EED %p InterpreterVirtual::DoInterpretLine 10\n", this);	  
-
-	  
+    	  
   }
   //=======================================================================  
 
@@ -1268,9 +1253,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 10\n", this);
   // =========================================================================
   void InterpreterVirtual::SwitchToFile( const std::string& name , bool source )
   {
-	  printf("EED InterpreterVirtual::SwitchToFile 1\n");
-	  printf("EED InterpreterVirtual::SwitchToFile name=%s\n", name.c_str() );
-	  
   // Note : in the following :
   // name : the user supplied name 
   //      - abreviated name    e.g.       scr   scr.bbs
@@ -1313,8 +1295,6 @@ printf("EED %p InterpreterVirtual::DoInterpretLine 10\n", this);
 
 	std::stringstream* stream = new std::stringstream;
 	//if (upath.size()!=0) // avoid troubles for "*"
-
-printf("EED InterpreterVirtual::SwitchToFile 2\n");
 		  
 	// ==== no path provided : look in root bbs path
 	if (upath.size()==0)
@@ -1376,8 +1356,6 @@ printf("EED InterpreterVirtual::SwitchToFile 2\n");
 	      }
 	  }
 	
-printf("EED InterpreterVirtual::SwitchToFile 3\n");
-
 	// === search paths list complete : now explore it
 	int nbBssFiles = 0;	
 	// ==== relative name, iterate + load all .bbs/.bbp files
@@ -1552,25 +1530,20 @@ printf("EED InterpreterVirtual::SwitchToFile 3\n");
 //EED Borrame	  if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
 		if (source) SetCurrentFileName(fullPathScriptName);
 	}    
-	  
-printf("EED InterpreterVirtual::SwitchToFile 4\n");
-	  
+	  	  
     return;
   }
   //=======================================================================
 
 	//=======================================================================
-	void InterpreterVirtual::SetCurrentFileName(std::string fullPathScriptName)  // virtual 
+	void InterpreterVirtual::SetCurrentFileName(const std::string &fullPathScriptName)  // virtual 
 	{
-		printf("EED InterpreterVirtual::SetCurrentFileName 1\n");
 	}	
 	//=======================================================================
 	
   //=======================================================================
 void InterpreterVirtual::SwitchToStream( std::stringstream* stream )
 {
-printf("EED InterpreterVirtual::SwitchToStream 1\n");
-	
   bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::SwitchToStream()"
 		   <<std::endl);
    mFile.push_back(stream);
@@ -1682,14 +1655,12 @@ printf("EED InterpreterVirtual::SwitchToStream 1\n");
                                       CommandInfoType& info )
   {
 	  
-	printf("EED InterpreterVirtual::InterpretCommand  1 \n");
     bbtkDebugMessage("interpreter",9,"==> InterpreterVirtual::InterpretCommand(...)"<<std::endl);
 
     // searches the command keyword
     CommandDictType::iterator c;
     c = mCommandDict.find(words[0]);
     if ( c == mCommandDict.end() ) {
-printf("EED InterpreterVirtual::InterpretCommand  2 \n");
       bbtkError(words[0]<<" : unknown command");
     }
 
@@ -1700,14 +1671,10 @@ printf("EED InterpreterVirtual::InterpretCommand  2 \n");
 		
 //EED       HelpCommand(words[0]);
 		commandHelp(words[0]);
-printf("EED InterpreterVirtual::InterpretCommand  3 \n");
-		
        bbtkError(words[0]<<" : wrong number of arguments");
     }
 //std::cout<<"InterpreterVirtual::InterpretCommand( const std::vector<std::string>& words,"<<std::endl;
     info = c->second;
-
-printf("EED InterpreterVirtual::InterpretCommand  4 \n"  );
     bbtkDebugMessage("interpreter",9,"<== InterpreterVirtual::InterpretCommand(...)"<<std::endl);
 
   }
@@ -1720,7 +1687,7 @@ printf("EED InterpreterVirtual::InterpretCommand  4 \n"  );
   { 
   }
   //=======================================================================
-  void InterpreterVirtual::commandHelp(const std::string words) 
+  void InterpreterVirtual::commandHelp(const std::string &words) 
   {  
   }
 	//=======================================================================