From 622bec0719d67f7639cca08fcb407684efef2728 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sat, 10 Dec 2011 02:53:51 -0600
Subject: [PATCH] avoid (format "~s" x) in favor of (symbol->string x) for
 symbols when doing typesetting stuff in Redex, as the former seems to have
 some kind of context dependency that makes it insert ||s around some
 upper-case symbols sometimes

---
 collects/redex/private/core-layout.rkt    | 5 ++---
 collects/redex/private/loc-wrapper-rt.rkt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/collects/redex/private/core-layout.rkt b/collects/redex/private/core-layout.rkt
index 7afa950713..941e8f06bb 100644
--- a/collects/redex/private/core-layout.rkt
+++ b/collects/redex/private/core-layout.rkt
@@ -374,7 +374,7 @@
                      who
                      (length lst)
                      (apply string-append
-                            (format "~s" (car lst))
+                            (format "~s" fst)
                             (map (λ (x) (format " ~s" x)) (cdr lst)))))
             (values fst snd))
           (values fst (blank)))))
@@ -679,7 +679,6 @@
       [(pict-token? tok) (pict-token-pict tok)]
       [else (error 'token->pict "~s" tok)]))
   
-    
   (define (atom->tokens col span atom all-nts unquoted?)
     (cond
       [(pict? atom)
@@ -702,7 +701,7 @@
                     (make-pict-token (+ col span) 0 sub+sup)))])]
       [(or (memq atom all-nts)
            (memq atom '(number variable variable-except variable-not-otherwise-mentioned)))
-       (list (non-terminal->token col span (format "~s" atom)))]
+       (list (non-terminal->token col span (symbol->string atom)))]
       [(symbol? atom)
        (list (or (rewrite-atomic col span atom literal-style)
                  (make-string-token col span (symbol->string atom) (literal-style))))]
diff --git a/collects/redex/private/loc-wrapper-rt.rkt b/collects/redex/private/loc-wrapper-rt.rkt
index e3f285e9a9..caa33bea21 100644
--- a/collects/redex/private/loc-wrapper-rt.rkt
+++ b/collects/redex/private/loc-wrapper-rt.rkt
@@ -58,7 +58,7 @@
       [(string? e) 
        (values line col (+ col (string-length e)))]
       [(symbol? e)
-       (values line col (+ col (string-length (format "~s" e))))]
+       (values line col (+ col (string-length (symbol->string e))))]
       [(not e) (values line col col)]
       [else 
        (let loop ([lws e]