(column :initarg :column :reader error-column)
(source :initarg :source :reader error-source)
(position-unit :initarg :position-unit :initform :character :reader error-position-unit)
- (context :initarg :context :initform nil :reader error-context))
+ (context :initarg :context :initform nil :reader error-context)
+ (cause :initarg :cause :initform nil :reader error-cause))
(:report (lambda (condition stream)
(format stream "~A~@[ in ~A~] at ~A ~D~@[ (line ~D~]~@[, column ~D)~]: ~A"
(error-code condition) (error-source condition)
(error-line condition) (error-column condition)
(error-message condition))
(dolist (frame (reverse (error-context condition)))
- (when (eq :mergemap (getf frame :purpose))
- (format stream "~% via %mergemap in ~A at character ~D -> ~A~@[ (source ~A)~]"
+ (when (member (getf frame :purpose) '(:mergemap :include))
+ (format stream "~% via %~(~A~) in ~A at character ~D -> ~A~@[ (source ~A)~]"
+ (getf frame :purpose)
(or (getf frame :source) (getf frame :document-iri)) (getf frame :position)
(getf frame :resource-iri) (getf frame :resource-source)))))))
(define-condition ctm-rejection (ctm-error) ())
(defvar *source-name* nil)
(defvar *source-text* "")
-(defun problem (type code position message &optional (unit :character))
+(defun problem (type code position message &optional (unit :character) cause)
(let ((line (when (eq unit :character) 1)) (column (when (eq unit :character) 1))
(previous-cr nil))
(when line
(setf column 1 previous-cr nil))
(t (incf column) (setf previous-cr nil)))))
(error type :code code :message message :position position :line line
- :column column :source *source-name* :position-unit unit :context (copy-tree (append *template-context* *resource-context*)))))
+ :column column :source *source-name* :position-unit unit :cause cause :context (copy-tree (append *template-context* *resource-context*)))))