From 1f4c52524502c762e9baf05b5be0ff1e15b7acba Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Thu, 16 Sep 2010 12:30:21 -0600
Subject: [PATCH] Fixing pr11214

---
 collects/tests/web-server/lang-test.rkt | 26 +++++++++++++++++++++++++
 collects/web-server/lang/anormal.rkt    |  4 +---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/collects/tests/web-server/lang-test.rkt b/collects/tests/web-server/lang-test.rkt
index fbdf53ae00..ca21a925d6 100644
--- a/collects/tests/web-server/lang-test.rkt
+++ b/collects/tests/web-server/lang-test.rkt
@@ -40,6 +40,32 @@
                           (+ f initial)))))])
        (check = 8 (test-m00.4 '(dispatch-start start 1)))))
     
+    
+    (test-case
+     "Embedded Definitions"
+     (let-values ([(test-m00.4)
+                   (make-module-eval
+                    (module m00.4 (lib "lang.rkt" "web-server")
+                      (provide start)
+                      (define (start initial)
+                        (define m 7)
+                        (define f m)
+                        (+ f initial))))])
+       (check = 8 (test-m00.4 '(dispatch-start start 1)))))
+    
+    (test-case
+     "Embedded Definitions + Intermixed expressions"
+     (let-values ([(test-m00.4)
+                   (make-module-eval
+                    (module m00.4 (lib "lang.rkt" "web-server")
+                      (provide start)
+                      (define (start initial)
+                        (define m 7)
+                        (+ m 13)
+                        (define f m)
+                        (+ f initial))))])
+       (check = 8 (test-m00.4 '(dispatch-start start 1)))))
+    
     (test-case
      "start-interaction in argument position of a function call"
      (let-values ([(test-m00.3)
diff --git a/collects/web-server/lang/anormal.rkt b/collects/web-server/lang/anormal.rkt
index 966ce95dae..5e9b2ae0d6 100644
--- a/collects/web-server/lang/anormal.rkt
+++ b/collects/web-server/lang/anormal.rkt
@@ -38,7 +38,7 @@
      (kernel-syntax-case
          stx (transformer?)
        [(begin)
-        (anormal ctxt (syntax/loc stx (#%plain-app (#%top . void))))]
+        (anormal ctxt (syntax/loc stx (#%plain-app void)))]
        [(begin lbe)
         (anormal ctxt (syntax/loc stx lbe))]
        [(begin fbe be ...)
@@ -48,8 +48,6 @@
                                 (#%plain-lambda () fbe)
                                 (#%plain-lambda throw-away
                                                 (begin be ...)))))]
-       [(begin0)
-        (anormal ctxt (syntax/loc stx (#%plain-app (#%top . void))))]
        [(begin0 lbe)
         (anormal ctxt (syntax/loc stx lbe))]
        [(begin0 fbe be ...)