pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

some minor cleanup

pull/252/head
Siegfried Pammer 14 years ago
parent
b8fd7b4d99
commit
fa638010a9
1 changed files with 13 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs

68
ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs
Unescape View File

@ -76,13 +76,7 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
List<KeyMapping> keys = new List<KeyMapping>(); List<KeyMapping> keys = new List<KeyMapping>();
KeyMapping LastKey { KeyMapping LastKey {
get { get { return keys.LastOrDefault(); }
KeyMapping last = keys.LastOrDefault();
if (last == null)
keys.Add(last = new KeyMapping());
return last;
}
} }
void LayerPop() void LayerPop()
@ -398,6 +392,8 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
break; break;
case BamlRecordType.DeferableContentStart: case BamlRecordType.DeferableContentStart:
Current.IsDeferred = true; Current.IsDeferred = true;
keys = new List<KeyMapping>();
currentKey = 0;
reader.ReadInt32(); reader.ReadInt32();
break; break;
case BamlRecordType.DefAttribute: case BamlRecordType.DefAttribute:
@ -1033,6 +1029,8 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
void ReadElementEnd() void ReadElementEnd()
{ {
CloseElement(); CloseElement();
if (Current.IsDeferred)
keys = null;
LayerPop(); LayerPop();
} }
@ -1600,26 +1598,18 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
return this.assemblyTable[identifier]; return this.assemblyTable[identifier];
} }
XmlBamlNode CurrentNode XmlBamlNode CurrentNode {
{ get { return _currentNode; }
get
{
return _currentNode;
}
} }
///<summary> ///<summary>
///When overridden in a derived class, gets the namespace URI (as defined in the W3C Namespace specification) of the node on which the reader is positioned. ///When overridden in a derived class, gets the namespace URI (as defined in the W3C Namespace specification) of the node on which the reader is positioned.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The namespace URI of the current node; otherwise an empty string. ///The namespace URI of the current node; otherwise an empty string.
///</returns> ///</returns>
/// public override string NamespaceURI {
public override string NamespaceURI get {
{
get
{
if (intoAttribute) return String.Empty; if (intoAttribute) return String.Empty;
TypeDeclaration declaration; TypeDeclaration declaration;
@ -1657,11 +1647,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets the namespace prefix associated with the current node. ///When overridden in a derived class, gets the namespace prefix associated with the current node.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The namespace prefix associated with the current node. ///The namespace prefix associated with the current node.
///</returns> ///</returns>
///
public override string Prefix public override string Prefix
{ {
get get
@ -1675,11 +1663,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets a value indicating whether the current node can have a <see cref="P:System.Xml.XmlReader.Value"></see>. ///When overridden in a derived class, gets a value indicating whether the current node can have a <see cref="P:System.Xml.XmlReader.Value"></see>.
///</summary> ///</summary>
///
///<returns> ///<returns>
///true if the node on which the reader is currently positioned can have a Value; otherwise, false. If false, the node has a value of String.Empty. ///true if the node on which the reader is currently positioned can have a Value; otherwise, false. If false, the node has a value of String.Empty.
///</returns> ///</returns>
///
public override bool HasValue public override bool HasValue
{ {
get { return this.Value != null; } get { return this.Value != null; }
@ -1696,11 +1682,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets the text value of the current node. ///When overridden in a derived class, gets the text value of the current node.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The value returned depends on the <see cref="P:System.Xml.XmlReader.NodeType"></see> of the node. The following table lists node types that have a value to return. All other node types return String.Empty.Node type Value AttributeThe value of the attribute. CDATAThe content of the CDATA section. CommentThe content of the comment. DocumentTypeThe internal subset. ProcessingInstructionThe entire content, excluding the target. SignificantWhitespaceThe white space between markup in a mixed content model. TextThe content of the text node. WhitespaceThe white space between markup. XmlDeclarationThe content of the declaration. ///The value returned depends on the <see cref="P:System.Xml.XmlReader.NodeType"></see> of the node. The following table lists node types that have a value to return. All other node types return String.Empty.Node type Value AttributeThe value of the attribute. CDATAThe content of the CDATA section. CommentThe content of the comment. DocumentTypeThe internal subset. ProcessingInstructionThe entire content, excluding the target. SignificantWhitespaceThe white space between markup in a mixed content model. TextThe content of the text node. WhitespaceThe white space between markup. XmlDeclarationThe content of the declaration.
///</returns> ///</returns>
///
public override string Value public override string Value
{ {
get get
@ -1730,11 +1714,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets the depth of the current node in the XML document. ///When overridden in a derived class, gets the depth of the current node in the XML document.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The depth of the current node in the XML document. ///The depth of the current node in the XML document.
///</returns> ///</returns>
///
public override int Depth public override int Depth
{ {
get { return this.readingElements.Count; } get { return this.readingElements.Count; }
@ -1743,11 +1725,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets the base URI of the current node. ///When overridden in a derived class, gets the base URI of the current node.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The base URI of the current node. ///The base URI of the current node.
///</returns> ///</returns>
///
public override string BaseURI public override string BaseURI
{ {
get { return String.Empty; } get { return String.Empty; }
@ -1756,62 +1736,42 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets a value indicating whether the current node is an empty element (for example, &lt;MyElement/&gt;). ///When overridden in a derived class, gets a value indicating whether the current node is an empty element (for example, &lt;MyElement/&gt;).
///</summary> ///</summary>
///
///<returns> ///<returns>
///true if the current node is an element (<see cref="P:System.Xml.XmlReader.NodeType"></see> equals XmlNodeType.Element) that ends with /&gt;; otherwise, false. ///true if the current node is an element (<see cref="P:System.Xml.XmlReader.NodeType"></see> equals XmlNodeType.Element) that ends with /&gt;; otherwise, false.
///</returns> ///</returns>
///
public override bool IsEmptyElement public override bool IsEmptyElement
{ {
get { return false; } get { return false; }
} }
//public override bool IsDefault
//{
// get
// {
// return this.NamespaceURI == null;
// }
//}
///<summary> ///<summary>
///When overridden in a derived class, gets the number of attributes on the current node. ///When overridden in a derived class, gets the number of attributes on the current node.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The number of attributes on the current node. ///The number of attributes on the current node.
///</returns> ///</returns>
/// public override int AttributeCount {
public override int AttributeCount
{
get { throw new NotImplementedException(); } get { throw new NotImplementedException(); }
} }
///<summary> ///<summary>
///When overridden in a derived class, gets a value indicating whether the reader is positioned at the end of the stream. ///When overridden in a derived class, gets a value indicating whether the reader is positioned at the end of the stream.
///</summary> ///</summary>
///
///<returns> ///<returns>
///true if the reader is positioned at the end of the stream; otherwise, false. ///true if the reader is positioned at the end of the stream; otherwise, false.
///</returns> ///</returns>
/// public override bool EOF {
public override bool EOF
{
get { return _eof; } get { return _eof; }
} }
///<summary> ///<summary>
///When overridden in a derived class, gets the state of the reader. ///When overridden in a derived class, gets the state of the reader.
///</summary> ///</summary>
///
///<returns> ///<returns>
///One of the <see cref="T:System.Xml.ReadState"></see> values. ///One of the <see cref="T:System.Xml.ReadState"></see> values.
///</returns> ///</returns>
/// public override ReadState ReadState {
public override ReadState ReadState get {
{
get
{
if (!initialized) if (!initialized)
return ReadState.Initial; return ReadState.Initial;
else if (reader == null) else if (reader == null)
@ -1831,11 +1791,9 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
///<summary> ///<summary>
///When overridden in a derived class, gets the <see cref="T:System.Xml.XmlNameTable"></see> associated with this implementation. ///When overridden in a derived class, gets the <see cref="T:System.Xml.XmlNameTable"></see> associated with this implementation.
///</summary> ///</summary>
///
///<returns> ///<returns>
///The XmlNameTable enabling you to get the atomized version of a string within the node. ///The XmlNameTable enabling you to get the atomized version of a string within the node.
///</returns> ///</returns>
///
public override XmlNameTable NameTable public override XmlNameTable NameTable
{ {
get { return _nameTable; } get { return _nameTable; }

Write Preview
Loading…
Cancel
Save