Don't fail when an item doesn't have a property

* undone/main.scm (get-field): Only get a cons cell, don't get its
  cdr.

  (get-field-value): New macro.

  (define-view): Add filtered list syntax, which filters items that
  don't have the needed properties.  Filter results before looking
  through them.
This commit is contained in:
Tom Willemsen 2012-08-31 14:45:18 +02:00
parent 4124f07fa9
commit 62cde9b1c8

View file

@ -7,7 +7,13 @@
(lambda (x)
(syntax-case x ()
((_ key alist)
#'(cdr (assq (quote key) alist))))))
#'(assq (quote key) alist)))))
(define-syntax get-field-value
(lambda (x)
(syntax-case x ()
((_ key alist)
#'(cdr (get-field key alist))))))
(define-syntax define-view
(lambda (x)
@ -17,28 +23,36 @@
sort-by sort-predicate sort-field)
(with-syntax ((viewname
(datum->syntax
x (symbol-append (syntax->datum #'name) '-view))))
x (symbol-append (syntax->datum #'name) '-view)))
(filtered-list
#`(filter (lambda (elm)
(and #,@(map
(lambda (field)
#`(get-field #,field elm))
#'(fields fields* ...))))
todo-list)))
#`(begin
(define (viewname)
doc
(for-each
(lambda (item)
(let (#,@(map (lambda (field)
#`(#,field
(cdr (assq (quote #,field) item))))
#'(fields fields* ...)))
(let (#,@(map
(lambda (field)
#`(#,field (get-field-value #,field item)))
#'(fields fields* ...)))
(if predicate
(format #t fmt
#,@(map (lambda (field)
field)
#'(fields fields* ...))))))
#,(if (syntax->datum #'sort-predicate)
#'(stable-sort
todo-list
#`(stable-sort
filtered-list
(lambda (a b)
(sort-predicate (get-field sort-field a)
(get-field sort-field b))))
#'todo-list)))
(sort-predicate
(get-field-value sort-field a)
(get-field-value sort-field b))))
#'filtered-list)))
(set! view-list
(append view-list
(list (cons 'name viewname)))))))