convert picts from rewriters into rhombus picts

Author: rfindler

redex-pict-lib/redex/private/core-layout.rkt

@@ -610,7 +610,7 @@
 
   ;; split-out : number pict (listof line) -> (listof line)
   (define (split-out col pict lines)
-    (let ([new-token (make-pict-token col 0 pict)])
+    (let ([new-token (make-pict-token col 0 (pict-convertible->pict pict))])
       (let loop ([lines lines])
         (cond
           [(null? lines)
@@ -768,7 +768,7 @@
   (define (atom->tokens col span atom all-nts unquoted?)
     (cond
       [(pict-convertible? atom)
-       (list (make-pict-token col span atom))]
+       (list (make-pict-token col span (pict-convertible->pict atom)))]
       [unquoted?
        (list (make-pict-token col span 
                               (pink-background 
@@ -828,7 +828,7 @@
     (define str/pict/sym (apply-atomic-rewrite e))
     (cond
      [(string? str/pict/sym) (make-string-token col span str/pict/sym (get-style))]
-     [(pict-convertible? str/pict/sym) (make-pict-token col span str/pict/sym)]
+     [(pict-convertible? str/pict/sym) (make-pict-token col span (pict-convertible->pict str/pict/sym))]
      [(symbol? str/pict/sym) #f]))
 
 (define (parse-subscript after-underscore)

redex-pict-lib/redex/private/pict-interface.rkt

@@ -1,8 +1,17 @@
 #lang racket
+#|
+
+This file exports functions that have the same interface as the functions
+in racket's pict library but, if rhombus is available, actually build
+rhombus picts. No other file in redex should depend on the racket
+pict library.
+
+|#
+
 (require (for-syntax syntax/parse racket/syntax)
          (only-in pict/convert pict-convertible?)
          (prefix-in p: pict)
-         pict)
+         pict/convert)
 
 (define-syntax (define-rhombus stx)
   (syntax-parse stx
@@ -50,6 +59,19 @@
 (define (to-rhm-pict p)
   (choose p (r:from_handle p)))
 
+;; we need this function to make sure that, when we're in rhombus mode
+;; we actually work only with rhombus picts, as rhombus pict functions
+;; don't implicitly do pict-convertible conversion
+(provide pict-convertible->pict)
+(define (pict-convertible->pict p)
+  (choose
+   (pict-convert p)
+   (cond
+     [(p:pict? p)
+      (to-rhm-pict p)]
+     [(pict-convertible? p)
+      (to-rhm-pict (pict-convert p))])))
+
 (provide dc
          blank
          text