summaryrefslogtreecommitdiff
path: root/scheme/plt/geiser/eval.ss
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2009-05-03 03:19:43 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2009-05-03 03:19:43 +0200
commit78152318f5e6fb8ad315bd72a8b9257ec4b91b4b (patch)
treefbbdd862ce8001c4332b2390292d51d86cd75060 /scheme/plt/geiser/eval.ss
parent8d4246f0b5cf3cfbe3a0cc3a9526d370ea9c26e1 (diff)
downloadgeiser-chez-78152318f5e6fb8ad315bd72a8b9257ec4b91b4b.tar.gz
geiser-chez-78152318f5e6fb8ad315bd72a8b9257ec4b91b4b.tar.bz2
Hopefully harmless refactoring.
Diffstat (limited to 'scheme/plt/geiser/eval.ss')
-rw-r--r--scheme/plt/geiser/eval.ss22
1 files changed, 5 insertions, 17 deletions
diff --git a/scheme/plt/geiser/eval.ss b/scheme/plt/geiser/eval.ss
index 090b517..9c6534e 100644
--- a/scheme/plt/geiser/eval.ss
+++ b/scheme/plt/geiser/eval.ss
@@ -33,7 +33,7 @@
macroexpand
make-repl-reader)
-(require scheme/enter srfi/13)
+(require scheme/enter geiser/utils)
(define last-result (void))
(define nowhere (open-output-nowhere))
@@ -66,21 +66,8 @@
(and (resolved-module-path? rmp)
(resolved-module-path-name rmp))))
-(define (namespace->module-name ns)
- (let ((path (namespace->module-path-name ns)))
- (if (not path)
- "<top>"
- (let* ((path (path->string path))
- (cpaths (map path->string (current-library-collection-paths)))
- (prefix-len (lambda (p)
- (let ((pl (string-length p)))
- (if (= pl (string-prefix-length p path)) pl 0))))
- (lens (map prefix-len cpaths))
- (real-path (substring path (apply max lens))))
- (if (absolute-path? real-path)
- (call-with-values (lambda () (split-path path))
- (lambda (_ basename __) basename))
- (regexp-replace "\\.[^./]*$" real-path ""))))))
+(define namespace->module-name
+ (compose module-path-name->name namespace->module-path-name))
(define last-namespace (make-parameter (current-namespace)))
@@ -111,7 +98,8 @@
(set-last-result
(string-append (with-output-to-string
(lambda ()
- (load-module (ensure-spec file) (current-output-port))))
+ (load-module (ensure-spec file)
+ (current-output-port))))
"done."))
(load-module (and (path? current-path)
(ensure-spec (path->string current-path))))))