Commit graph

126 commits

Author SHA1 Message Date
John Wiegley
f0f2b34ea9 More work toward getting my ledger data to parse. 2008-07-22 03:48:35 -04:00
John Wiegley
4bc29e1351 A great deal of reorganization to restore the old parsing code (since the
newer XML stuff was pulled).
2008-07-22 02:23:45 -04:00
John Wiegley
d86a91d45b The new XPath parser has been integrated, although I have removed the
XML-related bits -- I just wanted the better infrastructure that had been
created during the rewrite.  It doesn't work, but it compiles and links now.
This means that all of the previous 3.0 code has been moved over, although
there are still snippets of code in pending/old that need to be restored.
2008-07-20 23:12:04 -04:00
John Wiegley
b85e9ba95f Everything but main.cc is compiling again (but with much #if 0'd code). 2008-07-20 06:00:06 -04:00
John Wiegley
20e35aa6f5 I have walked further along the road less compiled by... 2008-07-20 05:32:09 -04:00
John Wiegley
52fc9f2e44 Brought in the final round of 3.0 code, although it does not compile yet:
report, session, parts of xpath, main, journal, option.
2008-07-20 05:03:54 -04:00
John Wiegley
59f6ffb863 Added a tracing statement. 2008-07-19 23:28:54 -04:00
John Wiegley
88634973a2 Some basic fixes to get things almost running, although we still can't parse
my personal ledger file yet.
2008-07-19 23:10:37 -04:00
John Wiegley
d568319495 Merged in bug fixes from master (done for 2.6.1b) 2008-07-19 21:36:34 -04:00
John Wiegley
56cfd84576 Disabled an error check that has no real value in 2.6. 2008-07-17 21:37:19 -04:00
John Wiegley
595452e332 Protect against a case where xact->entry may legitimately be NULL. 2008-07-17 20:55:15 -04:00
John Wiegley
ed0deb95c2 Strip \r from all lines read. 2008-07-17 18:31:36 -04:00
John Wiegley
a210e8ba56 Fixed several issues with clocking out in a timelog, which was leading to an
invalid memory access.
2008-07-17 18:08:22 -04:00
John Wiegley
95f323f137 Added several more date/time fixes from Nathan Jones. Fixes #49. 2008-07-17 06:19:40 -04:00
John Wiegley
f3b182ca80 Patch from Nathan Jones so that trailing whitespace after account names in a
transaction with no amount is not parsed as a special name.  Fixes #3.
2008-07-16 03:54:50 -04:00
Nathan Jones
780135281d Fix compile errors with gcc 4.3 2008-05-20 17:13:34 -06:00
John Wiegley
2ead28363a Most things are building, but not the Python code 2008-05-12 05:10:08 -04:00
John Wiegley
d159501993 The code is compiling again, but it's far from being able to run yet. 2008-05-08 02:50:19 -04:00
John Wiegley
e3aacac7f0 Improvements to the position calculation logic during parsing. 2008-04-13 05:08:55 -04:00
John Wiegley
9ec136db90 *** empty log message *** 2008-04-13 02:41:32 -04:00
John Wiegley
5a93d4819e Reworked the way date/times are handled. 2008-04-13 02:41:32 -04:00
John Wiegley
c3c401ac0f *** empty log message *** 2008-04-13 02:41:32 -04:00
John Wiegley
a5aff9eee9 Several fixes to lot price handling. 2008-04-13 02:41:31 -04:00
John Wiegley
44561c1c1d Further refinement of commodity lot information. 2008-04-13 02:41:31 -04:00
John Wiegley
32bdfe20d9 Tons of corrections and fixes to value expressions and lot figures. 2008-04-13 02:41:31 -04:00
John Wiegley
9800e3febc *** empty log message *** 2008-04-13 02:41:31 -04:00
John Wiegley
b1a04923fe *** empty log message *** 2008-04-13 02:41:30 -04:00
John Wiegley
2964dd15b2 *** empty log message *** 2008-04-13 02:41:30 -04:00
John Wiegley
f1d5716b95 *** empty log message *** 2008-04-13 02:41:29 -04:00
John Wiegley
e32d9e64a7 Added much better error location. 2008-04-13 02:41:29 -04:00
John Wiegley
7acc1306d9 *** empty log message *** 2008-04-13 02:41:29 -04:00
John Wiegley
96d6d62ad9 Began support for improved commodity handling. 2008-04-13 02:41:28 -04:00
John Wiegley
7d3e45958e *** empty log message *** 2008-04-13 02:41:28 -04:00
John Wiegley
68813448cb Added support for unlimited factoids. 2008-04-13 02:41:28 -04:00
John Wiegley
a2423f99db *** empty log message *** 2008-04-13 02:41:27 -04:00
John Wiegley
935f849c7d (parse_transaction): Assign the entry to an xact while parsing it so
that the 'd' variable is available to value expressions within a
transaction amount or cost.
2008-04-13 02:41:27 -04:00
John Wiegley
7901598f1d Checked in all major updates. 2008-04-13 02:41:27 -04:00
John Wiegley
f819ba6c10 *** empty log message *** 2008-04-13 02:41:26 -04:00
John Wiegley
5a8d1fc8ea *** empty log message *** 2008-04-13 02:41:26 -04:00
John Wiegley
f2a167e0ed *** empty log message *** 2008-04-13 02:41:26 -04:00
John Wiegley
7cf2a41755 (parse_transaction): Improved the @ check (scanning for a transaction
cost) so that it skips quoted symbol names and value expressions.
2008-04-13 02:41:25 -04:00
John Wiegley
fc8bbd5815 (parse_amount): Don't interpret an initial opening parenthesis as
inline math, but rather see it as introducing a value expression.
2008-04-13 02:41:25 -04:00
John Wiegley
c51704a2a1 (parse): Do not balance automated entries: they are now balanced as
part of the entry they match.  (parse): Report the remainder of failed
balances using `entry_balance'.  This can give a much better idea of
what went wrong, especially when values are being calculated.
2008-04-13 02:41:25 -04:00
John Wiegley
349183d5ea (write_textual_journal): Corrected an error message. 2008-04-13 02:41:24 -04:00
John Wiegley
2df14a5b86 Transactions now track their beginning and ending position, as do
entries.  The new format strings %xB %xE %xb %xe can be used to
display those values relative to a transaction.  The Emacs module now
relies on this support to exactly determine where a transaction is,
rather than the Elisp logic it relied on previously.
2008-04-13 02:41:24 -04:00
John Wiegley
7a44b2e367 *** empty log message *** 2008-04-13 02:41:23 -04:00
John Wiegley
4aea9709bb Made several changes to the parsing infrastructure to allow passing
the "config_t" object around.  This is needed for parsing option
settings in the initialization file.
2008-04-13 02:41:23 -04:00
John Wiegley
ced1d5a308 Relaxed parsing so that tabs are allowed in several places that
required spaces before.
2008-04-13 02:41:23 -04:00
John Wiegley
6cee916e04 Added in.clear() before resetting I/Os streams. Again, thanks to the
list.
2008-04-13 02:41:22 -04:00
John Wiegley
a8012940f4 Removed Python integration support. 2008-04-13 02:41:21 -04:00