using System;
using System.Collections;
-using System.Globalization;\r
+using System.Globalization;
using System.IO;
using System.Security.Policy;
using System.Text;
namespace System.Xml
{
+#if NET_2_0
+ public class XmlTextReader : XmlReader,
+ IXmlLineInfo, IXmlNamespaceResolver
+#else
public class XmlTextReader : XmlReader, IXmlLineInfo
+#endif
{
#region Constructors
get { return parserContext.BaseURI; }
}
+#if NET_2_0
+ public override bool CanResolveEntity {
+ get { return true; }
+ }
+
+#endif
+
+ internal bool CharacterChecking {
+ get { return checkCharacters && normalization; }
+ set { checkCharacters = value; }
+ }
+
+ // for XmlReaderSettings.CloseInput support
+ internal bool CloseInput {
+ get { return closeInput; }
+ set { closeInput = value; }
+ }
+
public override int Depth
{
get {
#if NET_2_0
[MonoTODO]
public EntityHandling EntityHandling {
- get { throw new NotImplementedException (); }
+ get { return entityHandling; }
+ set { entityHandling = value; }
}
#endif
- public override bool EOF
- {
- get
- {
- return
- readState == ReadState.EndOfFile ||
- readState == ReadState.Closed;
- }
+ public override bool EOF {
+ get { return readState == ReadState.EndOfFile; }
}
#if NET_2_0
get { return readState; }
}
+#if NET_2_0
+ public override XmlReaderSettings Settings {
+ get { return base.Settings; }
+ }
+#endif
+
public override string Value {
get { return cursorToken.Value != null ? cursorToken.Value : String.Empty; }
}
cursorToken.Clear ();
currentToken.Clear ();
attributeCount = 0;
- if (reader != null)
+ if (closeInput && reader != null)
reader.Close ();
}
return attributeTokens [idx].Value;
}
+#if NET_2_0
+ public IDictionary GetNamespacesInScope (XmlNamespaceScope scope)
+ {
+ return parserContext.NamespaceManager.GetNamespacesInScope (scope);
+ }
+#endif
+
public TextReader GetRemainder ()
{
if (peekCharsIndex == peekCharsLength)
return new StringReader (new string (peekChars, peekCharsIndex, peekCharsLength - peekCharsIndex) + reader.ReadToEnd ());
}
+#if NET_2_0
+ public bool HasLineInfo ()
+#else
bool IXmlLineInfo.HasLineInfo ()
+#endif
{
return true;
}
return LookupNamespace (prefix, false);
}
- internal string LookupNamespace (string prefix, bool atomizedName)
+#if NET_2_0
+ public override string LookupNamespace (string prefix, bool atomizedName)
+#else
+ internal override string LookupNamespace (string prefix, bool atomizedName)
+#endif
{
return parserContext.NamespaceManager.LookupNamespace (prefix, atomizedName);
}
+#if NET_2_0
+ string IXmlNamespaceResolver.LookupPrefix (string ns)
+ {
+ return LookupPrefix (ns, false);
+ }
+
+ public string LookupPrefix (string ns, bool atomizedName)
+ {
+ return parserContext.NamespaceManager.LookupPrefix (ns, atomizedName);
+ }
+#endif
+
public override void MoveToAttribute (int i)
{
if (i >= attributeCount)
return false;
}
+ private int SkipIgnorableBase64Chars (char [] chars, int charsLength, int i)
+ {
+ while (chars [i] == '=' || XmlChar.IsWhitespace (chars [i]))
+ if (charsLength == ++i)
+ break;
+ return i;
+ }
+
public int ReadBase64 (byte [] buffer, int offset, int length)
{
if (offset < 0)
byte b = 0;
byte work = 0;
- for (int i = 0; i < charsLength - 3; i += 4) {
+ bool loop = true;
+ for (int i = 0; i < charsLength - 3; i++) {
+ if ((i = SkipIgnorableBase64Chars (chars, charsLength, i)) == charsLength)
+ break;
b = (byte) (GetBase64Byte (chars [i]) << 2);
if (bufIndex < bufLast)
buffer [bufIndex] = b;
base64Cache [0] = b;
}
// charsLength mod 4 might not equals to 0.
- if (i + 1 == charsLength)
+ if (++i == charsLength)
+ break;
+ if ((i = SkipIgnorableBase64Chars (chars, charsLength, i)) == charsLength)
break;
- b = GetBase64Byte (chars [i + 1]);
+ b = GetBase64Byte (chars [i]);
work = (byte) (b >> 4);
if (bufIndex < bufLast) {
buffer [bufIndex] += work;
base64Cache [1] = work;
}
- if (i + 2 == charsLength)
+ if (++i == charsLength)
break;
- b = GetBase64Byte (chars [i + 2]);
+ if ((i = SkipIgnorableBase64Chars (chars, charsLength, i)) == charsLength)
+ break;
+ b = GetBase64Byte (chars [i]);
work = (byte) (b >> 2);
if (bufIndex < bufLast) {
buffer [bufIndex] += work;
base64CacheStartsAt = 2;
base64Cache [2] = work;
}
- if (i + 3 == charsLength)
+ if (++i == charsLength)
+ break;
+ if ((i = SkipIgnorableBase64Chars (chars, charsLength, i)) == charsLength)
break;
- work = GetBase64Byte (chars [i + 3]);
+ work = GetBase64Byte (chars [i]);
if (bufIndex < bufLast) {
buffer [bufIndex] += work;
bufIndex++;
return ReadCharsInternal (buffer, offset, length);
}
-#if NET_1_1
+#if NET_2_0
+ public override string ReadString ()
+ {
+ return ReadStringInternal ();
+ }
+#elif NET_1_1
#else
public override string ReadInnerXml ()
{
public void ResetState ()
{
+ throw new InvalidOperationException ("Cannot call ResetState when parsing an XML fragment.");
Init ();
}
+#if NET_2_0
+ [MonoTODO]
+ public override bool ReadValueAsBoolean ()
+ {
+ return base.ReadValueAsBoolean ();
+ }
+
+ [MonoTODO]
+ public override DateTime ReadValueAsDateTime ()
+ {
+ return base.ReadValueAsDateTime ();
+ }
+
+ [MonoTODO]
+ public override decimal ReadValueAsDecimal ()
+ {
+ return base.ReadValueAsDecimal ();
+ }
+
+ [MonoTODO]
+ public override double ReadValueAsDouble ()
+ {
+ return base.ReadValueAsDouble ();
+ }
+
+ [MonoTODO]
+ public override int ReadValueAsInt32 ()
+ {
+ return base.ReadValueAsInt32 ();
+ }
+
+ [MonoTODO]
+ public override long ReadValueAsInt64 ()
+ {
+ return base.ReadValueAsInt64 ();
+ }
+
+ [MonoTODO]
+ public override ICollection ReadValueAsList ()
+ {
+ return base.ReadValueAsList ();
+ }
+
+ [MonoTODO]
+ public override float ReadValueAsSingle ()
+ {
+ return base.ReadValueAsSingle ();
+ }
+
+ [MonoTODO]
+ public override string ReadValueAsString ()
+ {
+ return ReadString ();
+ }
+
+ [MonoTODO]
+ public override object ReadValueAs (Type type)
+ {
+ return base.ReadValueAs (type);
+ }
+
+ [MonoTODO]
+ public override object ReadValueAs (Type type, IXmlNamespaceResolver resolver)
+ {
+ return base.ReadValueAs (type, resolver);
+ }
+#endif
+
public override void ResolveEntity ()
{
// XmlTextReader does not resolve entities.
private XmlResolver resolver = new XmlUrlResolver ();
private bool normalization = false;
+ private bool checkCharacters;
private bool prohibitDtd = false;
+ private bool closeInput = true;
+ private EntityHandling entityHandling; // 2.0
private void Init ()
{
peekChars = new char [peekCharCapacity];
line = 1;
- column = 0;
+ column = 1;
currentTagLength = 0;
currentLinkedNodeLineNumber = currentLinkedNodeLinePosition = 0;
shouldSkipUntilEndTag = false;
base64CacheStartsAt = -1;
+
+ checkCharacters = true;
+#if NET_2_0
+ if (Settings != null)
+ checkCharacters = Settings.CheckCharacters;
+#endif
+ prohibitDtd = false;
+ closeInput = true;
+ entityHandling = EntityHandling.ExpandCharEntities;
}
private void InitializeContext (string url, XmlParserContext context, TextReader fragment, XmlNodeType fragType)
Init ();
+ reader = fragment;
+
switch (fragType) {
case XmlNodeType.Attribute:
- fragment = new StringReader (fragment.ReadToEnd ().Replace ("\"", """));
+ reader = new StringReader (fragment.ReadToEnd ().Replace ("\"", """));
break;
case XmlNodeType.Element:
currentState = XmlNodeType.Element;
default:
throw new XmlException (String.Format ("NodeType {0} is not allowed to create XmlTextReader.", fragType));
}
+ }
- reader = fragment;
+#if NET_2_0
+ [MonoTODO ("Test")]
+ internal ConformanceLevel Conformance {
+ set {
+ if (value == ConformanceLevel.Fragment) {
+ currentState = XmlNodeType.Element;
+ allowMultipleRoot = true;
+ }
+ }
}
+ internal void AdjustLineInfoOffset (int lineNumberOffset, int linePositionOffset)
+ {
+ line += lineNumberOffset;
+ column += linePositionOffset;
+ }
+
+ internal void SetNameTable (XmlNameTable nameTable)
+ {
+ parserContext.NameTable = nameTable;
+ }
+#endif
+
// Use this method rather than setting the properties
// directly so that all the necessary properties can
// be changed in harmony with each other. Maybe the
return -1;
return PeekChar ();
}
- else
- return peekChars [peekCharsIndex];
+ else {
+ char c = peekChars [peekCharsIndex];
+ if (c != 0) return c;
+ else return -1;
+ }
}
private int ReadChar ()
if (ch == '\n') {
line++;
column = 1;
+ } else if (ch == 0) {
+ return -1;
} else {
column++;
}
parserContext.NamespaceManager.PushScope ();
+ currentLinkedNodeLineNumber = line;
+ currentLinkedNodeLinePosition = column;
+
string name = ReadName ();
if (currentState == XmlNodeType.EndElement)
throw new XmlException (this as IXmlLineInfo,"document has terminated, cannot open new element");
throw new XmlException (this as IXmlLineInfo,
"End tag cannot appear in this state.");
+ currentLinkedNodeLineNumber = line;
+ currentLinkedNodeLinePosition = column;
+
string name = ReadName ();
if (elementNameStackPos == 0)
throw new XmlException (this as IXmlLineInfo,"closing element without matching opening element");
ch = ReadReference (false);
if (returnEntityReference) // Returns -1 if char validation should not be done
break;
- }
- else {
- if (XmlChar.IsInvalid (ch))
+ } else if (normalization && ch == '\r') {
+ ReadChar ();
+ ch = ReadChar ();
+ if (ch != '\n')
+ // append '\n' instead of '\r'.
+ AppendValueChar ('\n');
+ // and in case of "\r\n", discard '\r'.
+ } else {
+ if (CharacterChecking && XmlChar.IsInvalid (ch))
throw new XmlException (this, "Not allowed character was found.");
ch = ReadChar ();
}
ReadChar (); // ';'
// There is no way to save surrogate pairs...
- if (normalization && XmlChar.IsInvalid (value))
+ if (CharacterChecking && XmlChar.IsInvalid (value))
throw new XmlException (this as IXmlLineInfo,
- "Referenced character was not allowed in XML.");
+ "Referenced character was not allowed in XML. Normalization is " + normalization + ", checkCharacters = " + checkCharacters);
return value;
}
if (PeekChar () == '#') {
ReadChar ();
ch = ReadCharacterReference ();
- if (normalization && XmlChar.IsInvalid (ch))
+ if (CharacterChecking && XmlChar.IsInvalid (ch))
throw new XmlException (this as IXmlLineInfo,
"Not allowed character was found.");
AppendValueChar (ch);
AppendValueChar (predefined);
break;
default:
- if (normalization && XmlChar.IsInvalid (ch))
+ if (CharacterChecking && XmlChar.IsInvalid (ch))
throw new XmlException (this, "Invalid character was found.");
AppendValueChar (ch);
break;
break;
}
- if (normalization && XmlChar.IsInvalid (ch))
+ if (CharacterChecking && XmlChar.IsInvalid (ch))
throw new XmlException (this, "Invalid character was found.");
AppendValueChar (ch);
}
skip = true;
}
}
- if (normalization && XmlChar.IsInvalid (ch))
+ if (normalization && ch == '\r') {
+ ch = PeekChar ();
+ if (ch != '\n')
+ // append '\n' instead of '\r'.
+ AppendValueChar ('\n');
+ // otherwise, discard '\r'.
+ continue;
+ }
+ if (CharacterChecking && XmlChar.IsInvalid (ch))
throw new XmlException (this, "Invalid character was found.");
AppendValueChar (ch);
case -1:
throw new XmlException (this as IXmlLineInfo,"unexpected end of file at DTD.");
case '<':
- if (State == DtdInputState.InsideDoubleQuoted ||
- State == DtdInputState.InsideSingleQuoted)
+ switch (State) {
+ case DtdInputState.InsideDoubleQuoted:
+ case DtdInputState.InsideSingleQuoted:
+ case DtdInputState.Comment:
continue; // well-formed
- switch (ReadChar ()) {
+ }
+ int c = ReadChar ();
+ switch (c) {
case '?':
stateStack.Push (DtdInputState.PI);
break;
}
break;
default:
- throw new XmlException (this as IXmlLineInfo,"unexpected '>'.");
+ throw new XmlException (this as IXmlLineInfo, String.Format ("unexpected '<{0}'.", (char) c));
}
break;
case '\'':
stateStack.Pop ();
break;
case DtdInputState.InsideDoubleQuoted:
- continue;
case DtdInputState.InsideSingleQuoted:
- continue; // well-formed
case DtdInputState.Comment:
continue;
default:
return;
}
+ // Since ReadBase64() is processed for every 4 chars, it does
+ // not handle '=' here.
private byte GetBase64Byte (char ch)
{
switch (ch) {
return 62;
case '/':
return 63;
- case '=':
- return 0;
default:
if (ch >= 'A' && ch <= 'Z')
return (byte) (ch - 'A');
return 0;
}
- shouldSkipUntilEndTag = true;
-
if (offset < 0)
throw new ArgumentOutOfRangeException ("offset", offset, "Offset must be non-negative integer.");
else if (length < 0)
if (NodeType != XmlNodeType.Element)
return 0;
+ shouldSkipUntilEndTag = true;
+
int bufIndex = offset;
for (int i = 0; i < length; i++) {
int c = PeekChar ();
depth++;
depthUp = false;
}
- ReadEndTag();
+ ReadEndTag ();
shouldSkipUntilEndTag = false;
- Read ();
+ Read (); // move to the next node
return i;
default:
ReadChar ();
projects / mono.git / blobdiff