From b840602d6c15c2c036cf7a9e3530109c860b3d1b Mon Sep 17 00:00:00 2001
From: Alex Shinn <ashinn@users.noreply.github.com>
Date: Mon, 1 Apr 2013 20:38:35 +0900
Subject: [PATCH] Guarding @import expressions from the repl.

---
 lib/chibi/repl.scm | 57 +++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/lib/chibi/repl.scm b/lib/chibi/repl.scm
index 5d625a8f..1f994966 100644
--- a/lib/chibi/repl.scm
+++ b/lib/chibi/repl.scm
@@ -195,18 +195,23 @@
                               (mod+imps (eval `(resolve-import ',mod-name)
                                               meta-env)))
                          (if (pair? mod+imps)
-                             (let ((env (if (eq? op 'import-only)
-                                            (let ((env (make-environment)))
-                                              (interaction-environment env)
-                                              env)
-                                            env))
-                                   (imp-env
-                                    (vector-ref
-                                     (eval `(load-module ',(car mod+imps))
-                                           meta-env)
-                                     1)))
-                               (%import env imp-env (cdr mod+imps) #f)
-                               (continue module env meta-env))
+                             (guard
+                                 (exn
+                                  (else
+                                   (print-exception exn (current-error-port))
+                                   (fail "error loading module:" mod-name)))
+                               (let ((env (if (eq? op 'import-only)
+                                              (let ((env (make-environment)))
+                                                (interaction-environment env)
+                                                env)
+                                              env))
+                                     (imp-env
+                                      (vector-ref
+                                       (eval `(load-module ',(car mod+imps))
+                                             meta-env)
+                                       1)))
+                                 (%import env imp-env (cdr mod+imps) #f)
+                                 (continue module env meta-env)))
                              (fail "couldn't find module:" mod-name))))
                       ((in)
                        (let ((name (read/ss in)))
@@ -269,20 +274,20 @@
                            (for-each
                             (lambda (expr)
                               (call-with-values
-                               (lambda ()
-                                 (eval (list 'begin expr) env))
-                               (lambda res-list
-                                 (cond
-                                  ((not (or (null? res-list)
-                                            (equal? res-list
-                                                    (list (if #f #f)))))
-                                   (write/ss (car res-list) out)
-                                   (for-each
-                                    (lambda (res)
-                                      (write-char #\space out)
-                                      (write/ss res out))
-                                    (cdr res-list))
-                                   (newline out))))))
+                                  (lambda ()
+                                    (eval (list 'begin expr) env))
+                                (lambda res-list
+                                  (cond
+                                   ((not (or (null? res-list)
+                                             (equal? res-list
+                                                     (list (if #f #f)))))
+                                    (write/ss (car res-list) out)
+                                    (for-each
+                                     (lambda (res)
+                                       (write-char #\space out)
+                                       (write/ss res out))
+                                     (cdr res-list))
+                                    (newline out))))))
                             expr-list))))))
                 ;; If an interrupt occurs while the child thread is
                 ;; still running, terminate it, otherwise wait for it