Skip to content

Avoid duplicate internal subsets. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid duplicate internal subsets. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion xml/xml-parse.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2617,7 +2617,9 @@
(let ((xi2 (xstream-open-extid effective-extid)))
(with-zstream (zi2 :input-stack (list xi2))
(ensure-dtd)
(sax:start-internal-subset (handler *ctx*))
;; Avoid duplicate internal subsets.
(unless (ignore-errors (have-internal-subset (handler *ctx*)))
Copy link
Member

@scymtym scymtym Oct 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the ignore-errors necessary? The only method on have-internal-subset is a slot reader, the slot has :initform nil and there doesn't seem to be a `slot-makunbound' call for the slot.

Copy link
Contributor Author

@ruricolist ruricolist Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just running the tests, I see that cxml:sax-proxy does not inherit from cxml:sink, and so does not have an internal-subset slot at all, and rune-dom::dom-builder, while it does inherit from cxml:sink, overrides the definition of the slot and does not provide an initform. Of course there might be others.

(sax:start-internal-subset (handler *ctx*)))
(p/ext-subset zi2)
(when (and fresh-dtd-p
*cache-all-dtds*
Expand Down