diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2005-02-14 19:23:35 +0300 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2005-02-14 19:23:35 +0300 |
commit | 74d50eadf6acc300b61527d668e6282bc0cf3f69 (patch) | |
tree | 243c1ae4c0c4c612e9a576150dda97d0a6bcdf36 /mcs/class/System.XML/Mono.Xml.XPath | |
parent | 2c424904453f73d868dd0bf0259575c8e6e167eb (diff) |
2004-02-14 Atsushi Enomoto <atsushi@ximian.com>
* DTMXPathDocumentBuilder2.cs : in some cases, significant whitespace
is incorrectly regarded as Text. Patch by Andrew Skiba.
* XslApplyTemplates.cs : significant whitespace should not be regarded
as invalid element. Patch by Andrew Skiba.
svn path=/trunk/mcs/; revision=40635
Diffstat (limited to 'mcs/class/System.XML/Mono.Xml.XPath')
-rwxr-xr-x | mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs index 27286f1c22d..70822010bd3 100755 --- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs +++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs @@ -256,17 +256,20 @@ namespace Mono.Xml.XPath parentForFirstChild = -1; // Might be changed in ProcessElement(). string value = null; - XPathNodeType nodeType = xmlReader.NodeType == XmlNodeType.Whitespace ? - XPathNodeType.Whitespace : XPathNodeType.Text; + XPathNodeType nodeType = XPathNodeType.Text; switch (xmlReader.NodeType) { case XmlNodeType.Element: ProcessElement (parent, prevSibling); break; - case XmlNodeType.CDATA: case XmlNodeType.SignificantWhitespace: - case XmlNodeType.Text: + nodeType = XPathNodeType.SignificantWhitespace; + goto case XmlNodeType.Text; case XmlNodeType.Whitespace: + nodeType = XPathNodeType.Whitespace; + goto case XmlNodeType.Text; + case XmlNodeType.CDATA: + case XmlNodeType.Text: if (value == null) skipRead = true; AddNode (parent, |