From 3c3e4d68c4912ce667a5f1b7402ad7bf899f3857 Mon Sep 17 00:00:00 2001
From: AlexKnauth <alexander@knauth.org>
Date: Thu, 1 Sep 2016 09:58:30 -0400
Subject: [PATCH] use left-grouping behavior of read-cdot

---
 .gitignore             |  3 +++
 remix/stx0.rkt         | 19 ++++++++++---------
 remix/tests/reader.rkt |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8097c07
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+compiled/
+doc/
+*~
diff --git a/remix/stx0.rkt b/remix/stx0.rkt
index b160616..f2df209 100644
--- a/remix/stx0.rkt
+++ b/remix/stx0.rkt
@@ -203,13 +203,12 @@
 (define-syntax (#%dot stx)
   (syntax-parse stx
     #:literals (#%dot)
-    [(_ dt . (~and x+y (x ... (#%dot . y))))
-     #:declare dt (static dot-transformer? "dot transformer")
+    [(_ (#%dot dt x) . y)
+     ;; flatten it so that the dot transformer within dt sees both x and y
      (quasisyntax/loc stx
-       (#%dot dt
-              #,@(syntax/loc #'x+y
-                   (x ... . y))))]
-    [(_ dt . (~not (x ... (#%dot . _) . _)))
+       (#%dot dt x . y))]
+    [(_ dt . _)
+     ;; dt is an identifier with a syntax binding to a dot transformer
      #:declare dt (static dot-transformer? "dot transformer")
      (dot-transform (attribute dt.value) stx)]))
 
@@ -222,10 +221,12 @@
 (define-syntax (remix-#%app stx)
   (syntax-parse stx
     #: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
-       (remix-#%app (#%dot x ... . y) . body))]
-    [(_ (#%dot adt . (~not (x ... (#%dot . _) . _))) . body)
+       (remix-#%app (#%dot dt x . y) . 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")
      (app-dot-transform (attribute adt.value) stx)]
     [(_ . body)
diff --git a/remix/tests/reader.rkt b/remix/tests/reader.rkt
index f844418..bc4d058 100644
--- a/remix/tests/reader.rkt
+++ b/remix/tests/reader.rkt
@@ -55,10 +55,10 @@
    ["a . b" (#%dot a b)]
    ["1.a" (#%dot 1 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)]
    ;; ((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 d)" (#%dot (a b) (c d))]