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

Made the ParserIntItem's scan return DeckItem, and put a virtual scan in ParserItem. The ParserRecord now has a simple, but functioning parse method

Browse Source
This commit is contained in:
Kristian Flikka
2013-05-24 10:09:59 +02:00
parent 7bfe185998
commit 7998a84b81
11 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/parser/eclipse/Parser/ParserIntItem.cpp
View File

@@ -35,16 +35,12 @@ namespace Opm {
m_default = defaultValue;
}
/// Scans the rawRecords data according to the ParserItems definition.
/// returns a DeckIntItem object.
/// returns a DeckItem object.
/// NOTE: data are popped from the rawRecords deque!
DeckIntItemPtr ParserIntItem::scan__(size_t expectedItems , bool scanAll , RawRecordPtr rawRecord) {
DeckItemConstPtr ParserIntItem::scan__(size_t expectedItems , bool scanAll , RawRecordPtr rawRecord) const {
if (sizeType() == SINGLE && expectedItems > 1)
throw std::invalid_argument("Can only ask for one item when sizeType == SINGLE");
@@ -76,12 +72,12 @@ namespace Opm {
}
DeckIntItemPtr ParserIntItem::scan(size_t expectedItems, RawRecordPtr rawRecord) {
DeckItemConstPtr ParserIntItem::scan(size_t expectedItems, RawRecordPtr rawRecord) const {
return scan__( expectedItems , false , rawRecord);
}
DeckIntItemPtr ParserIntItem::scan(RawRecordPtr rawRecord) {
DeckItemConstPtr ParserIntItem::scan(RawRecordPtr rawRecord) const {
if (sizeType() == SINGLE)
return scan(1U , rawRecord);
else if (sizeType() == ALL)