2014-08-08 17:40:50 +02:00
|
|
|
diff -rupN net.old/sf/saxon/aelfred/XmlParser.java net/sf/saxon/aelfred/XmlParser.java
|
|
|
|
--- net.old/sf/saxon/aelfred/XmlParser.java 2002-04-12 14:30:00.000000000 -0700
|
|
|
|
+++ net/sf/saxon/aelfred/XmlParser.java 2014-08-08 07:24:55.979292881 -0700
|
|
|
|
@@ -1463,7 +1463,7 @@ loop:
|
|
|
|
{
|
|
|
|
String name;
|
|
|
|
int type;
|
|
|
|
- String enum = null;
|
|
|
|
+ String enum2 = null;
|
2008-03-03 16:59:28 +01:00
|
|
|
|
2014-08-08 17:40:50 +02:00
|
|
|
// Read the attribute name.
|
|
|
|
name = readNmtoken (true);
|
|
|
|
@@ -1475,12 +1475,12 @@ loop:
|
|
|
|
// Get the string of enumerated values
|
|
|
|
// if necessary.
|
|
|
|
if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) {
|
|
|
|
- enum = dataBufferToString ();
|
|
|
|
+ enum2 = dataBufferToString ();
|
|
|
|
}
|
2008-03-03 16:59:28 +01:00
|
|
|
|
2014-08-08 17:40:50 +02:00
|
|
|
// Read the default value.
|
|
|
|
requireWhitespace ();
|
|
|
|
- parseDefault (elementName, name, type, enum);
|
|
|
|
+ parseDefault (elementName, name, type, enum2);
|
|
|
|
}
|
2008-03-03 16:59:28 +01:00
|
|
|
|
|
|
|
|
2014-08-08 17:40:50 +02:00
|
|
|
@@ -1573,7 +1573,7 @@ loop:
|
|
|
|
String elementName,
|
|
|
|
String name,
|
|
|
|
int type,
|
|
|
|
- String enum
|
|
|
|
+ String enum2
|
|
|
|
) throws Exception
|
|
|
|
{
|
|
|
|
int valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
|
|
|
|
@@ -1605,7 +1605,7 @@ loop:
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
value = readLiteral (flags);
|
|
|
|
- setAttribute (elementName, name, type, enum, value, valueType);
|
|
|
|
+ setAttribute (elementName, name, type, enum2, value, valueType);
|
2008-03-03 16:59:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-08-08 17:40:50 +02:00
|
|
|
Binary files net.old/sf/saxon/aelfred/.XmlParser.java.un~ and net/sf/saxon/aelfred/.XmlParser.java.un~ differ
|