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
d71cb1aa51
parser integration test: use std::istream as a template argument for std::shared_ptr
...
gcc 4.4 has problems with such implicit conversions...
2014-05-20 13:27:37 +02:00
Andreas Lauser
0d92cd43b0
export possibility to parse an arbitrary std::istream
...
this has the potential to reduce the memory requirements of the parser
for opm-benchmarks considerably and is quite easy to add since
internally all parsing happend on istreams anyway...
The parser integration test has been extended to test the new method
as well as `parseString()` which was omitted previously. (I wonder who
introduced this without changing the test. ;)
2014-05-20 12:12:12 +02:00
Arne Morten Kvarving
3827ddca64
fixed: mark static symbols as such to quell warnings
2014-05-15 14:46:16 +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
f1e9230911
Merge remote-tracking branch 'upstream/master' into norne-keywords
2013-12-02 13:21:00 +01:00
Kristian Flikka
1d0135da5e
Removed use of boost::shared_ptr, replaced with std::shared_ptr
2013-12-02 13:07:01 +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
b99d5d75cc
Removed explicit keyword loading
2013-10-08 14:19:05 +02:00
Joakim Hove
97750f851f
Explicit cast 0 - > (size_t) 0
2013-10-01 16:36:49 +02:00
Joakim Hove
1ff18bb38a
Removed constructor with one global JSON config file + addedd optional flag to include all built in keywords
2013-09-14 22:39:43 +02:00
Kristian Flikka
480d14934b
Added test for a case with fully, partial and empty record body, defaults are added
2013-08-26 15:17:52 +02:00
Kristian Flikka
375332eb99
Added check if rawRecord is empty, then default is used. Added some json data
2013-08-23 14:20:32 +02:00
Joakim Hove
b630140316
Merged upstream/master
2013-08-23 09:30:23 +02:00
Kristian Flikka
8b4d052f9c
Added parameter to parse function to indicate if strict (exception throwing) parsing should be performed
2013-08-21 14:54:38 +02:00
Kristian Flikka
5f1c2722b5
Now also reading unrecognized keywords, labeled such in DeckKeyword class
2013-08-21 10:41:18 +02:00
Kristian Flikka
c7fa8a2e0a
Moved testdata into integration test folder. Added build folder to gitignore
2013-08-21 09:35:38 +02:00
Kristian Flikka
002ab45f77
Removed commented test
2013-08-21 08:51:00 +02:00
Joakim Hove
9848ef4d25
Updated integrationtest by adding summary keyword to parser
2013-08-21 07:41:06 +02:00
Joakim Hove
a0a20425f6
Updated tests to reflect that RawDeck has been removed
2013-08-13 14:51:33 +02:00
Joakim Hove
75954575d5
Changed Deck::getKeyword() to take an additional inde argument
2013-08-01 10:57:25 +02:00
Joakim Hove
a8d4a22894
Renamed DeckRecord::get() -> DeckRecord::getItem()
2013-08-01 09:52:49 +02:00
Joakim Hove
8bc176d63e
Added full(?) Parser configuration from json
2013-07-31 17:58:05 +02:00
Joakim Hove
db60ee2b56
Removed setRecord() method ParserKeyword. Instead ParserRecord is created during ParserKeyword construction
2013-07-31 15:02:00 +02:00
Joakim Hove
b7397ca502
Parser instantiated with json config file
2013-07-31 11:30:52 +02:00
Kristian Flikka
d79745ce4f
Changed some KEYWORD->Keyword instances, search and replace hickup
2013-06-20 15:40:45 +02:00
Kristian Flikka
f1660460dc
Replaced all instances of KW with Keyword. We can afford it.
2013-06-20 15:30:37 +02:00
Kristian Flikka
5fa04e5377
Added/implemented XStringItem for Parser and Deck, with tests. Added integration test for WWCT keyword. Moved DeckItem tests into type-specific files. Removed unused file.
2013-06-20 13:56:11 +02:00
Kristian Flikka
2cce97f115
Split parser function, to make more modular and testable. Moved integrationtests from ParserTests into Integration tests.
2013-06-18 10:28:30 +02:00
Kristian Flikka
fbb468342d
Finished up the last pieces for a simple BPR keyword vertical.
2013-06-04 14:32:30 +02:00
Kristian Flikka
b43d95c5a2
Starting to wrap up from the top, added the missing DeckKW, and refactored a bit in some of the Raw classes that returned the internal structure
2013-06-03 15:54:16 +02:00
Joakim Hove
c596b086c8
Started integration testing
2013-05-30 10:11:12 +02:00
Kristian Flikka
6e20bfda09
Added Deck class (empty), and some integration tests. WIP
2013-05-27 14:27:22 +02:00
