You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/10/19 22:50:42 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/framework XMLDTDScanner.java
lehors 00/10/19 13:50:40
Modified: java/src/org/apache/xerces/framework XMLDTDScanner.java
Log:
Fixed a bug in scanAttlistDecl. It failed to parse correctly the
following:
<!ENTITY % defaultAtVal "'yo!'">
<!ATTLIST test foo CDATA #FIXED%defaultAtVal;>
It failed to support a PE ref there and reported not to find a
whitespace after #FIXED.
Revision Changes Path
1.15 +2 -3 xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/framework/XMLDTDScanner.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XMLDTDScanner.java 2000/08/04 20:55:23 1.14
+++ XMLDTDScanner.java 2000/10/19 20:50:36 1.15
@@ -90,7 +90,7 @@
* </ol>
*
* @see XMLDTDScanner.EventHandler
- * @version $Id: XMLDTDScanner.java,v 1.14 2000/08/04 20:55:23 ericye Exp $
+ * @version $Id: XMLDTDScanner.java,v 1.15 2000/10/19 20:50:36 lehors Exp $
*/
public final class XMLDTDScanner {
//
@@ -2143,13 +2143,12 @@
attDefDefaultType = XMLAttributeDecl.DEFAULT_TYPE_IMPLIED;
} else {
if (fEntityReader.skippedString(fixed_string)) {
- if (!fEntityReader.lookingAtSpace(true)) {
+ if (!checkForPEReference(true)) {
abortMarkup(XMLMessages.MSG_SPACE_REQUIRED_AFTER_FIXED_IN_DEFAULTDECL,
XMLMessages.P60_SPACE_REQUIRED,
elementTypeIndex, attDefName);
return;
}
- fEntityReader.skipPastSpaces();
attDefDefaultType = XMLAttributeDecl.DEFAULT_TYPE_FIXED;
} else
attDefDefaultType = XMLAttributeDecl.DEFAULT_TYPE_DEFAULT;