From b3b6bc386dcfa805a9551f2ff485949839ad0535 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 17 Dec 2018 17:09:14 -0800 Subject: [PATCH] change currentOffset key name --- xenomorph/xenomorph/array.rkt | 2 +- xenomorph/xenomorph/helper.rkt | 3 ++- xenomorph/xenomorph/lazy-array.rkt | 2 +- xenomorph/xenomorph/struct.rkt | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xenomorph/xenomorph/array.rkt b/xenomorph/xenomorph/array.rkt index a0ea5030..a3bef851 100644 --- a/xenomorph/xenomorph/array.rkt +++ b/xenomorph/xenomorph/array.rkt @@ -29,7 +29,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Array.coffee (define new-parent (if (x:int? @len) (mhasheq 'parent parent x:start-offset-key (pos port) - '_currentOffset 0 + x:current-offset-key 0 '_length @len) parent)) (define len (resolve-length @len port parent)) diff --git a/xenomorph/xenomorph/helper.rkt b/xenomorph/xenomorph/helper.rkt index c6002b72..8dd9082f 100644 --- a/xenomorph/xenomorph/helper.rkt +++ b/xenomorph/xenomorph/helper.rkt @@ -8,8 +8,9 @@ (define x:version-key 'x:version) (define x:start-offset-key 'x:start-offset) +(define x:current-offset-key 'x:current-offset) -(define private-keys (list 'parent x:start-offset-key '_currentOffset '_length)) +(define private-keys (list 'parent x:start-offset-key x:current-offset-key '_length)) (define (dict-ref* d . keys) (for/fold ([d d]) diff --git a/xenomorph/xenomorph/lazy-array.rkt b/xenomorph/xenomorph/lazy-array.rkt index 325d055c..47019eb9 100644 --- a/xenomorph/xenomorph/lazy-array.rkt +++ b/xenomorph/xenomorph/lazy-array.rkt @@ -19,7 +19,7 @@ https://github.com/mbutterick/restructure/blob/master/src/LazyArray.coffee (define new-parent (if (x:int? @len) (mhasheq 'parent parent x:start-offset-key starting-pos - '_currentOffset 0 + x:current-offset-key 0 '_length @len) parent)) (define stream-starting-pos (pos port)) diff --git a/xenomorph/xenomorph/struct.rkt b/xenomorph/xenomorph/struct.rkt index 87f94fcb..81951e58 100644 --- a/xenomorph/xenomorph/struct.rkt +++ b/xenomorph/xenomorph/struct.rkt @@ -18,7 +18,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Struct.coffee (dict-set*! mheq 'parent parent x:start-offset-key (pos port) - '_currentOffset 0 + x:current-offset-key 0 '_length len) mheq) @@ -33,7 +33,7 @@ https://github.com/mbutterick/restructure/blob/master/src/Struct.coffee (send type x:decode port sdr))) (unless (void? val) (dict-set! sdr key val)) - (dict-set! sdr '_currentOffset (- (pos port) (dict-ref sdr x:start-offset-key))) + (dict-set! sdr x:current-offset-key (- (pos port) (dict-ref sdr x:start-offset-key))) sdr)) (define (dict->mutable-hash x)