File tree 3 files changed +17
-3
lines changed
3 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -947,9 +947,11 @@ Compare the symbol against previous definitions of symbols - if there is a misma
947
947
(defmethod interpret-tag ((tag tags :symbol-tag) state)
948
948
(let* ((c++-name (or (tags :c++-name% tag) (tags :lisp-name% tag)))
949
949
(namespace (or (tags :namespace% tag)
950
- (tags :namespace%
951
- (gethash (tags :package% tag)
952
- (state-package-to-assoc state)))))
950
+ (tags :namespace%
951
+ (let ((nst (gethash (tags :package% tag) (state-package-to-assoc state))))
952
+ (unless nst
953
+ (error " Couldn't find state-package-to-assoc for tag: ~s - did you use a wrong package name like KwPkg?????" tag))
954
+ nst))))
953
955
(package (or (tags :package% tag)
954
956
(tags :package%
955
957
(gethash (tags :namespace% tag)
Original file line number Diff line number Diff line change @@ -61,4 +61,6 @@ Read a list of tags from the sif file."
61
61
(with-open-file (stream sif-pathname :direction :input :external-format :utf-8 )
62
62
(loop for tag = (read stream nil stream )
63
63
until (eq tag stream )
64
+ unless tag
65
+ do (error " Encountered a NIL tag in ~s " sif-pathname)
64
66
collect tag))))
Original file line number Diff line number Diff line change 180
180
(c++-name% :initform nil :initarg :c++-name% :reader tags :c++-name%)
181
181
(lisp-name% :initarg :lisp-name% :reader tags :lisp-name%)))
182
182
183
+ (defmethod print-object ((tag tags :symbol-tag) stream )
184
+ (print-unreadable-object (tag stream :type t )
185
+ (format stream " :namespace% ~s :package% ~s :c++-name% ~s :lisp-name% ~s :file ~s :line ~s "
186
+ (tags :namespace% tag)
187
+ (tags :package% tag)
188
+ (tags :c++-name% tag)
189
+ (tags :lisp-name% tag)
190
+ (tags :file% tag)
191
+ (tags :line% tag))))
192
+
183
193
(defclass tags:symbol-external-tag (symbol-tag) ())
184
194
(defclass tags:symbol-shadow-external-tag (symbol-external-tag) ())
185
195
(defclass tags:detailed-symbol-external-tag (symbol-external-tag) ())
You can’t perform that action at this time.
0 commit comments