From 95ac3bb1c0bf743ad42807d4773459b1fd410f2d Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 3 Jul 2017 14:13:31 -0700 Subject: [PATCH] ptr --- pitfall/restructure/private/pointer.rkt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pitfall/restructure/private/pointer.rkt b/pitfall/restructure/private/pointer.rkt index 703ecac2..4b16a963 100644 --- a/pitfall/restructure/private/pointer.rkt +++ b/pitfall/restructure/private/pointer.rkt @@ -18,7 +18,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Pointer.coffee [(· ctx parent) => find-top-ctx] [else ctx])) -(define-subclass object% (Pointer offset-type type-in [options (mhasheq)]) +(define-subclass RestructureBase (Pointer offset-type type-in [options (mhasheq)]) (field [type (and (not (eq? type-in 'void)) type-in)]) (define pointer-style (or (· options type) 'local)) (define allow-null (or (· options allowNull) #t)) @@ -26,7 +26,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Pointer.coffee (define lazy (· options lazy)) (define relative-getter-or-0 (or (· options relativeTo) (λ (ctx) 0))) ; changed this to a simple lambda - (define/public (decode stream [ctx #f]) + (define/override (decode stream [ctx #f]) (define offset (send offset-type decode stream ctx)) (cond [(and allow-null (= offset null-value)) #f] ; handle null pointers @@ -56,7 +56,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Pointer.coffee [else ptr])])) - (define/public (size [val #f] [ctx #f]) + (define/override (size [val #f] [ctx #f]) (let*-values ([(parent) ctx] [(ctx) (caseq pointer-style [(local immediate) ctx] @@ -70,7 +70,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Pointer.coffee (send offset-type size))) - (define/public (encode stream val [ctx #f]) + (define/override (encode stream val [ctx #f]) (if (not val) (send offset-type encode stream null-value) (let* ([parent ctx]