Commit Graph

163 Commits

Author SHA1 Message Date
Joakim Hove
253d8bec0f Minor minor 2013-10-08 17:03:46 +02: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
f3a38425cb Added warning capabilities to the Deck 2013-10-08 16:02:16 +02:00
Joakim Hove
997d53ea99 Merge branch 'store-file-and-line' into keyword-status 2013-10-08 15:28:21 +02:00
Joakim Hove
f0770f47fb Added filename and line nr to RawRecord 2013-10-08 15:23:45 +02:00
Joakim Hove
f019d40dd4 Parser will inspect keyword->action; only INTERNALIZE are stored 2013-10-08 14:45:41 +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
Kristian Flikka
297c719a1c Cleanup of some remaining Logger stuff 2013-09-19 10:57:46 +02:00
Kristian Flikka
687b5aed2f Formatting... 2013-09-16 15:53:56 +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
f461ba6f07 Created code to create cpp representation of complete ParserKeyword 2013-09-13 22:23:12 +02:00
Joakim Hove
41376779f0 Fixed handling of INCLUDE keyword 2013-09-02 10:08:37 +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
f42536531a Increased readabiliy 2013-08-23 11:53:03 +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
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
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
Kristian Flikka
5f1c2722b5 Now also reading unrecognized keywords, labeled such in DeckKeyword class 2013-08-21 10:41:18 +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
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
475b607faf Can now parse file with several WCONHIST keywords 2013-08-01 12:50:42 +02:00
Joakim Hove
b3d9fb51a0 Parser object can be constructed with config file as input argument 2013-07-31 11:30:21 +02:00
Joakim Hove
e0995814f6 More JSON integration in Parser and ParserKeyword 2013-07-30 14:10:07 +02:00
Kristian Flikka
31b3031c1a Removed class ParserKeywordSize, and accompanying tests. Put info into ParserKeyword. Changed tests to expose same constraints. 2013-06-24 14:08:53 +02:00
Kristian Flikka
951ce6ac4d Changed from using RawParserKeywords to equivalent functionality now in Parser and ParserKeywordSize 2013-06-21 15:34:45 +02:00
Kristian Flikka
50ec3e0244 Changed from using RawParserKeywords to equivalent functionality now in Parser and ParserKeywordSize 2013-06-21 15:34:06 +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
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
18db675f71 Added some temporary code to make it build. WIP 2013-06-03 15:58:47 +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