From 148a2bcccade1679ae58ab317dd764da829a0c4b Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 3 Jul 2017 14:29:02 -0700 Subject: [PATCH] tweak --- pitfall/restructure/private/struct.rkt | 14 +++++++------- pitfall/restructure/test/pointer-test.rkt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pitfall/restructure/private/struct.rkt b/pitfall/restructure/private/struct.rkt index 2ff23de0..3578520c 100644 --- a/pitfall/restructure/private/struct.rkt +++ b/pitfall/restructure/private/struct.rkt @@ -13,8 +13,8 @@ https://github.com/mbutterick/restructure/blob/master/src/Struct.coffee (define (choose-dict d k) (if (memq k private-keys) - (get-field pvt d) - (get-field kv d))) + (get-field _pvt d) + (get-field _kv d))) (define dictable<%> (interface* () @@ -26,7 +26,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Struct.coffee (if (LazyThunk? res) ((LazyThunk-proc res)) res)) (define (dict-remove! d k) (d:dict-remove! (choose-dict d k) k)) ;; public keys only - (define (dict-keys d) (d:dict-keys (get-field kv d))))] + (define (dict-keys d) (d:dict-keys (get-field _kv d))))] [(generic-property gen:custom-write) (generic-method-table gen:custom-write (define (write-proc o port mode) @@ -34,14 +34,14 @@ https://github.com/mbutterick/restructure/blob/master/src/Struct.coffee [(#t) write] [(#f) display] [else (λ (p port) (print p port mode))])) - (proc (get-field kv o) port)))]))) + (proc (get-field _kv o) port)))]))) (define StructDictRes (class* RestructureBase (dictable<%>) (super-make-object) - (field [kv (mhasheq)] - [pvt (mhasheq)]) + (field [_kv (mhasheq)] + [_pvt (mhasheq)]) - (define/override (dump) kv))) + (define/override (dump) _kv))) (define-subclass Streamcoder (Struct [fields (dictify)]) diff --git a/pitfall/restructure/test/pointer-test.rkt b/pitfall/restructure/test/pointer-test.rkt index 383d37a6..f51e8fc9 100644 --- a/pitfall/restructure/test/pointer-test.rkt +++ b/pitfall/restructure/test/pointer-test.rkt @@ -104,7 +104,7 @@ https://github.com/mbutterick/restructure/blob/master/test/Pointer.coffee (let ([stream (+DecodeStream (+Buffer '(1 53)))] [struct (+Struct (dictify 'ptr (+Pointer uint8 uint8 (mhasheq 'lazy #t))))]) (define res (decode struct stream)) - (check-true (LazyThunk? (hash-ref (get-field kv res) 'ptr))) + (check-true (LazyThunk? (hash-ref (get-field _kv res) 'ptr))) (check-equal? (· res ptr) 53))