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 |
|
Joakim Hove
|
df031007db
|
Added items: to all inline config strings
|
2013-08-23 00:20:07 +02:00 |
|
Joakim Hove
|
7e9b817107
|
Reformatting
|
2013-08-23 00:16:50 +02:00 |
|
Kristian Flikka
|
3deab9cdf8
|
Changed unknown keyword concept to be a constructor only setting
|
2013-08-22 15:53:57 +02:00 |
|
Joakim Hove
|
e75998666d
|
Updated ParserKeyword::validName() to disregard names with not alphanumeric (c)
|
2013-08-21 23:15:40 +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 |
|
Joakim Hove
|
dfca913462
|
Added method to load keyword configurations from directory
|
2013-08-21 12:50:21 +02:00 |
|
Joakim Hove
|
4202ad027d
|
Added static method ParserKeyword::validName()
|
2013-08-21 12:43:15 +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
|
002ab45f77
|
Removed commented test
|
2013-08-21 08:51:00 +02:00 |
|
Kristian Flikka
|
89daeea561
|
Renamed newRawKeyword to createRawKeyword. Minor refactoring
|
2013-08-21 08:44:46 +02:00 |
|
Joakim Hove
|
47d29cc804
|
Added parser->size() and parser->loadKeywordFromFile()
|
2013-08-19 22:37:48 +02:00 |
|
Joakim Hove
|
75de3033f9
|
Renamed variables related keyword inferring size from other keyword
|
2013-08-14 08:43:54 +02:00 |
|
Joakim Hove
|
134e4be5cf
|
Removed references to RawDeck
|
2013-08-14 08:40:07 +02:00 |
|
Joakim Hove
|
e2fd83e731
|
Removed cout msg
|
2013-08-14 08:22:14 +02:00 |
|
Joakim Hove
|
a0a20425f6
|
Updated tests to reflect that RawDeck has been removed
|
2013-08-13 14:51:33 +02:00 |
|
Joakim Hove
|
5ab04d4b17
|
Removed old Parser::parse() and replaced with new implementation
|
2013-08-12 14:39:11 +02:00 |
|
Joakim Hove
|
5c3de27077
|
1. Implemented support for inferring size from another kewyord - i.e EQLDIMS + EQUIL.
2. Cleaned up the main parser loop considerably; the RawKeyword instance now itself knows whether it is complete or not.
|
2013-08-11 12:36:16 +02:00 |
|
Joakim Hove
|
4e531778f6
|
Merge branch 'master' into parse-EQUIL
|
2013-08-09 09:22:53 +02:00 |
|
Joakim Hove
|
fe070640ad
|
Added test for ParserDoubleItem
|
2013-08-09 09:12:55 +02:00 |
|
Joakim Hove
|
b190d74df6
|
Changed typo defaultInt() -> defaultDouble()
|
2013-08-09 08:49:14 +02:00 |
|
Joakim Hove
|
299eaf0a48
|
Minor rename
|
2013-08-06 16:30:48 +02:00 |
|
Joakim Hove
|
946485e2b4
|
Added parsing support for sizeType OTHER
|
2013-08-06 16:28:12 +02:00 |
|
Joakim Hove
|
c046fb0bde
|
Added support for keywords getting size from other keywords ~ EQUIL style
|
2013-08-06 16:26:49 +02:00 |
|
Joakim Hove
|
475b607faf
|
Can now parse file with several WCONHIST keywords
|
2013-08-01 12:50:42 +02:00 |
|
Joakim Hove
|
75954575d5
|
Changed Deck::getKeyword() to take an additional inde argument
|
2013-08-01 10:57:25 +02:00 |
|
Joakim Hove
|
15c4874ee0
|
Added parsing support for float (i.e. double) items
|
2013-08-01 09:31:27 +02:00 |
|
Joakim Hove
|
797125463c
|
Added class wide default double value
|
2013-08-01 09:31:06 +02:00 |
|
Joakim Hove
|
8bc176d63e
|
Added full(?) Parser configuration from json
|
2013-07-31 17:58:05 +02:00 |
|
Joakim Hove
|
8dc8781c12
|
Added ValueType enum
|
2013-07-31 16:52:24 +02:00 |
|
Joakim Hove
|
7b9206f675
|
Added Json config to ParserStringItem
|
2013-07-31 16:24:26 +02:00 |
|