diff --git a/pkgs/base/info.rkt b/pkgs/base/info.rkt index b0512fcca4..4198d700fa 100644 --- a/pkgs/base/info.rkt +++ b/pkgs/base/info.rkt @@ -14,7 +14,7 @@ ;; In the Racket source repo, this version should change only when ;; "racket_version.h" changes: -(define version "7.9.0.11") +(define version "7.9.0.12") (define deps `("racket-lib" ["racket" #:version ,version])) diff --git a/racket/src/cs/rumble/procedure.ss b/racket/src/cs/rumble/procedure.ss index 1ed9f3fb41..ed0a270c4c 100644 --- a/racket/src/cs/rumble/procedure.ss +++ b/racket/src/cs/rumble/procedure.ss @@ -338,8 +338,9 @@ ;; - (vector 'method) => is a method ;; - (box ) => JIT function generated, name is , not a method ;; - => parameter -;; - 'constructor => struct constructor -;; - 'predicate => struct predicate +;; - => JITted with name +;; - #\c => struct constructor +;; - #\p => struct predicate ;; - (cons rtd pos) => struct accessor ;; - (cons pos rtd) => struct mutator @@ -584,6 +585,7 @@ [(#%vector? name) (or (#%vector-ref name 0) (object-name (#%vector-ref name 1)))] [(parameter-data? name) (parameter-data-name name)] + [(symbol? name) name] [else (object-name (wrapper-procedure-procedure p))]))) ;; ---------------------------------------- diff --git a/racket/src/cs/rumble/struct.ss b/racket/src/cs/rumble/struct.ss index 3eff3d5927..984c4f4069 100644 --- a/racket/src/cs/rumble/struct.ss +++ b/racket/src/cs/rumble/struct.ss @@ -412,10 +412,10 @@ (resize! rtd-props)))) (define (|#%struct-constructor| p arity-mask) - (make-wrapper-procedure p arity-mask 'constructor)) + (make-wrapper-procedure p arity-mask #\c)) (define (|#%struct-predicate| p) - (make-wrapper-procedure p 2 'predicate)) + (make-wrapper-procedure p 2 #\p)) (define (|#%struct-field-accessor| p rtd pos) (make-wrapper-procedure p 2 (cons rtd pos))) @@ -426,12 +426,12 @@ (define (struct-constructor-procedure? v) (let ([v (strip-impersonator v)]) (and (wrapper-procedure? v) - (eq? 'constructor (wrapper-procedure-data v))))) + (eq? #\c (wrapper-procedure-data v))))) (define (struct-predicate-procedure? v) (let ([v (strip-impersonator v)]) (and (wrapper-procedure? v) - (eq? 'predicate (wrapper-procedure-data v))))) + (eq? #\p (wrapper-procedure-data v))))) (define (struct-accessor-procedure? v) (let ([v (strip-impersonator v)]) diff --git a/racket/src/version/racket_version.h b/racket/src/version/racket_version.h index 891c36f4b2..6c1ce3351c 100644 --- a/racket/src/version/racket_version.h +++ b/racket/src/version/racket_version.h @@ -16,7 +16,7 @@ #define MZSCHEME_VERSION_X 7 #define MZSCHEME_VERSION_Y 9 #define MZSCHEME_VERSION_Z 0 -#define MZSCHEME_VERSION_W 11 +#define MZSCHEME_VERSION_W 12 /* A level of indirection makes `#` work as needed: */ #define AS_a_STR_HELPER(x) #x