X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkInterpreterVirtual.cxx;h=93d05ed5cf88ef1d335734a949476b26cb088134;hb=4d3619bf05342807aec39f571d94e4aea2efa38b;hp=58552fc160db1b8ee27dd2a1a0ebd7577d1fbcc3;hpb=3dcc408acd2264664ca6431a501378ea64233dd6;p=bbtk.git diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 58552fc..93d05ed 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -890,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(" @@ -913,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() ); // we *really* want '.' to be the current working directory if (full_path == ".") { @@ -1369,8 +1366,6 @@ printf("EED InterpreterVirtual::SwitchToFile 1. >>%s\n", full_path.c_str() ); std::vector::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); @@ -1403,9 +1398,6 @@ printf("EED InterpreterVirtual::SwitchToFile (1) >> %s\n", (*i).c_str() ); for (std::vector::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 @@ -1561,9 +1553,7 @@ printf("EED InterpreterVirtual::SwitchToFile (2) >> %s\n", (*j).c_str() ); bbtkError("No ["<SetCurrentFileName(fullPathScriptName); if (source) { // Over writing the fullpath of the bbp file.