From ca35ec0b86a7f3dbec5b409c7b1815481b1c4157 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 1/9] Fix 1 occurrence of `cond-let-to-cond-define` Internal definitions are recommended instead of `let` expressions, to reduce nesting. --- drracket-test/tests/drracket/private/gui.rkt | 35 ++++++-------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/drracket-test/tests/drracket/private/gui.rkt b/drracket-test/tests/drracket/private/gui.rkt index b4709ac1b..583036354 100644 --- a/drracket-test/tests/drracket/private/gui.rkt +++ b/drracket-test/tests/drracket/private/gui.rkt @@ -17,30 +17,17 @@ (cond [(= i (string-length string1)) (only-whitespace? string2 j)] [(= j (string-length string2)) (only-whitespace? string1 i)] - [else (let ([c1 (string-ref string1 i)] - [c2 (string-ref string2 j)]) - (cond - [in-whitespace? - (cond - [(whitespace? c1) - (loop (+ i 1) - j - #t)] - [(whitespace? c2) - (loop i - (+ j 1) - #t)] - [else (loop i j #f)])] - [(and (whitespace? c1) - (whitespace? c2)) - (loop (+ i 1) - (+ j 1) - #t)] - [(char=? c1 c2) - (loop (+ i 1) - (+ j 1) - #f)] - [else #f]))]))) + [else (define c1 (string-ref string1 i)) + (define c2 (string-ref string2 j)) + (cond + [in-whitespace? + (cond + [(whitespace? c1) (loop (+ i 1) j #t)] + [(whitespace? c2) (loop i (+ j 1) #t)] + [else (loop i j #f)])] + [(and (whitespace? c1) (whitespace? c2)) (loop (+ i 1) (+ j 1) #t)] + [(char=? c1 c2) (loop (+ i 1) (+ j 1) #f)] + [else #f])]))) ;; whitespace? : char -> boolean ;; deteremines if `c' is whitespace From 1282bd38d6999f2d5635d18d0a74f137ee1ce5d8 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 2/9] Fix 1 occurrence of `and-let-to-cond` Using `cond` allows converting `let` to internal definitions, reducing nesting --- drracket-test/tests/drracket/private/gui.rkt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drracket-test/tests/drracket/private/gui.rkt b/drracket-test/tests/drracket/private/gui.rkt index 583036354..74cc3bad8 100644 --- a/drracket-test/tests/drracket/private/gui.rkt +++ b/drracket-test/tests/drracket/private/gui.rkt @@ -100,11 +100,11 @@ window label class)) (let loop ([window window]) (cond - [(and (or (not class) - (is-a? window class)) - (let ([win-label (and (is-a? window window<%>) - (send window get-label))]) - (equal? label win-label))) + [(cond + [(or (not class) (is-a? window class)) + (define win-label (and (is-a? window window<%>) (send window get-label))) + (equal? label win-label)] + [else #f]) (list window)] [(is-a? window area-container<%>) (apply append (map loop (send window get-children)))] [else '()]))) From d0ca1b68ca7f1f7ef8c04641c7523f16c3765a3d Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 3/9] Fix 3 occurrences of `map-to-for` This `map` operation can be replaced with a `for/list` loop. --- drracket-core-lib/drracket/private/frame.rkt | 21 ++++++++----------- .../drracket/private/stick-figures.rkt | 19 +++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/drracket-core-lib/drracket/private/frame.rkt b/drracket-core-lib/drracket/private/frame.rkt index 418f94195..c6c4c6fcd 100644 --- a/drracket-core-lib/drracket/private/frame.rkt +++ b/drracket-core-lib/drracket/private/frame.rkt @@ -291,18 +291,15 @@ (define (menu-item->prefix-string item) (apply string-append - (map (λ (prefix) - (case prefix - [(alt) (if (eq? (system-type) 'windows) - "m:" - "a:")] - [(cmd) "d:"] - [(meta) "m:"] - [(ctl) "c:"] - [(shift) "s:"] - [(opt option) "a:"] - [else (error 'menu-item->prefix-string "unknown prefix ~s\n" prefix)])) - (send item get-shortcut-prefix))))) + (for/list ([prefix (in-list (send item get-shortcut-prefix))]) + (case prefix + [(alt) (if (eq? (system-type) 'windows) "m:" "a:")] + [(cmd) "d:"] + [(meta) "m:"] + [(ctl) "c:"] + [(shift) "s:"] + [(opt option) "a:"] + [else (error 'menu-item->prefix-string "unknown prefix ~s\n" prefix)]))))) (require string-constants racket/match diff --git a/drracket-core-lib/drracket/private/stick-figures.rkt b/drracket-core-lib/drracket/private/stick-figures.rkt index af068f910..b1974d498 100644 --- a/drracket-core-lib/drracket/private/stick-figures.rkt +++ b/drracket-core-lib/drracket/private/stick-figures.rkt @@ -154,10 +154,8 @@ (define (normalize points) (define-values (min-x min-y) (get-max/min-x/y min points)) - (map (λ (x) (list (car x) - (- (list-ref x 1) min-x) - (- (list-ref x 2) min-y))) - points)) + (for/list ([x (in-list points)]) + (list (car x) (- (list-ref x 1) min-x) (- (list-ref x 2) min-y)))) (define (get-max/min-x/y choose points) (values (apply choose @@ -250,13 +248,12 @@ (set! orig-y (list-ref orig-point 2)))] [(and clicked-point (send evt moving?)) (set! points - (map (λ (x) - (if (eq? (car x) clicked-point) - (list (list-ref x 0) - (+ orig-x (- (send evt get-x) clicked-x)) - (+ orig-y (- (send evt get-y) clicked-y))) - x)) - points)) + (for/list ([x (in-list points)]) + (if (eq? (car x) clicked-point) + (list (list-ref x 0) + (+ orig-x (- (send evt get-x) clicked-x)) + (+ orig-y (- (send evt get-y) clicked-y))) + x))) (refresh) (send csmall refresh)] [(send evt button-up? 'left) From 76cb8bf30c81923fd86abaffae3876d5fa07dd46 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 4/9] Fix 4 occurrences of `let-to-define` Internal definitions are recommended instead of `let` expressions, to reduce nesting. --- .../drracket/private/stick-figures.rkt | 16 +-- .../drracket/private/no-fw-test-util.rkt | 116 +++++++++--------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/drracket-core-lib/drracket/private/stick-figures.rkt b/drracket-core-lib/drracket/private/stick-figures.rkt index b1974d498..e500542dc 100644 --- a/drracket-core-lib/drracket/private/stick-figures.rkt +++ b/drracket-core-lib/drracket/private/stick-figures.rkt @@ -183,14 +183,14 @@ (send dc set-brush "black" 'transparent) (draw-points points dc factor dx dy) - (let* ([head (assoc 'head points)] - [hx (list-ref head 1)] - [hy (list-ref head 2)]) - (send dc draw-ellipse - (+ dx (* factor (- hx (/ head-size 2)))) - (+ dy (* factor (- hy (/ head-size 2)))) - (* factor head-size) - (* factor head-size))))) + (define head (assoc 'head points)) + (define hx (list-ref head 1)) + (define hy (list-ref head 2)) + (send dc draw-ellipse + (+ dx (* factor (- hx (/ head-size 2)))) + (+ dy (* factor (- hy (/ head-size 2)))) + (* factor head-size) + (* factor head-size)))) (define (draw-points points dc factor dx dy) (connect 'neck 'shoulders points dc factor dx dy) diff --git a/drracket-test/tests/drracket/private/no-fw-test-util.rkt b/drracket-test/tests/drracket/private/no-fw-test-util.rkt index a47a10584..65eaa614d 100644 --- a/drracket-test/tests/drracket/private/no-fw-test-util.rkt +++ b/drracket-test/tests/drracket/private/no-fw-test-util.rkt @@ -57,80 +57,80 @@ (yield (make-semaphore 0))))))) (semaphore-wait s)) -(define (use-hash-for-prefs preferences:low-level-get-preference +(define (use-hash-for-prefs preferences:low-level-get-preference preferences:low-level-put-preferences preferences:restore-defaults preferences:set preferences:default-set? prefs) - ;; change the preferences system so that it doesn't write to + ;; change the preferences system so that it doesn't write to ;; a file; partly to avoid problems of concurrency in drdr ;; but also to make the test suite easier for everyone to run. - (let ([prefs-table (make-hash)]) - (preferences:low-level-put-preferences - (λ (names vals) - (for ([name (in-list names)] - [val (in-list vals)]) - (hash-set! prefs-table name val)))) - (preferences:low-level-get-preference - (λ (name [fail (lambda () #f)]) - (hash-ref prefs-table name fail))) - - ;; set all preferences to their defaults (some pref values may have - ;; been read by this point, but hopefully that won't affect the - ;; startup of drracket) - (preferences:restore-defaults) - - ;; initialize some preferences to simulate these - ;; being saved already in the user's prefs file - ;; call preferences:set too since the prefs file - ;; may have been "read" already at this point - (for ([pref (in-list prefs)]) - (define pref-key (list-ref pref 0)) - (define pref-val (list-ref pref 1)) - (define m (regexp-match #rx"^plt:framework-pref:(.*)$" (symbol->string pref-key))) - (cond - [m - (hash-set! prefs-table pref-key pref-val) - (define fw-pref-key (string->symbol (list-ref m 1))) - (when (preferences:default-set? fw-pref-key) - (preferences:set fw-pref-key pref-val))] - [else - ;; this currently doesn't happen, and it is easy to forget - ;; that prefix, so print a message here to remind - (printf "WARNING: setting a preference that isn't set via the framework: ~s\n" - pref-key)])))) + (define prefs-table (make-hash)) + (preferences:low-level-put-preferences (λ (names vals) + (for ([name (in-list names)] + [val (in-list vals)]) + (hash-set! prefs-table name val)))) + (preferences:low-level-get-preference (λ (name [fail (lambda () #f)]) + (hash-ref prefs-table name fail))) + + ;; set all preferences to their defaults (some pref values may have + ;; been read by this point, but hopefully that won't affect the + ;; startup of drracket) + (preferences:restore-defaults) + + ;; initialize some preferences to simulate these + ;; being saved already in the user's prefs file + ;; call preferences:set too since the prefs file + ;; may have been "read" already at this point + (for ([pref (in-list prefs)]) + (define pref-key (list-ref pref 0)) + (define pref-val (list-ref pref 1)) + (define m (regexp-match #rx"^plt:framework-pref:(.*)$" (symbol->string pref-key))) + (cond + [m + (hash-set! prefs-table pref-key pref-val) + (define fw-pref-key (string->symbol (list-ref m 1))) + (when (preferences:default-set? fw-pref-key) + (preferences:set fw-pref-key pref-val))] + [else + ;; this currently doesn't happen, and it is easy to forget + ;; that prefix, so print a message here to remind + (printf "WARNING: setting a preference that isn't set via the framework: ~s\n" pref-key)]))) (define (queue-callback/res thunk) (not-on-eventspace-handler-thread 'queue-callback/res #:more (λ () (format "\n thunk: ~e" thunk))) - (let ([c (make-channel)]) - (queue-callback (λ () (channel-put c (with-handlers ((exn:fail? values)) - (call-with-values thunk list)))) - #f) - (define res (channel-get c)) - (when (exn? res) (raise res)) - (apply values res))) + (define c (make-channel)) + (queue-callback (λ () + (channel-put c + (with-handlers ([exn:fail? values]) + (call-with-values thunk list)))) + #f) + (define res (channel-get c)) + (when (exn? res) + (raise res)) + (apply values res)) ;; poll-until : (-> alpha) number (-> alpha) -> alpha ;; waits until pred return a true value and returns that. ;; if that doesn't happen by `secs', calls fail and returns that. -(define (poll-until pred - [secs 10] - [fail (lambda () - (error 'poll-until - "timeout after ~e secs, ~e never returned a true value" - secs pred))]) - (let ([step 1/20]) - (let loop ([counter secs]) - (if (<= counter 0) - (fail) - (let ([result (pred)]) - (or result - (begin - (sleep step) - (loop (- counter step))))))))) +(define (poll-until + pred + [secs 10] + [fail + (lambda () + (error 'poll-until "timeout after ~e secs, ~e never returned a true value" secs pred))]) + (define step 1/20) + (let loop ([counter secs]) + (if (<= counter 0) + (fail) + (let ([result (pred)]) + (or result + (begin + (sleep step) + (loop (- counter step)))))))) (define (wait-for-events-in-frame-eventspace fr) (define sema (make-semaphore 0)) From 9b17eaa55cbbf5618e31f026146cd240d7093647 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 5/9] Fix 3 occurrences of `when-expression-in-for-loop-to-when-keyword` Use the `#:when` keyword instead of `when` to reduce loop body indentation. --- drracket-core-lib/drracket/private/frame.rkt | 46 +++++++++---------- .../private/tool-contract-language.rkt | 24 +++++----- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/drracket-core-lib/drracket/private/frame.rkt b/drracket-core-lib/drracket/private/frame.rkt index c6c4c6fcd..ef7bb09ea 100644 --- a/drracket-core-lib/drracket/private/frame.rkt +++ b/drracket-core-lib/drracket/private/frame.rkt @@ -262,30 +262,28 @@ (when (is-a? item menu-item-container<%>) (loop item)))) (when (member (system-type) '(unix windows)) - (for ([top-level-menu (in-list (send mb get-items))]) - (when (is-a? top-level-menu menu%) - (define amp-key - (let loop ([str (send top-level-menu get-label)]) - (cond - [(regexp-match #rx"[^&]*[&](.)(.*)" str) - => - (λ (m) - (define this-amp (list-ref m 1)) - (define rest (list-ref m 2)) - (cond - [(equal? this-amp "&") - (loop rest)] - [else - (string-downcase this-amp)]))] - [else #f]))) - (when amp-key - (hash-set! name-ht - (string->symbol (format "m:~a" amp-key)) - (format "~a menu" (send top-level-menu get-plain-label))) - (when (equal? (system-type) 'windows) - (hash-set! name-ht - (string->symbol (format "m:s:~a" amp-key)) - (format "~a menu" (send top-level-menu get-plain-label))))))))) + (for ([top-level-menu (in-list (send mb get-items))] + #:when (is-a? top-level-menu menu%)) + (define amp-key + (let loop ([str (send top-level-menu get-label)]) + (cond + [(regexp-match #rx"[^&]*[&](.)(.*)" str) + => + (λ (m) + (define this-amp (list-ref m 1)) + (define rest (list-ref m 2)) + (cond + [(equal? this-amp "&") (loop rest)] + [else (string-downcase this-amp)]))] + [else #f]))) + (when amp-key + (hash-set! name-ht + (string->symbol (format "m:~a" amp-key)) + (format "~a menu" (send top-level-menu get-plain-label))) + (when (equal? (system-type) 'windows) + (hash-set! name-ht + (string->symbol (format "m:s:~a" amp-key)) + (format "~a menu" (send top-level-menu get-plain-label)))))))) name-ht) (define (menu-item->prefix-string item) diff --git a/drracket-core-lib/drracket/private/tool-contract-language.rkt b/drracket-core-lib/drracket/private/tool-contract-language.rkt index abc17bcac..30e8e31e7 100644 --- a/drracket-core-lib/drracket/private/tool-contract-language.rkt +++ b/drracket-core-lib/drracket/private/tool-contract-language.rkt @@ -59,12 +59,12 @@ body)))))])))))))] [(_ (name type type-names strs ...) ...) (begin - (for ([str-stx (in-list (syntax->list (syntax (type-names ...))))]) - (when (string? (syntax->datum str-stx)) - (raise-syntax-error 'tool-contract-language.rkt - "expected type name specification" - stx - str-stx))) + (for ([str-stx (in-list (syntax->list (syntax (type-names ...))))] + #:when (string? (syntax->datum str-stx))) + (raise-syntax-error 'tool-contract-language.rkt + "expected type name specification" + stx + str-stx)) (for ([name (in-list (syntax->list (syntax (name ...))))]) (unless (identifier? name) (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name))) @@ -112,12 +112,12 @@ body)))]))))))] [(_ (name type type-names strs ...) ...) (begin - (for ([str-stx (in-list (syntax->list (syntax (type-names ...))))]) - (when (string? (syntax->datum str-stx)) - (raise-syntax-error 'tool-contract-language.rkt - "expected type name specification" - stx - str-stx))) + (for ([str-stx (in-list (syntax->list (syntax (type-names ...))))] + #:when (string? (syntax->datum str-stx))) + (raise-syntax-error 'tool-contract-language.rkt + "expected type name specification" + stx + str-stx)) (for ([name (in-list (syntax->list (syntax (name ...))))]) (unless (identifier? name) (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name))) From 8fb20a940d476998e7774d35087678660dab77c5 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 6/9] Fix 1 occurrence of `nested-when-to-compound-when` Nested `when` expressions can be merged into a single compound `when` expression. --- drracket-core-lib/drracket/private/frame.rkt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drracket-core-lib/drracket/private/frame.rkt b/drracket-core-lib/drracket/private/frame.rkt index ef7bb09ea..a90253233 100644 --- a/drracket-core-lib/drracket/private/frame.rkt +++ b/drracket-core-lib/drracket/private/frame.rkt @@ -332,12 +332,11 @@ (mixin (frame:standard-menus<%>) (drracket:frame:basics<%>) (define/override (on-subwindow-focus win on?) - (when the-keybindings-frame - (when on? - (send the-keybindings-frame set-bindings - (if (can-show-keybindings?) - (get-keybindings-to-show) - '()))))) + (when (and the-keybindings-frame on?) + (send the-keybindings-frame set-bindings + (if (can-show-keybindings?) + (get-keybindings-to-show) + '())))) (define/override (on-subwindow-char receiver event) (define user-key? (send (keymap:get-user) From e7506633fcf136e806fb3c65493b3fc8b0bdfe24 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 7/9] Fix 1 occurrence of `instantiate-to-new` The `instantiate` form is for mixing positional and by-name constructor arguments. When no positional arguments are needed, use `new` instead. --- drracket-core-lib/drracket/private/frame.rkt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drracket-core-lib/drracket/private/frame.rkt b/drracket-core-lib/drracket/private/frame.rkt index a90253233..903fb4654 100644 --- a/drracket-core-lib/drracket/private/frame.rkt +++ b/drracket-core-lib/drracket/private/frame.rkt @@ -410,12 +410,10 @@ (define/override (file-menu:between-print-and-close menu) (super file-menu:between-print-and-close menu) - (instantiate menu-item% () - (label (string-constant mfs-multi-file-search-menu-item)) - (parent menu) - (callback - (λ (_1 _2) - (drracket:multi-file-search:multi-file-search)))) + (new menu-item% + (label (string-constant mfs-multi-file-search-menu-item)) + (parent menu) + (callback (λ (_1 _2) (drracket:multi-file-search:multi-file-search)))) (new separator-menu-item% (parent menu))) (define/override (edit-menu:between-find-and-preferences menu) From 07153b7dab8cc2d2c524a6000bd0b6c344e62377 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 8/9] Fix 1 occurrence of `named-let-loop-to-for-in-range` This named `let` expression is equivalent to a `for` loop that uses `in-range`. --- drracket-core-lib/drracket/private/palaka.rkt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drracket-core-lib/drracket/private/palaka.rkt b/drracket-core-lib/drracket/private/palaka.rkt index 8399d52c3..61b97c684 100644 --- a/drracket-core-lib/drracket/private/palaka.rkt +++ b/drracket-core-lib/drracket/private/palaka.rkt @@ -24,17 +24,15 @@ (define (draw-palaka dc w h) (define alpha (send dc get-alpha)) (send dc set-pen palaka-color 1 'transparent) - (let loop ([dx (- (/ quadrant-size 2))]) - (when (< dx w) - (let loop ([dy (- (/ quadrant-size 2))]) - (when (< dy h) - (send dc set-alpha 1) - (send dc set-brush palaka-color 'solid) - (send dc draw-rectangle dx dy quadrant-size quadrant-size) - (send dc set-brush "white" 'solid) - (draw-one-palaka dc dx dy) - (loop (+ dy quadrant-size)))) - (loop (+ dx quadrant-size)))) + (for ([dx (in-range (- (/ quadrant-size 2)) w quadrant-size)]) + (let loop ([dy (- (/ quadrant-size 2))]) + (when (< dy h) + (send dc set-alpha 1) + (send dc set-brush palaka-color 'solid) + (send dc draw-rectangle dx dy quadrant-size quadrant-size) + (send dc set-brush "white" 'solid) + (draw-one-palaka dc dx dy) + (loop (+ dy quadrant-size))))) (send dc set-alpha alpha)) (define (draw-one-palaka dc dx dy) From fbfb6613db62d3885f46303c53bb9cef42153be5 Mon Sep 17 00:00:00 2001 From: "resyntax-ci[bot]" <181813515+resyntax-ci[bot]@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:43:10 +0000 Subject: [PATCH 9/9] Fix 5 occurrences of `unless-expression-in-for-loop-to-unless-keyword` Use the `#:unless` keyword instead of `unless` to reduce loop body indentation. --- .../private/insulated-read-language.rkt | 6 ++--- .../private/tool-contract-language.rkt | 24 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drracket-core-lib/drracket/private/insulated-read-language.rkt b/drracket-core-lib/drracket/private/insulated-read-language.rkt index 3a4292aa6..e8778c509 100644 --- a/drracket-core-lib/drracket/private/insulated-read-language.rkt +++ b/drracket-core-lib/drracket/private/insulated-read-language.rkt @@ -477,9 +477,9 @@ Will not work with the definitions text surrogate interposition that (for ([chars (in-list (syntax->list #'(chars ...)))]) (unless (string? (syntax-e chars)) (raise-syntax-error 'chars "expected a string" stx chars)) - (for ([char (in-string (syntax-e chars))]) - (unless (< (char->integer char) 128) - (raise-syntax-error 'chars "expected only one-byte chars" stx chars)))) + (for ([char (in-string (syntax-e chars))] + #:unless (< (char->integer char) 128)) + (raise-syntax-error 'chars "expected only one-byte chars" stx chars))) #'(cond [(check-chars port chars) rhs ...] diff --git a/drracket-core-lib/drracket/private/tool-contract-language.rkt b/drracket-core-lib/drracket/private/tool-contract-language.rkt index 30e8e31e7..02b7e4ed0 100644 --- a/drracket-core-lib/drracket/private/tool-contract-language.rkt +++ b/drracket-core-lib/drracket/private/tool-contract-language.rkt @@ -65,13 +65,13 @@ "expected type name specification" stx str-stx)) - (for ([name (in-list (syntax->list (syntax (name ...))))]) - (unless (identifier? name) - (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name))) + (for ([name (in-list (syntax->list (syntax (name ...))))] + #:unless (identifier? name)) + (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name)) (for ([str (in-list (apply append - (map syntax->list (syntax->list (syntax ((strs ...) ...))))))]) - (unless (string? (syntax->datum str)) - (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str))))])) + (map syntax->list (syntax->list (syntax ((strs ...) ...))))))] + #:unless (string? (syntax->datum str))) + (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str)))])) (define-syntax (-#%module-begin2 stx) (syntax-case stx () @@ -118,10 +118,10 @@ "expected type name specification" stx str-stx)) - (for ([name (in-list (syntax->list (syntax (name ...))))]) - (unless (identifier? name) - (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name))) + (for ([name (in-list (syntax->list (syntax (name ...))))] + #:unless (identifier? name)) + (raise-syntax-error 'tool-contract-language.rkt "expected identifier" stx name)) (for ([str (in-list (apply append - (map syntax->list (syntax->list (syntax ((strs ...) ...))))))]) - (unless (string? (syntax->datum str)) - (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str))))])) + (map syntax->list (syntax->list (syntax ((strs ...) ...))))))] + #:unless (string? (syntax->datum str))) + (raise-syntax-error 'tool-contract-language.rkt "expected docs string" stx str)))]))