From 8620bc50be96389ab4939a201b80cef19b0bfbe6 Mon Sep 17 00:00:00 2001
From: Stephen Chang <stchang@ccs.neu.edu>
Date: Tue, 23 Aug 2016 11:15:49 -0400
Subject: [PATCH] clean up check-module-form

- truly ignore expected-module (in err msgs) to match docs
- remove dead code
---
 racket/collects/syntax/modread.rkt | 34 ++++++++----------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/racket/collects/syntax/modread.rkt b/racket/collects/syntax/modread.rkt
index 38e2d27459..68f7bf9297 100644
--- a/racket/collects/syntax/modread.rkt
+++ b/racket/collects/syntax/modread.rkt
@@ -10,11 +10,6 @@
                       [read-accept-compiled #t])
          (thunk)))))
 
-  (define (raise-wrong-module-name filename expected-name name)
-    (error 'load-handler
-           "expected a `module' declaration for `~a' in ~s, found: ~a"
-           expected-name filename name))
-
   (define (check-module-form exp expected-module filename)
     (unless (or (syntax? exp) (eof-object? exp))
       (raise-argument-error 'check-module-form "(or/c syntax? eof-object?)" exp))
@@ -26,17 +21,10 @@
     (cond [(or (eof-object? exp) (eof-object? (syntax-e exp)))
            (and filename
                 (error 'load-handler
-                       "expected a `module' declaration for `~a' in ~s, but found end-of-file"
-                       expected-module filename))]
+                       "expected a `module' declaration in ~s, but found end-of-file"
+                       filename))]
           [(compiled-module-expression? (syntax-e exp))
-           (if (or #t ; we don't check the name anymore
-                   (eq? (module-compiled-name (syntax-e exp)) expected-module))
-             ;; It's fine:
-             exp
-             ;; Wrong name:
-             (and filename (raise-wrong-module-name
-                            filename expected-module
-                            (module-compiled-name (syntax-e exp)))))]
+           exp]
           [(and (syntax? exp)
                 (syntax-case exp ()
                   [(mod nm . _)
@@ -44,17 +32,13 @@
                   [_else #f]))
            ;; It's ok; need to install a specific `module' binding:
            (with-syntax ([(mod nm . _) exp])
-             (when #f ; we don't check the name anymore
-               (unless (eq? (syntax-e #'nm) expected-module)
-                 (raise-wrong-module-name filename expected-module
-                                          (syntax-e #'nm))))
              (datum->syntax exp
-                                   (cons (namespace-module-identifier)
-                                         (cdr (syntax-e exp)))
-                                   exp
-                                   exp))]
+                            (cons (namespace-module-identifier)
+                                  (cdr (syntax-e exp)))
+                            exp
+                            exp))]
           [else
            (and filename
                 (error 'load-handler
-                       "expected a `module' declaration for `~a' in ~s, but found something else"
-                       expected-module filename))])))
+                       "expected a `module' declaration in ~s, but found something else"
+                       filename))])))