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

DeckKeyword::ParserKeyword to regular pointer

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-02-03 12:18:07 +01:00
parent 8083290214
commit dc5afd5236
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/Deck/DeckKeyword.cpp
View File

@@ -44,14 +44,14 @@ namespace Opm {
m_lineNumber = lineNumber;
}
std::shared_ptr<const ParserKeyword> DeckKeyword::getParserKeyword() const {
if (!m_parserKeyword)
const ParserKeyword* DeckKeyword::getParserKeyword() const {
if (!this->m_parserKeyword)
throw std::invalid_argument("No ParserKeyword object available");
return m_parserKeyword;
return this->m_parserKeyword;
}
bool DeckKeyword::hasParserKeyword() const {
return static_cast<bool>(m_parserKeyword);
return static_cast< bool >( m_parserKeyword );
}
const std::string& DeckKeyword::getFileName() const {
@@ -62,8 +62,8 @@ namespace Opm {
return m_lineNumber;
}
void DeckKeyword::setParserKeyword(std::shared_ptr<const ParserKeyword> &parserKeyword) {
m_parserKeyword = parserKeyword;
void DeckKeyword::setParserKeyword( const ParserKeyword* parserKeyword ) {
this->m_parserKeyword = parserKeyword;
}
void DeckKeyword::setDataKeyword(bool isDataKeyword_) {

6
opm/parser/eclipse/Deck/DeckKeyword.hpp
View File

@@ -32,11 +32,11 @@ namespace Opm {
* If no parser keyword is available, this method throws
* std::invalid_exception. Use hasParserKeyword() to test if one is available..
*/
std::shared_ptr<const ParserKeyword> getParserKeyword() const;
const ParserKeyword* getParserKeyword() const;
bool hasParserKeyword() const;
void setParserKeyword(std::shared_ptr<const ParserKeyword> &parserKeyword);
void setParserKeyword(const ParserKeyword* parserKeyword);
size_t size() const;
void addRecord(std::shared_ptr< const DeckRecord > record);
@@ -67,7 +67,7 @@ namespace Opm {
std::string m_fileName;
int m_lineNumber;
std::shared_ptr<const ParserKeyword> m_parserKeyword;
const ParserKeyword* m_parserKeyword;
std::vector<std::shared_ptr< const DeckRecord >> m_recordList;
bool m_knownKeyword;
bool m_isDataKeyword;

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

@@ -403,7 +403,7 @@ namespace Opm {
if (isRecognizedKeyword(parserState->rawKeyword->getKeywordName())) {
ParserKeywordConstPtr parserKeyword = getParserKeywordFromDeckName(parserState->rawKeyword->getKeywordName());
DeckKeywordPtr deckKeyword = parserKeyword->parse(parserState->parseMode , parserState->rawKeyword);
deckKeyword->setParserKeyword(parserKeyword);
deckKeyword->setParserKeyword(parserKeyword.get());
parserState->deck->addKeyword(deckKeyword);
} else {
DeckKeywordPtr deckKeyword(new DeckKeyword(parserState->rawKeyword->getKeywordName(), false));