move lazy-require to racket/lazy-require
This commit is contained in:
Ryan Culpepper
parent
9762e3f895
commit
fd7d8a412c
|
|
@ -1,5 +1,5 @@
|
|||
#lang racket/base
|
||||
(require unstable/lazy-require
|
||||
(require racket/lazy-require
|
||||
racket/contract/base
|
||||
"base.rkt")
|
||||
(provide (all-from-out "base.rkt"))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#lang racket/base
|
||||
(require unstable/lazy-require
|
||||
(require racket/lazy-require
|
||||
syntax/parse/private/minimatch
|
||||
racket/file
|
||||
racket/list)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
syntax/parse/private/minimatch
|
||||
racket/place
|
||||
racket/serialize
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
"interfaces.rkt"
|
||||
"prepared.rkt")
|
||||
(provide connection-server)
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ TO DO:
|
|||
racket/port
|
||||
racket/tcp
|
||||
racket/string
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
"libcrypto.rkt"
|
||||
"libssl.rkt")
|
||||
(lazy-require
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
unstable/contract
|
||||
slideshow/pict
|
||||
unstable/parameter-group
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
unstable/latent-contract/defthing
|
||||
"../common/contract.rkt"
|
||||
"../common/math.rkt"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
unstable/contract
|
||||
slideshow/pict
|
||||
unstable/parameter-group
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
unstable/latent-contract/defthing
|
||||
"../common/contract.rkt"
|
||||
"../common/math.rkt"
|
||||
|
|
|
|||
84
collects/racket/lazy-require.rkt
Normal file
84
collects/racket/lazy-require.rkt
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base)
|
||||
compiler/cm-accomplice
|
||||
racket/runtime-path
|
||||
racket/promise)
|
||||
(provide lazy-require)
|
||||
|
||||
(define-syntax (lazy-require stx)
|
||||
(syntax-case stx ()
|
||||
[(lazy-require #:requires-for-path (extra-req ...)
|
||||
[modpath (thing ...)] ...)
|
||||
#`(begin
|
||||
(lazy-require1 modpath (extra-req ...) (thing ...) #,stx)
|
||||
...)]
|
||||
[(lazy-require [modpath (thing ...)] ...)
|
||||
(syntax/loc stx
|
||||
(lazy-require #:requires-for-path ()
|
||||
[modpath (thing ...)] ...))]))
|
||||
|
||||
(define-for-syntax counter 0)
|
||||
|
||||
(define-syntax (lazy-require1 stx)
|
||||
(syntax-case stx ()
|
||||
[(lazy-require1 modpath (extra-req ...) (name ...) orig-stx)
|
||||
(with-syntax ([(defn ...)
|
||||
(for/list ([name (in-list (syntax->list #'(name ...)))])
|
||||
(unless (identifier? name)
|
||||
(raise-syntax-error #f "expected identifier" #'orig-stx name))
|
||||
(with-syntax ([name name]
|
||||
[(aux) (generate-temporaries (list name))])
|
||||
#`(begin (define aux (make-lazy-function 'name get-sym))
|
||||
(define-syntax name
|
||||
(make-rename-transformer
|
||||
(syntax-property (quote-syntax aux)
|
||||
'not-provide-all-defined #t))))))]
|
||||
[define-mpi-var
|
||||
(let ([phase (sub1 (variable-reference->phase (#%variable-reference)))])
|
||||
(if (zero? phase)
|
||||
;; `define-runtime-module-path-index' works right at phase-level 0:
|
||||
#'(define-runtime-module-path-index mpi-var (quasiquote modpath))
|
||||
;; need a submodule:
|
||||
(with-syntax ([lazy-require-path-n
|
||||
(string->symbol
|
||||
(format "lazy-require-path-~a-~a"
|
||||
phase
|
||||
counter))])
|
||||
(set! counter (add1 counter))
|
||||
#'(begin
|
||||
(module lazy-require-path-n racket/base
|
||||
(require racket/runtime-path
|
||||
(for-syntax racket/base)
|
||||
extra-req ...)
|
||||
(provide mpi-var)
|
||||
(define-runtime-module-path-index mpi-var (quasiquote modpath)))
|
||||
(require 'lazy-require-path-n)))))])
|
||||
;; implicit quasiquote, so can use normal module-path syntax
|
||||
;; or escape to compute a the module-path via expression
|
||||
#'(begin
|
||||
define-mpi-var
|
||||
(define (get-sym sym)
|
||||
(parameterize ((current-namespace (variable-reference->namespace (#%variable-reference))))
|
||||
(begin0
|
||||
(dynamic-require mpi-var sym)
|
||||
(do-registration (#%variable-reference) (quasiquote modpath)))))
|
||||
defn ...))]))
|
||||
|
||||
(define (make-lazy-function name get-sym)
|
||||
;; Use 'delay/sync' because 'delay' promise is not reentrant.
|
||||
;; FIXME: OTOH, 'delay/sync' promise is not kill-safe.
|
||||
(let ([fun-p (delay/sync (get-sym name))])
|
||||
(procedure-rename
|
||||
(make-keyword-procedure
|
||||
(lambda (kws kwargs . args)
|
||||
(keyword-apply (force fun-p) kws kwargs args)))
|
||||
name)))
|
||||
|
||||
(define (do-registration vr modpath)
|
||||
(let ([path (resolved-module-path-name
|
||||
(module-path-index-resolve
|
||||
(module-path-index-join
|
||||
modpath
|
||||
(variable-reference->resolved-module-path vr))))])
|
||||
(when (path? path)
|
||||
(register-external-module path))))
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
unstable/sequence
|
||||
syntax/parse
|
||||
syntax/parse/experimental/template
|
||||
unstable/lazy-require))
|
||||
racket/lazy-require))
|
||||
|
||||
(begin-for-syntax
|
||||
(lazy-require [racket/match/patterns (bound-vars)]
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
define-match-expander)
|
||||
"define-forms.rkt"
|
||||
"struct.rkt"
|
||||
(for-syntax unstable/lazy-require
|
||||
(for-syntax racket/lazy-require
|
||||
(only-in "stxtime.rkt"
|
||||
match-...-nesting
|
||||
prop:match-expander
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
racket/place/private/th-place
|
||||
racket/place/private/prop
|
||||
racket/private/streams
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
|
||||
|
||||
(for-syntax racket/base
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@
|
|||
racket/package
|
||||
racket/splicing
|
||||
racket/runtime-path
|
||||
racket/lazy-require
|
||||
(only-in compiler/cm-accomplice
|
||||
register-external-module)
|
||||
racket/performance-hint))
|
||||
|
||||
@(define require-eval (make-base-eval))
|
||||
|
|
@ -2777,3 +2780,43 @@ syntactic forms or languages that supply a more limited kind of
|
|||
Attaches a @racket['compiler-hint:cross-module-inline]
|
||||
@tech{syntax property} to each @racket[form], which is useful when a
|
||||
@racket[form] is a function definition. See @racket[define-values].}
|
||||
|
||||
@;------------------------------------------------------------------------
|
||||
@section[#:tag "lazy-require"]{Importing Modules Lazily: @racket[lazy-require]}
|
||||
|
||||
@note-lib-only[racket/lazy-require]
|
||||
|
||||
@defform/subs[#:literals (unquote)
|
||||
(lazy-require maybe-requires
|
||||
[mod (imported-fun-id ...)] ...)
|
||||
([mod module-path
|
||||
(unquote module-path-expr)]
|
||||
[maybe-requires code:blank
|
||||
(code:line #:requires-for-path (require-spec ...))])
|
||||
#:contracts ([module-path-expr module-path?])]{
|
||||
|
||||
Defines each @racket[imported-fun-id] as a function that, when called,
|
||||
dynamically requires the export named @racket[imported-fun-id] from
|
||||
the module specified by @racket[mod] and calls it with the same
|
||||
arguments.
|
||||
|
||||
The module @racket[mod] can be specified as a @racket[_module-path]
|
||||
(see @racket[require]) or as an @racket[unquote]-escaped expression
|
||||
that computes a module path. As with
|
||||
@racket[define-runtime-module-path-index], a @racket[module-path-expr]
|
||||
is evaluated both in phase level 0 and phase level 1 relative to its
|
||||
enclosing phase level.
|
||||
|
||||
If the enclosing relative phase level is not 0, then
|
||||
@racket[module-path-expr] is also placed in a submodule (with a use of
|
||||
@racket[define-runtime-module-path-index] at phase level 0 within the
|
||||
submodule); supply extra @racket[require-spec]s with
|
||||
@racket[#:requires-for-path] to bind within the submodule for
|
||||
@racket[module-path-expr]. Introduced submodules have the names
|
||||
@racket[lazy-require-]@racket[_n]@racketidfont{-}@racket[_m], where
|
||||
@racket[_n] is a phase-level number and @racket[_m] is a number.
|
||||
|
||||
When the use of a lazily-required function triggers module loading,
|
||||
@racket[register-external-module] declares a potential compilation
|
||||
dependency (in case the function is used in the process of compiling a
|
||||
module).}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
syntax/parse/private/residual-ct) ;; keep abs.path
|
||||
racket/contract/base
|
||||
racket/contract/combinator
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base
|
||||
syntax/parse
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
"../private/kws.rkt")
|
||||
syntax/parse/private/residual) ;; keep abs. path
|
||||
(provide define-primitive-splicing-syntax-class)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
"sc.rkt"
|
||||
"lib.rkt"
|
||||
"kws.rkt"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base)
|
||||
racket/stxparam
|
||||
unstable/lazy-require)
|
||||
racket/lazy-require)
|
||||
|
||||
;; ============================================================
|
||||
;; Compile-time
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base
|
||||
unstable/lazy-require)
|
||||
racket/lazy-require)
|
||||
"keywords.rkt")
|
||||
|
||||
;; keep and keep as abs. path -- lazy-loaded macros produce references to this
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
|
|||
"base-types-extra.rkt"
|
||||
racket/flonum ; for for/flvector and for*/flvector
|
||||
(for-syntax
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
syntax/parse
|
||||
racket/syntax
|
||||
racket/base
|
||||
|
|
|
|||
2
collects/typed-racket/env/global-env.rkt
vendored
2
collects/typed-racket/env/global-env.rkt
vendored
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
(require "../types/tc-error.rkt"
|
||||
syntax/id-table
|
||||
unstable/lazy-require)
|
||||
racket/lazy-require)
|
||||
(provide register-type register-type-if-undefined
|
||||
finish-register-type
|
||||
maybe-finish-register-type
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
racket/match
|
||||
racket/set
|
||||
(for-syntax racket/base)
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
(contract-req))
|
||||
|
||||
;; Ugly hack - should use units
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
(contract-req)
|
||||
"free-variance.rkt"
|
||||
"interning.rkt" unstable/struct
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
racket/stxparam
|
||||
(for-syntax
|
||||
racket/match
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt"
|
||||
racket/match ;mzlib/etc
|
||||
racket/contract
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
(for-syntax racket/base syntax/parse))
|
||||
|
||||
;; Ugly hack - should use units
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
;; avoid the other dependencies of `racket/place`
|
||||
'#%place
|
||||
unstable/function
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
(except-in racket/contract/base ->* -> one-of/c)
|
||||
(prefix-in c: racket/contract/base)
|
||||
(for-syntax racket/base syntax/parse racket/list)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
racket/match
|
||||
racket/set
|
||||
racket/contract
|
||||
unstable/lazy-require)
|
||||
racket/lazy-require)
|
||||
(lazy-require ("union.rkt" (Un)))
|
||||
|
||||
(provide subst-all substitute substitute-dots substitute-dotted subst
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
(env type-name-env)
|
||||
racket/match unstable/match
|
||||
racket/function
|
||||
unstable/lazy-require
|
||||
racket/lazy-require
|
||||
(prefix-in c: racket/contract)
|
||||
(for-syntax racket/base syntax/parse))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,89 +1,9 @@
|
|||
#lang racket/base
|
||||
(require (for-syntax racket/base)
|
||||
compiler/cm-accomplice
|
||||
racket/runtime-path
|
||||
racket/promise)
|
||||
racket/lazy-require)
|
||||
(provide lazy-require
|
||||
begin-on-demand)
|
||||
|
||||
(define-syntax (lazy-require stx)
|
||||
(syntax-case stx ()
|
||||
[(lazy-require #:requires-for-path (extra-req ...)
|
||||
[modpath (thing ...)] ...)
|
||||
#`(begin
|
||||
(lazy-require1 modpath (extra-req ...) (thing ...) #,stx)
|
||||
...)]
|
||||
[(lazy-require [modpath (thing ...)] ...)
|
||||
(syntax/loc stx
|
||||
(lazy-require #:requires-for-path ()
|
||||
[modpath (thing ...)] ...))]))
|
||||
|
||||
(define-for-syntax counter 0)
|
||||
|
||||
(define-syntax (lazy-require1 stx)
|
||||
(syntax-case stx ()
|
||||
[(lazy-require1 modpath (extra-req ...) (name ...) orig-stx)
|
||||
(with-syntax ([(defn ...)
|
||||
(for/list ([name (in-list (syntax->list #'(name ...)))])
|
||||
(unless (identifier? name)
|
||||
(raise-syntax-error #f "expected identifier" #'orig-stx name))
|
||||
(with-syntax ([name name]
|
||||
[(aux) (generate-temporaries (list name))])
|
||||
#`(begin (define aux (make-lazy-function 'name get-sym))
|
||||
(define-syntax name
|
||||
(make-rename-transformer
|
||||
(syntax-property (quote-syntax aux)
|
||||
'not-provide-all-defined #t))))))]
|
||||
[define-mpi-var
|
||||
(let ([phase (sub1 (variable-reference->phase (#%variable-reference)))])
|
||||
(if (zero? phase)
|
||||
;; `define-runtime-module-path-index' works right at phase-level 0:
|
||||
#'(define-runtime-module-path-index mpi-var (quasiquote modpath))
|
||||
;; need a submodule:
|
||||
(with-syntax ([lazy-require-path-n
|
||||
(string->symbol
|
||||
(format "lazy-require-path-~a-~a"
|
||||
phase
|
||||
counter))])
|
||||
(set! counter (add1 counter))
|
||||
#'(begin
|
||||
(module lazy-require-path-n racket/base
|
||||
(require racket/runtime-path
|
||||
(for-syntax racket/base)
|
||||
extra-req ...)
|
||||
(provide mpi-var)
|
||||
(define-runtime-module-path-index mpi-var (quasiquote modpath)))
|
||||
(require 'lazy-require-path-n)))))])
|
||||
;; implicit quasiquote, so can use normal module-path syntax
|
||||
;; or escape to compute a the module-path via expression
|
||||
#'(begin
|
||||
define-mpi-var
|
||||
(define (get-sym sym)
|
||||
(parameterize ((current-namespace (variable-reference->namespace (#%variable-reference))))
|
||||
(begin0
|
||||
(dynamic-require mpi-var sym)
|
||||
(do-registration (#%variable-reference) (quasiquote modpath)))))
|
||||
defn ...))]))
|
||||
|
||||
(define (make-lazy-function name get-sym)
|
||||
;; Use 'delay/sync' because 'delay' promise is not reentrant.
|
||||
;; FIXME: OTOH, 'delay/sync' promise is not kill-safe.
|
||||
(let ([fun-p (delay/sync (get-sym name))])
|
||||
(procedure-rename
|
||||
(make-keyword-procedure
|
||||
(lambda (kws kwargs . args)
|
||||
(keyword-apply (force fun-p) kws kwargs args)))
|
||||
name)))
|
||||
|
||||
(define (do-registration vr modpath)
|
||||
(let ([path (resolved-module-path-name
|
||||
(module-path-index-resolve
|
||||
(module-path-index-join
|
||||
modpath
|
||||
(variable-reference->resolved-module-path vr))))])
|
||||
(when (path? path)
|
||||
(register-external-module path))))
|
||||
|
||||
#|
|
||||
begin-on-demand notes/todo
|
||||
|
||||
|
|
|
|||
|
|
@ -11,42 +11,6 @@
|
|||
|
||||
@defmodule[unstable/lazy-require]
|
||||
|
||||
@defform/subs[#:literals (unquote)
|
||||
(lazy-require maybe-requires
|
||||
[mod (imported-fun-id ...)] ...)
|
||||
([mod module-path
|
||||
(unquote module-path-expr)]
|
||||
[maybe-requires code:blank
|
||||
(code:line #:requires-for-path (require-spec ...))])
|
||||
#:contracts ([module-path-expr module-path?])]{
|
||||
|
||||
Defines each @racket[imported-fun-id] as a function that, when called,
|
||||
dynamically requires the export named @racket['imported-fun-id] from
|
||||
the module specified by @racket[mod] and calls it with the same
|
||||
arguments.
|
||||
|
||||
The module @racket[mod] can be specified as a @racket[_module-path]
|
||||
(see @racket[require]) or as an @racket[unquote]-escaped expression
|
||||
that computes a module path. As with
|
||||
@racket[define-runtime-module-path-index], a @racket[module-path-expr]
|
||||
is evaluated both in phase level 0 and phase level 1 relative to its
|
||||
enclosing phase level.
|
||||
|
||||
If the enclosing relative phase level is not 0, then
|
||||
@racket[module-path-expr] is also placed in a submodule (with a use of
|
||||
@racket[define-runtime-module-path-index] at phase level 0 within the
|
||||
submodule); supply extra @racket[require-spec]s with
|
||||
@racket[#:requires-for-path] to bind within the submodule for
|
||||
@racket[module-path-expr]. Introduced submodules have the names
|
||||
@racket[lazy-require-]@racket[_n]@racketidfont{-}@racket[_m], where
|
||||
@racket[_n] is a phase-level number and @racket[_m] is a number.
|
||||
|
||||
When the use of a lazily-required function triggers module loading,
|
||||
@racket[register-external-module] declares a potential compilation
|
||||
dependency (in case the function is used in the process of compiling a
|
||||
module).}
|
||||
|
||||
|
||||
@defform[(begin-on-demand #:export (fun-id ...)
|
||||
body ...+)]{
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user