X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreterVirtual.cxx;h=8d27b3290dd51134d6cbe9c578ca4d5805942d3a;hb=12f2166f201f4e5a99c9c7876dadd09da81bfb51;hp=2498e9018e0738f08468ba04ecd6a6975851bd78;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 2498e90..8d27b32 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -346,7 +346,6 @@ namespace bbtk */ - } //======================================================================= @@ -804,8 +803,7 @@ namespace bbtk //======================================================================= void InterpreterVirtual::DoInterpretLine( const std::string& line ) - { - + { bbtkDebugMessage("interpreter",6,"==> InterpreterVirtual::DoInterpretLine(\"" < words; @@ -892,19 +890,19 @@ namespace bbtk // break and quit commands if ((command.code==cBreak) || (command.code==cQuit)) - { - bool in_script = false; - std::string file(""); - int line = 0; - - if (mFileName.size()) - { - std::ifstream* fs = dynamic_cast(mFile.back()); - if (fs!=0) in_script = true; - file = mFileName.back(); - line = mLine.back(); - } - if (command.code==cBreak) + { +//EED-Borrame bool in_script = false; +//EED-Borrame std::string file(""); +//EED-Borrame int line = 0; + +//EED-Borrame if (mFileName.size()) +//EED-Borrame { +//EED-Borrame std::ifstream* fs = dynamic_cast(mFile.back()); +//EED-Borrame if (fs!=0) in_script = true; +//EED-Borrame file = mFileName.back(); +//EED-Borrame line = mLine.back(); +//EED-Borrame } + if (command.code==cBreak) { /* std::cout << "BreakException(" @@ -915,15 +913,13 @@ namespace bbtk commandBreak(); //EED Borrame bbtkError("break");//,in_script,file,line); // throw BreakException(in_script,file,line); - } - else - { + } else { commandQuit(); //EED Borrame bbtkError("quit");//,in_script,file,line); //throw QuitException(in_script,file,line); - } - return; - } + } // cBreak + return; + } // cBreak cQuit //std::cout<<" mVirtualExecuter->Create(words[1],words[2]); "<>%s\n", full_path.c_str() ); for (i=script_paths.begin();i!=script_paths.end();i++) { -printf("EED InterpreterVirtual::SwitchToFile jaja >> %s\n", (*i).c_str() ); +printf("EED InterpreterVirtual::SwitchToFile (1) >> %s\n", (*i).c_str() ); bbtkMessage("interpreter",1, "--> Looking in '" << *i << "'" << std::endl); @@ -1406,7 +1402,7 @@ printf("EED InterpreterVirtual::SwitchToFile jaja >> %s\n", (*i).c_str() ); j!= Filenames.end(); ++j) { -printf("EED InterpreterVirtual::SwitchToFile kkkkk >> %s\n", (*j).c_str() ); +printf("EED InterpreterVirtual::SwitchToFile (2) >> %s\n", (*j).c_str() ); int lgr = (*j).size(); if (lgr < 5) continue;