From 0be362e1122ccb8786b3afa3a5bda24b2156bc90 Mon Sep 17 00:00:00 2001
From: Sam Tobin-Hochstadt <samth@cs.indiana.edu>
Date: Fri, 14 Aug 2015 16:08:26 -0400
Subject: [PATCH] Fix for new expander.

---
 sugar/test.rkt      | 21 +++++++++++----------
 sugar/test/main.rkt | 38 +++++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/sugar/test.rkt b/sugar/test.rkt
index d8f1265..e98b52f 100644
--- a/sugar/test.rkt
+++ b/sugar/test.rkt
@@ -7,15 +7,16 @@
 (define-syntax (module-test-external stx)
   (syntax-case stx ()
     [(_ expr ...)
-     (with-syntax ([mod-name (generate-temporary)])
-     #'(begin
-         (module* mod-name racket/base
-           (require (submod ".."))
-           (require rackunit)
-           expr ...)
-         (module+ test
-           (require (submod ".." mod-name)))))]))
-
+     (let ([mod-name (syntax-e (generate-temporary))])
+       (datum->syntax stx
+                      `(begin
+                         (module* ,mod-name racket/base
+                           (require (submod ".."))
+                           (require rackunit)
+                           ,@(syntax->datum #'(expr ...)))
+                         (module+ test
+                           (require (submod ".." ,mod-name))))
+                      stx))]))
 
 (define-syntax (module-test-internal stx)
   (syntax-case stx ()
@@ -36,4 +37,4 @@
      (let ([exprs (syntax->datum #'(expr ...))])
        (datum->syntax stx `(begin
                              (module-test-internal ,@exprs)
-                             (module-test-external ,@exprs)) stx))]))
\ No newline at end of file
+                             (module-test-external ,@exprs)) stx))]))
diff --git a/sugar/test/main.rkt b/sugar/test/main.rkt
index 6f81805..1ee26b1 100644
--- a/sugar/test/main.rkt
+++ b/sugar/test/main.rkt
@@ -4,27 +4,31 @@
 (define-syntax (eval-as-untyped stx)
   (syntax-case stx ()
     [(_ exprs ...)
-     (with-syntax ([sym (generate-temporary)]
-                   [sym2 (generate-temporary)]) 
-       #'(begin
-           (module sym racket
-             (require rackunit "../main.rkt" net/url)
-             exprs ...)
-           (require 'sym)
-           (module sym2 racket
-             (require rackunit (submod "../main.rkt" safe) net/url)
-             exprs ...)
-           (require 'sym2)))]))
+     (let ([sym (generate-temporary)]
+           [sym2 (generate-temporary)])
+       (datum->syntax
+        stx
+        `(begin
+          (module ,sym racket
+            (require rackunit "../main.rkt" net/url)
+            ,@(syntax->datum #'(exprs ...)))
+          (require ',sym)
+          (module ,sym2 racket
+            (require rackunit (submod "../main.rkt" safe) net/url)
+            ,@(syntax->datum #'(exprs ...)))
+          (require ',sym2))))]))
 
 (define-syntax (eval-as-typed stx)
   (syntax-case stx ()
     [(_ exprs ...)
-     (with-syntax ([sym (generate-temporary)]) 
-       #'(begin
-           (module sym typed/racket
-             (require typed/rackunit "../../typed/sugar.rkt" typed/net/url)
-             exprs ...)
-           (require 'sym)))]))
+     (let ([sym (syntax-e (generate-temporary))])
+       (datum->syntax stx
+                      `(begin
+                        (module ,sym typed/racket
+                          (require typed/rackunit "../../typed/sugar.rkt" typed/net/url)
+                          ,@(syntax->datum #'(exprs ...)))
+                        (require ',sym))
+                      stx))]))
 
 (define-syntax-rule (eval-as-typed-and-untyped exprs ...)
   (begin