Skip to content
Snippets Groups Projects
Commit 9c3238e8 authored by ram's avatar ram
Browse files

Fixed error context stuff to know that the source-info-name for a file is now

the namestring and not the pathname.
parent 05e37fc5
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1util.lisp,v 1.49 1991/12/14 05:27:37 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/ir1util.lisp,v 1.50 1992/01/21 15:54:30 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -1438,7 +1438,8 @@ ...@@ -1438,7 +1438,8 @@
(context nil :type list) (context nil :type list)
;; ;;
;; The FILE-INFO-NAME for the relevant FILE-INFO. ;; The FILE-INFO-NAME for the relevant FILE-INFO.
(file-name (required-argument) :type (or pathname (member :lisp :stream))) (file-name (required-argument)
:type (or simple-string (member :lisp :stream)))
;; ;;
;; The file position at which the top-level form starts, if applicable. ;; The file position at which the top-level form starts, if applicable.
(file-position nil :type (or index null)) (file-position nil :type (or index null))
...@@ -1675,8 +1676,7 @@ ...@@ -1675,8 +1676,7 @@
(funcall *compiler-notification-function* severity (funcall *compiler-notification-function* severity
(format nil "~{~{~S~^ ~}~^ => ~}" (format nil "~{~{~S~^ ~}~^ => ~}"
(compiler-error-context-context context)) (compiler-error-context-context context))
(when (typep name 'pathname) (when (stringp name) name)
(namestring name))
(compiler-error-context-file-position context))) (compiler-error-context-file-position context)))
(funcall *compiler-notification-function* severity nil nil nil))) (funcall *compiler-notification-function* severity nil nil nil)))
(undefined-value)) (undefined-value))
...@@ -1727,10 +1727,10 @@ ...@@ -1727,10 +1727,10 @@
(unless (and last (unless (and last
(equal file (compiler-error-context-file-name last))) (equal file (compiler-error-context-file-name last)))
(when (typep file 'pathname) (when (stringp file)
(note-message-repeats) (note-message-repeats)
(setq last nil) (setq last nil)
(format stream "~2&File: ~A~%" (namestring file)))) (format stream "~2&File: ~A~%" file)))
(unless (and last (unless (and last
(equal in (compiler-error-context-context last))) (equal in (compiler-error-context-context last)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment