Rackety

2012-03-05 08:12:02 -06:00 · 2012-03-05 08:12:02 -06:00 · 4a304643d3
commit 4a304643d3
parent b7caf411ae
18 changed files with 55 additions and 49 deletions
--- a/collects/redex/main.rkt
+++ b/collects/redex/main.rkt
@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (require "reduction-semantics.rkt"
         "gui.rkt"
         "pict.rkt")
--- a/collects/redex/private/arrow.rkt
+++ b/collects/redex/private/arrow.rkt
@ -1,13 +1,13 @@
-#lang scheme/base
+#lang racket/base
 (require texpict/mrpict
         racket/draw
-         scheme/class
-         scheme/contract)
+         racket/class
+         racket/contract)

 (provide/contract
 [make-arrow-pict
  (-> string?
-      (symbols 'curvy 'straight 'straight-double 'map)
+      (or/c 'curvy 'straight 'straight-double 'map)
      symbol?
      number?
      (-> pict?))])
--- a/collects/redex/private/core-layout.rkt
+++ b/collects/redex/private/core-layout.rkt
@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base

 (require "loc-wrapper.rkt"
         "matcher.rkt"
@ -7,14 +7,14 @@
         texpict/utils
         texpict/mrpict
        
-         scheme/match
+         racket/match
         racket/draw
-         scheme/class)
+         racket/class
+         
+         (for-syntax racket/base))

 (define pink-code-font 'modern)

-(require (for-syntax scheme/base))
-  
 (provide find-enclosing-loc-wrapper
         render-lw
         lw->pict
--- a/collects/redex/private/error.rkt
+++ b/collects/redex/private/error.rkt
@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
 (define-struct (exn:fail:redex exn:fail) ())
 (define (redex-error name fmt . args)
  (define suffix (apply format fmt args))
--- a/collects/redex/private/loc-wrapper-ct.rkt
+++ b/collects/redex/private/loc-wrapper-ct.rkt
@ -1,5 +1,5 @@
-#lang scheme/base
-(require (for-template scheme/base)
+#lang racket/base
+(require (for-template racket/base)
         (for-template "loc-wrapper-rt.rkt")
         "term-fn.rkt")
 (provide to-lw/proc to-lw/uq/proc)
--- a/collects/redex/private/loc-wrapper.rkt
+++ b/collects/redex/private/loc-wrapper.rkt
@ -1,7 +1,7 @@
-#lang scheme/base
+#lang racket/base

-(require scheme/contract
-         (for-syntax scheme/base)
+(require racket/contract
+         (for-syntax racket/base)
         (for-syntax "loc-wrapper-ct.rkt")
         "loc-wrapper-rt.rkt")

--- a/collects/redex/private/red-sem-macro-helpers.rkt
+++ b/collects/redex/private/red-sem-macro-helpers.rkt
@ -1,8 +1,8 @@
-#lang scheme/base
+#lang racket/base

 (provide extract-names)

-(require scheme/match)
+(require racket/match)

 (define (extract-names stx)
  (let ([dup-names
--- a/collects/redex/private/sexp-diffs.rkt
+++ b/collects/redex/private/sexp-diffs.rkt
@ -1,9 +1,9 @@
-#lang scheme/base
-(require scheme/gui/base
-         scheme/contract
+#lang racket/base
+(require racket/gui/base
+         racket/contract
         mrlib/graph
-         scheme/pretty
-         scheme/class
+         racket/pretty
+         racket/class
         framework
         "size-snip.rkt")

@ -101,7 +101,7 @@
    ((pretty-print-parameters)
     (λ ()
       (parameterize ([pretty-print-columns columns])
-         (pretty-print sexp (open-output-text-editor text)))))
+         (pretty-write sexp (open-output-text-editor text)))))
    (for-each 
     (λ (p) (send text highlight-range (car p) (cdr p) (send the-color-database find-color "NavajoWhite")))
     to-color)
@ -160,7 +160,7 @@
                           (flush-output port)
                           (set! to-color (cons (cons (car start) position) to-color))
                           (set! start (cdr start))))])
-         (pretty-print sexp counting-port))))
+         (pretty-write sexp counting-port))))
    to-color))

 ;; does a map-like operation, but if the list is dotted, flattens the results into an actual list.
--- a/collects/redex/private/size-snip.rkt
+++ b/collects/redex/private/size-snip.rkt
@ -1,8 +1,8 @@
-#lang scheme/base
-(require scheme/gui/base
-         scheme/class
+#lang racket/base
+(require racket/gui/base
+         racket/class
         framework
-         scheme/pretty
+         racket/pretty
         "matcher.rkt")

 (provide reflowing-snip<%>
@ -32,7 +32,7 @@
                 [pretty-print-print-hook default-pretty-printer-print-hook])
    ((pretty-print-parameters)
     (λ ()
-       (pretty-print v port)))))
+       (pretty-write v port)))))

 (define (default-pretty-printer-size-hook val display? op)
  (cond
--- a/collects/redex/private/term-fn.rkt
+++ b/collects/redex/private/term-fn.rkt
@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base

 (require (for-template racket/base "defined-checks.rkt"))
 (provide make-term-fn
--- a/collects/redex/private/term.rkt
+++ b/collects/redex/private/term.rkt
@ -1,6 +1,6 @@
-#lang scheme/base
+#lang racket/base

-(require (for-syntax scheme/base 
+(require (for-syntax racket/base 
                     "term-fn.rkt"
                     syntax/boundmap
                     syntax/parse
--- a/collects/redex/private/underscore-allowed.rkt
+++ b/collects/redex/private/underscore-allowed.rkt
@ -1,3 +1,3 @@
-#lang scheme/base
+#lang racket/base
 (provide underscore-allowed) 
 (define underscore-allowed '(any number string variable variable-not-otherwise-mentioned natural integer real))
--- a/collects/redex/reduction-semantics.rkt
+++ b/collects/redex/reduction-semantics.rkt
@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/contract)
+#lang racket/base
+(require racket/contract)

 (require "private/reduction-semantics.rkt"
         "private/judgment-form.rkt"
--- a/collects/redex/tests/bitmap-test-util.rkt
+++ b/collects/redex/tests/bitmap-test-util.rkt
@ -1,7 +1,10 @@
-#lang scheme/gui
+#lang racket/base
 (require framework
         slideshow/pict
         racket/runtime-path
+         racket/gui/base
+         (for-syntax racket/base)
+         racket/class
         "../pict.rkt"
         "../reduction-semantics.rkt")

--- a/collects/redex/tests/color-test.rkt
+++ b/collects/redex/tests/color-test.rkt
@ -1,3 +1,5 @@
+#lang racket/base
+
 #|

 tests the color setting ability during a reduction sequence.
@ -8,10 +10,10 @@ In the other window, you expect to see the currently unreducted terms in green a

 |#

-#lang scheme/gui
-
 (require "../reduction-semantics.rkt"
-         "../gui.rkt")
+         "../gui.rkt"
+         racket/gui/base
+         racket/class)

 (reduction-steps-cutoff 1)

--- a/collects/redex/tests/core-layout-test.rkt
+++ b/collects/redex/tests/core-layout-test.rkt
@ -1,10 +1,9 @@
-#lang scheme/base
+#lang racket/base

 (require "../private/core-layout.rkt"
         "../private/loc-wrapper.rkt"
         "lw-test-util.rkt"
-         "test-util.rkt"
-         mzlib/struct)
+         "test-util.rkt")

 (require texpict/mrpict mred/mred mzlib/class)
 (dc-for-text-size (make-object bitmap-dc% (make-object bitmap% 1 1)))
@ -30,7 +29,7 @@
      [(pair? x) (cons (loop (car x))
                       (loop (cdr x)))]
      [(pict-token? x)
-       (copy-struct pict-token x [pict-token-pict 'pict])]
+       (struct-copy pict-token x [pict 'pict])]
      [else x])))

 (test (replace-pict-tokens
--- a/collects/redex/tests/run-tests.rkt
+++ b/collects/redex/tests/run-tests.rkt
@ -1,9 +1,10 @@
+#lang racket/base
+
 ;; require this file to run all of the test suites for redex.

-#lang racket/base
-(require scheme/runtime-path
-         scheme/cmdline
-         scheme/match
+(require racket/runtime-path
+         racket/cmdline
+         racket/match
         "test-util.rkt")

 (define test-bitmaps? #t)
--- a/collects/redex/tests/stepper-test.rkt
+++ b/collects/redex/tests/stepper-test.rkt
@ -1,6 +1,7 @@
-#lang racket
+#lang racket/base

 (require framework
+         racket/class
         "test-util.rkt"
         "../reduction-semantics.rkt"
         "../private/stepper.rkt"