remove use of 'try'

pull/27/head
Matthew Butterick 11 years ago
parent 221a346e61
commit 4cf362222e

@ -7,13 +7,13 @@
(define+provide (pagenode? x) (define+provide (pagenode? x)
(->boolean (and (symbol? x) (try (not (whitespace/nbsp? (->string x))) (->boolean (and (symbol? x) (with-handlers ([exn:fail? (λ(e) #f)])
(except [exn:fail? (λ(e) #f)]))))) (not (whitespace/nbsp? (->string x)))))))
(define+provide (pagenodeish? x) (define+provide (pagenodeish? x)
(try (pagenode? (->symbol x)) (with-handlers ([exn:fail? (λ(e) #f)])
(except [exn:fail? (λ(e) #f)]))) (pagenode? (->symbol x))))
(define/contract+provide (->pagenode x) (define/contract+provide (->pagenode x)
@ -34,14 +34,14 @@
(let ([pagenodes (pagetree->list x)]) (let ([pagenodes (pagetree->list x)])
(and (and
(andmap (λ(p) (or (pagenode? p) (error (format "validate-pagetree: \"~a\" is not a valid pagenode" p)))) pagenodes) (andmap (λ(p) (or (pagenode? p) (error (format "validate-pagetree: \"~a\" is not a valid pagenode" p)))) pagenodes)
(try (members-unique?/error pagenodes) (with-handlers ([exn:fail? (λ(e) (error (format "validate-pagetree: ~a" (exn-message e))))])
(except [exn:fail? (λ(e) (error (format "validate-pagetree: ~a" (exn-message e))))])) (members-unique?/error pagenodes))
x)))) x))))
(define+provide (pagetree? x) (define+provide (pagetree? x)
(try (->boolean (validate-pagetree x)) (with-handlers ([exn:fail? (λ(e) #f)])
(except [exn:fail? (λ(e) #f)]))) (->boolean (validate-pagetree x))))
(define+provide/contract (directory->pagetree dir) (define+provide/contract (directory->pagetree dir)

Loading…
Cancel
Save