refactor wires

beautiful-racket-demo/wires-demo/main.rkt

@@ -14,12 +14,12 @@
 (provide #%module-begin)
 
 (define-macro-cases wire
-  [(wire ARG -> WIRE) #'(define/display (WIRE)
+  [(wire ARG -> ID)
-                          (val ARG))]
+   #'(define/display (ID) (val ARG))]
-  [(wire OP ARG -> WIRE) #'(define/display (WIRE)
+  [(wire OP ARG -> ID)
-                             (OP (val ARG)))]
+   #'(wire (OP (val ARG)) -> ID)]
-  [(wire ARG1 OP ARG2 -> WIRE) #'(define/display (WIRE)
+  [(wire ARG1 OP ARG2 -> ID)
-                                   (OP (val ARG1) (val ARG2)))]
+   #'(wire (OP (val ARG1) (val ARG2)) -> ID)]
   [else #'(void)])
 (provide wire)
 
@@ -27,7 +27,7 @@
   #'(begin
       (define (ID) BODY)
       (module+ main
-        (displayln (format "~a: ~a" 'ID (val ID))))))
+        (displayln (format "~a: ~a" 'ID (ID))))))
 
 (define val
   (let ([val-cache (make-hash)])

beautiful-racket-demo/wires-demo/with-promises.rkt

@@ -14,20 +14,12 @@
        #,@wire-datums)))
 
 (define-macro-cases wire
-  [(wire ARG -> WIRE) #'(define/display (WIRE)
+  [(wire ARG -> WIRE)
-                          (val ARG))]
-  [(wire OP ARG -> WIRE) #'(define/display (WIRE)
-                             (OP (val ARG)))]
-  [(wire ARG1 OP ARG2 -> WIRE) #'(define/display (WIRE)
-                                   (OP (val ARG1) (val ARG2)))]
-  [else #'(void)])
-(provide wire)
-
-(define-macro (define/display (WIRE) BODY)
    #'(begin
-      (define WIRE (delay BODY))
+       (define WIRE (delay ARG))
        (module+ main
-        (displayln 'promises)
+         (displayln (format "promise ~a: ~a" 'WIRE (force WIRE)))))]
-        (displayln (format "~a: ~a" 'WIRE (val WIRE))))))
+  [(wire OP ARG -> WIRE) #'(wire (OP (force ARG)) -> WIRE)]
-
+  [(wire ARG1 OP ARG2 -> WIRE) #'(wire (OP (force ARG1) (force ARG2)) -> WIRE)]
-(define (val num-or-wire) (force num-or-wire))
+  [else #'(void)])
+(provide wire)