OSCL/CXML
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-eduni/namespaces/1.0/043.xml [not validating:] FAILED:

Browse Source 
-  well-formedness violation not detected
-[
-Colon in entity name
-]
-eduni/namespaces/1.0/044.xml [not validating:] FAILED:
-  well-formedness violation not detected
-[
-Colon in entity name
-]
-eduni/namespaces/1.0/045.xml [not validating:] input [validating:] FAILED:
-  validity error not detected
-[
-Colon in ID attribute name
-]
-eduni/namespaces/1.0/046.xml [not validating:] input [validating:] FAILED:
-  validity error not detected
-[
-Colon in ID attribute name
-]
This commit is contained in:
dlichteblau
2005-12-03 21:54:42 +00:00
parent eff3a932e7
commit 0e994ba607
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
XMLCONF
View File

@ -1827,24 +1827,8 @@ eduni/namespaces/1.0/039.xml [not validating:] input [validating:] invalid
eduni/namespaces/1.0/040.xml [not validating:] input [validating:] invalid
eduni/namespaces/1.0/041.xml [not validating:] input [validating:] invalid
eduni/namespaces/1.0/042.xml [not validating:] not-wf [validating:] not-wf
eduni/namespaces/1.0/043.xml [not validating:] FAILED:
well-formedness violation not detected
[
Colon in entity name
]
eduni/namespaces/1.0/044.xml [not validating:] FAILED:
well-formedness violation not detected
[
Colon in entity name
]
eduni/namespaces/1.0/045.xml [not validating:] input [validating:] FAILED:
validity error not detected
[
Colon in ID attribute name
]
eduni/namespaces/1.0/046.xml [not validating:] input [validating:] FAILED:
validity error not detected
[
Colon in ID attribute name
]
4/1829 tests failed; 333 tests were skipped
eduni/namespaces/1.0/043.xml [not validating:] not-wf [validating:] not-wf
eduni/namespaces/1.0/044.xml [not validating:] not-wf [validating:] not-wf
eduni/namespaces/1.0/045.xml [not validating:] input [validating:] invalid
eduni/namespaces/1.0/046.xml [not validating:] input [validating:] invalid
0/1829 tests failed; 333 tests were skipped

23
xml/xml-parse.lisp
View File

@ -624,7 +624,6 @@
(zstream (if (zstream-p stream) stream zmain))
(xstream (if (xstream-p stream) stream nil))
(s (make-string-output-stream)))
(write-string "Parse error: " s)
(write-line message s)
(when xstream
(write-line "Location:" s)
@ -726,12 +725,18 @@
(dolist (a attlist) ;normalize non-CDATA values
(let* ((qname (sax:attribute-qname a))
(adef (find-attribute e qname)))
(when (and adef (not (eq (attdef-type adef) :CDATA)))
(let ((canon (canon-not-cdata-attval (sax:attribute-value a))))
(when (and (standalone-check-necessary-p adef)
(not (rod= (sax:attribute-value a) canon)))
(validity-error "(02) Standalone Document Declaration: attribute value not normalized"))
(setf (sax:attribute-value a) canon)))))
(when adef
(when (and *validate*
sax:*namespace-processing*
(eq (attdef-type adef) :ID)
(find #/: (sax:attribute-value a)))
(validity-error "colon in ID attribute"))
(unless (eq (attdef-type adef) :CDATA)
(let ((canon (canon-not-cdata-attval (sax:attribute-value a))))
(when (and (standalone-check-necessary-p adef)
(not (rod= (sax:attribute-value a) canon)))
(validity-error "(02) Standalone Document Declaration: attribute value not normalized"))
(setf (sax:attribute-value a) canon))))))
(when *validate* ;maybe validate attribute values
(dolist (a attlist)
(validate-attribute ctx e a))))
@ -879,6 +884,8 @@
(defun define-entity (source-stream name kind def)
(setf name (intern-name name))
(when (and sax:*namespace-processing* (find #/: name))
(wf-error source-stream "colon in entity name"))
(let ((table
(ecase kind
(:general (dtd-gentities (dtd *ctx*)))
@ -2273,6 +2280,8 @@
(normalize-public-id (extid-public id))
nil)
(uri-rod (extid-system id)))
(when (and sax:*namespace-processing* (find #/: name))
(wf-error input "colon in notation name"))
(when *validate*
(define-notation (dtd *ctx*) name id))
(list :notation-decl name id)))