From a31a91fc546266aa58b8e3b9698d08ffbec6a67c Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Sun, 27 Nov 2005 16:22:32 +0000 Subject: [PATCH] unparsed entities duerfen nicht referenziert werden --- XMLCONF | 15 +++------------ xml/xml-parse.lisp | 3 +++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/XMLCONF b/XMLCONF index 74f4e9a..fb3719c 100644 --- a/XMLCONF +++ b/XMLCONF @@ -80,10 +80,7 @@ xmltest/not-wf/sa/079.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/080.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/081.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/082.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/083.xml [not validating:] FAILED: - Error opening #P"/home/david/2001/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/nul", No such file or directory. -[ - Undefined NOTATION n. ] +xmltest/not-wf/sa/083.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/084.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/085.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/086.xml [not validating:] not-wf [validating:] not-wf @@ -1362,13 +1359,7 @@ ibm/not-wf/P68/ibm68n06.xml [not validating:] FAILED: the element "root" is externally declared, but standalone is "yes". ] ibm/not-wf/P68/ibm68n07.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P68/ibm68n08.xml [not validating:] FAILED: - Error opening #P"/home/david/2001/XML-Test-Suite/xmlconf/ibm/not-wf/P68/image.jpg", No such file or directory. -[ - Tests EntityRef which is against P68 WFC: Parsed Entity. The - EntityRef in the AttValue in the STag of the element "root" contains the - name "aImage" of an unparsed entity. - ] +ibm/not-wf/P68/ibm68n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P68/ibm68n09.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P68/ibm68n10.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P69/ibm69n01.xml [not validating:] not-wf [validating:] not-wf @@ -1924,4 +1915,4 @@ ibm/valid/P86/ibm86v01.xml [not validating:] input [validating:] input ibm/valid/P87/ibm87v01.xml [not validating:] input [validating:] input ibm/valid/P88/ibm88v01.xml [not validating:] input [validating:] input ibm/valid/P89/ibm89v01.xml [not validating:] input [validating:] input -28/1786 tests failed; 376 tests were skipped \ No newline at end of file +26/1786 tests failed; 376 tests were skipped \ No newline at end of file diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp index 7dc9fcd..5f7fa2e 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -921,6 +921,9 @@ (external-entdef (when internalp (wf-error "entity not internal: ~A" (rod-string entity-name))) + (when (entdef-ndata def) + (wf-error "reference to unparsed entity: ~A" + (rod-string entity-name))) (setf r (xstream-open-extid (extid-using-catalog (entdef-extid def)))) (setf (stream-name-entity-name (xstream-name r)) entity-name (stream-name-entity-kind (xstream-name r)) kind)))