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

Add #:lang and input-program inputs to make-base-eval and friends.

Browse Source 
This commit extends make-base-eval, make-base-eval-factory, and
make-eval-factory with an #:eval and input-program inputs so that
these functions are more like racket/sandbox make-evaluator.

original commit: 213430f728b33486fcc8334058a833f9d8c9de78
This commit is contained in:
David Van Horn 2013-02-22 19:01:42 -05:00 committed by Matthew Flatt
parent d16c59f097
commit 0808c21415
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
collects/scribble/eval.rkt
View File

@ -342,13 +342,13 @@
(namespace-attach-module ns 'racket/pretty) (namespace-attach-module ns 'racket/pretty)
(current-print (dynamic-require 'racket/pretty 'pretty-print-handler))))) (current-print (dynamic-require 'racket/pretty 'pretty-print-handler)))))
(define (make-base-eval #:pretty-print? [pretty-print? #t]) (define (make-base-eval #:lang [lang '(begin)] #:pretty-print? [pretty-print? #t] . ips)
(call-with-trusted-sandbox-configuration (call-with-trusted-sandbox-configuration
(lambda () (lambda ()
(parameterize ([sandbox-output 'string] (parameterize ([sandbox-output 'string]
[sandbox-error-output 'string] [sandbox-error-output 'string]
[sandbox-propagate-breaks #f]) [sandbox-propagate-breaks #f])
(let ([e (make-evaluator '(begin))]) (let ([e (apply make-evaluator lang ips)])
(let ([ns (namespace-anchor->namespace anchor)]) (let ([ns (namespace-anchor->namespace anchor)])
(call-in-sandbox-context (call-in-sandbox-context
e e
@ -357,7 +357,8 @@
e))))) e)))))
(define (make-base-eval-factory mod-paths (define (make-base-eval-factory mod-paths
#:pretty-print? [pretty-print? #t]) #:lang [lang '(begin)]
#:pretty-print? [pretty-print? #t] . ips)
(let ([ns (delay (let ([ns (let ([ns (delay (let ([ns
;; This namespace-creation choice needs to be consistent ;; This namespace-creation choice needs to be consistent
;; with the sandbox (i.e., with `make-base-eval') ;; with the sandbox (i.e., with `make-base-eval')
@ -370,7 +371,7 @@
(when pretty-print? (dynamic-require 'racket/pretty #f))) (when pretty-print? (dynamic-require 'racket/pretty #f)))
ns))]) ns))])
(lambda () (lambda ()
(let ([ev (make-base-eval #:pretty-print? #f)] (let ([ev (apply make-base-eval #:lang lang #:pretty-print? #f ips)]
[ns (force ns)]) [ns (force ns)])
(when pretty-print? (install-pretty-printer! ev ns)) (when pretty-print? (install-pretty-printer! ev ns))
(call-in-sandbox-context (call-in-sandbox-context
@ -381,8 +382,9 @@
ev)))) ev))))
(define (make-eval-factory mod-paths (define (make-eval-factory mod-paths
#:pretty-print? [pretty-print? #t]) #:lang [lang '(begin)]
(let ([base-factory (make-base-eval-factory mod-paths #:pretty-print? pretty-print?)]) #:pretty-print? [pretty-print? #t] . ips)
(let ([base-factory (apply make-base-eval-factory mod-paths #:lang lang #:pretty-print? pretty-print? ips)])
(lambda () (lambda ()
(let ([ev (base-factory)]) (let ([ev (base-factory)])
(call-in-sandbox-context (call-in-sandbox-context

24
collects/scribblings/scribble/eval.scrbl
View File

@ -155,10 +155,16 @@ Like @racket[examples], but each definition using @racket[define] or
prompt, and with line of space after it.} prompt, and with line of space after it.}
@defproc[(make-base-eval [#:pretty-print? pretty-print? any/c #t]) @defproc[(make-base-eval [#:pretty-print? pretty-print? any/c #t]
[#:lang lang
(or/c module-path?
(list/c 'special symbol?)
(cons/c 'begin list?))
'(begin)]
[input-program any/c] ...)
(any/c . -> . any)]{ (any/c . -> . any)]{
Creates an evaluator using @racket[(make-evaluator 'racket/base)], Creates an evaluator using @racket[(make-evaluator 'racket/base #:lang lang input-program ...)],
setting sandbox parameters to disable limits, setting the outputs to setting sandbox parameters to disable limits, setting the outputs to
@racket['string], and not adding extra security guards. @racket['string], and not adding extra security guards.
@ -167,7 +173,12 @@ If @racket[pretty-print?] is true, the sandbox's printer is set to
@defproc[(make-base-eval-factory [mod-paths (listof module-path?)] @defproc[(make-base-eval-factory [mod-paths (listof module-path?)]
[#:pretty-print? pretty-print? any/c #t]) [#:pretty-print? pretty-print? any/c #t]
[#:lang lang
(or/c module-path?
(list/c 'special symbol?)
(cons/c 'begin list?))
'(begin)])
(-> (any/c . -> . any))]{ (-> (any/c . -> . any))]{
Produces a function that is like @racket[make-base-eval], except that Produces a function that is like @racket[make-base-eval], except that
@ -178,7 +189,12 @@ time) and then attached to each evaluator that is created.}
@defproc[(make-eval-factory [mod-paths (listof module-path?)] @defproc[(make-eval-factory [mod-paths (listof module-path?)]
[#:pretty-print? pretty-print? any/c #t]) [#:pretty-print? pretty-print? any/c #t]
[#:lang lang
(or/c module-path?
(list/c 'special symbol?)
(cons/c 'begin list?))
'(begin)])
(-> (any/c . -> . any))]{ (-> (any/c . -> . any))]{
Like @racket[make-base-eval-factory], but each module in @racket[mod-paths] is Like @racket[make-base-eval-factory], but each module in @racket[mod-paths] is