Author: atsushi
Date: 2005-03-01 00:28:19 -0500 (Tue, 01 Mar 2005)
New Revision: 41306
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs
Log:
2005-03-01 Atsushi Enomoto <[EMAIL PROTECTED]>
* RelaxngPattern.cs : RdpUnresolvedRef should process empty/notAllowed
elimination on its referenced pattern.
* RdpPattern.cs : In "textDeriv(group p1 p2) s", "nullable p1" is
incorrectly computed as "nullable p".
Modified: trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
2005-03-01 03:10:41 UTC (rev 41305)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/ChangeLog
2005-03-01 05:28:19 UTC (rev 41306)
@@ -1,3 +1,8 @@
+2005-03-01 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * RelaxngPattern.cs : RdpUnresolvedRef should process empty/notAllowed
+ elimination on its referenced pattern.
+
2005-02-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* XsdDatatypeProvider.cs : Added simpleType parameter support.
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs
===================================================================
--- trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs
2005-03-01 03:10:41 UTC (rev 41305)
+++ trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng/RelaxngPattern.cs
2005-03-01 05:28:19 UTC (rev 41306)
@@ -1074,6 +1074,14 @@
TargetGrammar.MarkReacheableDefine (this.name);
}
+ internal virtual RdpPattern ReduceEmptyAndNotAllowed (ref bool
result, Hashtable visited)
+ {
+ referencedPattern =
+ referencedPattern.ReduceEmptyAndNotAllowed (
+ ref result, visited);
+ return this;
+ }
+
internal override void CheckConstraints (bool attribute, bool
oneOrMore, bool oneOrMoreGroup, bool oneOrMoreInterleave, bool list, bool
dataExcept)
{
// throw new InvalidOperationException ();
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
===================================================================
---
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
2005-03-01 03:10:41 UTC (rev 41305)
+++
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/ChangeLog
2005-03-01 05:28:19 UTC (rev 41306)
@@ -1,3 +1,8 @@
+2005-03-01 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * RdpPattern.cs : In "textDeriv(group p1 p2) s", "nullable p1" is
+ incorrectly computed as "nullable p".
+
2005-02-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* RdpObjects.cs : provide error type name. removed commented code block.
Modified:
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
===================================================================
---
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
2005-03-01 03:10:41 UTC (rev 41305)
+++
trunk/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.Derivative/RdpPatterns.cs
2005-03-01 05:28:19 UTC (rev 41306)
@@ -906,7 +906,7 @@
public override RdpPattern TextDeriv (string s, XmlReader
reader)
{
RdpPattern p = LValue.TextDeriv (s, reader).Group
(RValue);
- return p.Nullable ?
+ return LValue.Nullable ?
p.Choice (RValue.TextDeriv(s, reader)) : p;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
