suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further improvements to source locations for `require' forms

Browse Source
This commit is contained in:
Matthew Flatt 2012-09-30 06:32:26 -06:00
parent 259a2b8c19
commit 9047427e07
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
collects/racket/require-transform.rkt
View File

@ -24,8 +24,10 @@
(raise-argument-error 'make-import "identifier?" i)) (raise-argument-error 'make-import "identifier?" i))
(unless (symbol? s) (unless (symbol? s)
(raise-argument-error 'make-import "symbol?" s)) (raise-argument-error 'make-import "symbol?" s))
(unless (module-path? path) (unless (or (module-path? path)
(raise-argument-error 'make-import "module-path?" path)) (and (syntax? path)
(module-path? (syntax->datum path))))
(raise-argument-error 'make-import "(or/c module-path? module-path-syntax?)" path))
(unless (or (not mode) (unless (or (not mode)
(exact-integer? mode)) (exact-integer? mode))
(raise-argument-error 'make-import "(or/c exact-integer? #f)" mode)) (raise-argument-error 'make-import "(or/c exact-integer? #f)" mode))
@ -292,14 +294,19 @@
name name
stx) stx)
name name
mod-path (if (equal? (syntax->datum #'simple) mod-path)
#'simple
mod-path)
mode mode
0 0
mode mode
stx)) stx))
(cdr names)))) (cdr names))))
namess)) namess))
(list (make-import-source (datum->syntax #'simple mod-path #'simple #'simple) 0)))))] (list (make-import-source (if (equal? (syntax->datum #'simple) mod-path)
#'simple
(datum->syntax #'simple mod-path #'simple))
0)))))]
[(id . rest) [(id . rest)
(identifier? #'id) (identifier? #'id)
(let ([t (syntax-local-value #'id (lambda () #f))]) (let ([t (syntax-local-value #'id (lambda () #f))])

5
collects/scribblings/reference/stx-trans.scrbl
View File

@ -893,7 +893,10 @@ Returns @racket[#t] if @racket[v] has the
@defstruct[import ([local-id identifier?] @defstruct[import ([local-id identifier?]
[src-sym symbol?] [src-sym symbol?]
[src-mod-path module-path?] [src-mod-path (or/c module-path?
(and/c syntax?
(lambda (stx)
(module-path? (syntax->datum stx)))))]
[mode (or/c exact-integer? #f)] [mode (or/c exact-integer? #f)]
[req-mode (or/c exact-integer? #f)] [req-mode (or/c exact-integer? #f)]
[orig-mode (or/c exact-integer? #f)] [orig-mode (or/c exact-integer? #f)]

4
collects/tests/racket/macro.rktl
View File

@ -800,8 +800,8 @@
(_only rl2)))) (_only rl2))))
(list #'rl1 #'rl2)])) (list #'rl1 #'rl2)]))
(test (list #f #t) map syntax-original? r/ls) (test (list #t #t) map syntax-original? r/ls)
(test (list #f #t) map number? (map syntax-position r/ls))) (test (list #t #t) map number? (map syntax-position r/ls)))
;; ---------------------------------------- ;; ----------------------------------------

1
doc/release-notes/racket/HISTORY.txt
View File

@ -4,6 +4,7 @@ Added reroot-path
Added #:break and #:final clauses to for forms Added #:break and #:final clauses to for forms
syntax/for-body: added syntax/for-body: added
racket/set: added set-first and set-rest, sets are streams racket/set: added set-first and set-rest, sets are streams
racket/require-transformer: an import's module path can be syntax
Version 5.3.0.23 Version 5.3.0.23
Changed make-log-receiver to accept a logger name as an Changed make-log-receiver to accept a logger name as an