From bd1a63a43ada5955257abf9d289318b7b235388a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 3 Dec 2012 22:43:14 -0700 Subject: [PATCH] racket/pretty: fix `print' mode for fxvectors and flvectors Closes PR 13340 --- collects/racket/pretty.rkt | 10 ++++++---- collects/tests/racket/pretty.rktl | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/collects/racket/pretty.rkt b/collects/racket/pretty.rkt index fbaccbfabf..ec60e02b78 100644 --- a/collects/racket/pretty.rkt +++ b/collects/racket/pretty.rkt @@ -1096,8 +1096,9 @@ (let ([vecl (flvector->repeatless-list obj)]) (if (and qd (zero? qd)) (pp-pair (cons (make-unquoted 'flvector) vecl) - pair? car cdr pair-open pair-close - qd) + extra depth + pair? car cdr pair-open pair-close + qd) (begin (out "#fl") (when print-vec-length? @@ -1109,8 +1110,9 @@ (let ([vecl (fxvector->repeatless-list obj)]) (if (and qd (zero? qd)) (pp-pair (cons (make-unquoted 'fxvector) vecl) - pair? car cdr pair-open pair-close - qd) + extra depth + pair? car cdr pair-open pair-close + qd) (begin (out "#fx") (when print-vec-length? diff --git a/collects/tests/racket/pretty.rktl b/collects/tests/racket/pretty.rktl index bb791c672a..475bd6d1d7 100644 --- a/collects/tests/racket/pretty.rktl +++ b/collects/tests/racket/pretty.rktl @@ -175,6 +175,11 @@ ")")) #f)) +(parameterize ([pretty-print-columns 20] + [print-as-expression #t]) + (test "(fxvector\n 1234567890\n 1\n 2\n 3\n 4)" pretty-format (fxvector 1234567890 1 2 3 4)) + (test "(flvector\n 1234567890.0\n 1.0\n 2.0\n 3.0\n 4.0)" pretty-format (flvector 1234567890.0 1.0 2.0 3.0 4.0))) + (parameterize ([pretty-print-exact-as-decimal #t]) (test "10" pretty-format 10) (test "0.5" pretty-format 1/2)