mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-23 21:10:29 +02:00
Code Activity

tweaks to new repl

Browse source 
* module/system/repl/command.scm (read-command): Remove a pk.
* module/system/repl/repl.scm (run-repl): Export. Use % and abort to
  implement the prompt.
This commit is contained in:
Andy Wingo 2010-07-09 18:22:08 +02:00
parent 33df2ec719
commit 3ae78d95e6
2 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/system/repl/command.scm
View file

@ -128,7 +128,7 @@
(define (read-command repl) (define (read-command repl)
(catch #t (catch #t
(lambda () (read (pk (repl-inport repl)))) (lambda () (read (repl-inport repl)))
(lambda (key . args) (lambda (key . args)
(pmatch args (pmatch args
((,subr ,msg ,args . ,rest) ((,subr ,msg ,args . ,rest)

19
module/system/repl/repl.scm
View file

@ -28,7 +28,8 @@
#:use-module (system repl error-handling) #:use-module (system repl error-handling)
#:use-module (system repl common) #:use-module (system repl common)
#:use-module (system repl command) #:use-module (system repl command)
#:export (start-repl)) #:use-module (ice-9 control)
#:export (start-repl run-repl))
@ -89,11 +90,7 @@
(run-repl (make-repl lang debug))) (run-repl (make-repl lang debug)))
(define (run-repl repl) (define (run-repl repl)
(let ((tag (make-prompt-tag "repl "))) (% (with-fluids ((*repl-stack*
(call-with-prompt
tag
(lambda ()
(with-fluids ((*repl-stack*
(cons repl (or (fluid-ref *repl-stack*) '())))) (cons repl (or (fluid-ref *repl-stack*) '()))))
(if (null? (cdr (fluid-ref *repl-stack*))) (if (null? (cdr (fluid-ref *repl-stack*)))
(repl-welcome repl)) (repl-welcome repl))
@ -105,10 +102,10 @@
(catch 'quit (catch 'quit
(lambda () (meta-command repl)) (lambda () (meta-command repl))
(lambda (k . args) (lambda (k . args)
(abort-to-prompt tag args)))) (abort args))))
((eof-object? exp) ((eof-object? exp)
(newline) (newline)
(abort-to-prompt tag '())) (abort '()))
(else (else
;; since the input port is line-buffered, consume up to the ;; since the input port is line-buffered, consume up to the
;; newline ;; newline
@ -127,11 +124,11 @@
(repl-print repl v)) (repl-print repl v))
l)))) l))))
(lambda (k . args) (lambda (k . args)
(abort-to-prompt tag args))))))) (abort args)))))))
(next-char #f) ;; consume trailing whitespace (next-char #f) ;; consume trailing whitespace
(prompt-loop))))) (prompt-loop))))
(lambda (k status) (lambda (k status)
status)))) status)))
(define (next-char wait) (define (next-char wait)
(if (or wait (char-ready?)) (if (or wait (char-ready?))