Commit Graph

10 Commits

Author SHA1 Message Date
Andreas Lauser
f754bd9c45 fix some screw-up with internal vs deck names
Parser::hasKeyword() was called with deckNames but looked up the map
for internal names. This patch renames the method to hasDeckName(),
renames Parser::getKeyword() to Parser::getKeywordFromDeckName() and
adapts/extends the tests.
2014-07-01 17:07:43 +02:00
Andreas Lauser
fe638c2fc8 separate the internal keyword names and the deck names more clearly
so far, these two concepts were partially mingled in Opm::Parser...
2014-06-29 14:32:06 +02:00
Andreas Lauser
d820a4d435 change construction of ParserKeyword objects to the factory paradigm
this makes it more explicit what the object is supposed to represent.
2014-06-11 15:08:58 +02:00
Andreas Lauser
9a09fa29af rename Parser::parse to Parser::parseFile and add Parser::parseData
Parser::parseData is quite useful for unit tests to prevent them
spilling files to everything. Also, what was formerly
Parser::parseFile has been renamed to Parser::parseStream and slightly
modified to not be specific for std::ifstream.
2014-01-10 14:51:56 +01:00
Joakim Hove
ed06ebf4d3 Added UNKNOWN enum value in ParserKeywordSize enum throughout. 2013-12-04 15:31:28 +01:00
Joakim Hove
abd0905171 Changed parser to support parsing of keywords with wildcard like
"TVDP*". An importtant change is that we now query the parser
canParseKeyword() instead of hasKeyword().
2013-12-01 09:28:14 +01:00
Joakim Hove
8375a357db Loading WPR / GPR / IR from DeckKeywords + setting Prediction / History mode WCONINJX keywords 2013-11-12 10:02:09 +01:00
Joakim Hove
6dce82c5a5 Added action: THROW_EXCEPTION 2013-10-08 16:54:41 +02:00
Joakim Hove
8e550b7f32 Added warnings in Deck for keywords of type IGNORE_WARNING and unrecognized keywords 2013-10-08 16:19:18 +02:00
Joakim Hove
f019d40dd4 Parser will inspect keyword->action; only INTERNALIZE are stored 2013-10-08 14:45:41 +02:00