From 4622a4cc322dc9553f542ce06e1b7a50f48bf904 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 25 Feb 2015 21:08:02 -0700 Subject: [PATCH] use `quote` instead of `quote-syntax` for annotations in macro expansion The choice of identifier is arbitrary, but avoiding `quote-syntax` may be more forward-comptiable as the macro system changes. --- typed-racket-lib/typed-racket/base-env/colon.rkt | 2 +- .../typed-racket/typecheck/check-class-unit.rkt | 6 +++--- .../typed-racket/typecheck/internal-forms.rkt | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/typed-racket-lib/typed-racket/base-env/colon.rkt b/typed-racket-lib/typed-racket/base-env/colon.rkt index aacd2d36..ef22bc08 100644 --- a/typed-racket-lib/typed-racket/base-env/colon.rkt +++ b/typed-racket-lib/typed-racket/base-env/colon.rkt @@ -44,7 +44,7 @@ "Declaration for `~a' provided, but `~a' has no definition" (syntax-e #'i) (syntax-e #'i))) - (syntax-property (syntax/loc stx (begin (quote-syntax (:-internal i ty)) + (syntax-property (syntax/loc stx (begin (quote (:-internal i ty)) (#%plain-app values))) 'disappeared-use #'i)] [(_ orig-stx _ i:id x ...) diff --git a/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt b/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt index 476c91ec..56970101 100644 --- a/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt +++ b/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt @@ -61,7 +61,7 @@ (define-syntax-class internal-class-data #:literal-sets (kernel-literals) #:literals (class-internal values) - (pattern (let-values ([() (begin (quote-syntax + (pattern (let-values ([() (begin (quote (class-internal (#:forall type-parameter:id ...) (#:all-inits all-init-names:id ...) @@ -173,7 +173,7 @@ #:literals (values void :-internal) #:attributes (name type) (pattern (let-values - ([() (begin (quote-syntax (:-internal name:id type:expr)) + ([() (begin (quote (:-internal name:id type:expr)) (#%plain-app values))]) (#%plain-app void)))) @@ -659,7 +659,7 @@ (hash-set! annotations name type)) other-exprs] ;; FIXME: use internal-forms for this instead - [(quote-syntax (:-augment name-stx:id type-stx)) + [(quote (:-augment name-stx:id type-stx)) (define name (syntax-e #'name-stx)) (define type (parse-type #'type-stx)) (unless (check-duplicate-member augment-annotations name type) diff --git a/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt b/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt index 4efb7d4e..f27e665d 100644 --- a/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt +++ b/typed-racket-lib/typed-racket/typecheck/internal-forms.rkt @@ -75,11 +75,11 @@ (define-syntax-class internal^ #:attributes (value) #:literal-sets (kernel-literals internal-form-literals) - (pattern (define-values () (begin (quote-syntax value:expr) (#%plain-app values)))) + (pattern (define-values () (begin (quote value:expr) (#%plain-app values)))) ;; handles form that splicing-syntax-parameterize expands to - (pattern (define-values () (letrec-syntaxes+values _ () (quote-syntax value:expr) (#%plain-app values)))) + (pattern (define-values () (letrec-syntaxes+values _ () (quote value:expr) (#%plain-app values)))) ;; for use in forms like classes that transform definitions - (pattern (let-values ([() (begin (quote-syntax value:expr) (#%plain-app values))]) + (pattern (let-values ([() (begin (quote value:expr) (#%plain-app values))]) (#%plain-app void)))) (define-syntax (define-internal-classes stx) @@ -125,7 +125,7 @@ ;; the `define-values` protocol used for other internal forms. (define-syntax-class typecheck-failure #:literal-sets (kernel-literals internal-literals) - (pattern (quote-syntax (typecheck-fail-internal stx message:str var)))) + (pattern (quote (typecheck-fail-internal stx message:str var)))) ;;; Internal form creation (begin-for-syntax @@ -133,5 +133,5 @@ (quasisyntax/loc stx (define-values () (begin - (quote-syntax #,stx) + (quote #,stx) (#%plain-app values))))))