www

commit f7b4dde15bd8cceae2b1e5bc04a06f2cc96b12ac
parent eacf9d50d06a474bde2dde15dec96e04d9a100cc
Author: Stephen Chang <stchang@ccs.neu.edu>
Date:   Fri, 22 Jul 2016 14:16:01 -0400

fix more src locs in typecheck.rkt

Diffstat:
M
macrotypes/typecheck.rkt
 | 
23
++++++++++++++---------

1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/macrotypes/typecheck.rkt b/macrotypes/typecheck.rkt
@@ -97,18 +97,23 @@
      #:with conflicted? #'(λ (n) (member (string->symbol n) '(#%app λ #%datum begin let let* letrec if define)))
      #:with not-conflicted? #'(λ (n) (and (not (conflicted? n)) n))
      #`(begin
-         #,(syntax/loc this-syntax
-             (require (prefix-in pre: base-lang))) ; prefixed
-         #,(syntax/loc this-syntax
-            (require (rename-in (only-in base-lang old ...) [old new] ...)))
-         #,(syntax/loc this-syntax
-             (require (filtered-in not-conflicted? non-excluded-imports)))
-         #,(syntax/loc this-syntax
-             (require (filtered-in ; conflicted names, with (internal) prefix
+         #,(quasisyntax/loc this-syntax
+             (require #,(syntax/loc this-syntax
+                          (prefix-in pre: base-lang)))) ; prefixed
+         #,(quasisyntax/loc this-syntax
+            (require #,(syntax/loc this-syntax
+                         (rename-in (only-in base-lang old ...) [old new] ...))))
+         #,(quasisyntax/loc this-syntax
+             (require #,(syntax/loc this-syntax 
+                          (filtered-in not-conflicted? non-excluded-imports))))
+         #,(quasisyntax/loc this-syntax
+             (require 
+              #,(syntax/loc this-syntax 
+                  (filtered-in ; conflicted names, with (internal) prefix
                    (let ([conflicted-pre (symbol->string (syntax->datum #'internal-pre))])
                      (λ (name) (and (conflicted? name)
                                     (string-append conflicted-pre name))))
-                   non-excluded-imports)))
+                   non-excluded-imports))))
          #,(quasisyntax/loc this-syntax
              (provide (filtered-out
                    (let* ([pre-str #,(string-append (extract-filename (syntax-e #'base-lang)) ":")]