test/utf8domtest.diff

   1 Index: test/domtest.lisp
   2 ===================================================================
   3 RCS file: /project/cxml/cvsroot/cxml/test/domtest.lisp,v
   4 retrieving revision 1.13
   5 diff -u -r1.13 domtest.lisp
   6 --- test/domtest.lisp   27 Dec 2005 00:21:37 -0000      1.13
   7 +++ test/domtest.lisp   27 Dec 2005 00:46:00 -0000
   8 @@ -137,21 +137,22 @@
   9      ((digit-char-p (runes:rune-char (elt str 0)))
  10        (parse-integer (runes:rod-string str)))
  11      ((runes:rune= (elt str 0) #.(runes:char-rune #\"))
  12 -      (let ((v (make-array 1 :fill-pointer 0 :adjustable t)))
  13 -        (for* ((i = 1 :then (1+ i))
  14 -               (c = (elt str i))
  15 -               :until (runes:rune= c #.(runes:char-rune #\")))
  16 -            (if (runes:rune= c #.(runes:char-rune #\\))
  17 -                (let ((frob
  18 -                      (progn
  19 -                         (incf i)
  20 -                         (elt str i))))
  21 -                 (ecase frob
  22 -                   ;; ...
  23 -                   (#/n (vector-push-extend #/newline v (length v)))
  24 -                   ((#/\\ #/\") (vector-push-extend #/\\ v (length v)))))
  25 -                (vector-push-extend c v (length v))))
  26 -        (coerce v 'runes::simple-rod)))
  27 +      (utf8-dom::%rod
  28 +       (let ((v (make-array 1 :fill-pointer 0 :adjustable t)))
  29 +        (for* ((i = 1 :then (1+ i))
  30 +               (c = (elt str i))
  31 +               :until (runes:rune= c #.(runes:char-rune #\")))
  32 +              (if (runes:rune= c #.(runes:char-rune #\\))
  33 +                  (let ((frob
  34 +                         (progn
  35 +                           (incf i)
  36 +                           (elt str i))))
  37 +                    (ecase frob
  38 +                      ;; ...
  39 +                      (#/n (vector-push-extend #/newline v (length v)))
  40 +                      ((#/\\ #/\") (vector-push-extend #/\\ v (length v)))))
  41 +                (vector-push-extend c v (length v))))
  42 +        (coerce v 'runes::simple-rod))))
  43      (t
  44        (%intern str))))
  45
  46 @@ -368,7 +369,7 @@
  47
  48  (defun translate-implementation (elt)
  49    (with-attributes (|var|) elt
  50 -    (maybe-setf (%intern |var|) `'rune-dom:implementation)))
  51 +    (maybe-setf (%intern |var|) `'utf8-dom:implementation)))
  52
  53  (defun translate-length (load)
  54    ;; XXX Soweit ich sehe unterscheiden die Tests nicht zwischen
  55 @@ -406,7 +407,7 @@
  56      (if (nullify |obj|)
  57         (translate-member element)
  58         (maybe-setf (%intern |var|)
  59 -                   `(dom:has-feature 'rune-dom:implementation
  60 +                   `(dom:has-feature 'utf8-dom:implementation
  61                                       ,(parse-java-literal |feature|)
  62                                       ,(parse-java-literal |version|))))))
  63
  64 @@ -493,9 +494,9 @@
  65        (return
  66          `(block assert-domexception
  67             (handler-bind
  68 -               ((rune-dom::dom-exception
  69 +               ((utf8-dom::dom-exception
  70                   (lambda (c)
  71 -                   (when (eq (rune-dom::dom-exception-key c)
  72 +                   (when (eq (utf8-dom::dom-exception-key c)
  73                               ,(intern (tag-name c) :keyword))
  74                       (return-from assert-domexception)))))
  75               ,@(translate-body c)
  76 @@ -506,7 +507,7 @@
  77       ,@(map-child-elements
  78          'list
  79          (lambda (exception)
  80 -          `(when (eq (rune-dom::dom-exception-key c)
  81 +          `(when (eq (utf8-dom::dom-exception-key c)
  82                       ,(intern (runes:rod-string (dom:get-attribute exception "code"))
  83                                :keyword))
  84               ,@(translate-body exception)
  85 @@ -516,7 +517,7 @@
  86  (defun translate-try (element)
  87    `(block try
  88       (handler-bind
  89 -         ((rune-dom::dom-exception
  90 +         ((utf8-dom::dom-exception
  91             ,(translate-catch
  92               (do-child-elements (c element :name "catch") (return c))
  93               '(return-from try))))
  94 @@ -631,7 +632,7 @@
  95    (setf name (runes:rod-string name))
  96    (cxml:parse-file
  97     (make-pathname :name name :type "xml" :defaults *files-directory*)
  98 -   (rune-dom:make-dom-builder)))
  99 +   (cxml:make-recoder (utf8-dom:make-dom-builder) 'cxml:rod-to-utf8-string)))
 100
 101  (defparameter *bad-tests*
 102      '("hc_elementnormalize2.xml"