From b9cb7f31c927c77e4913d2349cdcbdabec5acba8 Mon Sep 17 00:00:00 2001
From: John Clements <clements@racket-lang.org>
Date: Sat, 2 Feb 2008 00:36:40 +0000
Subject: [PATCH] run-teaching-programs tweaks (no settings, contract changes)

svn: r8498
---
 collects/lang/htdp-langs.ss           | 11 +++++------
 collects/lang/run-teaching-program.ss | 10 ++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/collects/lang/htdp-langs.ss b/collects/lang/htdp-langs.ss
index 0431ed66c3..f10e0d0ca3 100644
--- a/collects/lang/htdp-langs.ss
+++ b/collects/lang/htdp-langs.ss
@@ -505,12 +505,11 @@
           (inherit get-reader set-printing-parameters)
           
           (define/override (front-end/complete-program port settings)
-            (run-teaching-program port 
-                                  settings 
-                                  (get-reader)
-                                  (get-module)
-                                  (htdp-lang-settings-teachpacks settings)
-                                  (drscheme:rep:current-rep)))
+            (expand-teaching-program port  
+                                     (get-reader)
+                                     (get-module)
+                                     (htdp-lang-settings-teachpacks settings)
+                                     (drscheme:rep:current-rep)))
 
           (define keywords #f)
           (define/augment (capability-value key)
diff --git a/collects/lang/run-teaching-program.ss b/collects/lang/run-teaching-program.ss
index 95e9165298..7cde884b5b 100644
--- a/collects/lang/run-teaching-program.ss
+++ b/collects/lang/run-teaching-program.ss
@@ -7,15 +7,14 @@
          scheme/contract)
 
 (provide/contract
- [run-teaching-program (-> input-port?
-                           any/c
+ [expand-teaching-program (-> input-port?
                            (-> any/c input-port? any/c)
                            any/c
                            (listof any/c)
-                           (object-contract [display-results/void (-> (listof any/c) any)])
+                           (or/c false/c (object-contract [display-results/void (-> (listof any/c) any)]))
                            any)])
 
-(define (run-teaching-program port settings reader language-module teachpacks rep)
+(define (expand-teaching-program port reader language-module teachpacks rep)
   (let ([state 'init]
         ;; state : 'init => 'require => 'done-or-exn
         
@@ -51,7 +50,6 @@
                     (error))))
               teachpacks)
              (rewrite-module
-              settings
               (expand
                (datum->syntax
                 #f
@@ -90,7 +88,7 @@
 
 ;; rewrite-module : settings syntax (is-a?/c interactions-text<%>) -> syntax
 ;; rewrites te module to print out results of non-definitions
-(define (rewrite-module settings stx rep)
+(define (rewrite-module stx rep)
   (syntax-case stx (module #%plain-module-begin)
     [(module name lang (#%plain-module-begin bodies ...))
      (with-syntax ([(rewritten-bodies ...)