From f804e914f2deb70db26c9cef9c913c51fb74cb1c Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 16 Oct 2001 20:13:03 +0000
Subject: [PATCH] Fix problem in declaration parser.
---
v7/src/xml/xml-parser.scm | 52 +++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/v7/src/xml/xml-parser.scm b/v7/src/xml/xml-parser.scm
index 2e778a53d..d4ed011f9 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.10 2001/07/16 20:39:33 cph Exp $
+;;; $Id: xml-parser.scm,v 1.11 2001/10/16 20:13:03 cph Exp $
;;;
;;; Copyright (c) 2001 Massachusetts Institute of Technology
;;;
@@ -93,30 +93,30 @@
;;;; Top level
(define (parse-xml-document buffer) ;[1,22]
- (fluid-let ((*general-entities* (predefined-entities))
- (*standalone?*)
- (*internal-dtd?* #t))
- (let ((declaration (parse-declaration buffer))
- (one-value (lambda (v) (and v (vector-ref v 0)))))
- (set! *standalone?*
- (and declaration
- (equal? (xml-declaration-standalone declaration)
- "yes")))
- (let* ((misc-1 (one-value (parse-misc buffer)))
- (dtd (one-value (parse-dtd buffer)))
- (misc-2 (if dtd (one-value (parse-misc buffer)) '()))
- (element
- (or (one-value (parse-element buffer))
- (perror buffer "Missing root element")))
- (misc-3 (one-value (parse-misc buffer))))
- (if (peek-parser-buffer-char buffer)
- (perror buffer "Unparsed content in input"))
- (make-xml-document declaration
- misc-1
- dtd
- misc-2
- element
- misc-3)))))
+ (let ((one-value (lambda (v) (and v (vector-ref v 0)))))
+ (fluid-let ((*general-entities* (predefined-entities))
+ (*standalone?*)
+ (*internal-dtd?* #t))
+ (let ((declaration (one-value (parse-declaration buffer))))
+ (set! *standalone?*
+ (and declaration
+ (equal? (xml-declaration-standalone declaration)
+ "yes")))
+ (let* ((misc-1 (one-value (parse-misc buffer)))
+ (dtd (one-value (parse-dtd buffer)))
+ (misc-2 (if dtd (one-value (parse-misc buffer)) '()))
+ (element
+ (or (one-value (parse-element buffer))
+ (perror buffer "Missing root element")))
+ (misc-3 (one-value (parse-misc buffer))))
+ (if (peek-parser-buffer-char buffer)
+ (perror buffer "Unparsed content in input"))
+ (make-xml-document declaration
+ misc-1
+ dtd
+ misc-2
+ element
+ misc-3))))))
(define *standalone?*)
(define *internal-dtd?*)
@@ -133,7 +133,7 @@
(*parser
(top-level
(with-pointer p
- (transform
+ (encapsulate
(lambda (v)
(transform-declaration (vector-ref v 0) allow-standalone? p))
(sbracket description "<?xml" "?>"
--
2.25.1