Factor out loop and add "null hypothesis"

chapter6.3.ss

@@ -302,16 +302,10 @@
     (toplevel))
   (toplevel))
 
-;; For unattended execution. Read expressions from the current input
-;; port, and evaluate them until EOF is read.
-
-(define (eval-exprs)
+;; For the smoketest
+(define (eval-expr e)
   (set! *env* sr.init)
-  (let ((in (read)))
-    (if (not (eq? in #!eof))
-        (begin
-          (display ((meaning in r.init #t)))(newline)
-          (eval-exprs)))))
+  ((meaning e r.init #t)))
 
 (define-primitive '+ + 2)
 (define-primitive '- - 2)

chapter6.ss

@@ -561,12 +561,10 @@
     (toplevel))
   (toplevel))
 
-(define (eval-exprs)
-  (let ((in (read)))
-    (if (not (eq? in #!eof))
-        (begin
-          ((meaning in r.init) sr.init display)(newline)
-          (eval-exprs)))))
+;; For the smoketest
+(define (eval-expr e)
+  (call/cc (lambda (k)
+             ((meaning e r.init) sr.init k))))
 
 ;; Things to play with
 (define-primitive '+ + 2)

chapter7.ss

@@ -335,12 +335,8 @@
     (display (compile+run in))(newline)
     (repl)))
 
-(define (eval-exprs)
-  (let ((in (read)))
-    (if (not (eq? #!eof in))
-        (begin
-          (display (compile+run in))(newline)
-          (eval-exprs)))))
+;; For smoketest
+(define eval-expr compile+run)
 
 (define (define-primitive name underlying arity)
   (let ((arity+1 (+ arity 1)))

null-eval.scm

@@ -0,0 +1 @@
+(define eval-expr eval)

run-smoketest.scm

@@ -13,7 +13,15 @@
 ;; Actually, other than those imports, it's all R5RS I think.
 
 (define (main arguments)
+
   (load (cadr arguments))
+
   (with-input-from-port (open-input-file "test-exprs.scm")
-    eval-exprs)
+    (lambda ()
+      (define (eval-exprs)
+        (let ((in (read)))
+          (if (not (eq? #!eof in))
+              (begin (display (eval-expr in))(newline)
+                     (eval-exprs)))))
+      (eval-exprs)))
   0)