From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 8 Dec 2002 17:58:45 +0000 (+0000)
Subject: Change output of parser to distinguish <foo></foo> from <foo/>.
X-Git-Tag: 20090517-FFI~2116
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f066ecc37b2f45f0517c5fd6f63b503b70cd0f9d;p=mit-scheme.git

Change output of parser to distinguish <foo></foo> from <foo/>.
---

diff --git a/v7/src/xml/xml-parser.scm b/v7/src/xml/xml-parser.scm
index 0f7f6067d..bd38d6b1b 100644
--- a/v7/src/xml/xml-parser.scm
+++ b/v7/src/xml/xml-parser.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: xml-parser.scm,v 1.13 2002/12/07 04:14:09 cph Exp $
+;;; $Id: xml-parser.scm,v 1.14 2002/12/08 17:58:45 cph Exp $
 ;;;
 ;;; Copyright (c) 2001, 2002 Massachusetts Institute of Technology
 ;;;
@@ -218,11 +218,20 @@
 			   (if (not (eq? (vector-ref v 0) (vector-ref v* 0)))
 			       (perror p "Mismatched start tag"
 				       (vector-ref v 0) (vector-ref v* 0)))
-			   (coalesce-strings!
-			    (list-transform-negative (vector->list elements)
-			      (lambda (element)
-				(and (string? element)
-				     (string-null? element))))))
+			   (let ((contents
+				  (coalesce-strings!
+				   (list-transform-negative
+				       (vector->list elements)
+				     (lambda (element)
+				       (and (string? element)
+					    (string-null? element)))))))
+			     (if (null? contents)
+				 ;; Preserve fact that this element
+				 ;; was formed by a start/end tag pair
+				 ;; rather than by an empty-element
+				 ;; tag.
+				 (list "")
+				 contents)))
 			 (let ((v* (parse-content buffer)))
 			   (if (not v*)
 			       (perror p "Unterminated start tag"