mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

simplify top-repl

Browse source 
* module/ice-9/boot-9.scm (top-repl): Simplify.
This commit is contained in:
Andy Wingo 2010-06-22 23:29:43 +02:00
parent c592de96c0
commit 8fba85750d
1 changed files with 26 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

67
module/ice-9/boot-9.scm
View file

@ -3342,6 +3342,25 @@ module '(ice-9 q) '(make-q q-length))}."
(lambda (v) (fluid-set! using-readline? v))))) (lambda (v) (fluid-set! using-readline? v)))))
(define (top-repl) (define (top-repl)
(define (call-with-sigint thunk)
(if (not (provided? 'posix))
(thunk)
(let ((handler #f))
(dynamic-wind
(lambda ()
(set! handler
(sigaction SIGINT
(lambda (sig)
(scm-error 'signal #f "User interrupt" #f
(list sig))))))
thunk
(lambda ()
(if handler
;; restore Scheme handler, SIG_IGN or SIG_DFL.
(sigaction SIGINT (car handler) (cdr handler))
;; restore original C handler.
(sigaction SIGINT #f)))))))
(let ((guile-user-module (resolve-module '(guile-user)))) (let ((guile-user-module (resolve-module '(guile-user))))
;; Use some convenient modules (in reverse order) ;; Use some convenient modules (in reverse order)
@ -3361,51 +3380,17 @@ module '(ice-9 q) '(make-q q-length))}."
;; load debugger on demand ;; load debugger on demand
(module-autoload! guile-user-module '(system vm debug) '(debug)) (module-autoload! guile-user-module '(system vm debug) '(debug))
(let ((old-handlers #f) (let (;; We can't use @ here, as modules have been booted, but in Guile's
;; We can't use @ here, as modules have been booted, but in Guile's
;; build the srfi-1 helper lib hasn't been built yet, which will ;; build the srfi-1 helper lib hasn't been built yet, which will
;; result in an error when (system repl repl) is loaded at compile ;; result in an error when (system repl repl) is loaded at compile
;; time (to see if it is a macro or not). ;; time (to see if it is a macro or not).
(start-repl (module-ref (resolve-module '(system repl repl)) (start-repl (module-ref (resolve-module '(system repl repl))
'start-repl)) 'start-repl)))
(signals (if (provided? 'posix) (call-with-sigint
`((,SIGINT . "User interrupt")) (lambda ()
'()))) (let ((status (start-repl 'scheme)))
(run-hook exit-hook)
(dynamic-wind status))))))
;; call at entry
(lambda ()
(let ((make-handler (lambda (msg)
(lambda (sig)
(scm-error 'signal
#f
msg
#f
(list sig))))))
(set! old-handlers
(map (lambda (sig-msg)
(sigaction (car sig-msg)
(make-handler (cdr sig-msg))))
signals))))
;; the protected thunk.
(lambda ()
(let ((status (start-repl 'scheme)))
(run-hook exit-hook)
status))
;; call at exit.
(lambda ()
(map (lambda (sig-msg old-handler)
(if (not (car old-handler))
;; restore original C handler.
(sigaction (car sig-msg) #f)
;; restore Scheme handler, SIG_IGN or SIG_DFL.
(sigaction (car sig-msg)
(car old-handler)
(cdr old-handler))))
signals old-handlers))))))