From dbd5470805d212fa5544571ee50669fdddf73308 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 14 Aug 2015 07:45:47 -0600 Subject: [PATCH] move `call/cc` and `call/ec` to `racket/private/more-scheme` Those aliases were moved out of `#%kernel` as part of the determinstic-bytecode changes, but putting them in `racket/private/pre-base` meant that they weren't included in `mzscheme` or Pretty Big. The new location is with `let/cc`, which makes more sense, and makes them picked up by `mzscheme` and Pretty Big. --- racket/collects/racket/private/more-scheme.rkt | 5 ++++- racket/collects/racket/private/pre-base.rkt | 6 +----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/racket/collects/racket/private/more-scheme.rkt b/racket/collects/racket/private/more-scheme.rkt index 02e16ed2ff..b1511ce779 100644 --- a/racket/collects/racket/private/more-scheme.rkt +++ b/racket/collects/racket/private/more-scheme.rkt @@ -298,6 +298,9 @@ stx (let-values ([(temp ...) expr]) (set! id temp) ...)))]))) + + (define-values (call/cc) call-with-current-continuation) + (define-values (call/ec) call-with-escape-continuation) (define-syntax let/cc (lambda (stx) @@ -386,6 +389,6 @@ (rename break-paramz? break-parameterization?) with-handlers with-handlers* call-with-exception-handler set!-values - let/cc fluid-let time + let/cc call/cc call/ec fluid-let time log-fatal log-error log-warning log-info log-debug define-logger hash-ref! hash-has-key? hash-update hash-update!)) diff --git a/racket/collects/racket/private/pre-base.rkt b/racket/collects/racket/private/pre-base.rkt index a1b5d93520..e695d4bf08 100644 --- a/racket/collects/racket/private/pre-base.rkt +++ b/racket/collects/racket/private/pre-base.rkt @@ -149,9 +149,6 @@ stx) (raise-syntax-error #f "bad syntax" stx))))) - (define-values (call/cc) call-with-current-continuation) - (define-values (call/ec) call-with-escape-continuation) - (#%provide (all-from-except "more-scheme.rkt" old-case fluid-let) (all-from-except "misc.rkt" collection-path collection-file-path) (all-from "define.rkt") @@ -210,5 +207,4 @@ define-struct/derived struct-field-index struct-copy - double-flonum? - call/cc call/ec)) + double-flonum?))