From b7ac0907ff8d089a066e7f596906d7a875b02d93 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Thu, 10 Aug 2017 16:10:12 -0700 Subject: [PATCH] reorder `dump` precedence --- pitfall/xenomorph/private/base.rkt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pitfall/xenomorph/private/base.rkt b/pitfall/xenomorph/private/base.rkt index 59811aee..3d2cc61d 100644 --- a/pitfall/xenomorph/private/base.rkt +++ b/pitfall/xenomorph/private/base.rkt @@ -42,14 +42,17 @@ (define (size o [val #f] [parent #f]) (send o size val parent)))]))) (define (dump x) + (define (dump-dict x) + (for/list ([(k v) (in-dict x)]) + (cons (dump k) (dump v)))) (let loop ([x x]) (cond [(input-port? x) (port->bytes x)] [(output-port? x) (get-output-bytes x)] - [(dict? x) (for/list ([(k v) (in-dict x)]) - (cons (loop k) (loop v)))] + [(and (object? x) + (memq 'dump (interface->method-names (object-interface x)))) (send x dump)] + [(dict? x) (dump-dict x)] [(list? x) (map loop x)] - [(and (object? x) (memq 'dump (interface->method-names (object-interface x)))) (send x dump)] [else x]))) #;(define dumpable<%>