Merge branch 'guile-meta' into meta-reconnection

1 files changed, 11 insertions, 6 deletions

diff --git a/scheme/guile/geiser/evaluation.scm b/scheme/guile/geiser/evaluation.scm
index 1cc21a7..ef082db 100644
--- a/scheme/guile/geiser/evaluation.scm
+++ b/scheme/guile/geiser/evaluation.scm
@@ -10,8 +10,8 @@
 ;; Start date: Mon Mar 02, 2009 02:46
 
 (define-module (geiser evaluation)
-  #:export (compile/warns
-            compile/no-warns
+  #:export (ge:compile
+            ge:eval
             ge:macroexpand
             ge:compile-file
             ge:load-file
@@ -71,10 +71,7 @@
                    (set! result (thunk)))))))
     (write-result result output)))
 
-(define (compile/no-warns form module)
-  (compile* form module '()))
-
-(define (compile/warns form module)
+(define (ge:compile form module)
   (compile* form module compile-opts))
 
 (define (compile* form module-name opts)
@@ -92,6 +89,14 @@
                  (lambda vs (map object->string vs))))))
     (call-with-result ev)))
 
+(define (ge:eval form module-name)
+  (let* ((module (or (find-module module-name) (current-module)))
+         (ev (lambda ()
+               (call-with-values
+                   (lambda () (eval form module))
+                 (lambda vs (map object->string vs))))))
+    (call-with-result ev)))
+
 (define (ge:compile-file path)
   (call-with-result
    (lambda ()