Skip to content

In stepper, respect the number-display format of the language. #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

In stepper, respect the number-display format of the language. #246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 44 additions & 31 deletions htdp-lib/stepper/private/mred-extensions.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
images/compile-time
string-constants
pict
simple-tree-text-markup/data
(for-syntax images/icons/control images/icons/style))

(provide
Expand Down Expand Up @@ -178,7 +179,16 @@
(inherit get-dc)

(define/private (format-sexp sexp)
(define text-port (open-output-text-editor this))
(define text-port
(open-output-text-editor this 'end
; need to handle number-markup
(lambda (x)
(if (number-markup? x)
(f:number-snip:number->string/snip (number-markup-number x)
#:exact-prefix (number-markup-exact-prefix x)
#:inexact-prefix (number-markup-inexact-prefix x)
#:fraction-view (number-markup-fraction-view x))
x))))

(parameterize
([pretty-print-show-inexactness show-inexactness?]
Expand All @@ -187,38 +197,37 @@

; the pretty-print-size-hook decides whether this object should be printed by the new pretty-print-hook
[pretty-print-size-hook
(lambda (value display? port)
(let ([looked-up (hash-ref highlight-table value (lambda () #f))])
(cond
[(is-a? value snip%)
;; Calculate the effective width of the snip, so that
;; too-long lines (as a result of large snips) are broken
;; correctly. When the snip is actusally inserted, its width
;; will be determined by `(send snip get-count)', but the number
;; returned here triggers line breaking in the pretty printer.
(let ([dc (get-dc)]
[wbox (box 0)])
(send value get-extent dc 0 0 wbox #f #f #f #f #f)
(let-values ([(xw dc dc2 dc3) (send dc get-text-extent "x")])
(max 1 (inexact->exact (ceiling (/ (unbox wbox) xw))))))]
[(and looked-up (not (eq? looked-up 'non-confusable)))
(string-length (format "~s" (car looked-up)))]
[else #f])))]
(let ([language-pretty-print-size-hook (pretty-print-size-hook)])
(lambda (value display? port)
(let ([looked-up (hash-ref highlight-table value (lambda () #f))])
(cond
[(is-a? value snip%)
;; Calculate the effective width of the snip, so that
;; too-long lines (as a result of large snips) are broken
;; correctly. When the snip is actusally inserted, its width
;; will be determined by `(send snip get-count)', but the number
;; returned here triggers line breaking in the pretty printer.
(let ([dc (get-dc)]
[wbox (box 0)])
(send value get-extent dc 0 0 wbox #f #f #f #f #f)
(let-values ([(xw dc dc2 dc3) (send dc get-text-extent "x")])
(max 1 (inexact->exact (ceiling (/ (unbox wbox) xw))))))]
[(and looked-up (not (eq? looked-up 'non-confusable)))
(language-pretty-print-size-hook (car looked-up) display? port)]
[else #f]))))]

[pretty-print-print-hook
; this print-hook is called for confusable highlights and for images.
(lambda (value display? port)
(let ([to-display (cond
[(hash-ref highlight-table value (lambda () #f)) => car]
[else value])])
(cond
[(is-a? to-display snip%)
(write-special (send to-display copy) port) (set-last-style)]
[else
;; there's already code somewhere else to handle this; this seems like a bit of a hack.
(when (and (number? to-display) (inexact? to-display) (pretty-print-show-inexactness))
(write-string "#i" port))
(write-string (format "~s" to-display) port)])))]
(let ([language-pretty-print-print-hook (pretty-print-print-hook)])
; this print-hook is called for confusable highlights and for images.
(lambda (value display? port)
(let ([to-display (cond
[(hash-ref highlight-table value (lambda () #f)) => car]
[else value])])
(cond
[(is-a? to-display snip%)
(write-special (send to-display copy) port) (set-last-style)]
[else
(language-pretty-print-print-hook to-display display? port)]))))]
[pretty-print-print-line
(lambda (number port old-length dest-columns)
(when (and number (not (eq? number 0)))
Expand Down Expand Up @@ -254,10 +263,14 @@
(select-all)
(clear)
(reset-style)
(define start (get-start-position))
(for ([exp stripped-exps] [i (in-naturals)])
(unless (= i 0)
(insert #\newline))
(format-sexp exp))
(define end (get-start-position))
(change-style (send (get-style-list) find-named-style "Standard")
start end)
(end-edit-sequence)
(lock #t))

Expand Down