November 2005 - cxml-cvs@common-lisp.net - mailman3.common-lisp.net

[cxml-cvs] CVS update: cxml/runes/encodings.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv5138/runes Modified Files: encodings.lisp Log Message: -xmltest/not-wf/sa/170.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Four byte UTF-8 encodings can encode UCS-4 characters - which are beyond the range of legal XML characters - (and can't be expressed in Unicode surrogate pairs). - This document holds such a character. ] Date: Sun Nov 27 18:34:23 2005 Author: dlichteblau Index: cxml/runes/encodings.lisp diff -u cxml/runes/encodings.lisp:1.2 cxml/runes/encodings.lisp:1.3 --- cxml/runes/encodings.lisp:1.2 Sun Nov 27 18:19:12 2005 +++ cxml/runes/encodings.lisp Sun Nov 27 18:34:23 2005 @@ -160,8 +160,10 @@ `((lambda (x) (when (or (<= #xD800 x #xDBFF) (<= #xDC00 x #xDFFF)) - (xerror "surrogate encoded in UTF-8: #x~x." x)) - (cond ((%> x #xFFFF) + (xerror "surrogate encoded in UTF-8: #x~X." x)) + (cond ((%> x #x10FFFF) + (xerror "not a valid code point: #x~X" x)) + ((%> x #xFFFF) (setf (aref out (%+ 0 wptr)) (%+ #xD7C0 (ash x -10)) (aref out (%+ 1 wptr)) (%ior #xDC00 (%and x #x3FF))) (setf wptr (%+ wptr 2)))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv5138 Modified Files: XMLCONF Log Message: -xmltest/not-wf/sa/170.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Four byte UTF-8 encodings can encode UCS-4 characters - which are beyond the range of legal XML characters - (and can't be expressed in Unicode surrogate pairs). - This document holds such a character. ] Date: Sun Nov 27 18:34:23 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.30 cxml/XMLCONF:1.31 --- cxml/XMLCONF:1.30 Sun Nov 27 18:19:10 2005 +++ cxml/XMLCONF Sun Nov 27 18:34:22 2005 @@ -167,13 +167,7 @@ xmltest/not-wf/sa/167.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/168.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/169.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/170.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Four byte UTF-8 encodings can encode UCS-4 characters - which are beyond the range of legal XML characters - (and can't be expressed in Unicode surrogate pairs). - This document holds such a character. ] +xmltest/not-wf/sa/170.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/171.xml [not validating:] FAILED: well-formedness violation not detected [ @@ -1862,4 +1856,4 @@ 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 -15/1786 tests failed; 376 tests were skipped \ No newline at end of file +14/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv4026/xml Modified Files: xml-parse.lisp Log Message: encoding-fehler resignalisieren Date: Sun Nov 27 18:19:14 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.34 cxml/xml/xml-parse.lisp:1.35 --- cxml/xml/xml-parse.lisp:1.34 Sun Nov 27 17:49:22 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 18:19:14 2005 @@ -2960,10 +2960,13 @@ :type type)))))) (defun parse-xstream (xstream handler &rest args) - (let ((zstream (make-zstream :input-stack (list xstream)))) - (peek-rune xstream) - (with-scratch-pads () - (apply #'p/document zstream handler args)))) + (handler-case + (let ((zstream (make-zstream :input-stack (list xstream)))) + (peek-rune xstream) + (with-scratch-pads () + (apply #'p/document zstream handler args))) + (runes-encoding:encoding-error (c) + (wf-error "~A" c)))) (defun parse-file (filename handler &rest args) (with-open-xfile (input filename) @@ -3021,10 +3024,7 @@ (defun parse-string (string handler) ;; XXX this function mis-handles encoding - (with-scratch-pads () - (let* ((x (string->xstream string)) - (z (make-zstream :input-stack (list x)))) - (p/document z handler)))) + (parse-xstream (string->xstream string) handler)) (defun string->xstream (string) ;; XXX encoding is mis-handled by this kind of stream

1 0

[cxml-cvs] CVS update: cxml/runes/encodings-data.lisp cxml/runes/encodings.lisp cxml/runes/package.lisp cxml/runes/xstream.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv4026/runes Modified Files: encodings-data.lisp encodings.lisp package.lisp xstream.lisp Log Message: encoding-fehler resignalisieren Date: Sun Nov 27 18:19:12 2005 Author: dlichteblau Index: cxml/runes/encodings-data.lisp diff -u cxml/runes/encodings-data.lisp:1.1.1.1 cxml/runes/encodings-data.lisp:1.2 --- cxml/runes/encodings-data.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/encodings-data.lisp Sun Nov 27 18:19:12 2005 @@ -1,4 +1,4 @@ -(in-package :encoding) +(in-package :runes-encoding) (progn (add-name :us-ascii "ANSI_X3.4-1968") Index: cxml/runes/encodings.lisp diff -u cxml/runes/encodings.lisp:1.1.1.1 cxml/runes/encodings.lisp:1.2 --- cxml/runes/encodings.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/encodings.lisp Sun Nov 27 18:19:12 2005 @@ -1,4 +1,9 @@ -(in-package :encoding) +(in-package :runes-encoding) + +(define-condition encoding-error (simple-error) ()) + +(defun xerror (fmt &rest args) + (error 'encoding-error :format-control fmt :format-arguments args)) ;;;; --------------------------------------------------------------------------- ;;;; Encoding names @@ -115,6 +120,9 @@ (let ((hi (aref in rptr)) (lo (aref in (%+ 1 rptr)))) (setf rptr (%+ 2 rptr)) + ;; FIXME: Wenn wir hier ein Surrogate sehen, muessen wir das naechste + ;; Zeichen abwarten und nachgucken, dass nicht etwa die andere + ;; Haelfte fehlt! (setf (aref out wptr) (logior (ash hi 8) lo)) (setf wptr (%+ 1 wptr)))) (values wptr rptr))) @@ -132,6 +140,9 @@ (let ((lo (aref in (%+ 0 rptr))) (hi (aref in (%+ 1 rptr)))) (setf rptr (%+ 2 rptr)) + ;; FIXME: Wenn wir hier ein Surrogate sehen, muessen wir das naechste + ;; Zeichen abwarten und nachgucken, dass nicht etwa die andere + ;; Haelfte fehlt! (setf (aref out wptr) (logior (ash hi 8) lo)) (setf wptr (%+ 1 wptr)))) (values wptr rptr))) @@ -147,13 +158,9 @@ byte0) (macrolet ((put (x) `((lambda (x) - (cond ((or (<= #xD800 x #xDBFF) - (<= #xDC00 x #xDFFF)) - (error "Encoding UTF-16 in UTF-8? : #x~x." x))) - '(unless (data-char-p x) - (error "#x~x is not a data character." x)) - ;;(fresh-line) - ;;(prin1 x) (princ "-> ") + (when (or (<= #xD800 x #xDBFF) + (<= #xDC00 x #xDFFF)) + (xerror "surrogate encoded in UTF-8: #x~x." x)) (cond ((%> x #xFFFF) (setf (aref out (%+ 0 wptr)) (%+ #xD7C0 (ash x -10)) (aref out (%+ 1 wptr)) (%ior #xDC00 (%and x #x3FF))) @@ -196,7 +203,7 @@ (setf rptr (%+ rptr 1))) ((%<= #|#b10000000|# byte0 #b10111111) - (error "Corrupted UTF-8 input (initial byte was #b~8,'0B)" byte0) + (xerror "Corrupted UTF-8 input (initial byte was #b~8,'0B)" byte0) (setf rptr (%+ rptr 1))) ((%<= #|#b11000000|# byte0 #b11011111) @@ -260,7 +267,7 @@ (return)))) (t - (error "Corrupted UTF-8 input (initial byte was #b~8,'0B)" byte0)) ) )) + (xerror "Corrupted UTF-8 input (initial byte was #b~8,'0B)" byte0)) ) )) (values wptr rptr)) ) (defmethod encoding-p ((object (eql :utf-16-little-endian))) t) @@ -343,5 +350,4 @@ (defun find-charset (name) (or (gethash name *charsets*) - (error "There is no character set named ~S." name))) - + (xerror "There is no character set named ~S." name))) Index: cxml/runes/package.lisp diff -u cxml/runes/package.lisp:1.2 cxml/runes/package.lisp:1.3 --- cxml/runes/package.lisp:1.2 Fri Mar 25 19:16:56 2005 +++ cxml/runes/package.lisp Sun Nov 27 18:19:12 2005 @@ -61,8 +61,9 @@ #:set-to-full-speed #:xstream-name)) -(defpackage :encoding +(defpackage :runes-encoding (:use :cl :runes) (:export + #:encoding-error #:find-encoding #:decode-sequence)) Index: cxml/runes/xstream.lisp diff -u cxml/runes/xstream.lisp:1.2 cxml/runes/xstream.lisp:1.3 --- cxml/runes/xstream.lisp:1.2 Fri Mar 25 19:16:56 2005 +++ cxml/runes/xstream.lisp Sun Nov 27 18:19:12 2005 @@ -1,4 +1,4 @@ -;;; -*- Mode: Lisp; Syntax: Common-Lisp; Package: runes; readtable: runes; Encoding: utf-8; -*- +;;; -*- Mode: Lisp; Syntax: Common-Lisp; readtable: runes; Encoding: utf-8; -*- ;;; --------------------------------------------------------------------------- ;;; Title: Fast streams ;;; Created: 1999-07-17 @@ -66,9 +66,7 @@ ;; (eval-when (:compile-toplevel :load-toplevel :execute) - (defparameter *fast* '(optimize (speed 3) (safety 0))) - ;;(defparameter *fast* '(optimize (speed 2) (safety 3))) - ) + (defparameter *fast* '(optimize (speed 3) (safety 0)))) ;; Let us first define fast fixnum arithmetric get rid of type ;; checks. (After all we know what we do here). @@ -277,10 +275,14 @@ :end2 (xstream-os-left-end input)) ;; then we take care that the buffer is large enough to carry at ;; least 100 bytes (a random number) + ;; + ;; david: was heisst da random? ich nehme an, dass 100 einfach + ;; ausreichend sein soll, um die laengste utf-8 bytesequenz oder die + ;; beiden utf-16 surrogates zu halten? dann ist 100 ja wohl dicke + ;; ausreichend und koennte in make-xstream ordentlich geprueft werden. + ;; oder was geht hier vor? (unless (>= (length (xstream-os-buffer input)) 100) - (error "You lost") - ;; todo: enlarge buffer - )) + (error "You lost"))) (setf n (read-octets (xstream-os-buffer input) (xstream-os-stream input) m (min (1- (length (xstream-os-buffer input))) @@ -292,7 +294,7 @@ :eof) (t (multiple-value-bind (fnw fnr) - (encoding:decode-sequence + (runes-encoding:decode-sequence (xstream-encoding input) (xstream-os-buffer input) 0 n (xstream-buffer input) 0 (1- (length (xstream-buffer input)))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv4026 Modified Files: XMLCONF Log Message: encoding-fehler resignalisieren Date: Sun Nov 27 18:19:11 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.29 cxml/XMLCONF:1.30 --- cxml/XMLCONF:1.29 Sun Nov 27 17:49:21 2005 +++ cxml/XMLCONF Sun Nov 27 18:19:10 2005 @@ -165,16 +165,8 @@ xmltest/not-wf/sa/165.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/166.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/167.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/168.xml [not validating:] FAILED: - Encoding UTF-16 in UTF-8? : #xD800. -[ - An unpaired surrogate (D800) is not legal anywhere - in an XML document.] -xmltest/not-wf/sa/169.xml [not validating:] FAILED: - Encoding UTF-16 in UTF-8? : #xDC00. -[ - An unpaired surrogate (DC00) is not legal anywhere - in an XML document.] +xmltest/not-wf/sa/168.xml [not validating:] not-wf [validating:] invalid +xmltest/not-wf/sa/169.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/170.xml [not validating:] FAILED: well-formedness violation not detected [ @@ -968,16 +960,8 @@ ibm/not-wf/P02/ibm02n27.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P02/ibm02n28.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P02/ibm02n29.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P02/ibm02n30.xml [not validating:] FAILED: - Encoding UTF-16 in UTF-8? : #xD800. -[ - Tests a comment which contains an illegal Char: #xD800 - ] -ibm/not-wf/P02/ibm02n31.xml [not validating:] FAILED: - Encoding UTF-16 in UTF-8? : #xDFFF. -[ - Tests a comment which contains an illegal Char: #xDFFF - ] +ibm/not-wf/P02/ibm02n30.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P02/ibm02n31.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P02/ibm02n32.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P02/ibm02n33.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P03/ibm03n01.xml [not validating:] not-wf [validating:] not-wf @@ -1878,4 +1862,4 @@ 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 -19/1786 tests failed; 376 tests were skipped \ No newline at end of file +15/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv1388/xml Modified Files: xml-parse.lisp Log Message: im prolog haben pe refs auch nuescht zu suchen Date: Sun Nov 27 17:49:22 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.33 cxml/xml/xml-parse.lisp:1.34 --- cxml/xml/xml-parse.lisp:1.33 Sun Nov 27 17:46:48 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 17:49:22 2005 @@ -217,7 +217,7 @@ (entity-resolver nil) (disallow-internal-subset nil)) -(defvar *expand-pe-p*) +(defvar *expand-pe-p* nil) ;;;; --------------------------------------------------------------------------- ;;;; xstreams

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv1388 Modified Files: XMLCONF Log Message: im prolog haben pe refs auch nuescht zu suchen Date: Sun Nov 27 17:49:21 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.28 cxml/XMLCONF:1.29 --- cxml/XMLCONF:1.28 Sun Nov 27 17:46:48 2005 +++ cxml/XMLCONF Sun Nov 27 17:49:21 2005 @@ -160,10 +160,7 @@ xmltest/not-wf/sa/160.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/161.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/162.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/163.xml [not validating:] FAILED: - The variable CXML::*EXPAND-PE-P* is unbound. -[ - Invalid placement of Parameter entity reference. ] +xmltest/not-wf/sa/163.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/164.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/165.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/166.xml [not validating:] not-wf [validating:] invalid @@ -1881,4 +1878,4 @@ 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 -20/1786 tests failed; 376 tests were skipped \ No newline at end of file +19/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv912/xml Modified Files: xml-parse.lisp Log Message: *patsch* wieder eine runde eof-bugs erschlagen Date: Sun Nov 27 17:46:50 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.32 cxml/xml/xml-parse.lisp:1.33 --- cxml/xml/xml-parse.lisp:1.32 Sun Nov 27 17:37:59 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 17:46:48 2005 @@ -1506,16 +1506,24 @@ (let ((c (read-rune input))) (check-rune input c #/#) (setq c (read-rune input)) - (cond ((eql c #/x) + (cond ((eql c :eof) + (eox input)) + ((eql c #/x) ;; hexadecimal (setq c (read-rune input)) + (when (eql c :eof) + (eox input)) (unless (digit-rune-p c 16) (wf-error "garbage in character reference")) (prog1 (parse-integer (with-output-to-string (sink) (write-char (rune-char c) sink) - (while (digit-rune-p (setq c (read-rune input)) 16) + (while (progn + (setq c (read-rune input)) + (when (eql c :eof) + (eox input)) + (digit-rune-p c 16)) (write-char (rune-char c) sink))) :radix 16) (check-rune input c #/\;))) @@ -1525,7 +1533,11 @@ (parse-integer (with-output-to-string (sink) (write-char (rune-char c) sink) - (while (rune<= #/0 (setq c (read-rune input)) #/9) + (while (progn + (setq c (read-rune input)) + (when (eql c :eof) + (eox input)) + (rune<= #/0 c #/9)) (write-char (rune-char c) sink))) :radix 10) (check-rune input c #/\;)))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv912 Modified Files: XMLCONF Log Message: *patsch* wieder eine runde eof-bugs erschlagen Date: Sun Nov 27 17:46:48 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.27 cxml/XMLCONF:1.28 --- cxml/XMLCONF:1.27 Sun Nov 27 17:37:57 2005 +++ cxml/XMLCONF Sun Nov 27 17:46:48 2005 @@ -113,12 +113,7 @@ xmltest/not-wf/sa/113.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/114.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/115.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/116.xml [not validating:] FAILED: - Argument Y is not a REAL: :EOF -[ - Internal general parsed entities are only well formed if - they match the "content" production. This is a partial - character reference, not a full one. ] +xmltest/not-wf/sa/116.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/117.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/118.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/119.xml [not validating:] not-wf [validating:] invalid @@ -1886,4 +1881,4 @@ 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 -21/1786 tests failed; 376 tests were skipped \ No newline at end of file +20/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv32697/xml Modified Files: xml-parse.lisp Log Message: noch EOF-Pruefungen Date: Sun Nov 27 17:37:59 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.31 cxml/xml/xml-parse.lisp:1.32 --- cxml/xml/xml-parse.lisp:1.31 Sun Nov 27 17:22:33 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 17:37:59 2005 @@ -1435,7 +1435,9 @@ (eox input "EOF")) ((rune= c #/&) (setf c (peek-rune input)) - (cond ((rune= c #/#) + (cond ((eql c :eof) + (eox input)) + ((rune= c #/#) (let ((c (read-character-reference input))) (%put-unicode-char c collect))) (t @@ -1462,8 +1464,11 @@ (map nil (lambda (x) (collect x)) name) (collect #/\; ))))))) ((and (eq mode :ENT) (rune= c #/%)) - (unless (name-start-rune-p (peek-rune input)) - (wf-error "Expecting name after %.")) + (let ((d (peek-rune input))) + (when (eq d :eof) + (eox input)) + (unless (name-start-rune-p d) + (wf-error "Expecting name after %."))) (let ((name (read-name-token input))) (setf c (read-rune input)) (check-rune input c #/\;) @@ -1490,7 +1495,7 @@ (declare (dynamic-extent #'muffle)) (muffle input (or delim (let ((delim (read-rune input))) - (unless (member delim '(#/\" #/\')) + (unless (member delim '(#/\" #/\') :test #'eql) (wf-error "invalid attribute delimiter")) delim)))))) @@ -3224,11 +3229,13 @@ (return)) ((rune= c #/&) (setf c (peek-rune input)) - (cond ((rune= c #/#) + (cond ((eql c :eof) + (eox input)) + ((rune= c #/#) (let ((c (read-character-reference input))) (%put-unicode-char c collect))) (t - (unless (name-start-rune-p (peek-rune input)) + (unless (name-start-rune-p c) (wf-error "Expecting name after &.")) (let ((name (read-name-token input))) (setf c (read-rune input)) @@ -3237,12 +3244,8 @@ zinput name :general (lambda (zinput) (muffle (car (zstream-input-stack zinput))))))))) - ((and (rune= c #/<)) - ;; xxx fix error message - (cerror "Eat them in spite of this." - "For no apparent reason #\/< is forbidden in attribute values. ~ - You lost -- next time choose SEXPR syntax.") - (collect c)) + ((rune= c #/<) + (wf-error "unexpected #\/<")) ((space-rune-p c) (collect #/space)) ((not (data-rune-p c))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv32697 Modified Files: XMLCONF Log Message: noch EOF-Pruefungen Date: Sun Nov 27 17:37:58 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.26 cxml/XMLCONF:1.27 --- cxml/XMLCONF:1.26 Sun Nov 27 17:22:32 2005 +++ cxml/XMLCONF Sun Nov 27 17:37:57 2005 @@ -112,12 +112,7 @@ xmltest/not-wf/sa/112.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/113.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/114.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/115.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - The replacement text of this entity is an illegal character - reference, which must be rejected when it is parsed in the - context of an attribute value.] +xmltest/not-wf/sa/115.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/116.xml [not validating:] FAILED: Argument Y is not a REAL: :EOF [ @@ -1167,28 +1162,10 @@ ibm/not-wf/P41/ibm41n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P41/ibm41n09.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P41/ibm41n10.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P41/ibm41n11.xml [not validating:] FAILED: - For no apparent reason #/< is forbidden in attribute values. You lost -- next time choose SEXPR syntax. -[ - Tests Attribute against WFC "no external entity references". A indirect - references to the external entity "aExternal" is contained in the value of the - attribute "attr1". - ] +ibm/not-wf/P41/ibm41n11.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P41/ibm41n12.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P41/ibm41n13.xml [not validating:] FAILED: - For no apparent reason #/< is forbidden in attribute values. You lost -- next time choose SEXPR syntax. -[ - Tests Attribute against WFC "No (less that) character in Attribute - Values". The character "less than" is contained in the value of the - attribute "attr1". - ] -ibm/not-wf/P41/ibm41n14.xml [not validating:] FAILED: - For no apparent reason #/< is forbidden in attribute values. You lost -- next time choose SEXPR syntax. -[ - Tests Attribute against WFC "No (less than) in Attribute Values". The character - "less than" is contained in the value of the attribute "attr1" through indirect - internal entity reference. - ] +ibm/not-wf/P41/ibm41n13.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P41/ibm41n14.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P42/ibm42n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P42/ibm42n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P42/ibm42n03.xml [not validating:] not-wf [validating:] not-wf @@ -1302,13 +1279,7 @@ ] ibm/not-wf/P60/ibm60n05.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P60/ibm60n06.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P60/ibm60n07.xml [not validating:] FAILED: - For no apparent reason #/< is forbidden in attribute values. You lost -- next time choose SEXPR syntax. -[ - Tests DefaultDecl against WFC of P60. The text replacement of the - entity "avalue" contains the "less than" character in the DefaultDecl in the - AttDef in the AttlistDecl in the DTD. - ] +ibm/not-wf/P60/ibm60n07.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P60/ibm60n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P61/ibm61n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P62/ibm62n01.xml [not validating:] not-wf [validating:] not-wf @@ -1915,4 +1886,4 @@ 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 -26/1786 tests failed; 376 tests were skipped \ No newline at end of file +21/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv31584/xml Modified Files: xml-parse.lisp Log Message: unparsed entities duerfen nicht referenziert werden Date: Sun Nov 27 17:22:33 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.30 cxml/xml/xml-parse.lisp:1.31 --- cxml/xml/xml-parse.lisp:1.30 Sun Nov 27 17:09:19 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 17:22:33 2005 @@ -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)))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv31584 Modified Files: XMLCONF Log Message: unparsed entities duerfen nicht referenziert werden Date: Sun Nov 27 17:22:32 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.25 cxml/XMLCONF:1.26 --- cxml/XMLCONF:1.25 Sun Nov 27 17:09:18 2005 +++ cxml/XMLCONF Sun Nov 27 17:22:32 2005 @@ -80,10 +80,7 @@ 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 @@ 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/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

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv30430/xml Modified Files: xml-parse.lisp Log Message: [WFC: No External Entity References] Date: Sun Nov 27 17:09:19 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.29 cxml/xml/xml-parse.lisp:1.30 --- cxml/xml/xml-parse.lisp:1.29 Sun Nov 27 14:03:01 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 17:09:19 2005 @@ -642,9 +642,13 @@ (define-condition xml-parse-error (simple-error) ()) (define-condition well-formedness-violation (xml-parse-error) ()) -(define-condition end-of-xstream (well-formedness-violation) ()) (define-condition validity-error (xml-parse-error) ()) +;; We make some effort to signal end of file as a special condition, but we +;; don't actually try very hard. Not sure whether we should. Right now I +;; would prefer not to document this class. +(define-condition end-of-xstream (well-formedness-violation) ()) + (defun validity-error (x &rest args) (error 'validity-error :format-control "Document not valid: ~?" @@ -901,13 +905,11 @@ (rod-string entity-name))) def)) -(defun entity->xstream (entity-name kind &optional zstream) +(defun entity->xstream (zstream entity-name kind &optional internalp) ;; `zstream' is for error messages (let ((def (get-entity-definition entity-name kind (dtd *ctx*)))) (unless def - (if zstream - (perror zstream "Entity '~A' is not defined." (rod-string entity-name)) - (wf-error "Entity '~A' is not defined." (rod-string entity-name)))) + (perror zstream "Entity '~A' is not defined." (rod-string entity-name))) (let (r) (etypecase def (internal-entdef @@ -917,6 +919,8 @@ :entity-kind kind :uri nil))) (external-entdef + (when internalp + (wf-error "entity not internal: ~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))) @@ -941,9 +945,9 @@ :name (make-stream-name :uri sysid) :initial-speed 1))) -(defun call-with-entity-expansion-as-stream (zstream cont name kind) - ;; `zstream' is for error messages -- we need something better! - (let ((in (entity->xstream name kind zstream))) +(defun call-with-entity-expansion-as-stream (zstream cont name kind internalp) + ;; `zstream' is for error messages + (let ((in (entity->xstream zstream name kind internalp))) (unwind-protect (funcall cont in) (close-xstream in)))) @@ -1234,7 +1238,7 @@ (check-rune input #/\; (read-rune input)) (cond (*expand-pe-p* ;; no external entities here! - (let ((i2 (entity->xstream nam :parameter))) + (let ((i2 (entity->xstream zinput nam :parameter))) (zstream-push i2 zinput)) (values :S nil) ;space before inserted PE expansion. ) @@ -1443,7 +1447,8 @@ zinput name :general (lambda (zinput) (muffle (car (zstream-input-stack zinput)) - :eof)))) + :eof)) + t)) (:ENT ;; bypass, but never the less we ;; need to check for legal @@ -3052,10 +3057,8 @@ (push new-xstream (zstream-input-stack zstream)) zstream) -(defun recurse-on-entity (zstream name kind continuation) +(defun recurse-on-entity (zstream name kind continuation &optional internalp) (assert (not (zstream-token-category zstream))) - ;;(sleep .2) - ;;(warn "~S / ~S[~S]." (zstream-input-stack zstream) (mu name) kind) (call-with-entity-expansion-as-stream zstream (lambda (new-xstream) @@ -3069,7 +3072,9 @@ (assert (eq (pop (zstream-input-stack zstream)) :stop)) (setf (zstream-token-category zstream) nil) '(consume-token zstream)) ) - name kind)) + name + kind + internalp)) #|| (defmacro read-data-until* ((predicate input res res-start res-end) &body body)

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv30430 Modified Files: XMLCONF Log Message: [WFC: No External Entity References] Date: Sun Nov 27 17:09:18 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.24 cxml/XMLCONF:1.25 --- cxml/XMLCONF:1.24 Sun Nov 27 14:03:01 2005 +++ cxml/XMLCONF Sun Nov 27 17:09:18 2005 @@ -79,22 +79,12 @@ 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:] FAILED: - Error opening #P"/home/david/2001/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/nul", No such file or directory. -[ - This tests the WFC, - since the entity is referred to within an attribute. ] +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/084.xml [not validating:] FAILED: - Error opening #P"/home/david/2001/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/nul", No such file or directory. -[ - Tests the WFC by referring to an - unparsed entity. (This precedes the error of not declaring - that entity's notation, which may be detected any time before - the DTD parsing is completed.) ] +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 xmltest/not-wf/sa/087.xml [not validating:] not-wf [validating:] not-wf @@ -1934,4 +1924,4 @@ 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 -30/1786 tests failed; 376 tests were skipped \ No newline at end of file +28/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv17392/xml Modified Files: xml-parse.lisp Log Message: -xmltest/not-wf/sa/076.xml [not validating:] FAILED: - The value NIL is not of type CXML::DTD. -[ - Undefined ENTITY foo. ] Date: Sun Nov 27 14:03:02 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.28 cxml/xml/xml-parse.lisp:1.29 --- cxml/xml/xml-parse.lisp:1.28 Sun Nov 27 13:56:56 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 14:03:01 2005 @@ -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

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv17392 Modified Files: XMLCONF Log Message: -xmltest/not-wf/sa/076.xml [not validating:] FAILED: - The value NIL is not of type CXML::DTD. -[ - Undefined ENTITY foo. ] Date: Sun Nov 27 14:03:01 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.23 cxml/XMLCONF:1.24 --- cxml/XMLCONF:1.23 Sun Nov 27 13:56:55 2005 +++ cxml/XMLCONF Sun Nov 27 14:03:01 2005 @@ -73,10 +73,7 @@ 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/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

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv16321/xml Modified Files: xml-parse.lisp Log Message: mein lieblingsfehler! error while parsing arguments to DESTRUCTURING-BIND: invalid number of elements in () to satisfy lambda list (CXML::NAME &REST CXML::ATTRS): at least 1 expected, but 0 found Date: Sun Nov 27 13:56:56 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.27 cxml/xml/xml-parse.lisp:1.28 --- cxml/xml/xml-parse.lisp:1.27 Sun Nov 27 13:43:29 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 13:56:56 2005 @@ -2596,37 +2596,41 @@ (defun p/element-ns (input) - (destructuring-bind (cat (name &rest attrs)) - (multiple-value-list (read-token input)) - (validate-start-element *ctx* name) - (let ((ns-decls (declare-namespaces name attrs))) - (multiple-value-bind (ns-uri prefix local-name) (decode-qname name) - (declare (ignore prefix)) - (let* ((raw-attlist (build-attribute-list-ns attrs)) - (attlist - (remove-if-not (lambda (a) - (or sax:*include-xmlns-attributes* - (not (xmlns-attr-p (sax:attribute-qname a))))) - (process-attributes *ctx* name raw-attlist)))) - (cond ((eq cat :ztag) - (sax:start-element (handler *ctx*) ns-uri local-name name attlist) - (sax:end-element (handler *ctx*) ns-uri local-name name)) + (multiple-value-bind (cat sem) (read-token input) + (case cat + ((:stag :ztag)) + (:eof (eox input)) + (t (wf-error "element expected"))) + (destructuring-bind (&optional name &rest attrs) sem + (validate-start-element *ctx* name) + (let ((ns-decls (declare-namespaces name attrs))) + (multiple-value-bind (ns-uri prefix local-name) (decode-qname name) + (declare (ignore prefix)) + (let* ((raw-attlist (build-attribute-list-ns attrs)) + (attlist + (remove-if-not (lambda (a) + (or sax:*include-xmlns-attributes* + (not (xmlns-attr-p (sax:attribute-qname a))))) + (process-attributes *ctx* name raw-attlist)))) + (cond ((eq cat :ztag) + (sax:start-element (handler *ctx*) ns-uri local-name name attlist) + (sax:end-element (handler *ctx*) ns-uri local-name name)) - ((eq cat :stag) - (sax:start-element (handler *ctx*) ns-uri local-name name attlist) - (p/content input) - (multiple-value-bind (cat2 sem2) (read-token input) - (unless (and (eq cat2 :etag) - (eq (car sem2) name)) - (perror input "Bad nesting. ~S / ~S" (mu name) (mu (cons cat2 sem2)))) - (when (cdr sem2) - (wf-error "no attributes allowed in end tag"))) - (sax:end-element (handler *ctx*) ns-uri local-name name)) + ((eq cat :stag) + (sax:start-element (handler *ctx*) ns-uri local-name name attlist) + (p/content input) + (multiple-value-bind (cat2 sem2) (read-token input) + (unless (and (eq cat2 :etag) + (eq (car sem2) name)) + (perror input "Bad nesting. ~S / ~S" (mu name) (mu (cons cat2 sem2)))) + (when (cdr sem2) + (wf-error "no attributes allowed in end tag"))) + (sax:end-element (handler *ctx*) ns-uri local-name name)) - (t - (wf-error "Expecting element, got ~S." cat))))) - (undeclare-namespaces ns-decls)) - (validate-end-element *ctx* name))) + (t + (wf-error "Expecting element, got ~S." cat))))) + (undeclare-namespaces ns-decls)) + (validate-end-element *ctx* name)))) (defun perror (stream format-string &rest format-args) (when (zstream-p stream)

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv16321 Modified Files: XMLCONF Log Message: mein lieblingsfehler! error while parsing arguments to DESTRUCTURING-BIND: invalid number of elements in () to satisfy lambda list (CXML::NAME &REST CXML::ATTRS): at least 1 expected, but 0 found Date: Sun Nov 27 13:56:55 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.22 cxml/XMLCONF:1.23 --- cxml/XMLCONF:1.22 Sun Nov 27 13:43:29 2005 +++ cxml/XMLCONF Sun Nov 27 13:56:55 2005 @@ -47,24 +47,8 @@ xmltest/not-wf/sa/047.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/048.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/049.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/050.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Empty document, with no root element. ] -xmltest/not-wf/sa/051.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - CDATA is invalid at top level of document.] +xmltest/not-wf/sa/050.xml [not validating:] not-wf [validating:] invalid +xmltest/not-wf/sa/051.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/052.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/053.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/054.xml [not validating:] not-wf [validating:] not-wf @@ -134,15 +118,7 @@ xmltest/not-wf/sa/102.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/103.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/104.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/105.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Invalid placement of CDATA section. ] +xmltest/not-wf/sa/105.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/106.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/107.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/108.xml [not validating:] not-wf [validating:] invalid @@ -194,14 +170,8 @@ xmltest/not-wf/sa/144.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/145.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/146.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/147.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - XML Declaration may not be preceded by whitespace.] -xmltest/not-wf/sa/148.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - XML Declaration may not be preceded by comments or whitespace.] +xmltest/not-wf/sa/147.xml [not validating:] not-wf [validating:] invalid +xmltest/not-wf/sa/148.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/149.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/150.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/151.xml [not validating:] not-wf [validating:] invalid @@ -593,11 +563,7 @@ sun/not-wf/pubid04.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/pubid05.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/sgml01.xml [not validating:] not-wf [validating:] invalid -sun/not-wf/sgml02.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - XML declaration must be at the very beginning of a document; - it"s not a processing instruction] +sun/not-wf/sgml02.xml [not validating:] not-wf [validating:] invalid sun/not-wf/sgml03.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/sgml04.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/sgml05.xml [not validating:] not-wf [validating:] not-wf @@ -709,16 +675,8 @@ oasis/p74pass1.xml [not validating:] input [validating:] invalid oasis/p75pass1.xml [not validating:] input [validating:] invalid oasis/e2.xml [not validating:] input [validating:] invalid -oasis/p01fail1.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - S cannot occur before the prolog - ] -oasis/p01fail2.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - comments cannot occur before the prolog - ] +oasis/p01fail1.xml [not validating:] not-wf [validating:] invalid +oasis/p01fail2.xml [not validating:] not-wf [validating:] invalid oasis/p01fail3.xml [not validating:] not-wf [validating:] invalid oasis/p01fail4.xml [not validating:] not-wf [validating:] invalid oasis/p02fail1.xml [not validating:] not-wf [validating:] invalid @@ -811,26 +769,14 @@ oasis/p15fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p15fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p15fail3.xml [not validating:] not-wf [validating:] not-wf -oasis/p16fail1.xml [not validating:] FAILED: - The value "" is not of type LIST. -[ - "xml" is an invalid PITarget - ] +oasis/p16fail1.xml [not validating:] not-wf [validating:] invalid oasis/p16fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p16fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p18fail1.xml [not validating:] not-wf [validating:] invalid oasis/p18fail2.xml [not validating:] not-wf [validating:] invalid oasis/p18fail3.xml [not validating:] not-wf [validating:] invalid -oasis/p22fail1.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - prolog must start with XML decl - ] -oasis/p22fail2.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - prolog must start with XML decl - ] +oasis/p22fail1.xml [not validating:] not-wf [validating:] invalid +oasis/p22fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p23fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p23fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p23fail3.xml [not validating:] not-wf [validating:] not-wf @@ -856,15 +802,7 @@ oasis/p32fail5.xml [not validating:] not-wf [validating:] not-wf oasis/p39fail1.xml [not validating:] not-wf [validating:] invalid oasis/p39fail2.xml [not validating:] not-wf [validating:] invalid -oasis/p39fail3.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - XML documents contain one or more elements] +oasis/p39fail3.xml [not validating:] not-wf [validating:] invalid oasis/p39fail4.xml [not validating:] not-wf [validating:] not-wf oasis/p39fail5.xml [not validating:] not-wf [validating:] not-wf oasis/p40fail1.xml [not validating:] not-wf [validating:] not-wf @@ -1027,17 +965,7 @@ ibm/invalid/P60/ibm60i03.xml [not validating:] input/output [validating:] invalid ibm/invalid/P60/ibm60i04.xml [not validating:] input/output [validating:] invalid ibm/invalid/P76/ibm76i01.xml [not validating:] input/output [validating:] invalid -ibm/not-wf/P01/ibm01n01.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests a document with no element. A well-formed document should have at lease - one elements. - ] +ibm/not-wf/P01/ibm01n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P01/ibm01n02.xml [not validating:] not-wf [validating:] invalid ibm/not-wf/P01/ibm01n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P02/ibm02n01.xml [not validating:] not-wf [validating:] not-wf @@ -1132,106 +1060,26 @@ ibm/not-wf/P15/ibm15n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P15/ibm15n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P15/ibm15n04.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P16/ibm16n01.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - bogus sublist #(97) to satisfy lambda-list (CXML::NAME &REST CXML::ATTRS) -[ - Tests PI. The content of the PI includes the sequence - "(less than)?". - ] +ibm/not-wf/P16/ibm16n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P16/ibm16n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P16/ibm16n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P16/ibm16n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P17/ibm17n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P17/ibm17n02.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P17/ibm17n03.xml [not validating:] FAILED: - The value 84 is not of type LIST. -[ - Tests PITarget. The PITarget contains the string "xml". - ] +ibm/not-wf/P17/ibm17n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P17/ibm17n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P18/ibm18n01.xml [not validating:] not-wf [validating:] invalid ibm/not-wf/P18/ibm18n02.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P19/ibm19n01.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDStart. The CDStart contains a lower case string "cdata". - ] -ibm/not-wf/P19/ibm19n02.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDStart. The CDStart contains an extra character "[". - ] +ibm/not-wf/P19/ibm19n01.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P19/ibm19n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P19/ibm19n03.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P20/ibm20n01.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDATA with an illegal sequence. The CDATA contains the string - "[[>". - ] -ibm/not-wf/P21/ibm21n01.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDEnd. One "]" is missing in the CDEnd. - ] -ibm/not-wf/P21/ibm21n02.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDEnd. An extra "]" is placed in the CDEnd. - ] -ibm/not-wf/P21/ibm21n03.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - invalid number of elements in - () - to satisfy lambda list - (CXML::NAME &REST CXML::ATTRS): - at least 1 expected, but 0 found -[ - Tests CDEnd. A wrong character ")" is placed in the CDEnd. - ] -ibm/not-wf/P22/ibm22n01.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - Tests prolog with wrong field ordering. The XMLDecl occurs - after the DTD. - ] -ibm/not-wf/P22/ibm22n02.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - Tests prolog with wrong field ordering. The Misc (comment) - occurs before the XMLDecl. - ] -ibm/not-wf/P22/ibm22n03.xml [not validating:] FAILED: - The value 118 is not of type LIST. -[ - Tests prolog with wrong field ordering. The XMLDecl occurs - after the DTD and a comment. The other comment occurs before the DTD. - ] +ibm/not-wf/P20/ibm20n01.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P21/ibm21n01.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P21/ibm21n02.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P21/ibm21n03.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P22/ibm22n01.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P22/ibm22n02.xml [not validating:] not-wf [validating:] invalid +ibm/not-wf/P22/ibm22n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P23/ibm23n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P23/ibm23n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P23/ibm23n03.xml [not validating:] not-wf [validating:] not-wf @@ -1315,16 +1163,7 @@ quot), and references to this entity appear in the document. ] ibm/not-wf/P39/ibm39n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P39/ibm39n02.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - bogus sublist - #(109 105 115 115 105 110 103) - to satisfy lambda-list - (CXML::NAME &REST CXML::ATTRS) -[ - Tests element with a required field missing. The STag is missing - for the element "root". - ] +ibm/not-wf/P39/ibm39n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P39/ibm39n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P39/ibm39n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P39/ibm39n05.xml [not validating:] not-wf [validating:] not-wf @@ -1634,13 +1473,7 @@ ibm/not-wf/P82/ibm82n07.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P82/ibm82n08.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P83/ibm83n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P83/ibm83n02.xml [not validating:] FAILED: - error while parsing arguments to DESTRUCTURING-BIND: - bogus sublist #(114) to satisfy lambda-list (CXML::NAME &REST CXML::ATTRS) -[ - Tests PublicID with wrong key word. The string "Public" is used as - the key word in the PublicID in the NotationDcl in the DTD. - ] +ibm/not-wf/P83/ibm83n02.xml [not validating:] not-wf [validating:] invalid ibm/not-wf/P83/ibm83n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P83/ibm83n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P83/ibm83n05.xml [not validating:] not-wf [validating:] not-wf @@ -2104,4 +1937,4 @@ 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 -57/1786 tests failed; 376 tests were skipped \ No newline at end of file +31/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv15203/xml Modified Files: xml-parse.lisp Log Message: noch ein paar assertions durch check-rune ersetzt Date: Sun Nov 27 13:43:29 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.26 cxml/xml/xml-parse.lisp:1.27 --- cxml/xml/xml-parse.lisp:1.26 Sun Nov 27 13:39:36 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 13:43:29 2005 @@ -1219,10 +1219,17 @@ (unread-rune c input) (values :CDATA (read-cdata input))))))))))) +(definline check-rune (input actual expected) + (declare (ignore input)) + (unless (eql actual expected) + (wf-error "expected #/~A but found #/~A" + (rune-char expected) + (rune-char actual)))) + (defun read-pe-reference (zinput) (let* ((input (car (zstream-input-stack zinput))) (nam (read-name-token input))) - (assert (rune= #/\; (read-rune input))) + (check-rune input #/\; (read-rune input)) (cond (*expand-pe-p* ;; no external entities here! (let ((i2 (entity->xstream nam :parameter))) @@ -1346,7 +1353,7 @@ (values kind (cons name atts))) ((eq (peek-rune input) #//) (consume-rune input) - (assert (rune= #/> (read-rune input))) + (check-rune input #/> (read-rune input)) (values :ztag (cons name atts))) (t (wf-error "syntax error in read-tag-2.")) ))) @@ -1427,7 +1434,7 @@ (wf-error "Expecting name after &.")) (let ((name (read-name-token input))) (setf c (read-rune input)) - (assert (rune= c #/\;)) + (check-rune input c #/\;) (ecase mode (:ATT (recurse-on-entity @@ -1449,7 +1456,7 @@ (wf-error "Expecting name after %.")) (let ((name (read-name-token input))) (setf c (read-rune input)) - (assert (rune= c #/\;)) + (check-rune input c #/\;) (cond (*expand-pe-p* (recurse-on-entity zinput name :parameter @@ -1473,16 +1480,10 @@ (declare (dynamic-extent #'muffle)) (muffle input (or delim (let ((delim (read-rune input))) - (assert (member delim '(#/\" #/\'))) + (unless (member delim '(#/\" #/\')) + (wf-error "invalid attribute delimiter")) delim)))))) -(defun check-rune (input actual expected) - (declare (ignore input)) - (unless (eql actual expected) - (wf-error "expected #/~A but found #/~A" - (rune-char expected) - (rune-char actual)))) - (defun read-character-reference (input) ;; xxx eof handling ;; The #/& is already read @@ -3217,7 +3218,7 @@ (wf-error "Expecting name after &.")) (let ((name (read-name-token input))) (setf c (read-rune input)) - (assert (rune= c #/\;)) + (check-rune input c #/\;) (recurse-on-entity zinput name :general (lambda (zinput)

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv15203 Modified Files: XMLCONF Log Message: noch ein paar assertions durch check-rune ersetzt Date: Sun Nov 27 13:43:29 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.21 cxml/XMLCONF:1.22 --- cxml/XMLCONF:1.21 Sun Nov 27 13:39:36 2005 +++ cxml/XMLCONF Sun Nov 27 13:43:29 2005 @@ -42,18 +42,9 @@ xmltest/not-wf/sa/042.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/043.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/044.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/045.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 62 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - Invalid Empty Element Tag ] -xmltest/not-wf/sa/046.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 62 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - This start (or empty element) tag was not terminated correctly. ] -xmltest/not-wf/sa/047.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 62 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - Invalid empty element tag invalid whitespace ] +xmltest/not-wf/sa/045.xml [not validating:] not-wf [validating:] invalid +xmltest/not-wf/sa/046.xml [not validating:] not-wf [validating:] invalid +xmltest/not-wf/sa/047.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/048.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/049.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/050.xml [not validating:] FAILED: @@ -579,10 +570,7 @@ sun/not-wf/dtd00.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/dtd01.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/dtd02.xml [not validating:] not-wf [validating:] not-wf -sun/not-wf/dtd03.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - PE name immediately followed by ";"] +sun/not-wf/dtd03.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/dtd04.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/dtd05.xml [not validating:] not-wf [validating:] not-wf sun/not-wf/dtd07.xml [not validating:] not-wf [validating:] not-wf @@ -888,19 +876,12 @@ oasis/p41fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p42fail1.xml [not validating:] not-wf [validating:] invalid oasis/p42fail2.xml [not validating:] not-wf [validating:] invalid -oasis/p42fail3.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 62 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - no NET (contrast with SGML) - ] +oasis/p42fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p43fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p43fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p43fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p44fail1.xml [not validating:] not-wf [validating:] not-wf -oasis/p44fail2.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 62 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - Illegal space after Empty element tag. ] +oasis/p44fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p44fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p44fail4.xml [not validating:] not-wf [validating:] not-wf oasis/p44fail5.xml [not validating:] not-wf [validating:] not-wf @@ -976,28 +957,16 @@ oasis/p68fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p68fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p68fail3.xml [not validating:] not-wf [validating:] not-wf -oasis/p69fail1.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - terminating ';' is required - ] +oasis/p69fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p69fail2.xml [not validating:] not-wf [validating:] not-wf -oasis/p69fail3.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - no S before ';' - ] +oasis/p69fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p70fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p71fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p71fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p71fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p71fail4.xml [not validating:] not-wf [validating:] not-wf oasis/p72fail1.xml [not validating:] not-wf [validating:] not-wf -oasis/p72fail2.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - S is required after '%' - ] +oasis/p72fail2.xml [not validating:] not-wf [validating:] not-wf oasis/p72fail3.xml [not validating:] not-wf [validating:] not-wf oasis/p72fail4.xml [not validating:] not-wf [validating:] not-wf oasis/p73fail1.xml [not validating:] not-wf [validating:] not-wf @@ -1134,18 +1103,8 @@ ibm/not-wf/P05/ibm05n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P05/ibm05n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P05/ibm05n03.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P09/ibm09n01.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= CXML::C 59) failed. -[ - Tests an internal general entity with an invalid value. The entity - "Fullname" contains "%". - ] -ibm/not-wf/P09/ibm09n02.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= CXML::C 59) failed. -[ - Tests an internal general entity with an invalid value. The entity - "Fullname" contains the ampersand character. - ] +ibm/not-wf/P09/ibm09n01.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P09/ibm09n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P09/ibm09n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P09/ibm09n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P10/ibm10n01.xml [not validating:] not-wf [validating:] not-wf @@ -1587,18 +1546,8 @@ 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 -ibm/not-wf/P69/ibm69n02.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - Tests PEReference with a required field missing. The semicolon is - missing in the PEReference "%paaa" in the DTD. - ] -ibm/not-wf/P69/ibm69n03.xml [not validating:] FAILED: - The assertion (RUNES:RUNE= 59 (RUNES:READ-RUNE CXML::INPUT)) failed. -[ - Tests PEReference with an extra white space. There is an extra - white space occurs before ";" in the PEReference in the DTD. - ] +ibm/not-wf/P69/ibm69n02.xml [not validating:] not-wf [validating:] not-wf +ibm/not-wf/P69/ibm69n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P69/ibm69n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P69/ibm69n06.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P69/ibm69n07.xml [not validating:] not-wf [validating:] not-wf @@ -2155,4 +2104,4 @@ 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 -70/1786 tests failed; 376 tests were skipped \ No newline at end of file +57/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv15151/xml Modified Files: xml-parse.lisp Log Message: character range pruefen Date: Sun Nov 27 13:39:37 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.25 cxml/xml/xml-parse.lisp:1.26 --- cxml/xml/xml-parse.lisp:1.25 Sun Nov 27 13:26:09 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 13:39:36 2005 @@ -1217,7 +1217,7 @@ (%put-unicode-char data collect))))))) (t (unread-rune c input) - (values :CDATA (read-cdata input))) )))))))) + (values :CDATA (read-cdata input))))))))))) (defun read-pe-reference (zinput) (let* ((input (car (zstream-input-stack zinput))) @@ -3158,6 +3158,18 @@ (defun read-cdata (input) (read-data-until* ((lambda (rune) (declare (type rune rune)) + (when (or (and (%rune< rune #/U+0020) + (not (or (%rune= rune #/U+0009) + (%rune= rune #/U+000a) + (%rune= rune #/U+000d)))) + ;; Surrogates nicht ausschliessen, denn wir + ;; haben ja UTF-16 Runen. + #+(or) + (and (%rune<= #/U+D800 rune) + (%rune< rune #/U+E000)) + (%rune= rune #/U+FFFE) + (%rune= rune #/U+FFFF)) + (wf-error "code point invalid: ~A" rune)) (or (%rune= rune #/<) (%rune= rune #/&))) input source start end)

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv15151 Modified Files: XMLCONF Log Message: character range pruefen Date: Sun Nov 27 13:39:36 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.20 cxml/XMLCONF:1.21 --- cxml/XMLCONF:1.20 Sun Nov 27 13:26:08 2005 +++ cxml/XMLCONF Sun Nov 27 13:39:36 2005 @@ -27,16 +27,10 @@ xmltest/not-wf/sa/027.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/028.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/029.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/030.xml [not validating:] FAILED: - well-formedness violation not detected -[ - A form feed is not a legal XML character. ] +xmltest/not-wf/sa/030.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/031.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/032.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/033.xml [not validating:] FAILED: - well-formedness violation not detected -[ - An ESC (octal 033) is not a legal XML character. ] +xmltest/not-wf/sa/033.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/034.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/035.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/036.xml [not validating:] not-wf [validating:] invalid @@ -238,10 +232,7 @@ xmltest/not-wf/sa/164.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/165.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/166.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/167.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Character FFFE is not legal anywhere in an XML document. ] +xmltest/not-wf/sa/167.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/168.xml [not validating:] FAILED: Encoding UTF-16 in UTF-8? : #xD800. [ @@ -742,127 +733,37 @@ ] oasis/p01fail3.xml [not validating:] not-wf [validating:] invalid oasis/p01fail4.xml [not validating:] not-wf [validating:] invalid -oasis/p02fail1.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail10.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail11.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail12.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail13.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail14.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail15.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail16.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail17.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail18.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail19.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail2.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail20.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail21.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail22.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail23.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail24.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail25.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail26.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail27.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail28.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail29.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail3.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail30.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] +oasis/p02fail1.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail10.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail11.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail12.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail13.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail14.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail15.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail16.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail17.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail18.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail19.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail2.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail20.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail21.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail22.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail23.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail24.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail25.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail26.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail27.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail28.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail29.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail3.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail30.xml [not validating:] not-wf [validating:] invalid oasis/p02fail31.xml [not validating:] not-wf [validating:] invalid -oasis/p02fail4.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail5.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail6.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail7.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail8.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] -oasis/p02fail9.xml [not validating:] FAILED: - well-formedness violation not detected -[ - Use of illegal character within XML document. ] +oasis/p02fail4.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail5.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail6.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail7.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail8.xml [not validating:] not-wf [validating:] invalid +oasis/p02fail9.xml [not validating:] not-wf [validating:] invalid oasis/p03fail1.xml [not validating:] not-wf [validating:] not-wf oasis/p03fail10.xml [not validating:] not-wf [validating:] not-wf oasis/p03fail11.xml [not validating:] not-wf [validating:] not-wf @@ -2254,4 +2155,4 @@ 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 -103/1786 tests failed; 376 tests were skipped \ No newline at end of file +70/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv14054/xml Modified Files: xml-parse.lisp Log Message: eof in kommentaren Date: Sun Nov 27 13:26:09 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.24 cxml/xml/xml-parse.lisp:1.25 --- cxml/xml/xml-parse.lisp:1.24 Sun Nov 27 13:24:40 2005 +++ cxml/xml/xml-parse.lisp Sun Nov 27 13:26:09 2005 @@ -1573,6 +1573,8 @@ (tagbody state-1 (setf d (read-rune input)) + (when (eq d :eof) + (eox input)) (unless (data-rune-p d) (wf-error "Illegal char: ~S." d)) (when (rune= d #/-) (go state-2)) @@ -1580,6 +1582,8 @@ (go state-1) state-2 ;; #/- seen (setf d (read-rune input)) + (when (eq d :eof) + (eox input)) (unless (data-rune-p d) (wf-error "Illegal char: ~S." d)) (when (rune= d #/-) (go state-3)) @@ -1588,6 +1592,8 @@ (go state-1) state-3 ;; #/- #/- seen (setf d (read-rune input)) + (when (eq d :eof) + (eox input)) (unless (data-rune-p d) (wf-error "Illegal char: ~S." d)) (when (rune= d #/>) (return))

1 0

[cxml-cvs] CVS update: cxml/XMLCONF
by dlichteblau＠common-lisp.net 27 Nov '05

27 Nov '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv14054 Modified Files: XMLCONF Log Message: eof in kommentaren Date: Sun Nov 27 13:26:09 2005 Author: dlichteblau Index: cxml/XMLCONF diff -u cxml/XMLCONF:1.19 cxml/XMLCONF:1.20 --- cxml/XMLCONF:1.19 Sun Nov 27 13:24:38 2005 +++ cxml/XMLCONF Sun Nov 27 13:26:08 2005 @@ -24,10 +24,7 @@ xmltest/not-wf/sa/024.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/025.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/026.xml [not validating:] not-wf [validating:] invalid -xmltest/not-wf/sa/027.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Comments must be terminated with "-->".] +xmltest/not-wf/sa/027.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/028.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/029.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/sa/030.xml [not validating:] FAILED: @@ -276,11 +273,7 @@ xmltest/not-wf/sa/179.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/180.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/181.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/sa/182.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Internal parsed entities must match the - production to be well formed. ] +xmltest/not-wf/sa/182.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/183.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/184.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/sa/185.xml [not validating:] not-wf [validating:] not-wf @@ -292,12 +285,7 @@ xmltest/not-wf/not-sa/006.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/not-sa/007.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/not-sa/008.xml [not validating:] not-wf [validating:] not-wf -xmltest/not-wf/not-sa/009.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - This test violates WFC:PE Between Declarations in Production 28a. - The last character of a markup declaration is not contained in the same - parameter-entity text replacement.] +xmltest/not-wf/not-sa/009.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/ext-sa/001.xml [not validating:] not-wf [validating:] invalid xmltest/not-wf/ext-sa/002.xml [not validating:] not-wf [validating:] not-wf xmltest/not-wf/ext-sa/003.xml [not validating:] not-wf [validating:] not-wf @@ -1222,11 +1210,7 @@ Tests a comment which contains an illegal Char: #xDFFF ] ibm/not-wf/P02/ibm02n32.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P02/ibm02n33.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Tests a comment which contains an illegal Char: #xFFFF - ] +ibm/not-wf/P02/ibm02n33.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P03/ibm03n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P04/ibm04n01.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P04/ibm04n02.xml [not validating:] not-wf [validating:] not-wf @@ -1285,19 +1269,9 @@ ibm/not-wf/P14/ibm14n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P14/ibm14n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P15/ibm15n01.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P15/ibm15n02.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Tests comment. The second comment has a wrong closing sequence - "-(greater than)". - ] +ibm/not-wf/P15/ibm15n02.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P15/ibm15n03.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P15/ibm15n04.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Tests comment. The closing sequence is missing with the second - comment. - ] +ibm/not-wf/P15/ibm15n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P16/ibm16n01.xml [not validating:] FAILED: error while parsing arguments to DESTRUCTURING-BIND: bogus sublist #(97) to satisfy lambda-list (CXML::NAME &REST CXML::ATTRS) @@ -1450,12 +1424,7 @@ ibm/not-wf/P29/ibm29n03.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P29/ibm29n04.xml [not validating:] not-wf [validating:] not-wf ibm/not-wf/P29/ibm29n05.xml [not validating:] not-wf [validating:] not-wf -ibm/not-wf/P29/ibm29n06.xml [not validating:] FAILED: - The value :EOF is not of type NUMBER. -[ - Tests WFC "PEs in Internal Subset". A PE reference occurs inside a comment - in the DTD. - ] +ibm/not-wf/P29/ibm29n06.xml [not validating:] not-wf [validating:] not-wf 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 @@ -2285,4 +2254,4 @@ 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 -110/1786 tests failed; 376 tests were skipped \ No newline at end of file +103/1786 tests failed; 376 tests were skipped \ No newline at end of file

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs November 2005