conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abort execution when an error occurred during running a file program

This commit is contained in:
Yuichi Nishiwaki 2014-08-03 14:38:38 +09:00
parent 9375aadf4b
commit e16de03b65
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
piclib/picrin/repl.scm
View File

@ -48,7 +48,7 @@
(else (else
(file->string (car args))))))) (file->string (car args)))))))
(define (main-loop in out) (define (main-loop in out on-err)
(display "> " out) (display "> " out)
(let ((expr (read in))) (let ((expr (read in)))
(if (eof-object? expr) (if (eof-object? expr)
@ -60,10 +60,12 @@
(lambda (condition) (lambda (condition)
(display (error-object-message condition) (current-error-port)) (display (error-object-message condition) (current-error-port))
(newline) (newline)
(leave)) (if on-err
(on-err)
(leave)))
(lambda () (lambda ()
(print (eval expr '(picrin user)) out))))) (print (eval expr '(picrin user)) out)))))
(main-loop in out))))) (main-loop in out on-err)))))
(define (run-repl program) (define (run-repl program)
(let ((in (if program (let ((in (if program
@ -71,8 +73,11 @@
(current-input-port))) (current-input-port)))
(out (if program (out (if program
(open-output-string) ; ignore output (open-output-string) ; ignore output
(current-output-port)))) (current-output-port)))
(main-loop in out))) (on-err (if program
(lambda () (exit 1))
#f)))
(main-loop in out on-err)))
(define (repl) (define (repl)
(let ((program (getopt))) (let ((program (getopt)))