Commit Graph

51 Commits

Author SHA1 Message Date
Kristian Flikka
9fddf998cf Fixed a bug with comments after keywords, right-side trims away dashes and spaces from the 8 char candidate 2013-11-20 14:35:48 +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
Roland Kaufmann
0a69727bf7 Add missing header for function used inline in class 2013-10-22 22:38:08 +02:00
Joakim Hove
2d68ebe94c Merge remote-tracking branch 'upstream/master' into track-default 2013-10-15 14:24:42 +02:00
Joakim Hove
dabfdb922b Added loose function tokenCOntainsStar to StarToken.cpp 2013-10-14 21:27:20 +02:00
Joakim Hove
7ec4be5b47 Including StarTokenTest 2013-10-14 21:13:24 +02:00
Joakim Hove
a7078ba687 Implemented StarToken specializations in cpp file 2013-10-14 21:05:10 +02:00
Joakim Hove
ccae60777d Ensure that StarToken() will throw for missing multiplier 2013-10-14 17:49:07 +02:00
Joakim Hove
aae260c47d Added class StarToken() to treat tokens with a multiplier/default 2013-10-14 16:54:43 +02:00
Joakim Hove
f0770f47fb Added filename and line nr to RawRecord 2013-10-08 15:23:45 +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
ff715812c0 isTerminatedRecordString() will inspect the partial input - and not the whole string 2013-09-30 11:13:23 +02:00
Kristian Flikka
297c719a1c Cleanup of some remaining Logger stuff 2013-09-19 10:57:46 +02:00
Joakim Hove
d8dff84cb3 Removed Logger class 2013-09-16 14:36:14 +02:00
Kristian Flikka
e42a7a3a97 Refactoring the main function, added submethod. Removed valgrind uninitialized error 2013-08-21 14:29:46 +02:00
Joakim Hove
7786f296d8 Removed RawKeyword::lineContainsData() and RawKeyword::lineTerminatesKeyword() 2013-08-13 14:49:01 +02:00
Joakim Hove
c1ff0a6eb0 Removed RawDeckTests from CMakeLists.txt 2013-08-13 14:47:42 +02:00
Joakim Hove
d5705d131e Removed RawDeck class 2013-08-13 14:46:41 +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
475b607faf Can now parse file with several WCONHIST keywords 2013-08-01 12:50:42 +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
f1660460dc Replaced all instances of KW with Keyword. We can afford it. 2013-06-20 15:30:37 +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
Kristian Flikka
082978fc2e Functionality to read from RawRecord into DeckRecord, based on ParserRecord. 2013-05-27 14:28:23 +02:00
Joakim Hove
f178691831 Added size() method to the RawRecord class 2013-05-12 21:37:22 +02:00
Joakim Hove
a9cd24f628 Added operator[] and method push_front() to RawDeck 2013-05-10 13:55:00 +02:00
Kristian Flikka
2a331e1a3a ParserIntItem's scan function now supports ITEM_FIXED parsing 2013-05-08 15:29:58 +02:00
Kristian Flikka
2088c3e96d Simple scan implementation in ParserIntItem added. DeckIntItem now support push_back 2013-05-08 14:31:20 +02:00
Kristian Flikka
2d6e6842d6 Changed ParserItem from template based to a base-inheritance based system. Corresponds to and creates DeckItem objects 2013-05-07 21:55:49 +02:00
Kristian Flikka
b36f000377 Moved tests from one base location, into per-topic folders 2013-05-06 14:46:29 +02:00
Kristian Flikka
bf3be4695d Refactoring, prefixing parser setup classes with Parser. 4 space indent. 2013-05-06 12:13:49 +02:00
Joakim Hove
60abc2c397 Merged in documentation 2013-05-06 09:44:00 +02:00
Kristian Flikka
f7fdbe96fa Added some comments and documentation 2013-05-05 23:02:26 +02:00
Joakim Hove
19fa7ab1d1 Moved Logger implementation to subdirectory Logger/ 2013-05-03 15:11:28 +02:00
Kristian Flikka
8b32658e54 Refactoring, more consts, etc. Comments from Joakim 2013-04-08 14:32:17 +02:00
Kristian Flikka
f89b8362ff Changed to tabsize 2 after discussion with Joakim. I vote for real tabs. 2013-04-08 10:36:14 +02:00
Kristian Flikka
1868615a4a Moved some consts for the Raw classes to a separate file, characters and sizes 2013-04-08 10:31:54 +02:00
Kristian Flikka
76b8df09ad Changed the logic in raw-reading, only adding keyword after it is finished. Simplified special casing for INCLUDE. Reset keyword pointer when keyword finished 2013-04-08 10:07:24 +02:00
Kristian Flikka
c76767b9aa Adding recursive reading of Include files. Fixed a performance bug when appending strings to a record 2013-04-05 16:14:43 +02:00
Kristian Flikka
b200d74c9d Rename variable 2013-04-04 15:57:21 +02:00
Kristian Flikka
041ac87337 Removed unused variable 2013-04-04 15:54:55 +02:00
Kristian Flikka
aa8cd7b4ca Added a thin container for knowledge about keywords with fixed number of records. Changed some getter methods to return reference 2013-04-04 13:30:50 +02:00
Kristian Flikka
8a0892b388 Rename file-checking-function 2013-04-04 09:58:54 +02:00
Kristian Flikka
3adb09cb5a Review updates: Keyword can have numbers, comment lines can start with space, data can start at pos 0 on line, must explicitly have end-of-keyword control 2013-04-04 09:56:00 +02:00
Joakim Hove
57c6946c07 Merged data/ -> RawDeck/ source code reorganisation 2013-04-03 09:27:55 +02:00
Kristian Flikka
d24f487d18 Refactoring for readability. Added a couple of unit tests 2013-04-02 15:42:19 +02:00