From 94e4276d60f202ef2dd2078900ac08f745b4079d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Axel=20S=C3=B8gaard?= <jensaxel@soegaard.net>
Date: Sun, 1 Jul 2012 22:45:19 +0200
Subject: [PATCH] REPL now displays output in infix.

---
 bracket/runtime-config.rkt | 14 ++++++++++++--
 bracket/unparse.rkt        | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/bracket/runtime-config.rkt b/bracket/runtime-config.rkt
index caea0f849..48e3e9662 100644
--- a/bracket/runtime-config.rkt
+++ b/bracket/runtime-config.rkt
@@ -1,7 +1,13 @@
 #lang racket
 (provide configure)
 
-(require bracket/lang/reader)
+;;;
+;;; This file configures the repl in DrRacket/racket,
+;;; when the bracket language is used.
+;;;
+
+(require bracket/lang/reader 
+         bracket/unparse)
  
 (define (configure data)
   (current-read-interaction read0)
@@ -10,8 +16,12 @@
                     (define val (old-eval form))
                     (displayln (list 'eval-result: val))
                     val))
-  #;(define old-print (current-print))
+  (define old-print (current-print))
   #;(current-print (λ (val) (displayln (list 'print: val)) (old-print val)))
+  (current-print 
+   (λ (val) 
+     (unless (void? val)
+       (displayln (unparse val)))))
   )
 
 
diff --git a/bracket/unparse.rkt b/bracket/unparse.rkt
index 9f441ce22..4b1ea5e38 100644
--- a/bracket/unparse.rkt
+++ b/bracket/unparse.rkt
@@ -31,11 +31,13 @@
 
 (define (unparse-sum form [first? #t] [level-below-times? #f])
   (case (operator form)
-    [(Plus) 
-     (string-append* 
-      (maybe-add-between 
-       (map unparse-product (operands form))
-       "+" #\-))]
+    [(Plus)
+     (define ops (operands form))
+     (define unwrapped
+       (string-append* 
+        (maybe-add-between (map unparse-product ops) "+" #\-)))
+     (wrap-if (and level-below-times? (>= (length ops) 2))
+              unwrapped)]
     [else
      (unparse-product form first? level-below-times?)]))
 
@@ -81,7 +83,9 @@
      (format "(~a)" (unparse-sum form #t))]
     [(times-expression? form)
      (format "(~a)" (unparse-product form #t))]
-    [else (error 'unparse-factor "Internal Bracket Error, got " form)]))
+    [else
+     ; pass value unchanged: stuff like #void, #eof, special values etc.
+     form]))
 
 (define (unparse-power form)
   (case (operator form)
@@ -134,6 +138,8 @@
   ; Powers of products
   (check-equal? (unparse '(Power (Times x y) 3)) "(x*y)^3")
   (check-equal? (unparse '(Power (Times x y) 3)) "(x*y)^3")
+  ; Powers of sums
+  (check-equal? (unparse '(Power (Plus x 3) 7)) "(x+3)^7")
   ; Sums of products
   (check-equal? (unparse '(Plus  2 (Times 3 x)  (Times  4 y)))  "2+3*x+4*y")
   (check-equal? (unparse '(Plus  2 (Times 3 x)  (Times -4 y)))  "2+3*x-4*y")