;;; Read-Eval-Print Loop
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
-;; This program 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 2, or (at your option)
-;; any later version.
+;; This library is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
;;
-;; This program is distributed in the hope that it will be useful,
+;; This library 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.
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;; Lesser General Public License for more details.
;;
-;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with this library; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
;;; Code:
(define-module (system repl repl)
- #:use-syntax (system base syntax)
+ #:use-module (system base syntax)
#:use-module (system base pmatch)
#:use-module (system base compile)
#:use-module (system base language)
#:use-module (system repl command)
#:use-module (system vm vm)
#:use-module (system vm debug)
- #:use-module (ice-9 rdelim)
#:export (start-repl call-with-backtrace))
(define meta-command-token (cons 'meta 'command))
-(define (meta-reader read)
+(define (meta-reader read env)
(lambda read-args
- (with-input-from-port
- (if (pair? read-args) (car read-args) (current-input-port))
- (lambda ()
- (if (eqv? (next-char #t) #\,)
- (begin (read-char) meta-command-token)
- (read))))))
+ (let ((port (if (pair? read-args) (car read-args) (current-input-port))))
+ (with-input-from-port port
+ (lambda ()
+ (let ((ch (next-char #t)))
+ (cond ((eof-object? ch)
+ ;; apparently sometimes even if this is eof, read will
+ ;; wait on somethingorother. strange.
+ ch)
+ ((eqv? ch #\,)
+ (read-char port)
+ meta-command-token)
+ (else (read port env)))))))))
;; repl-reader is a function defined in boot-9.scm, and is replaced by
;; something else if readline has been activated. much of this hoopla is
;; to be able to re-use the existing readline machinery.
(define (prompting-meta-read repl)
- (let ((prompt (lambda () (repl-prompt repl)))
- (lread (language-reader (repl-language repl))))
- (with-fluid* current-reader (meta-reader lread)
- (lambda () (repl-reader (lambda () (repl-prompt repl)))))))
-
-(define (default-pre-unwind-handler key . args)
- (save-stack default-pre-unwind-handler)
- (vm-save-stack (the-vm))
- (apply throw key args))
+ (repl-reader (lambda () (repl-prompt repl))
+ (meta-reader (language-reader (repl-language repl))
+ (current-module))))
(define (default-catch-handler . args)
(pmatch args
((quit . _)
(apply throw args))
- ((vm-error ,fun ,msg ,args)
- (vm-backtrace (the-vm))
- (display "\nVM error: \n")
- (apply format #t msg args)
- (newline))
((,key ,subr ,msg ,args . ,rest)
- (vm-backtrace (the-vm))
- (newline)
(let ((cep (current-error-port)))
(cond ((not (stack? (fluid-ref the-last-stack))))
((memq 'backtrace (debug-options-interface))
(define (call-with-backtrace thunk)
(catch #t
- thunk
+ (lambda () (%start-stack #t thunk))
default-catch-handler
default-pre-unwind-handler))
+(define-macro (with-backtrace form)
+ `(call-with-backtrace (lambda () ,form)))
+
(define (start-repl lang)
(let ((repl (make-repl lang))
(status #f))
(repl-welcome repl)
(let prompt-loop ()
- (let ((exp (call-with-backtrace
- (lambda () (prompting-meta-read repl)))))
+ (let ((exp (with-backtrace (prompting-meta-read repl))))
(cond
((eqv? exp (if #f #f))) ; read error, pass
((eq? exp meta-command-token)
- (call-with-backtrace
- (lambda ()
- (meta-command repl (read-line)))))
+ (with-backtrace (meta-command repl)))
((eof-object? exp)
(newline)
(set! status '()))
(else
- (call-with-backtrace
- (lambda ()
- (catch 'quit
- (lambda ()
- (call-with-values (lambda ()
- (run-hook before-eval-hook exp)
- (start-stack repl-eval
- (repl-eval repl exp)))
- (lambda l
- (for-each (lambda (v)
- (run-hook before-print-hook v)
- (repl-print repl v))
- l))))
- (lambda (k . args)
- (set! status args)))))))
+ ;; since the input port is line-buffered, consume up to the
+ ;; newline
+ (flush-to-newline)
+ (with-backtrace
+ (catch 'quit
+ (lambda ()
+ (call-with-values
+ (lambda ()
+ (run-hook before-eval-hook exp)
+ (start-stack #t
+ (repl-eval repl (repl-parse repl exp))))
+ (lambda l
+ (for-each (lambda (v)
+ (run-hook before-print-hook v)
+ (repl-print repl v))
+ l))))
+ (lambda (k . args)
+ (set! status args))))))
(or status
(begin
(next-char #f) ;; consume trailing whitespace
((char-whitespace? ch) (read-char) (next-char wait))
(else ch)))
#f))
+
+(define (flush-to-newline)
+ (if (char-ready?)
+ (let ((ch (peek-char)))
+ (if (and (not (eof-object? ch)) (char-whitespace? ch))
+ (begin
+ (read-char)
+ (if (not (char=? ch #\newline))
+ (flush-to-newline)))))))
+
+
\ No newline at end of file
HCoop / bpt / guile.git / blobdiff