improve

9 years ago · 8345b0a0dd
parent 73f61936ba
commit 8345b0a0dd
14 changed files with 392 additions and 41 deletions
--- a/beautiful-racket-lib/br/define.rkt
+++ b/beautiful-racket-lib/br/define.rkt
@ -4,9 +4,17 @@
 ;; everything is prefixed br: whether it needs it or not so it can be stripped by #lang br
 (define-for-syntax (syntax-flatten stx)
  (flatten
   (let loop ([stx stx])
     (define maybe-list (syntax->list stx))
     (if maybe-list
         (map loop maybe-list)
         stx))))
 (define-for-syntax (generate-literals pats)
  ;; generate literals for any symbols that are not ... or _ or _underscore-prefixed
-  (for*/list ([pat-arg (in-list (flatten (map (λ(stx) (or (syntax->list stx) stx)) (syntax->list pats))))]
+  (for*/list ([pat-arg (in-list (syntax-flatten pats))]
              [pat-datum (in-value (syntax->datum pat-arg))]
              #:when (and (symbol? pat-datum)
                          (not (eq? pat-datum '...)) (not (eq? pat-datum '_))
@ -51,7 +59,7 @@
                                        (syntax-case stx (LITERAL ...)
                                          [pat (syntax-parameterize ([caller-stx (make-rename-transformer #'stx)])
                                                 body ...)] ...
-                                          [else (raise-syntax-error 'define-cases (format "no matching case for syntax pattern `~a`" (syntax->datum stx)) (syntax->datum #'top-id.name))]))
+                                          [else (raise-syntax-error 'define-cases (format "no matching case for syntax pattern ~v" (syntax->datum stx)) (syntax->datum #'top-id.name))]))
                                      (if (not (syntax? result))
                                          (datum->syntax stx result)
                                          result))))]
@ -136,10 +144,10 @@
  (br:define #'plusser #'plus)
  (check-equal? (plusser 42) +)
  (check-equal? plusser +)
-  (br:define #'(times _ARG) #'(* _ARG _ARG))
+  (br:define #'(times [nested _ARG]) #'(* _ARG _ARG))
-  (check-equal? (times 10) 100)
+  (check-equal? (times [nested 10]) 100)
  (br:define #'timeser #'times)
-  (check-equal? (timeser 12) 144)
+  (check-equal? (timeser [nested 12]) 144)
  (br:define #'fortytwo #'42)
  (check-equal? fortytwo 42)
  (check-equal? (let ()
--- a/beautiful-racket/br/demo/hdl.rkt
+++ b/beautiful-racket/br/demo/hdl.rkt
@ -0,0 +1,5 @@
 #lang br
 (module+ reader
  (require "hdl/reader.rkt")
  (provide (all-from-out "hdl/reader.rkt")))
--- a/beautiful-racket/br/demo/hdl/#Not2.hdl.rkt#1#
+++ b/beautiful-racket/br/demo/hdl/#Not2.hdl.rkt#1#
@ -0,0 +1,259 @@
 #reader(lib"read.ss""wxme")WXME0108 ## 
 #|
   This file uses the GRacket editor format.
   Open this file in DrRacket version 6.4.0.15 or later to read it.
   Most likely, it was created by saving a program in DrRacket,
   and it probably contains a program with non-text elements
   (such as images or comment boxes).
            http://racket-lang.org/
 |#
 22 7 #"wxtext\0"
 3 1 6 #"wxtab\0"
 1 1 8 #"wximage\0"
 2 0 8 #"wxmedia\0"
 4 1 34 #"(lib \"syntax-browser.ss\" \"mrlib\")\0"
 1 0 16 #"drscheme:number\0"
 3 0 44 #"(lib \"number-snip.ss\" \"drscheme\" \"private\")\0"
 1 0 36 #"(lib \"comment-snip.ss\" \"framework\")\0"
 1 0 93
 (
 #"((lib \"collapsed-snipclass.ss\" \"framework\") (lib \"collapsed-sni"
 #"pclass-wxme.ss\" \"framework\"))\0"
 ) 0 0 43 #"(lib \"collapsed-snipclass.ss\" \"framework\")\0"
 0 0 19 #"drscheme:sexp-snip\0"
 0 0 36 #"(lib \"cache-image-snip.ss\" \"mrlib\")\0"
 1 0 68
 (
 #"((lib \"image-core.ss\" \"mrlib\") (lib \"image-core-wxme.rkt\" \"mr"
 #"lib\"))\0"
 ) 1 0 29 #"drscheme:bindings-snipclass%\0"
 1 0 101
 (
 #"((lib \"ellipsis-snip.rkt\" \"drracket\" \"private\") (lib \"ellipsi"
 #"s-snip-wxme.rkt\" \"drracket\" \"private\"))\0"
 ) 2 0 88
 (
 #"((lib \"pict-snip.rkt\" \"drracket\" \"private\") (lib \"pict-snip.r"
 #"kt\" \"drracket\" \"private\"))\0"
 ) 0 0 34 #"(lib \"bullet-snip.rkt\" \"browser\")\0"
 0 0 25 #"(lib \"matrix.ss\" \"htdp\")\0"
 1 0 22 #"drscheme:lambda-snip%\0"
 1 0 29 #"drclickable-string-snipclass\0"
 0 0 26 #"drracket:spacer-snipclass\0"
 0 0 57
 #"(lib \"hrule-snip.rkt\" \"macro-debugger\" \"syntax-browser\")\0"
 1 0 1 6 #"wxloc\0"
          0 0 63 0 1 #"\0"
 0 75 1 #"\0"
 0 12 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 0 9
 #"Standard\0"
 0 75 15 #"Triplicate T3c\0"
 0 16 90 -1 90 -1 3 -1 0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 255 255 255 1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 0 0 0 -1 -1 2 24
 #"framework:default-color\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1 2
 1 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 150 0 150 0 0 0 -1 -1 2 15
 #"text:ports out\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 119 34 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1.0 0 -1 -1 93 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 255 0 0 0 0 0 -1
 -1 2 15 #"text:ports err\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 136 17 17 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 175 0 0 0 -1 -1 2 17
 #"text:ports value\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 34 119 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
 -1 2 27 #"Matching Parenthesis Style\0"
 0 -1 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 34 139 34 0 0 0 -1
 -1 2 1 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 38 38 128 0 0 0 -1 -1 2 37
 #"framework:syntax-color:scheme:symbol\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 34 119 0 0 0 -1 -1 2 38
 #"framework:syntax-color:scheme:keyword\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 34 119 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 194 116 31 0 0 0 -1 -1 2
 38 #"framework:syntax-color:scheme:comment\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 119 34 119 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 41 128 38 0 0 0 -1 -1 2 37
 #"framework:syntax-color:scheme:string\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 119 34 0 0 0 -1 -1 2 35
 #"framework:syntax-color:scheme:text\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 119 34 0 0 0 -1 -1 2 39
 #"framework:syntax-color:scheme:constant\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 119 34 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 132 60 36 0 0 0 -1 -1 2 49
 #"framework:syntax-color:scheme:hash-colon-keyword\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 119 34 0 0 0 -1 -1 2 42
 #"framework:syntax-color:scheme:parenthesis\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 178 178 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 255 0 0 0 0 0 -1 -1 2 36
 #"framework:syntax-color:scheme:error\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 136 17 17 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 36
 #"framework:syntax-color:scheme:other\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 34 34 119 0 0 0 -1 -1 2 16
 #"Misspelled Text\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2
 38 #"drracket:check-syntax:lexically-bound\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 81 112 203 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 28
 #"drracket:check-syntax:set!d\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 136 17 17 0 0 0 -1 -1 2 37
 #"drracket:check-syntax:unused-require\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 136 17 17 0 0 0 -1 -1 2 36
 #"drracket:check-syntax:free-variable\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 136 17 17 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 31
 #"drracket:check-syntax:imported\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 68 0 203 0 0 0 -1 -1 2 47
 #"drracket:check-syntax:my-obligation-style-pref\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 178 34 34 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 50
 #"drracket:check-syntax:their-obligation-style-pref\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 116 0 0 0 0 -1 -1 2 48
 #"drracket:check-syntax:unk-obligation-style-pref\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
 49 #"drracket:check-syntax:both-obligation-style-pref\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 139 142 28 0 0 0 -1 -1 2
 37 #"plt:module-language:test-coverage-on\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 -1 -1 2 1
 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 2 38
 #"plt:module-language:test-coverage-off\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 93 -1 -1 0 1 0 0 0 1 0 0 0 0 0 0 255 165 0 0 0 0 -1 -1 4 1
 #"\0"
 0 71 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
 -1 -1 4 1 #"\0"
 0 -1 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
 -1 4 1 #"\0"
 0 71 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 1 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 0 255 0 0 0 -1
 -1 4 1 #"\0"
 0 71 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 0 100 0 0 0 0 -1
 -1 2 1 #"\0"
 0 -1 1 #"\0"
 1 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1 1 1 200 0 0 0 0 0 -1 -1 4 1
 #"\0"
 0 -1 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 255 255 0 -1 -1 0
 1 #"\0"
 0 75 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
 -1 -1 2 1 #"\0"
 0 75 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
 -1 -1 2 1 #"\0"
 0 75 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255 255 255 -1 -1
 2 1 #"\0"
 0 75 1 #"\0"
 1.0 0 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 34 139 34 255 255 255 -1
 -1 2 1 #"\0"
 0 -1 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 36 36 140 0 0 0 -1
 -1 2 1 #"\0"
 0 -1 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
 -1 -1 2 1 #"\0"
 0 -1 1 #"\0"
 0 4 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 -1
 -1 2 1 #"\0"
 0 75 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 1.0 1.0 1.0 36 36 140 0 0 0 -1
 -1 2 1 #"\0"
 0 75 1 #"\0"
 1.0 0 92 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0
 -1 -1 2 1 #"\0"
 0 75 1 #"\0"
 0 4 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 1.0 1.0 1.0 1.0 1.0 1.0 0 0 0 0 0 0 -1
 -1           0 25 0 28 3 17 #"#lang br/demo/hdl"
 0 0 24 29 1 #"\n"
 0 0 24 29 1 #"\n"
 0 0 14 3 4 #"CHIP"
 0 0 24 3 1 #" "
 0 0 14 3 3 #"Not"
 0 0 24 3 2 #" {"
 0 0 24 29 1 #"\n"
 0 0 24 3 10 #"          "
 0 0 14 3 2 #"IN"
 0 0 24 3 1 #" "
 0 0 14 3 1 #"x"
 0 0 28 3 1 #","
 0 0 24 3 1 #" "
 0 0 14 3 1 #"y"
 0 0 28 3 1 #","
 0 0 24 3 1 #" "
 0 0 14 3 1 #"z"
 0 0 17 3 1 #";"
 0 0 24 29 1 #"\n"
 0 0 24 3 1 #"}"
 0 0 24 29 1 #"\n"
 0 0 24 29 1 #"\n"
 0 0 24 29 1 #"\n"
 0 0 24 29 1 #"\n"
 0           0
--- a/beautiful-racket/br/demo/hdl/And.hdl
+++ b/beautiful-racket/br/demo/hdl/And.hdl
@ -1,7 +1,14 @@
-#lang racket/base
+#lang s-exp br/demo/hdl/expander
-(provide And)
+
-(define (And #:a a #:b b)
+(chip And
-  (define out (if (and (not (zero? a)) (not (zero? b)))
+      (a b)
-                  1
+      (out)
-                  0))
+      ((Nand [a a] [b b] [out nand-out])
-  out)
+       (Not [in nand-out] [out out])))
 (module+ test
  (require rackunit)
  (check-equal? (And #:a 0 #:b 0) 0)
  (check-equal? (And #:a 0 #:b 1) 0)
  (check-equal? (And #:a 1 #:b 0) 0)
  (check-equal? (And #:a 1 #:b 1) 1))
--- a/beautiful-racket/br/demo/hdl/Nand.hdl
+++ b/beautiful-racket/br/demo/hdl/Nand.hdl
@ -0,0 +1,13 @@
 #lang br
 (define+provide (Nand #:a a #:b b)
  (if (< (+ a b) 2)
      1
      0))
 (module+ test
  (require rackunit)
  (check-equal? (Nand #:a 0 #:b 0) 1)
  (check-equal? (Nand #:a 0 #:b 1) 1)
  (check-equal? (Nand #:a 1 #:b 0) 1)
  (check-equal? (Nand #:a 1 #:b 1) 0))
--- a/beautiful-racket/br/demo/hdl/Not.hdl
+++ b/beautiful-racket/br/demo/hdl/Not.hdl
@ -1,7 +1,11 @@
-#lang racket/base
+#lang s-exp br/demo/hdl/expander
-(provide Not)
+
-(define (Not #:in in)
+(chip Not
-  (define out (if (zero? in)
+      (in)
-                  1
+      (out)
-                  0))
+      ((Nand [a in] [b in] [out out])))
-  out)
+
 (module+ test
  (require rackunit)
  (check-equal? (Not #:in 0) 1)
  (check-equal? (Not #:in 1) 0))
--- a/beautiful-racket/br/demo/hdl/Not2.hdl.rkt
+++ b/beautiful-racket/br/demo/hdl/Not2.hdl.rkt
@ -0,0 +1,8 @@
 #lang br/demo/hdl
 CHIP Not {
          IN x;
 }
--- a/beautiful-racket/br/demo/hdl/Or.hdl
+++ b/beautiful-racket/br/demo/hdl/Or.hdl
@ -1,7 +1,16 @@
-#lang racket/base
+#lang s-exp br/demo/hdl/expander
-(provide Or)
+
-(define (Or #:a a #:b b)
+(chip Or
-  (define out (if (or (not (zero? a)) (not (zero? b)))
+      (a b)
-                  1
+      (out)
-                  0))
+      ((Not [in a] [out nota])
-  out)
+       (Not [in b] [out notb])
       (And [a nota] [b notb] [out and-out])
       (Not [in and-out] [out out])))
 (module+ test
  (require rackunit)
  (check-equal? (Or #:a 0 #:b 0) 0)
  (check-equal? (Or #:a 0 #:b 1) 1)
  (check-equal? (Or #:a 1 #:b 0) 1)
  (check-equal? (Or #:a 1 #:b 1) 1))
--- a/beautiful-racket/br/demo/hdl/Xor1.hdl
+++ b/beautiful-racket/br/demo/hdl/Xor1.hdl
@ -1,4 +1,4 @@
-#lang s-exp "hdl.rkt"
+#lang s-exp br/demo/hdl/expander
 (chip Xor (IN a b)
      (OUT out)
--- a/beautiful-racket/br/demo/hdl/Xor2.hdl
+++ b/beautiful-racket/br/demo/hdl/Xor2.hdl
@ -1,4 +1,4 @@
-#lang reader "hdl-reader.rkt"
+#lang br/demo/hdl
 CHIP Xor {
          IN a, b;
@ -12,9 +12,4 @@ CHIP Xor {
 }
-(module+ test
+
  (require rackunit)
  (check-equal? (Xor #:a 0 #:b 0) 0)
  (check-equal? (Xor #:a 0 #:b 1) 1)
  (check-equal? (Xor #:a 1 #:b 0) 1)
  (check-equal? (Xor #:a 1 #:b 1) 0))
--- a/beautiful-racket/br/demo/hdl/expander.rkt
+++ b/beautiful-racket/br/demo/hdl/expander.rkt
@ -3,10 +3,9 @@
 (define #'(chip _Chip
-                (IN _input-pin ...)
+                (_input-pin ...)
-                (OUT _output-pin)
+                (_output-pin)
-                (PARTS
+                ((_Part [_pin-in _val-id] ... [out _pin-out]) ...))
                 (_Part [_pin-in _val-id] ... [out _pin-out]) ...))
  #'(begin
      (provide _Chip)
      (define _Chip
--- a/beautiful-racket/br/demo/hdl/parser.rkt
+++ b/beautiful-racket/br/demo/hdl/parser.rkt
@ -0,0 +1,21 @@
 #lang ragg
 chip-program : "CHIP" chip-name "{" in-pin-spec "}"
 chip-name : ID
 in-pin-spec : "IN" pin-list ";"
 out-pin-spec : "OUT" pin-list ";"
 pin-list : pin ["," pin-list]
 pin : ID
 part-spec : "PARTS:" part+
 part : ID "(" part-arg-list ")" ";"
 part-arg-list : part-arg ["," part-arg-list]
 part-arg : ID "=" ID
--- a/beautiful-racket/br/demo/hdl/reader.rkt
+++ b/beautiful-racket/br/demo/hdl/reader.rkt
@ -0,0 +1,6 @@
 #lang br
 (require br/reader-utils "parser.rkt" "tokenizer.rkt")
 (define-read-and-read-syntax (source-path input-port)
  #`(module hdl-mod br/demo/hdl/expander
      #,(parse source-path (tokenize input-port))))
--- a/beautiful-racket/br/demo/hdl/tokenizer.rkt
+++ b/beautiful-racket/br/demo/hdl/tokenizer.rkt
@ -0,0 +1,17 @@
 #lang br
 (require parser-tools/lex parser-tools/lex-sre
         ragg/support
         racket/string)
 (provide tokenize)
 (define (tokenize input-port)
  (define (next-token)
    (define get-token
      (lexer
       [(eof) eof]
       [(union #\tab #\space #\newline) (get-token input-port)]
       [(union "CHIP" "IN" "OUT" "PARTS:") lexeme]
       [(char-set "{}(),;=") lexeme]
       [(repetition 1 +inf.0 (union alphabetic numeric)) (token 'ID (string->symbol lexeme))]))
    (get-token input-port))  
  next-token)