Commit Graph

140 Commits

Author SHA1 Message Date
Joakim Hove
d1f0a9f5f7 Moved some tests around 2013-10-14 14:15:44 +02:00
Joakim Hove
268119e1ce Removed unneceessary includes 2013-10-11 15:38:30 +02:00
Joakim Hove
fb7dc690d1 Added defaultApplied() method to DeckItem - and FAILING test 2013-10-10 13:32:05 +02:00
Joakim Hove
b4b4a50092 Completed tableCollection implementation - added PVTG based testing 2013-10-01 17:13:40 +02:00
Joakim Hove
2913b526d7 Added isTableCollection attribute on Parser and Raw keyword - mainly to parse PVTG keyword 2013-10-01 16:35:55 +02:00
Joakim Hove
94250f6e03 Added (default == false) verbose keyword for the parseFile() method 2013-10-01 16:05:01 +02:00
Joakim Hove
b938057dbd Renamed sizeType UNDEFINED -> SLASH_TERMINATED 2013-10-01 15:50:43 +02:00
Joakim Hove
5ea0b8de20 Fixed readFromRawRecord to correctly handle empty records with sizeType == ALL 2013-10-01 15:45:28 +02:00
Joakim Hove
c8b6071f8f Added many keyword config files + createDefaultKeywordList will print 2013-09-26 22:49:27 +02:00
Joakim Hove
ff52309c72 Will print a error message and continue when meeting malformed json 2013-09-26 00:05:34 +02:00
Joakim Hove
d7ca4fee83 Added support for 'data' keywords ~ the PORO and PERMX keywords 2013-09-22 17:23:27 +02:00
Kristian Flikka
297c719a1c Cleanup of some remaining Logger stuff 2013-09-19 10:57:46 +02:00
Joakim Hove
0afbcfc6e4 sizeType is default set to SINGLE - and optional in Json config 2013-09-18 07:16:09 +02:00
Joakim Hove
3992a32efc Made sizeType : SINGLE default 2013-09-17 22:27:53 +02:00
Joakim Hove
9986916ca7 Fixing parser tests 2013-09-17 17:45:42 +02:00
Kristian Flikka
687b5aed2f Formatting... 2013-09-16 15:53:56 +02:00
Kristian Flikka
7f1acfe279 Deleted unused file 2013-09-16 15:53:38 +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
Joakim Hove
3778077422 Assemble all generated cpp source in build/generated-source 2013-09-14 22:29:56 +02:00
Joakim Hove
79a59fc629 Added indent parameter to ParserKeyword::inlineNew() to beautify generated cpp source 2013-09-14 22:14:58 +02:00
Joakim Hove
ccac972d6c Removed - not needed - ParserRecord::inlineNew 2013-09-14 21:46:16 +02:00
Joakim Hove
414feb1132 Added dynamic creation of inline default list of keywords 2013-09-14 21:44:20 +02:00
Joakim Hove
f461ba6f07 Created code to create cpp representation of complete ParserKeyword 2013-09-13 22:23:12 +02:00
Joakim Hove
c04f9728b0 Added temporaryr library target buildParser which is used for executables creating source 2013-09-13 12:50:40 +02:00
Joakim Hove
b36fa7d42c Added inlineNew() method to create ParserRecord 2013-09-13 12:34:38 +02:00
Joakim Hove
414752b78a Fixed quoting of string default arguments 2013-09-13 10:26:56 +02:00
Joakim Hove
c11fdeeb42 Added ParserRecord::equal() method 2013-09-13 10:16:00 +02:00
Joakim Hove
b10952bb4f Added typeid() based test in ParserItem::equal() 2013-09-13 10:15:42 +02:00
Joakim Hove
9bc8090c08 Added parserItem method inlineNew() which will create a cpp source representation of self 2013-09-12 23:50:16 +02:00
Joakim Hove
6d0ed41b29 Added property m_defaultSet to track if the default value has been explicitly set 2013-09-12 12:13:32 +02:00
Joakim Hove
5284b4ff89 Added equal() method for the ParserItem classes 2013-09-12 10:58:44 +02:00
Joakim Hove
41376779f0 Fixed handling of INCLUDE keyword 2013-09-02 10:08:37 +02:00
Kristian Flikka
e55d52654d Added test to check that getKeyword throws when asked for non-existing keyword 2013-08-27 10:10:12 +02:00
Kristian Flikka
57ca1d0eb6 Added an else clause that throws, should check before getting 2013-08-27 10:06:55 +02:00
Kristian Flikka
1fc3857d06 Bumped boost to filesystem version 3, and changed a single usage of filename(), which has changed from string to path in filesystem v 3 2013-08-27 10:00:36 +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
0e5593dc9e Removed removed extra layer of scan / scan__ 2013-08-23 15:45:20 +02:00
Kristian Flikka
cdf16c747a Removed the expectedItems concept from the scan functions 2013-08-23 15:39:08 +02:00
Kristian Flikka
64fb9a6cee Removed expectedItems param from readFromRawRecord method in ParserItem 2013-08-23 14:43:17 +02:00
Kristian Flikka
771167c02e Removed ParserXItem's scan with expected elements. Only SINGLE and ALL is now allowed 2013-08-23 14:35:47 +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
Kristian Flikka
be882b6b27 Removed commented test 2013-08-23 12:18:38 +02:00
Kristian Flikka
07f1d70d79 Merge branch 'config-from-directory' of github.com:joakim-hove/opm-parser into config-from-directory 2013-08-23 12:04:10 +02:00
Kristian Flikka
1977d311ff Fixed validName method 2013-08-23 11:58:56 +02:00
Kristian Flikka
f42536531a Increased readabiliy 2013-08-23 11:53:03 +02:00
flikka
1fc65d2136 Changed indentation 2013-08-23 11:40:37 +02:00
Kristian Flikka
22e650de2e Removed commented line 2013-08-23 10:37:55 +02:00
Joakim Hove
e8e9f5bb87 Completed merge 2013-08-23 09:32:44 +02:00
Joakim Hove
b630140316 Merged upstream/master 2013-08-23 09:30:23 +02:00
Joakim Hove
4b728a5196 Added function declaration in .hpp 2013-08-23 00:20:22 +02:00