2005-06-21 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.XML / Mono.Xml.Xsl.Operations / XslProcessingInstruction.cs

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslProcessingInstruction.cs b/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslProcessingInstruction.cs
index ee6ebaded8da0a9ffc5f4bd2be48d94460ac093e..d9bb64259d5220195b45d694ef5fb9611cbac9e1 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslProcessingInstruction.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslProcessingInstruction.cs
@@ -9,15 +9,37 @@
 // (C) 2003 Atsushi Enomoto
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
+using System.Globalization;
 using System.Xml;
 using System.Xml.XPath;
 using System.Xml.Xsl;
 using System.IO;
 
 namespace Mono.Xml.Xsl.Operations {
-       public class XslProcessingInstruction : XslCompiledElement {
+       internal class XslProcessingInstruction : XslCompiledElement {
                XslAvt name;
                XslOperation value;
                
@@ -43,16 +65,15 @@ namespace Mono.Xml.Xsl.Operations {
 
                public override void Evaluate (XslTransformProcessor p)
                {
-                       StringWriter s = new StringWriter ();
-                       Outputter outputter = new TextOutputter(s, true);
-                       p.PushOutput (outputter);
-                       value.Evaluate (p);
-                       p.PopOutput ();
-                       
                        string actualName = name.Evaluate (p);
-                       if (actualName.ToLower () == "xml")
+                       if (String.Compare (actualName, "xml", true, CultureInfo.InvariantCulture) == 0)
                                throw new XsltException ("Processing instruction name was evaluated to \"xml\"", null, p.CurrentNode);
-                       p.Out.WriteProcessingInstruction (actualName, s.ToString ());
+                       if (actualName.IndexOf (':') >= 0)
+                               return; //MS.NET ignores such processing instructions
+
+                       p.Out.WriteProcessingInstruction (actualName,
+                               value == null ? String.Empty :
+                               value.EvaluateAsString (p));
                }
        }
 }