gluezilla/src:

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

diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/XslAttributeSet.cs b/mcs/class/System.XML/Mono.Xml.Xsl/XslAttributeSet.cs
index 76b8d82ab83f81f6f6d27709b86440442e826f0c..121a4f7d66dedf1f0e07a4902900acdd44aacaea 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Xsl/XslAttributeSet.cs
+++ b/mcs/class/System.XML/Mono.Xml.Xsl/XslAttributeSet.cs
@@ -9,8 +9,28 @@
 // (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.CodeDom;
 using System.Collections;
 using System.Collections.Specialized;
 using System.Xml;
@@ -22,7 +42,7 @@ using Mono.Xml.Xsl.Operations;
 using QName = System.Xml.XmlQualifiedName;
 
 namespace Mono.Xml.Xsl {
-       public class XslAttributeSet : XslCompiledElement {
+       internal class XslAttributeSet : XslCompiledElement {
                QName name;
                // [QName]=>XslAttributeSet
                ArrayList usedAttributeSets = new ArrayList ();
@@ -40,17 +60,19 @@ namespace Mono.Xml.Xsl {
                {
                        this.name = c.ParseQNameAttribute ("name");
                        
-                       foreach (QName q in c.ParseQNameListAttribute ("use-attribute-sets"))
-                               usedAttributeSets.Add (q);
+                       QName [] attrSets = c.ParseQNameListAttribute ("use-attribute-sets");
+                       if (attrSets != null)
+                               foreach (QName q in attrSets)
+                                       usedAttributeSets.Add (q);
 
                        
                        if (!c.Input.MoveToFirstChild ()) return;
                                
                        do {
-                               if (c.Input.NodeType != XPathNodeType.Element) continue;
-                                       
+                               if (c.Input.NodeType != XPathNodeType.Element)
+                                       continue;
                                if (c.Input.NamespaceURI != XsltNamespace || c.Input.LocalName != "attribute")
-                                       throw new Exception ("Invalid attr set content");
+                                       throw new XsltCompileException ("Invalid attr set content", null, c.Input);
                                attributes.Add (new XslAttribute (c));
                        } while (c.Input.MoveToNext ());
                        
@@ -67,30 +89,27 @@ namespace Mono.Xml.Xsl {
                                        usedAttributeSets.Add (q);
                }
                
-               // busy flag to detect circular dependencies
-               // TODO: Move this logic into the compiler, for MT safty
-               bool busy = false;
                public override void Evaluate (XslTransformProcessor p) {
-                       busy = true;
-                       
-                       foreach (Operations.XslAttribute a in attributes)
-                               a.Evaluate (p);
+                       p.SetBusy (this);
                        
                        if (usedAttributeSets != null) {
-                               foreach (QName set in usedAttributeSets)
-                               {
+                               for (int i = 0; i < usedAttributeSets.Count; i++) {
+                                       QName set = (QName) usedAttributeSets [i];
                                        XslAttributeSet s = p.ResolveAttributeSet (set);
                                        if (s == null)
-                                               throw new Exception ("Could not resolve attribute set");
+                                               throw new XsltException ("Could not resolve attribute set", null, p.CurrentNode);
                                        
-                                       if (s.busy)
-                                               throw new Exception ("circular dependency");
+                                       if (p.IsBusy (s))
+                                               throw new XsltException ("circular dependency", null, p.CurrentNode);
                                        
                                        s.Evaluate (p);
                                }
                        }
+                                               
+                       for (int i = 0; i < attributes.Count; i++)
+                               ((XslAttribute) attributes [i]).Evaluate (p);
                        
-                       busy = false;
+                       p.SetFree (this);
                }
        }
 }