From 8b824c07a12614f0fb936ea372275dad80856433 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Tue, 19 Aug 2003 18:43:00 +0000 Subject: [PATCH] 2003-08-19 Ben Maurer * Compiler.cs: Fixed lre/lre04. svn path=/trunk/mcs/; revision=17413 --- mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog | 4 ++++ mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog index 86335467d05..dbea0963b34 100644 --- a/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog +++ b/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog @@ -1,3 +1,7 @@ +2003-08-19 Ben Maurer + + * Compiler.cs: Fixed lre/lre04. + 2003-08-19 Atsushi Enomoto * Compiler.cs : Fixed XslNameUtil.FromString() so that unprefixed name diff --git a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs index 7fb3ce4261a..0ddb72216e9 100644 --- a/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs +++ b/mcs/class/System.XML/Mono.Xml.Xsl/Compiler.cs @@ -338,18 +338,19 @@ namespace Mono.Xml.Xsl { XPathNavigator nav = Input.Clone (); XPathNavigator nsScope = nav.Clone (); + + if (nav.MoveToFirstNamespace (XPathNamespaceScope.ExcludeXml)) { + do { + if (nav.Value != XsltNamespace && !ret.Contains (nav.Name)) + ret.Add (nav.Name, nav.Value); + } while (nav.MoveToNextNamespace (XPathNamespaceScope.ExcludeXml)); + nav.MoveToParent (); + } + do { bool isXslt = nav.NamespaceURI == XsltNamespace; nsScope.MoveTo (nav); - - if (nav.MoveToFirstNamespace (XPathNamespaceScope.Local)) { - do { - if (nav.Value != XsltNamespace && !ret.Contains (nav.Name)) - ret.Add (nav.Name, nav.Value); - } while (nav.MoveToNextNamespace (XPathNamespaceScope.Local)); - nav.MoveToParent (); - } - + if (nav.MoveToFirstAttribute()) { do { if ((nav.LocalName == "extension-element-prefixes" || nav.LocalName == "exclude-result-prefixes") && -- 2.25.1