X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freader.lisp;h=b6f28cf3b081dc15e7b51972fcca50095754d8c8;hb=5da5805594423a2d2a841b88617fd2c87fc05750;hp=4eb34002ef67486f5f6044ad0c6083fa6766d867;hpb=8d04349cceb4eb25c8782b0c68ed5ffaa60f7d20;p=sbcl.git

diff --git a/src/code/reader.lisp b/src/code/reader.lisp
index 4eb3400..b6f28cf 100644
--- a/src/code/reader.lisp
+++ b/src/code/reader.lisp
@@ -525,16 +525,22 @@
 
 (defun read-comment (stream ignore)
   (declare (ignore ignore))
-  (let ((stream (in-synonym-of stream)))
-    (if (ansi-stream-p stream)
-	(prepare-for-fast-read-char stream
-	  (do ((char (fast-read-char nil nil)
-		     (fast-read-char nil nil)))
-	      ((or (not char) (char= char #\newline))
-	       (done-with-fast-read-char))))
-	;; CLOS stream
-	(do ((char (read-char stream nil :eof) (read-char stream nil :eof)))
-	    ((or (eq char :eof) (char= char #\newline))))))
+  (handler-bind
+      ((character-decoding-error
+	#'(lambda (decoding-error)
+	    (declare (ignorable decoding-error))
+	    (style-warn "Character decoding error in a ;-comment at position ~A reading source file ~A, resyncing." (file-position stream) stream)
+	    (invoke-restart 'attempt-resync))))
+    (let ((stream (in-synonym-of stream)))
+      (if (ansi-stream-p stream)
+	  (prepare-for-fast-read-char stream
+	   (do ((char (fast-read-char nil nil)
+		      (fast-read-char nil nil)))
+	       ((or (not char) (char= char #\newline))
+		(done-with-fast-read-char))))
+	  ;; CLOS stream
+	  (do ((char (read-char stream nil :eof) (read-char stream nil :eof)))
+	      ((or (eq char :eof) (char= char #\newline)))))))
   ;; Don't return anything.
   (values))
 
@@ -826,7 +832,7 @@
 	(#.+char-attr-single-escape+ (go SINGLE-ESCAPE))
 	(#.+char-attr-package-delimiter+ (go COLON))
 	(#.+char-attr-multiple-escape+ (go MULT-ESCAPE))
-	(#.+char-attr-invalid+ (%reader-error "invalid constituent"))
+	(#.+char-attr-invalid+ (%reader-error stream "invalid constituent"))
 	;; can't have eof, whitespace, or terminating macro as first char!
 	(t (go SYMBOL)))
      SIGN ; saw "sign"