X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcondition.lisp;h=a62586a19598c2d7bd11c306a08f77ced71ae4ff;hb=c960f8bc221ef4db0058013b8aa992d9b5a73fb7;hp=b082c575456d046e594ea224afe72120af00f102;hpb=68612b8227bdd1a9e70962201f54231c82affa17;p=sbcl.git

diff --git a/src/code/condition.lisp b/src/code/condition.lisp
index b082c57..a62586a 100644
--- a/src/code/condition.lisp
+++ b/src/code/condition.lisp
@@ -677,11 +677,28 @@
     :initform '()))
   (:report
    (lambda (condition stream)
-     (let ((error-stream (stream-error-stream condition)))
-       (format stream "READER-ERROR ~@[at ~W ~]on ~S:~%~?"
-	       (file-position error-stream) error-stream
-	       (reader-error-format-control condition)
-	       (reader-error-format-arguments condition))))))
+     (let* ((error-stream (stream-error-stream condition))
+	    (pos (file-position error-stream)))
+       (let (lineno colno)
+	 (when (and pos
+		    (< pos sb!xc:array-dimension-limit)
+		    (file-position error-stream :start))
+	   (let ((string
+		  (make-string pos
+			       :element-type (stream-element-type error-stream))))
+	     (when (= pos (read-sequence string error-stream))
+	       (setq lineno (1+ (count #\Newline string))
+		     colno (- pos
+			      (or (position #\Newline string :from-end t) -1)
+			      1))))
+	   (file-position error-stream pos))
+	 (format stream
+		 "READER-ERROR ~@[at ~W ~]~
+                  ~@[(line ~W~]~@[, column ~W) ~]~
+                  on ~S:~%~?"
+		 pos lineno colno error-stream
+		 (reader-error-format-control condition)
+		 (reader-error-format-arguments condition)))))))
 
 ;;;; various other (not specified by ANSI) CONDITIONs
 ;;;;