From e3f0eefe1d026804fc43afc82050f93f83d93cd3 Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Sun, 27 Nov 2005 19:28:45 +0000 Subject: [PATCH] ich sag nur: 'foo --- XMLCONF | 48 ++++++++-------------------------------------- xml/xml-parse.lisp | 6 ++++-- 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/XMLCONF b/XMLCONF index 7f0ad1d..03ff040 100644 --- a/XMLCONF +++ b/XMLCONF @@ -734,10 +734,7 @@ oasis/p23fail4.xml [not validating:] not-wf [validating:] not-wf oasis/p23fail5.xml [not validating:] not-wf [validating:] not-wf oasis/p24fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p24fail2.xml [not validating:] not-wf [validating:] not-wf -oasis/p25fail1.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Comment is illegal in VersionInfo. ] +oasis/p25fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p26fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p26fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p27fail1.xml [not validating:] not-wf [validating:] not-wf @@ -1035,29 +1032,15 @@ ibm/not-wf/P24/ibm24n01.xml [not validating:] FAILED: missing in the VersionInfo in the XMLDecl. ] ibm/not-wf/P24/ibm24n02.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P24/ibm24n03.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests VersionInfo with a required field missing. The "=" - (equal sign) is missing between the key word "version" and the VersionNum. - ] +ibm/not-wf/P24/ibm24n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P24/ibm24n04.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P24/ibm24n05.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests VersionInfo with wrong field ordering. The "=" occurs - after "version" and the VersionNum. - ] +ibm/not-wf/P24/ibm24n05.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P24/ibm24n06.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P24/ibm24n07.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P24/ibm24n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P24/ibm24n09.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P25/ibm25n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P25/ibm25n02.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests eq with a wrong key word "eq". - ] +ibm/not-wf/P25/ibm25n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P26/ibm26n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P27/ibm27n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P28/ibm28n01.xml [not validating:] not-wf [validating:] not-wf @@ -1079,23 +1062,13 @@ ibm/not-wf/P29/ibm29n07.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P30/ibm30n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P31/ibm31n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P32/ibm32n02.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests SDDecl with a required field missing. The "=" sign is missing - in the SDDecl in the XMLDecl. - ] +ibm/not-wf/P32/ibm32n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n05.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n06.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n07.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P32/ibm32n08.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests SDDecl with wrong field ordering. The "=" sign occurs - after the key word "yes" in the SDDecl in the XMLDecl. - ] +ibm/not-wf/P32/ibm32n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P32/ibm32n09.xml [not validating:] not-wf [validating:] invalid ibm/not-wf/P39/ibm39n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P39/ibm39n02.xml [not validating:] not-wf [validating:] not-wf @@ -1339,12 +1312,7 @@ ibm/not-wf/P78/ibm78n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P79/ibm79n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P79/ibm79n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P80/ibm80n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P80/ibm80n02.xml [not validating:] FAILED: - The value CXML::FOO is not of type RUNES::XSTREAM. -[ - Tests EncodingDecl with a required field missing. The "=" sign is - missing in the EncodingDecl in the XMLDecl. - ] +ibm/not-wf/P80/ibm80n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P80/ibm80n03.xml [not validating:] FAILED: Argument X is not a REAL: :EOF [ @@ -1836,4 +1804,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 -10/1786 tests failed; 376 tests were skipped \ No newline at end of file +3/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 8455160..eb1e997 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -2752,7 +2752,8 @@ (defun parse-xml-decl (content) (let* ((res (make-xml-header)) (i (make-rod-xstream content)) - (atts (read-attribute-list 'foo i t))) ;xxx on 'foo + (z (make-zstream :input-stack (list i))) + (atts (read-attribute-list z i t))) (unless (eq (peek-rune i) :eof) (wf-error "Garbage at end of XMLDecl.")) ;; versioninfo muss da sein @@ -2808,7 +2809,8 @@ (defun parse-text-decl (content) (let* ((res (make-xml-header)) (i (make-rod-xstream content)) - (atts (read-attribute-list 'foo i t))) ;xxx on 'foo + (z (make-zstream :input-stack (list i))) + (atts (read-attribute-list z i t))) (unless (eq (peek-rune i) :eof) (wf-error "Garbage at end of TextDecl")) ;; versioninfo optional