From 0646de84731d7b61a3c802259cdabf219c79fb83 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Wed, 5 Aug 2009 19:44:06 +0000
Subject: [PATCH] cleaned up a little bit, here and there

svn: r15675
---
 collects/2htdp/private/check-aux.ss | 6 ------
 collects/2htdp/private/syn-aux.ss   | 5 ++---
 collects/htdp/world.ss              | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/collects/2htdp/private/check-aux.ss b/collects/2htdp/private/check-aux.ss
index 2c7eef2163..c5eaf55ddf 100644
--- a/collects/2htdp/private/check-aux.ss
+++ b/collects/2htdp/private/check-aux.ss
@@ -185,12 +185,6 @@
 (define (image-pins i)
   (format "image with pinhole at (~s,~s)" (pinhole-x i) (pinhole-y i)))
 
-
-;; Symbol Any String -> Void
-(define (check-color tag width rank)
-  (check-arg tag (or (symbol? width) (string? width)) 
-             "color symbol or string" rank width))
-
 ;; Symbol (union Symbol String) Nat -> Void
 (define (check-mode tag s rank)
   (check-arg tag (or (eq? s 'solid)
diff --git a/collects/2htdp/private/syn-aux.ss b/collects/2htdp/private/syn-aux.ss
index 4ec77bc47d..177e5dcd55 100644
--- a/collects/2htdp/private/syn-aux.ss
+++ b/collects/2htdp/private/syn-aux.ss
@@ -1,9 +1,8 @@
 #lang scheme
 
-(provide define-keywords function-with-arity except err check-flat-spec
-         (all-from-out "syn-aux-aux.ss"))
+(provide define-keywords function-with-arity except err check-flat-spec)
 
-(require "syn-aux-aux.ss"
+(require 
  (for-template "syn-aux-aux.ss" 
                scheme
                (rename-in lang/prim (first-order->higher-order f2h))))
diff --git a/collects/htdp/world.ss b/collects/htdp/world.ss
index 1a1228484d..3af91a3140 100644
--- a/collects/htdp/world.ss
+++ b/collects/htdp/world.ss
@@ -186,7 +186,7 @@ Matthew
   (check-size/0 'nw:rectangle width "first")
   (check-size/0 'nw:rectangle height "second")
   (check-mode 'rectangle mode "third")
-  (check-color 'rectangle color "fourth")
+  (check-sym/string-color 'rectangle color "fourth")
   (put-pinhole (rectangle width height mode color) 0 0))
 
 (define (place-image image x y scene)
@@ -411,7 +411,7 @@ Matthew
 (define (scene? i) (and (= 0 (pinhole-x i)) (= 0 (pinhole-y i))))
 
 ;; Symbol Any String -> Void
-(define (check-color tag width rank)
+(define (check-sym/string-color tag width rank)
   (check-arg tag (or (symbol? width) (string? width)) 
              "color symbol or string" rank width))