From d49aeecd8a09654cc0986361b1c2412ea55df526 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Tue, 6 Nov 2012 12:35:04 -0500 Subject: [PATCH] Switch the teachpack wrappers to `racket/base'. (I think that the change to `teachpack/htdp/dir' is fine too, looks like the previous code is dealing with the old restriction of not requiring a binding that conflicts with the language bindings.) --- collects/teachpack/htdp/arrow-gui.ss | 6 +++--- collects/teachpack/htdp/arrow.ss | 6 +++--- collects/teachpack/htdp/convert.ss | 5 ++--- collects/teachpack/htdp/dir.ss | 8 +++----- collects/teachpack/htdp/docs.ss | 6 +++--- collects/teachpack/htdp/draw.ss | 6 +++--- collects/teachpack/htdp/elevator.ss | 6 +++--- collects/teachpack/htdp/graphing.ss | 6 +++--- collects/teachpack/htdp/guess-gui.ss | 6 +++--- collects/teachpack/htdp/guess.ss | 6 +++--- collects/teachpack/htdp/gui.ss | 6 +++--- collects/teachpack/htdp/hangman.ss | 6 +++--- collects/teachpack/htdp/image.ss | 7 +++---- collects/teachpack/htdp/lkup-gui.ss | 6 +++--- collects/teachpack/htdp/master.ss | 6 +++--- collects/teachpack/htdp/matrix.ss | 6 +++--- collects/teachpack/htdp/servlet.ss | 6 +++--- collects/teachpack/htdp/servlet2.ss | 6 +++--- collects/teachpack/htdp/show-queen.ss | 6 +++--- collects/teachpack/htdp/testing.ss | 2 +- collects/teachpack/htdp/world.ss | 6 +++--- 21 files changed, 60 insertions(+), 64 deletions(-) diff --git a/collects/teachpack/htdp/arrow-gui.ss b/collects/teachpack/htdp/arrow-gui.ss index 1c40e37965..09de6dab6a 100644 --- a/collects/teachpack/htdp/arrow-gui.ss +++ b/collects/teachpack/htdp/arrow-gui.ss @@ -1,3 +1,3 @@ -#cs(module arrow-gui mzscheme - (require htdp/arrow-gui) - (provide (all-from htdp/arrow-gui))) +#lang racket/base +(require htdp/arrow-gui) +(provide (all-from-out htdp/arrow-gui)) diff --git a/collects/teachpack/htdp/arrow.ss b/collects/teachpack/htdp/arrow.ss index 1eab296882..e51265ad39 100644 --- a/collects/teachpack/htdp/arrow.ss +++ b/collects/teachpack/htdp/arrow.ss @@ -1,3 +1,3 @@ -#cs(module arrow mzscheme - (require htdp/arrow) - (provide (all-from htdp/arrow))) +#lang racket/base +(require htdp/arrow) +(provide (all-from-out htdp/arrow)) diff --git a/collects/teachpack/htdp/convert.ss b/collects/teachpack/htdp/convert.ss index 823aa27faa..f33b1fa1b0 100644 --- a/collects/teachpack/htdp/convert.ss +++ b/collects/teachpack/htdp/convert.ss @@ -1,4 +1,3 @@ -#lang mzscheme - +#lang racket/base (require htdp/convert) -(provide (all-from htdp/convert)) +(provide (all-from-out htdp/convert)) diff --git a/collects/teachpack/htdp/dir.ss b/collects/teachpack/htdp/dir.ss index 2dd01be54c..b1692a054a 100644 --- a/collects/teachpack/htdp/dir.ss +++ b/collects/teachpack/htdp/dir.ss @@ -1,5 +1,3 @@ -#cs(module dir mzscheme - (require (all-except htdp/dir file-size) - (rename htdp/dir file--size file-size)) - (provide (rename file--size file-size) - (all-from-except htdp/dir file--size))) +#lang racket/base +(require htdp/dir) +(provide (all-from-out htdp/dir)) diff --git a/collects/teachpack/htdp/docs.ss b/collects/teachpack/htdp/docs.ss index 90d337f7b4..1cf2d59c00 100644 --- a/collects/teachpack/htdp/docs.ss +++ b/collects/teachpack/htdp/docs.ss @@ -1,3 +1,3 @@ -#cs(module docs mzscheme - (require htdp/docs) - (provide (all-from htdp/docs))) +#lang racket/base +(require htdp/docs) +(provide (all-from-out htdp/docs)) diff --git a/collects/teachpack/htdp/draw.ss b/collects/teachpack/htdp/draw.ss index 332516c0cf..119e2b196c 100644 --- a/collects/teachpack/htdp/draw.ss +++ b/collects/teachpack/htdp/draw.ss @@ -1,3 +1,3 @@ -#cs(module draw mzscheme - (require htdp/draw) - (provide (all-from htdp/draw))) +#lang racket/base +(require htdp/draw) +(provide (all-from-out htdp/draw)) diff --git a/collects/teachpack/htdp/elevator.ss b/collects/teachpack/htdp/elevator.ss index cfa84005c8..2612f8edaf 100644 --- a/collects/teachpack/htdp/elevator.ss +++ b/collects/teachpack/htdp/elevator.ss @@ -1,3 +1,3 @@ -#cs(module elevator mzscheme - (require htdp/elevator) - (provide (all-from htdp/elevator))) +#lang racket/base +(require htdp/elevator) +(provide (all-from-out htdp/elevator)) diff --git a/collects/teachpack/htdp/graphing.ss b/collects/teachpack/htdp/graphing.ss index a089e85fea..cab3946130 100644 --- a/collects/teachpack/htdp/graphing.ss +++ b/collects/teachpack/htdp/graphing.ss @@ -1,3 +1,3 @@ -#cs(module graphing mzscheme - (require htdp/graphing) - (provide (all-from htdp/graphing))) +#lang racket/base +(require htdp/graphing) +(provide (all-from-out htdp/graphing)) diff --git a/collects/teachpack/htdp/guess-gui.ss b/collects/teachpack/htdp/guess-gui.ss index f640a330bf..57381b3ec8 100644 --- a/collects/teachpack/htdp/guess-gui.ss +++ b/collects/teachpack/htdp/guess-gui.ss @@ -1,3 +1,3 @@ -#cs(module guess-gui mzscheme - (require htdp/guess-gui) - (provide (all-from htdp/guess-gui))) +#lang racket/base +(require htdp/guess-gui) +(provide (all-from-out htdp/guess-gui)) diff --git a/collects/teachpack/htdp/guess.ss b/collects/teachpack/htdp/guess.ss index f9e7eeab09..044036bb0b 100644 --- a/collects/teachpack/htdp/guess.ss +++ b/collects/teachpack/htdp/guess.ss @@ -1,3 +1,3 @@ -#cs(module guess mzscheme - (require htdp/guess) - (provide (all-from htdp/guess))) +#lang racket/base +(require htdp/guess) +(provide (all-from-out htdp/guess)) diff --git a/collects/teachpack/htdp/gui.ss b/collects/teachpack/htdp/gui.ss index 4243105307..9dd92acf47 100644 --- a/collects/teachpack/htdp/gui.ss +++ b/collects/teachpack/htdp/gui.ss @@ -1,3 +1,3 @@ -#cs(module gui mzscheme - (require htdp/gui) - (provide (all-from htdp/gui))) +#lang racket/base +(require htdp/gui) +(provide (all-from-out htdp/gui)) diff --git a/collects/teachpack/htdp/hangman.ss b/collects/teachpack/htdp/hangman.ss index 5c7a1152e8..4778215296 100644 --- a/collects/teachpack/htdp/hangman.ss +++ b/collects/teachpack/htdp/hangman.ss @@ -1,3 +1,3 @@ -#cs(module hangman mzscheme - (provide (all-from htdp/hangman)) - (require htdp/hangman)) +#lang racket/base +(require htdp/hangman) +(provide (all-from-out htdp/hangman)) diff --git a/collects/teachpack/htdp/image.ss b/collects/teachpack/htdp/image.ss index 693d8fb533..953bb5176f 100644 --- a/collects/teachpack/htdp/image.ss +++ b/collects/teachpack/htdp/image.ss @@ -1,4 +1,3 @@ -(module image mzscheme - (require htdp/image lang/prim) - (provide (all-from htdp/image)) -) +#lang racket/base +(require htdp/image lang/prim) +(provide (all-from-out htdp/image)) diff --git a/collects/teachpack/htdp/lkup-gui.ss b/collects/teachpack/htdp/lkup-gui.ss index 8750cb48b8..253057829d 100644 --- a/collects/teachpack/htdp/lkup-gui.ss +++ b/collects/teachpack/htdp/lkup-gui.ss @@ -1,3 +1,3 @@ -#cs(module lkup-gui mzscheme - (require htdp/lkup-gui) - (provide (all-from htdp/lkup-gui))) +#lang racket/base +(require htdp/lkup-gui) +(provide (all-from-out htdp/lkup-gui)) diff --git a/collects/teachpack/htdp/master.ss b/collects/teachpack/htdp/master.ss index 94a3794737..1ea865bc88 100644 --- a/collects/teachpack/htdp/master.ss +++ b/collects/teachpack/htdp/master.ss @@ -1,3 +1,3 @@ -#cs(module master mzscheme - (require htdp/master) - (provide (all-from htdp/master))) +#lang racket/base +(require htdp/master) +(provide (all-from-out htdp/master)) diff --git a/collects/teachpack/htdp/matrix.ss b/collects/teachpack/htdp/matrix.ss index 16f7a3fe35..d42b89c16c 100644 --- a/collects/teachpack/htdp/matrix.ss +++ b/collects/teachpack/htdp/matrix.ss @@ -1,3 +1,3 @@ -(module matrix mzscheme - (provide (all-from htdp/matrix)) - (require htdp/matrix)) +#lang racket/base +(require htdp/matrix) +(provide (all-from-out htdp/matrix)) diff --git a/collects/teachpack/htdp/servlet.ss b/collects/teachpack/htdp/servlet.ss index cafb93e107..6188e54a9c 100644 --- a/collects/teachpack/htdp/servlet.ss +++ b/collects/teachpack/htdp/servlet.ss @@ -1,3 +1,3 @@ -#cs(module servlet mzscheme - (require htdp/servlet) - (provide (all-from htdp/servlet))) +#lang racket/base +(require htdp/servlet) +(provide (all-from-out htdp/servlet)) diff --git a/collects/teachpack/htdp/servlet2.ss b/collects/teachpack/htdp/servlet2.ss index a2b52f62f9..6eac6a0dc3 100644 --- a/collects/teachpack/htdp/servlet2.ss +++ b/collects/teachpack/htdp/servlet2.ss @@ -1,3 +1,3 @@ -#cs(module servlet2 mzscheme - (require htdp/servlet2) - (provide (all-from htdp/servlet2))) +#lang racket/base +(require htdp/servlet2) +(provide (all-from-out htdp/servlet2)) diff --git a/collects/teachpack/htdp/show-queen.ss b/collects/teachpack/htdp/show-queen.ss index b0c4f8396a..418d2f03ec 100644 --- a/collects/teachpack/htdp/show-queen.ss +++ b/collects/teachpack/htdp/show-queen.ss @@ -1,3 +1,3 @@ -(module show-queen mzscheme - (require htdp/show-queen) - (provide (all-from htdp/show-queen))) +#lang racket/base +(require htdp/show-queen) +(provide (all-from-out htdp/show-queen)) diff --git a/collects/teachpack/htdp/testing.ss b/collects/teachpack/htdp/testing.ss index 3739d03b18..458ce81eee 100644 --- a/collects/teachpack/htdp/testing.ss +++ b/collects/teachpack/htdp/testing.ss @@ -1,3 +1,3 @@ -#lang racket +#lang racket/base (require htdp/testing) (provide (all-from-out htdp/testing)) diff --git a/collects/teachpack/htdp/world.ss b/collects/teachpack/htdp/world.ss index 72004ab270..e465521f08 100644 --- a/collects/teachpack/htdp/world.ss +++ b/collects/teachpack/htdp/world.ss @@ -1,3 +1,3 @@ -(module world mzscheme - (provide (all-from htdp/world)) - (require htdp/world)) +#lang racket/base +(require htdp/world) +(provide (all-from-out htdp/world))