From edfcec821183f79db73d7ea56458ff421c5419ee Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 13 Oct 2019 08:32:12 -0600 Subject: [PATCH] cs: repair `call-with-immediate-continuation-mark` The default-value expression could get lost, replaced with just #f. --- pkgs/base/info.rkt | 2 +- pkgs/racket-test-core/tests/racket/contmark.rktl | 1 + racket/src/cs/rumble/control.ss | 2 +- racket/src/racket/src/schvers.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt index 9d96be2a8c..6951833a32 100644 --- a/pkgs/base/info.rkt +++ b/pkgs/base/info.rkt @@ -12,7 +12,7 @@ (define collection 'multi) -(define version "7.5.0.2") +(define version "7.5.0.3") (define deps `("racket-lib" ["racket" #:version ,version])) diff --git a/pkgs/racket-test-core/tests/racket/contmark.rktl b/pkgs/racket-test-core/tests/racket/contmark.rktl index d84b878a00..630590d503 100644 --- a/pkgs/racket-test-core/tests/racket/contmark.rktl +++ b/pkgs/racket-test-core/tests/racket/contmark.rktl @@ -698,6 +698,7 @@ (test #f call-with-immediate-continuation-mark 'x (lambda (v) v)) (test 10 call-with-immediate-continuation-mark 'x (lambda (v) v) 10) +(test 10 'also-ten (call-with-immediate-continuation-mark 'x (lambda (v) v) 10)) (test 12 'cwicm (with-continuation-mark 'x 12 (call-with-immediate-continuation-mark 'x (lambda (v) v)))) (test '(#f) 'cwiwcm (with-continuation-mark 'x 12 (list (call-with-immediate-continuation-mark 'x (lambda (v) v))))) (test 12 'cwicm (with-continuation-mark 'x 12 diff --git a/racket/src/cs/rumble/control.ss b/racket/src/cs/rumble/control.ss index 0da27f3d2c..4899ce240d 100644 --- a/racket/src/cs/rumble/control.ss +++ b/racket/src/cs/rumble/control.ss @@ -1112,7 +1112,7 @@ [(_ key-expr proc-expr) #'(call-with-immediate-continuation-mark/inline key-expr proc-expr #f)] [(_ key-expr (|#%name| _ (lambda (arg) body ...)) default-v-expr) - #'(call-with-immediate-continuation-mark/inline key-expr (lambda (arg) body ...) #f)] + #'(call-with-immediate-continuation-mark/inline key-expr (lambda (arg) body ...) default-v-expr)] [(_ key-expr (lambda (arg) body ...) default-v-expr) #'(call-getting-continuation-attachment empty-mark-frame diff --git a/racket/src/racket/src/schvers.h b/racket/src/racket/src/schvers.h index 8eb5374cf9..8a535f94fa 100644 --- a/racket/src/racket/src/schvers.h +++ b/racket/src/racket/src/schvers.h @@ -16,7 +16,7 @@ #define MZSCHEME_VERSION_X 7 #define MZSCHEME_VERSION_Y 5 #define MZSCHEME_VERSION_Z 0 -#define MZSCHEME_VERSION_W 2 +#define MZSCHEME_VERSION_W 3 /* A level of indirection makes `#` work as needed: */ #define AS_a_STR_HELPER(x) #x