Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drracket-core-lib/drracket/private/debug.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
[(null? (cdr planet-version))
(format "~s" `(,(car planet-version) ?))]
[else
(format "~s" `(,(car planet-version) ,(cadr planet-version)))]))
(format "~s" (list (car planet-version) (cadr planet-version)))]))
(cons 'description (exn->trace exn)))]
[else #f]))

Expand Down
3 changes: 1 addition & 2 deletions drracket-test/tests/drracket/example-tool.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
(define new-collection-root
#;
(string->path "C:\\tmp")
(make-temporary-file "drracket-test-example-tool~a"
'directory))
(make-temporary-directory "drracket-test-example-tool~a"))
(define coll (build-path new-collection-root "coll"))
(unless (directory-exists? coll) (make-directory coll))

Expand Down
21 changes: 13 additions & 8 deletions drracket-test/tests/drracket/language-test.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,7 @@ the settings above should match r5rs
(loop child))]
[(is-a? gui-thing radio-box%)
(k gui-thing)])))]))
(error 'find-output-radio-box "could not find `~a' radio box"
label)))
(raise-arguments-error 'find-output-radio-box "could not find `' radio box" "label" label)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change is incorrect.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I see that you have already done something about this, @jackfirth . But also, this isn't a problem with the arguments of the function.


(define re:out-of-sync
(regexp
Expand Down Expand Up @@ -1933,16 +1932,22 @@ the settings above should match r5rs
(define (test-undefined-var id #:icon+in? [icon+in? #f])
(test-expression
id
(string-append (if icon+in? "{stop-22x22.png} " "")
(format "~a: this variable is not defined" id)
(if icon+in? (format " in: ~a " id) ""))))
(format "~a~a: this variable is not defined~a"
(if icon+in? "{stop-22x22.png} " "")
id
(if icon+in?
(format " in: ~a " id)
""))))

(define (test-undefined-fn exp id #:icon+in? [icon+in? #f])
(test-expression
exp
(string-append (if icon+in? "{stop-22x22.png} " "")
(format "~a: this function is not defined" id)
(if icon+in? (format " in: ~a " id) ""))))
(format "~a~a: this function is not defined~a"
(if icon+in? "{stop-22x22.png} " "")
id
(if icon+in?
(format " in: ~a " id)
""))))

(define-syntax (go stx)
(syntax-case stx ()
Expand Down
12 changes: 5 additions & 7 deletions drracket-test/tests/drracket/no-write-and-frame-leak.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,11 @@ This test checks:
(process-container item)))))

(define (record-shortcut item)
(when (is-a? item selectable-menu-item<%>)
(when (send item get-shortcut)
(define k (append (sort (send item get-shortcut-prefix)
string<=?
#:key symbol->string)
(list (send item get-shortcut))))
(hash-update! shortcuts k (λ (v) (cons (send item get-label) v)) '()))))
(when (and (is-a? item selectable-menu-item<%>) (send item get-shortcut))
(define k
(append (sort (send item get-shortcut-prefix) string<=? #:key symbol->string)
(list (send item get-shortcut))))
(hash-update! shortcuts k (λ (v) (cons (send item get-label) v)) '())))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not digging this change; the and seems harder to read, as does new set of line breaks.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The line breaks are fmt's doing. As for the when merging, I think I'll try adjusting that rule to only fire if there's three or more nested when forms. That seems more likely to be an improvement when it applies.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've filed jackfirth/resyntax#639 to address this.

(define (get-lab item)
(cond
Expand Down
Loading