From 4768cfe46465396e972e2cc68b2f442b2baa1525 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Wed, 7 Jun 2017 15:13:32 -0700
Subject: [PATCH] more

---
 pitfall/restructure/helper.rkt | 12 ++++++++----
 pitfall/restructure/number.rkt | 24 ++++++++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pitfall/restructure/helper.rkt b/pitfall/restructure/helper.rkt
index 84297b41..cfd7e55a 100644
--- a/pitfall/restructure/helper.rkt
+++ b/pitfall/restructure/helper.rkt
@@ -8,23 +8,27 @@
     (raise-argument-error 'read-bytes-exact (format "byte string length ~a" count) bs))
   bs)
 
-(define BinaryIO%
+(define RestructureBase%
   (class object%
     (super-new)    
     (abstract decode)
     (abstract encode)
-    (abstract size)))
+    #;(abstract size)))
 
 
 (define-macro (define-subclass SUPERCLASS (ID . INIT-ARGS) . BODY)
   #'(define ID (class SUPERCLASS (super-new) (init-field . INIT-ARGS) . BODY)))
 
+(require (for-syntax sugar/debug))
 (define-macro (getter-field [ID . EXPRS])
   (with-pattern ([_ID (prefix-id "_" #'ID)])
-    #'(begin
+    #`(begin
         (field [(ID _ID)  . EXPRS])
         (public (_ID ID))
-        (define (_ID) ID))))
+        (#,(if (syntax-property caller-stx 'override) #'define/override #'define) (_ID) ID))))
+
+(define-macro (getter-field/override [ID . EXPRS])
+  (syntax-property #'(getter-field [ID . EXPRS]) 'override #t))
 
 (define-macro (test-module . EXPRS)
   #`(module+ test
diff --git a/pitfall/restructure/number.rkt b/pitfall/restructure/number.rkt
index 901a3579..30b66d34 100644
--- a/pitfall/restructure/number.rkt
+++ b/pitfall/restructure/number.rkt
@@ -14,7 +14,7 @@
  (check-true (unsigned-type? 'UInt16))
  (check-false (unsigned-type? 'Int16)))
 
-(define-subclass object% (NumberT type [endian (if (system-big-endian?) 'BE 'LE)])
+(define-subclass RestructureBase% (NumberT type [endian (if (system-big-endian?) 'BE 'LE)])
   (getter-field [fn (string->symbol (format "~a~a" type (if (ends-with-8? type) "" endian)))])
 
   (unless (hash-has-key? type-sizes fn)
@@ -22,7 +22,7 @@
   
   (getter-field [size (hash-ref type-sizes fn)])
 
-  (define/public (decode stream)
+  (define/override (decode stream)
     (unless (input-port? stream)
       (raise-argument-error 'decode "input port" stream))
     (define bstr (read-bytes-exact size stream))
@@ -30,22 +30,30 @@
         (bytes-ref bstr 0)
         (integer-bytes->integer bstr (unsigned-type? type) (eq? endian 'BE))))
 
-  (define/public (encode stream val)
+  (define/override (encode stream val)
     (unless (output-port? stream)
       (raise-argument-error 'encode "output port" stream))
-    (unfinished)))
+    (if (= 1 size)
+        (bytes val)
+        (integer->integer-bytes val size (unsigned-type? type) (eq? endian 'BE)))))
     
 
 (test-module
  (let ([o (make-object NumberT 'UInt16 'LE)]
-       [ip (open-input-bytes (bytes 1 2 3 4))])
+       [ip (open-input-bytes (bytes 1 2 3 4))]
+       [op (open-output-bytes)])
    (check-equal? (send o decode ip) 513) ;; 1000 0000  0100 0000
-   (check-equal? (send o decode ip) 1027)) ;; 1100 0000 0010 0000
+   (check-equal? (send o decode ip) 1027)  ;; 1100 0000 0010 0000
+   (check-equal? (send o encode op 513) (bytes 1 2))
+   (check-equal? (send o encode op 1027) (bytes 3 4)))
 
  (let ([o (make-object NumberT 'UInt16 'BE)]
-       [ip (open-input-bytes (bytes 1 2 3 4))])
+       [ip (open-input-bytes (bytes 1 2 3 4))]
+       [op (open-output-bytes)])
    (check-equal? (send o decode ip) 258) ;; 0100 0000 1000 0000 
-   (check-equal? (send o decode ip) 772))) ;; 0010 0000 1100 0000 
+   (check-equal? (send o decode ip) 772) ;; 0010 0000 1100 0000 
+   (check-equal? (send o encode op 258) (bytes 1 2))
+   (check-equal? (send o encode op 772) (bytes 3 4))))
 
 
 (test-module