From ca867c2f73cca99fceecf949336f51f99fcb1a17 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Sun, 26 Apr 2009 15:08:16 +0200 Subject: PLT: evaluation functions moved to their own module. --- scheme/plt/geiser.ss | 39 +++------------------------- scheme/plt/geiser/eval.ss | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 35 deletions(-) create mode 100644 scheme/plt/geiser/eval.ss 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)")) diff --git a/scheme/plt/geiser/eval.ss b/scheme/plt/geiser/eval.ss new file mode 100644 index 0000000..8fa5b81 --- /dev/null +++ b/scheme/plt/geiser/eval.ss @@ -0,0 +1,65 @@ +;; eval.ss -- evaluation + +;; Copyright (C) 2009 Jose Antonio Ortega Ruiz + +;; Author: Jose Antonio Ortega Ruiz +;; Start date: Sun Apr 26, 2009 00:44 + +;; This file is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. + +;; This file is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Comentary: + +;; Evaluation functions + +;;; Code: + +#lang scheme + +(provide eval-in compile-in set-last-result) + +(require scheme/enter) + +(define last-result (void)) +(define nowhere (open-output-nowhere)) + +(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 (set-last-error e) + (set! last-result `((error (key . ,(exn-key e)) + (subr) + (msg . ,(exn-message e)))))) +(define (set-last-result v) + (set! last-result `((result ,v)))) + +(define (eval-in form spec) + (set-last-result (void)) + (with-handlers ((exn? set-last-error)) + (parameterize ((current-error-port nowhere)) + (eval #`(enter! #,(ensure-module spec)))) + ((dynamic-require '(lib "geiser/eval") + 'set-last-result) (eval form))) + (enter! #f) + last-result) + +(define compile-in eval-in) + +;;; eval.ss ends here -- cgit v1.2.3