OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OPM-17: First attempt to handle END and ENDINC keywords

Browse Source
This commit is contained in:
Atle Haugan
2014-01-24 09:57:09 +01:00
parent 581bf74e9a
commit ef11a2331f
5 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -186,7 +186,13 @@ namespace Opm {
while (true) {
bool streamOK = tryParseKeyword(parserState);
if (parserState->rawKeyword) {
if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::include) {
if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::end) {
break;
}
else if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::endinclude) {
break;
}
else if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::include) {
RawRecordConstPtr firstRecord = parserState->rawKeyword->getRecord(0);
std::string includeFileString = firstRecord->getItem(0);
boost::filesystem::path includeFile(includeFileString);