diff --git a/source/persistency/ascii/include/G4tgrFileIn.hh b/source/persistency/ascii/include/G4tgrFileIn.hh index 84dcb82de02..a89e147df77 100644 --- a/source/persistency/ascii/include/G4tgrFileIn.hh +++ b/source/persistency/ascii/include/G4tgrFileIn.hh @@ -35,6 +35,7 @@ #define G4tgrFileIn_hh 1 #include +#include #include "globals.hh" @@ -60,8 +61,10 @@ class G4tgrFileIn // Access data members G4int Nline() { return theLineNo[theCurrentFile]; } + G4bool IgnoreLine() const; const G4String& GetName() { return theName; } + const G4String& GetCurrentName() { return theNames[theCurrentFile]; } void OpenNewFile(const char* filename); G4bool EndOfFile(); @@ -81,6 +84,10 @@ class G4tgrFileIn std::vector theNames; + std::map theMacros; + + std::vector> ignoreLines; + G4int theCurrentFile = -1; // Index of file being read in theFiles diff --git a/source/persistency/ascii/include/G4tgrLineProcessor.hh b/source/persistency/ascii/include/G4tgrLineProcessor.hh index a3a5415276d..1b2c9dc4937 100644 --- a/source/persistency/ascii/include/G4tgrLineProcessor.hh +++ b/source/persistency/ascii/include/G4tgrLineProcessor.hh @@ -50,6 +50,10 @@ class G4tgrLineProcessor virtual G4bool ProcessLine(const std::vector& wl); + void SetCurrentFile(const G4String& file) { currentFile = file; } + + const G4String& GetCurrentFile() const { return currentFile; } + protected: G4tgrVolume* FindVolume(const G4String& volname); @@ -57,6 +61,7 @@ class G4tgrLineProcessor private: G4tgrVolumeMgr* volmgr = nullptr; + G4String currentFile; }; #endif diff --git a/source/persistency/ascii/src/G4tgrFileIn.cc b/source/persistency/ascii/src/G4tgrFileIn.cc index 5e2c58d0c95..9187e117477 100644 --- a/source/persistency/ascii/src/G4tgrFileIn.cc +++ b/source/persistency/ascii/src/G4tgrFileIn.cc @@ -37,7 +37,9 @@ #include "G4tgrFileIn.hh" #include "G4tgrMessenger.hh" #include "G4tgrUtils.hh" +#include "G4tgrParameterMgr.hh" #include "G4UIcommand.hh" +#include "G4Filesystem.hh" G4ThreadLocal std::vector* G4tgrFileIn::theInstances = nullptr; @@ -106,6 +108,8 @@ void G4tgrFileIn::OpenNewFile(const char* filename) theNames.push_back(filename); + ignoreLines.push_back({}); + #ifndef OS_SUN_4_2 if(!fin->is_open()) { @@ -342,6 +346,25 @@ G4int G4tgrFileIn::GetWordsInLine(std::vector& wordlist) wordlist = std::move(wordlist2); + // check for macro replacements (exclude # directives) + if (wordlist[0][0] != '#') + { + for (auto& w : wordlist) + { + auto it = theMacros.find(w); + if (it != theMacros.end() && (*it).second != "") + { +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - Replacing '" << w << "' by '" << (*it).second << "'" << G4endl; + } +#endif + w = (*it).second; + } + } + } + // Or why not like this (?): // typedef std::istream_iterator string_iter; // std::copy(string_iter(istr_line), string_iter(), back_inserter(wordlist)); @@ -364,8 +387,169 @@ G4int G4tgrFileIn::GetWordsInLine(std::vector& wordlist) G4cout << " G4tgrFileIn::GetWordsInLine() - Include found !" << G4endl; } #endif - OpenNewFile(wordlist[1].c_str()); - isok = GetWordsInLine(wordlist); + if(IgnoreLine()) + { + wordlist.pop_back(); + wordlist.pop_back(); + } + else + { + G4fs::path filepath = wordlist[1].c_str(); + if(filepath.is_relative()) + { + if(theCurrentFile == -1) + { + filepath = G4fs::canonical(filepath); + } + else + { + G4fs::path currpath = G4String(theNames[theCurrentFile]); + filepath = currpath.parent_path() / filepath; + } + } + OpenNewFile(filepath.c_str()); + isok = GetWordsInLine(wordlist); + } + } + // check for 'define' + else if(wordlist[0] == "#define") + { + if(wordlist.size() != 2 && wordlist.size() != 3) + { + ErrorInLine(); + G4String ErrMessage = + "'#define' should have one or two arguments (macro name, [macro body])!"; + G4Exception("G4tgrFileIn::GetWordsInLine()", "InvalidInput", + FatalException, ErrMessage); + } + +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - Define found !" << G4endl; + } +#endif + G4String macroBody; + if(wordlist.size() == 3) + { + macroBody = wordlist[2]; + wordlist.pop_back(); + } + theMacros[wordlist[1]] = macroBody; + wordlist.pop_back(); + wordlist.pop_back(); + } + // check for 'undef' + else if(wordlist[0] == "#undef") + { + if(wordlist.size() != 2) + { + ErrorInLine(); + G4String ErrMessage = + "'#undef' should have as second argument, the macro name !"; + G4Exception("G4tgrFileIn::GetWordsInLine()", "InvalidInput", + FatalException, ErrMessage); + } + +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - Undef found !" << G4endl; + } +#endif + theMacros.erase(wordlist[1]); + wordlist.pop_back(); + wordlist.pop_back(); + } + // check for 'ifdef' + else if(wordlist[0] == "#ifdef") + { + if(wordlist.size() != 2) + { + ErrorInLine(); + G4String ErrMessage = + "'#ifdef' should have as second argument, the macro name!"; + G4Exception("G4tgrFileIn::GetWordsInLine()", "InvalidInput", + FatalException, ErrMessage); + } + +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - Ifdef found !" << G4endl; + } +#endif + G4bool macroFound = theMacros.find(wordlist[1]) != theMacros.end(); + G4bool paramFound = false; + if(wordlist[1][0] == '$') + paramFound = G4tgrParameterMgr::GetInstance()->FindParameter( + wordlist[1].substr(1, wordlist[1].size()), false) != ""; + if(!macroFound && !paramFound) + ignoreLines.back().push_back(true); + else + ignoreLines.back().push_back(false); + wordlist.pop_back(); + wordlist.pop_back(); + } + // check for 'ifndef' + else if(wordlist[0] == "#ifndef") + { + if(wordlist.size() != 2) + { + ErrorInLine(); + G4String ErrMessage = + "'#ifndef' should have as second argument, the macro name!"; + G4Exception("G4tgrFileIn::GetWordsInLine()", "InvalidInput", + FatalException, ErrMessage); + } + +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - Ifndef found !" << G4endl; + } +#endif + G4bool macroFound = theMacros.find(wordlist[1]) != theMacros.end(); + G4bool paramFound = false; + if(wordlist[1][0] == '$') + paramFound = G4tgrParameterMgr::GetInstance()->FindParameter( + wordlist[1].substr(1, wordlist[1].size()), false) != ""; + if(!macroFound && !paramFound) + ignoreLines.back().push_back(false); + else + ignoreLines.back().push_back(true); + wordlist.pop_back(); + wordlist.pop_back(); + } + // check for 'else' + else if(wordlist[0] == "#else") + { +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - else found !" << G4endl; + } +#endif + ignoreLines.back().back() = !ignoreLines.back().back(); + wordlist.pop_back(); + } + // check for 'endif' + else if(wordlist[0] == "#endif") + { +#ifdef G4VERBOSE + if(G4tgrMessenger::GetVerboseLevel() >= 3) + { + G4cout << " G4tgrFileIn::GetWordsInLine() - endif found !" << G4endl; + } +#endif + if(!ignoreLines.back().size()) + { + G4String ErrMessage = "#endif without if in file " + theNames[theCurrentFile]; + G4Exception("G4tgrFileIn::GetWordsInLine()", "InvalidInput", FatalException, + ErrMessage); + } + ignoreLines.back().pop_back(); + wordlist.pop_back(); } return isok; @@ -378,6 +562,16 @@ void G4tgrFileIn::ErrorInLine() << " file: " << theNames[theCurrentFile] << " : "; } +// -------------------------------------------------------------------- +G4bool G4tgrFileIn::IgnoreLine() const +{ + if(std::find(ignoreLines.back().begin(), ignoreLines.back().end(), true) + != ignoreLines.back().end()) + return true; + else + return false; +} + // -------------------------------------------------------------------- G4bool G4tgrFileIn::EndOfFile() { @@ -391,10 +585,7 @@ G4bool G4tgrFileIn::EndOfFile() } #endif --theCurrentFile; - if(theCurrentFile != -1) // Last file will be closed by the user - { - Close(); - } + Close(); } // Only real closing if all files are closed @@ -426,8 +617,17 @@ void G4tgrFileIn::Close() } #endif + if(ignoreLines.back().size()) + { + G4String ErrMessage = "Missing #endif in file " + theNames[theCurrentFile + 1]; + G4Exception("G4tgrFileIn::Close()", "InvalidInput", FatalException, + ErrMessage); + } + ignoreLines.pop_back(); + theFiles[theCurrentFile + 1]->close(); theFiles.pop_back(); + theNames.pop_back(); } // -------------------------------------------------------------------- diff --git a/source/persistency/ascii/src/G4tgrFileReader.cc b/source/persistency/ascii/src/G4tgrFileReader.cc index 92982547dca..0500a5352eb 100644 --- a/source/persistency/ascii/src/G4tgrFileReader.cc +++ b/source/persistency/ascii/src/G4tgrFileReader.cc @@ -107,6 +107,8 @@ G4bool G4tgrFileReader::ReadFiles() { break; } + if(fin.IgnoreLine()) + continue; // Check if it is continuation line or first line if(wlnew[0].c_str()[0] != ':') { @@ -137,6 +139,7 @@ G4bool G4tgrFileReader::ReadFiles() } wl = wlnew; } + theLineProcessor->SetCurrentFile(fin.GetCurrentName()); } if(wl.size() != 0) diff --git a/source/persistency/ascii/src/G4tgrLineProcessor.cc b/source/persistency/ascii/src/G4tgrLineProcessor.cc index e3d34a7f6e3..c68f8e42337 100644 --- a/source/persistency/ascii/src/G4tgrLineProcessor.cc +++ b/source/persistency/ascii/src/G4tgrLineProcessor.cc @@ -67,6 +67,10 @@ G4bool G4tgrLineProcessor::ProcessLine(const std::vector& wl) } #endif + // ignore empty word list + if(!wl.size()) + return true; + G4String wl0 = wl[0]; for(G4int ii = 0; ii < (G4int)wl0.length(); ++ii) {