Kristian Flikka
2648bb350b
Added newlines to files
2013-11-18 15:32:14 +01:00
Kristian Flikka
006ab6d35d
Added keywordName and dataFilename to RawRecord. Using these in the ParserRecord to give better error message when throwing on too long RawRecords
2013-11-07 12:32:07 +01:00
Joakim Hove
bd289194f3
Merged with upstream/master
2013-10-28 10:12:53 +01:00
Joakim Hove
91704558a6
Added test for compile time polymorphism
2013-10-28 10:00:40 +01:00
Joakim Hove
76a9cbb0b8
Updated test to check a return value
2013-10-25 17:31:48 +02:00
Roland Kaufmann
781ef04a0e
Compare size with unsigned int literal
...
Surprisingly, some compilers (notably GCC 4.6.3) will issue a warning
when comparing a literal which is clearly positive to an unsigned type,
when looking for a suitable instantiation in Boost. This is fixed by
making the literal unsigned too, so there's no doubt.
2013-10-22 23:39:49 +02:00
flikka
6ffa9052ef
Merge pull request #32 from joakim-hove/reload-keyword
...
Added test for replace keyword functionality
2013-10-18 05:48:06 -07:00
Joakim Hove
1cc16de2bd
Added test for replace keyword functionality
2013-10-18 10:17:48 +02:00
Kristian Flikka
65e01082d2
Added tests exposed tracking of default usage
2013-10-16 15:07:54 +02:00
Joakim Hove
2d68ebe94c
Merge remote-tracking branch 'upstream/master' into track-default
2013-10-15 14:24:42 +02:00
Joakim Hove
2ac8bc55a5
Merge pull request #30 from joakim-hove/data-with-space
...
Data with space
2013-10-15 05:23:11 -07:00
Joakim Hove
f38cd79839
Commented out failing DefaultApplied tests
2013-10-14 21:15:57 +02:00
Joakim Hove
9be183cf52
Minor reformat to not confuse comment end marker
2013-10-14 21:14:39 +02:00
Joakim Hove
d1f0a9f5f7
Moved some tests around
2013-10-14 14:15:44 +02:00
Joakim Hove
fb7dc690d1
Added defaultApplied() method to DeckItem - and FAILING test
2013-10-10 13:32:05 +02:00
Joakim Hove
b63244228d
Added Parser::dropKeyword()
2013-10-09 08:22:43 +02:00
Joakim Hove
6dce82c5a5
Added action: THROW_EXCEPTION
2013-10-08 16:54:41 +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
cc21644c9e
Added Json parsing of action attribute
2013-10-08 14:13:45 +02:00
Joakim Hove
e6b38c6445
Added action value to ParserKeyword constructor
2013-10-08 13:46:55 +02:00
Joakim Hove
9b96d6dfa5
Added new enum ParserKeywordActionEnum
2013-10-08 11:39:04 +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
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
d7ca4fee83
Added support for 'data' keywords ~ the PORO and PERMX keywords
2013-09-22 17:23:27 +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
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
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
9bc8090c08
Added parserItem method inlineNew() which will create a cpp source representation of self
2013-09-12 23:50:16 +02:00
Joakim Hove
5284b4ff89
Added equal() method for the ParserItem classes
2013-09-12 10:58:44 +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
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
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
Joakim Hove
b630140316
Merged upstream/master
2013-08-23 09:30:23 +02:00
Joakim Hove
df031007db
Added items: to all inline config strings
2013-08-23 00:20:07 +02:00
Joakim Hove
e75998666d
Updated ParserKeyword::validName() to disregard names with not alphanumeric (c)
2013-08-21 23:15:40 +02:00
