Reduce for-template imports in environment code.

This commit is contained in:
Eric Dobson 2013-11-16 12:14:23 -08:00
parent 4537b52b6a
commit 7a31c966c8
3 changed files with 17 additions and 22 deletions

View File

@ -1,8 +1,8 @@
#lang racket/base #lang racket/base
(require syntax/parse (require syntax/parse
"annotate-classes.rkt" (for-template (only-in racket/base quote))
(for-template racket/base)) "annotate-classes.rkt")
(provide (all-defined-out)) (provide (all-defined-out))
@ -13,7 +13,7 @@
(pattern (~and c (var:optionally-annotated-name seq-expr:expr)) (pattern (~and c (var:optionally-annotated-name seq-expr:expr))
#:with (expand ...) #`(#,(syntax/loc #'c #:with (expand ...) #`(#,(syntax/loc #'c
(var.ann-name seq-expr))) (var.ann-name seq-expr)))
#:with (expand* ...) #'(expand ... #:when #t)) #:with (expand* ...) #'(expand ... #:when '#t))
;; multi-valued seq-expr ;; multi-valued seq-expr
;; currently disabled because it triggers an internal error in the typechecker ;; currently disabled because it triggers an internal error in the typechecker
;; (pattern (~and c (((v:optionally-annotated-name) ...) seq-expr:expr)) ;; (pattern (~and c (((v:optionally-annotated-name) ...) seq-expr:expr))

View File

@ -10,10 +10,6 @@
"mvar-env.rkt" "mvar-env.rkt"
(rename-in racket/private/sort [sort raw-sort]) (rename-in racket/private/sort [sort raw-sort])
(rep type-rep object-rep filter-rep rep-utils free-variance) (rep type-rep object-rep filter-rep rep-utils free-variance)
(for-template (rep type-rep object-rep filter-rep)
(types union abbrev)
racket/shared (except-in racket/base sort)
(rename-in racket/private/sort [sort raw-sort]))
(for-syntax syntax/parse racket/base) (for-syntax syntax/parse racket/base)
(types abbrev union) (types abbrev union)
racket/syntax racket/dict racket/list racket/syntax racket/dict racket/list

View File

@ -3,7 +3,6 @@
;; Maintain mapping of type variables introduced by literal Alls in type annotations. ;; Maintain mapping of type variables introduced by literal Alls in type annotations.
(require "../utils/utils.rkt" (require "../utils/utils.rkt"
(for-template racket/base)
(private syntax-properties) (private syntax-properties)
syntax/parse syntax/parse
syntax/id-table syntax/id-table
@ -28,7 +27,7 @@
(hash-update! tvar-stx-mapping stx (lambda (old-vars) (cons vars old-vars)) null)) (hash-update! tvar-stx-mapping stx (lambda (old-vars) (cons vars old-vars)) null))
(let loop ((stx stx)) (let loop ((stx stx))
(syntax-parse stx (syntax-parse stx
#:literals (#%expression #%plain-lambda let-values case-lambda) #:literal-sets (kernel-literals)
[(#%expression e) (loop #'e)] [(#%expression e) (loop #'e)]
[(~or (case-lambda formals . body) (#%plain-lambda formals . body)) [(~or (case-lambda formals . body) (#%plain-lambda formals . body))
(add-vars stx)] (add-vars stx)]