From 8cb718427feed1d0882971676610e0a6ccd2c642 Mon Sep 17 00:00:00 2001
From: Matthew Butterick <mb@mbtype.com>
Date: Wed, 7 Jun 2017 13:18:49 -0700
Subject: [PATCH] more

---
 pitfall/restructure/helper.rkt | 25 ++++++++++++++++++++++++-
 pitfall/restructure/number.rkt | 22 ++++++++++++++--------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/pitfall/restructure/helper.rkt b/pitfall/restructure/helper.rkt
index d4e57eef..84297b41 100644
--- a/pitfall/restructure/helper.rkt
+++ b/pitfall/restructure/helper.rkt
@@ -29,4 +29,27 @@
 (define-macro (test-module . EXPRS)
   #`(module+ test
       (require #,(datum->syntax caller-stx 'rackunit))
-      . EXPRS))
\ No newline at end of file
+      . EXPRS))
+
+(define-macro (define-stub-stop ID)
+  (with-pattern ([ERROR-ID (suffix-id (prefix-id (syntax-source #'this) ":" #'ID) ":not-implemented")])
+                #'(define (ID . args)
+                    (error 'ERROR-ID))))
+
+(provide (rename-out [define-stub-stop define-stub]))
+
+(define-macro (define-stub-go ID)
+  (with-pattern ([ERROR-ID (suffix-id (prefix-id (syntax-source #'this) ":" #'ID) ":not-implemented")])
+                #'(define (ID . args)
+                    (displayln 'ERROR-ID))))
+
+(define-macro (define-unfinished (ID . ARGS) . BODY)
+  (with-pattern ([ID-UNFINISHED (suffix-id (prefix-id (syntax-source #'this) ":" #'ID) ":unfinished")])
+                #'(define (ID . ARGS)
+                    (begin . BODY)
+                    (error 'ID-UNFINISHED))))
+
+
+(define-macro (unfinished)
+  (with-pattern ([ID-UNFINISHED (prefix-id (syntax-source caller-stx) ":" (syntax-line caller-stx) ":" #'unfinished)])
+                #'(error 'ID-UNFINISHED)))
\ No newline at end of file
diff --git a/pitfall/restructure/number.rkt b/pitfall/restructure/number.rkt
index 5c2054df..901a3579 100644
--- a/pitfall/restructure/number.rkt
+++ b/pitfall/restructure/number.rkt
@@ -14,20 +14,26 @@
  (check-true (unsigned-type? 'UInt16))
  (check-false (unsigned-type? 'Int16)))
 
-(define-subclass BinaryIO% (NumberT type [endian (if (system-big-endian?) 'BE 'LE)])
+(define-subclass object% (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)
     (raise-argument-error 'NumberT "valid type and endian" (format "~v ~v" type endian)))
-
-  (define/override (decode stream)
-    (define bstr (read-bytes-exact (size) stream))
-    (if (= 1 (size))
+  
+  (getter-field [size (hash-ref type-sizes fn)])
+
+  (define/public (decode stream)
+    (unless (input-port? stream)
+      (raise-argument-error 'decode "input port" stream))
+    (define bstr (read-bytes-exact size stream))
+    (if (= 1 size)
         (bytes-ref bstr 0)
         (integer-bytes->integer bstr (unsigned-type? type) (eq? endian 'BE))))
 
-  (define/override (encode op val) 'foo)
-
-  (define/override (size) (hash-ref type-sizes fn)))
+  (define/public (encode stream val)
+    (unless (output-port? stream)
+      (raise-argument-error 'encode "output port" stream))
+    (unfinished)))
     
 
 (test-module