From 5106ced596442299cb3266a611b14db051f92e05 Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Sun, 27 Nov 2005 13:03:01 +0000 Subject: [PATCH] -xmltest/not-wf/sa/076.xml [not validating:] FAILED: - The value NIL is not of type CXML::DTD. -[ - Undefined ENTITY foo. ] --- XMLCONF | 7 ++----- xml/xml-parse.lisp | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/XMLCONF b/XMLCONF index df0cfdc..0ea620d 100644 --- a/XMLCONF +++ b/XMLCONF @@ -73,10 +73,7 @@ xmltest/not-wf/sa/072.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/073.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/074.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/075.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/076.xml [not validating:] FAILED: - The value NIL is not of type CXML::DTD. -[ - Undefined ENTITY foo. ] +xmltest/not-wf/sa/076.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/077.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/078.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/079.xml [not validating:] not-wf [validating:] not-wf @@ -1937,4 +1934,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 -31/1786 tests failed; 376 tests were skipped \ No newline at end of file +30/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 0949ce9..8c3102b 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -888,6 +888,8 @@ (cons *markup-declaration-external-p* def))))) (defun get-entity-definition (entity-name kind dtd) + (unless dtd + (wf-error "entity not defined: ~A" (rod-string entity-name))) (destructuring-bind (extp &rest def) (gethash entity-name (ecase kind