run-teaching-programs tweaks (no settings, contract changes)

svn: r8498
This commit is contained in:
John Clements 2008-02-02 00:36:40 +00:00
parent 1c2f1538b8
commit b9cb7f31c9
2 changed files with 9 additions and 12 deletions

View File

@ -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)

View File

@ -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 ...)