1 files changed, 4 insertions, 35 deletions
diff --git a/scheme/plt/geiser.ss b/scheme/plt/geiser.ss
index 59b49f0..acdb75b 100644
--- a/scheme/plt/geiser.ss
+++ b/scheme/plt/geiser.ss
@@ -28,44 +28,13 @@
   (provide geiser/eval
            geiser/compile
            geiser/autodoc
-           geiser/format-error
-           geiser/set-result!
            geiser/make-repl-reader)
 
   (compile-enforce-module-constants #f)
-  (require scheme/enter scheme/string scheme/port)
-
-  (define (ensure-module spec)
-    (cond ((symbol? spec) spec)
-          ((not (string? spec)) #f)
-          ((not (file-exists? spec)) #f)
-          ((absolute-path? spec) `(file ,spec))
-          (else spec)))
-
-  (define (exn-key e)
-    (vector-ref (struct->vector e) 0))
-
-  (define last-result (void))
-
-  (define (geiser/format-error e)
-    (set! last-result `((error (key . ,(exn-key e))
-                               (subr)
-                               (msg . ,(exn-message e))))))
-  (define (geiser/set-result! v)
-    (set! last-result `((result  ,v))))
-
-  (define nowhere (open-output-nowhere))
-
-  (define (geiser/eval form spec)
-    (geiser/set-result! (void))
-    (with-handlers ((exn? geiser/format-error))
-      (parameterize ((current-error-port nowhere))
-        (eval #`(enter! #,(ensure-module spec))))
-      ((dynamic-require ''geiser 'geiser/set-result!) (eval form)))
-    (enter! #f)
-    last-result)
-
-  (define geiser/compile geiser/eval)
+  (require (lib "geiser/eval"))
+
+  (define geiser/eval eval-in)
+  (define geiser/compile compile-in)
   (define (geiser/autodoc . x) #f)
 
   (define prompt (make-parameter "mzscheme@(geiser)"))