X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreterVirtual.cxx;h=451ade9e45cabbbfea1285770f41f77aa45bec28;hb=dfcd0b84f01eb96e43c2180a35d626cc123a7231;hp=8d27b3290dd51134d6cbe9c578ca4d5805942d3a;hpb=12f2166f201f4e5a99c9c7876dadd09da81bfb51;p=bbtk.git

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index 8d27b32..451ade9 100644
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -516,6 +516,7 @@ namespace bbtk
   //=======================================================================
   void InterpreterVirtual::CatchUnknownException()
   {
+printf("EED InterpreterVirtual::CatchUnknownException Start\n");
 //EED Borrame   if (GetExecuter()->GetNoErrorMode()) 
 //EED Borrame       {
 //EED Borrame 	std::string file("?");
@@ -556,27 +557,28 @@ namespace bbtk
  	CloseAllFiles();
 	std::cerr << mess.str();
       }
+printf("EED InterpreterVirtual::CatchUnknownException End\n");
   }
   //=======================================================================
 
   //=======================================================================
   
-#define CATCH_MACRO					\
-  catch (InterpreterException e)			\
-    {							\
-      CatchInterpreterException(e);			\
-    }							\
+#define CATCH_MACRO						\
+  catch (InterpreterException e)		\
+    {									\
+      CatchInterpreterException(e);		\
+    }									\
   catch (bbtk::Exception e)				\
-    {							\
-      CatchBbtkException(e);				\
-    }							\
+    {									\
+      CatchBbtkException(e);			\
+    }									\
   catch (std::exception& e)				\
-    {							\
+    {									\
       CatchStdException(e);				\
-    }							\
-  catch (...)						\
-    {							\
-      CatchUnknownException();				\
+    }									\
+  catch (...)							\
+    {									\
+      CatchUnknownException();			\
     }						
   //=======================================================================
    
@@ -611,8 +613,7 @@ namespace bbtk
 
 
   //=======================================================================
-  InterpreterVirtual::ExitStatus 
-  InterpreterVirtual::InterpretBuffer( std::stringstream* buffer )
+  InterpreterVirtual::ExitStatus   InterpreterVirtual::InterpretBuffer( std::stringstream* buffer )
   {
     bbtkDebugMessage("interpreter",4,"==> InterpreterVirtual::InterpretBuffer()"<<std::endl);
 
@@ -633,6 +634,7 @@ namespace bbtk
 
     
     mCommandLine = exm;
+
     return mStatus;
   }
   //=======================================================================
@@ -1336,7 +1338,6 @@ namespace bbtk
 		 i++)
 	      {
 		std::string full_path(*i);
-printf("EED InterpreterVirtual::SwitchToFile 1. >>%s\n", full_path.c_str() );
 		// we *really* want '.' to be the current working directory
 		if (full_path == ".") 
 		  {
@@ -1367,8 +1368,6 @@ printf("EED InterpreterVirtual::SwitchToFile 1. >>%s\n", full_path.c_str() );
 	std::vector<std::string>::iterator i;
 	for (i=script_paths.begin();i!=script_paths.end();i++)
 	  {
-
-printf("EED InterpreterVirtual::SwitchToFile (1) >>  %s\n", (*i).c_str() );
 		  
 	    bbtkMessage("interpreter",1,
 			"--> Looking in '" << *i << "'" << std::endl);
@@ -1401,9 +1400,6 @@ printf("EED InterpreterVirtual::SwitchToFile (1) >>  %s\n", (*i).c_str() );
 	    for (std::vector<std::string>::iterator j = Filenames.begin(); 
 		 j!= Filenames.end(); ++j)
 	      {
-			  
-printf("EED InterpreterVirtual::SwitchToFile (2)     >>  %s\n", (*j).c_str() );
-			  
 		int lgr = (*j).size();
 		if (lgr < 5) continue;  
 		// ignore non .bbp file
@@ -1559,9 +1555,7 @@ printf("EED InterpreterVirtual::SwitchToFile (2)     >>  %s\n", (*j).c_str() );
           bbtkError("No ["<<pkgname<<".bbs/.bbp] script found");
 	return;
       } else {
-//EED printf("EED D. SwitchToFile %s\n", fullPathScriptName.c_str() );	  
 		LoadScript(fullPathScriptName,name);
-//EED Borrame	  if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
 		  if (source) 
 		  {
 			  // Over writing the fullpath of the bbp file.