Skip to content
Browse files

Merge pull request #2 from cbbrowne/master

The bits inside cl-ledger
  • Loading branch information...
2 parents cfc7dbd + 378ea8b commit c380beba5b730eab935e7f847a494910c0e6489c @jwiegley committed
Showing with 9 additions and 9 deletions.
  1. +2 −2 core/ledger.lisp
  2. +2 −2 core/valexpr.lisp
  3. +1 −1 reports/sexp.lisp
  4. +2 −2 transforms/filter.lisp
  5. +2 −2 transforms/subtotal.lisp
View
4 core/ledger.lisp
@@ -76,10 +76,10 @@
(let (earliest latest)
(iterate ((xact (scan-transactions binder)))
(if (or (null earliest)
- (local-time< (xact-date xact) earliest))
+ (timestamp< (xact-date xact) earliest))
(setf earliest (xact-date xact)))
(if (or (null latest)
- (local-time> (xact-date xact) latest))
+ (timestamp> (xact-date xact) latest))
(setf latest (xact-date xact))))
(time-range :begin earliest :end latest :end-inclusive-p t)))
View
4 core/valexpr.lisp
@@ -416,9 +416,9 @@
(if (char= #\= (peek-char nil in))
(progn
(read-char in)
- (make-comparator function local-time>= value>=
+ (make-comparator function timestamp>= value>=
"'>=' operator not followed by argument"))
- (make-comparator function local-time> value>
+ (make-comparator function timestamp> value>
"'>' operator not followed by argument")))
(t
function))
View
2 reports/sexp.lisp
@@ -9,7 +9,7 @@
(list
(item-position-begin-line (entry-position entry))
(append (multiple-value-list
- (floor (unix-time (entry-date entry))
+ (floor (unix-to-timestamp (entry-date entry))
65536))
(list 0))
(entry-status entry)
View
4 transforms/filter.lisp
@@ -117,12 +117,12 @@
(:begin
(or string fixed-time)
,#'(lambda (value)
- (fixed-time-matcher value #'local-time>=)))
+ (fixed-time-matcher value #'timestamp>=)))
(:end
(or string fixed-time)
,#'(lambda (value)
- (fixed-time-matcher value #'local-time<=)))
+ (fixed-time-matcher value #'timestamp<=)))
(:range
(or string time-range) ,#'time-range-matcher)
View
4 transforms/subtotal.lisp
@@ -16,10 +16,10 @@
;; Remember the earliest and latest transactions in the set, so that
;; we can create a meaningful display name for the grouped entry.
(if (or (null earliest-date)
- (local-time< (xact-date xact) earliest-date))
+ (timestamp< (xact-date xact) earliest-date))
(setf earliest-date (xact-date xact)))
(if (or (null latest-date)
- (local-time> (xact-date xact) latest-date))
+ (timestamp> (xact-date xact) latest-date))
(setf latest-date (xact-date xact)))
(account-set-value account

0 comments on commit c380beb

Please sign in to comment.
Something went wrong with that request. Please try again.