suzanne.soy/remix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use left-grouping behavior of read-cdot

Browse Source
This commit is contained in:
AlexKnauth 2016-09-01 09:58:30 -04:00
parent d6d418d67a
commit 3c3e4d68c4
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
compiled/
doc/
*~

19
remix/stx0.rkt
View File

@ -203,13 +203,12 @@
(define-syntax (#%dot stx) (define-syntax (#%dot stx)
(syntax-parse stx (syntax-parse stx
#:literals (#%dot) #:literals (#%dot)
[(_ dt . (~and x+y (x ... (#%dot . y)))) [(_ (#%dot dt x) . y)
#:declare dt (static dot-transformer? "dot transformer") ;; flatten it so that the dot transformer within dt sees both x and y
(quasisyntax/loc stx (quasisyntax/loc stx
(#%dot dt (#%dot dt x . y))]
#,@(syntax/loc #'x+y [(_ dt . _)
(x ... . y))))] ;; dt is an identifier with a syntax binding to a dot transformer
[(_ dt . (~not (x ... (#%dot . _) . _)))
#:declare dt (static dot-transformer? "dot transformer") #:declare dt (static dot-transformer? "dot transformer")
(dot-transform (attribute dt.value) stx)])) (dot-transform (attribute dt.value) stx)]))
@ -222,10 +221,12 @@
(define-syntax (remix-#%app stx) (define-syntax (remix-#%app stx)
(syntax-parse stx (syntax-parse stx
#:literals (#%dot) #:literals (#%dot)
[(_ (#%dot x ... (#%dot . y)) . body) [(_ (#%dot (#%dot dt x) . y) . body)
;; flatten it so that the dot or app-dot transformer within dt sees both x and y
(syntax/loc stx (syntax/loc stx
(remix-#%app (#%dot x ... . y) . body))] (remix-#%app (#%dot dt x . y) . body))]
[(_ (#%dot adt . (~not (x ... (#%dot . _) . _))) . body) [(_ (#%dot adt . _) . body)
;; adt is an identifier with a syntax binding to an app-dot transformer
#:declare adt (static app-dot-transformer? "app-dot transformer") #:declare adt (static app-dot-transformer? "app-dot transformer")
(app-dot-transform (attribute adt.value) stx)] (app-dot-transform (attribute adt.value) stx)]
[(_ . body) [(_ . body)

4
remix/tests/reader.rkt
View File

@ -55,10 +55,10 @@
["a . b" (#%dot a b)] ["a . b" (#%dot a b)]
["1.a" (#%dot 1 a)] ["1.a" (#%dot 1 a)]
["#i1.2 .a" (#%dot 1.2 a)] ["#i1.2 .a" (#%dot 1.2 a)]
["1 .2.a" (#%dot 1 (#%dot 2 a))] ["1 .2.a" (#%dot (#%dot 1 2) a)]
["a.#i1.2" (#%dot a 1.2)] ["a.#i1.2" (#%dot a 1.2)]
;; ((sprite.bbox).ul).x ;; ((sprite.bbox).ul).x
["a.b.c" (#%dot a (#%dot b c))] ["a.b.c" (#%dot (#%dot a b) c)]
["a.(b c)" (#%dot a (b c))] ["a.(b c)" (#%dot a (b c))]
["(a b).c" (#%dot (a b) c)] ["(a b).c" (#%dot (a b) c)]
["(a b).(c d)" (#%dot (a b) (c d))] ["(a b).(c d)" (#%dot (a b) (c d))]